From 92d87eda945d68346475e6766673a3cdccf3d41c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 20 八月 2024 11:39:35 +0800
Subject: [PATCH] model
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelDocController.java | 51 +
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleDataConstructor.java | 113 ---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelRunlogDao.xml | 23
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/controller/ScheduleJobLogController.java | 8
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelRunlogServiceImpl.java | 88 --
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/CommonConstant.java | 424 --------------
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobLogDTO.java | 8
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dto/StModelDocDTO.java | 53 -
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobDao.java | 8
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobDTO.java | 8
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/config/MybatisPlusConfig.java | 78 +-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelRunlogService.java | 13
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobLogDao.java | 8
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelResultService.java | 19
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelResultDao.xml | 184 +----
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleInfoConstructor.java | 19
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelController.java | 250 ++++++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelResultDao.java | 17
/dev/null | 12
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelResultServiceImpl.java | 95 ---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/ModelServiceApplication.java | 2
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/utils/DateUtils.java | 83 --
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelRunlogDao.java | 6
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelRequestLogController.java | 46 +
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelRunlogController.java | 96 +++
25 files changed, 589 insertions(+), 1,123 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/api/IFeignModelApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/api/IFeignModelApi.java
deleted file mode 100644
index 1ebb086..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/api/IFeignModelApi.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.iailab.api;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author lirm
- * @Description
- * @createTime 2024年05月22日
- */
-@FeignClient(value = "iailab-ntt-model", path = "/")
-public interface IFeignModelApi {
- @Parameter(name = "map", description = "插入运行状态数据", required = true)
- @Operation(summary = "Feign接口-插入运行状态数据")
- @PostMapping("/api/feign/run-state")
- void insertRunState(@RequestParam Map<String, Integer> tMap);
-
- @Parameter(name = "map", description = "插入健康状态数据", required = true)
- @Operation(summary = "Feign接口-插入健康状态数据")
- @PostMapping("/api/feign/health-state")
- void insertHealthState(@RequestParam Map<String, Object> tMap);
-
- @Parameter(name = "map", description = "插入设备列表数据", required = true)
- @Operation(summary = "Feign接口-插入设备列表数据")
- @PostMapping("/api/feign/device-list")
- void insertDeviceList(@RequestParam Map<String, String> tMap);
-
- @Parameter(name = "map", description = "调用模型", required = true)
- @Operation(summary = "Feign接口-调用模型")
- @PostMapping("/api/feign/run-model")
- Map<String, Object> runModel(@RequestParam Map<String, Object> params, @RequestBody List<double[][]> sampleDataList);
-
- @Parameter(name = "list", description = "查询设备ID", required = true)
- @Operation(summary = "Feign接口-查询设备ID")
- @PostMapping("/api/feign/deviceIdList")
- List<String> getDeviceIdList();
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/api/IFeignProddispApi.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/api/IFeignProddispApi.java
deleted file mode 100644
index cbe943f..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/api/IFeignProddispApi.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.iailab.api;
-
-import com.iailab.dto.*;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 生产调度
- *
- * @author PanZhibao
- * @Description
- * @createTime 2023年06月28日 08:54:00
- */
-@FeignClient(value = "iailab-ntt-coal-proddisp", path = "/")
-public interface IFeignProddispApi {
-
- @Parameter(name = "FeignConsumeTargetDTO", description = "消耗指标", required = true)
- @Operation(summary = "Feign接口-创建消耗指标")
- @PostMapping("/api/feign/create/consume-target")
- void createConsumeTarget(@RequestBody FeignConsumeTargetDTO dto);
-
- @Parameter(name = "FeignRunTimeDTO", description = "运行时长", required = true)
- @Operation(summary = "Feign接口-创建运行时长")
- @PostMapping("/api/feign/create/run-time")
- void createRunTime(@RequestBody FeignRunTimeDTO dto);
-
- @Parameter(name = "FeignHourVolumeDTO", description = "小时量", required = true)
- @Operation(summary = "Feign接口-创建小时量")
- @PostMapping("/api/feign/create/hour-volume")
- void createHourVolume(@RequestBody FeignHourVolumeDTO dto);
-
- @Parameter(name = "FeignWarehousePositionDTO", description = "仓位", required = true)
- @Operation(summary = "Feign接口-创建仓位")
- @PostMapping("/api/feign/create/warehouse-position")
- void createWarehousePosition(@RequestBody FeignWarehousePositionDTO dto);
-
- @Parameter(name = "FeignWarehouseStockDTO", description = "库存", required = true)
- @Operation(summary = "Feign接口-创建库存")
- @PostMapping("/api/feign/create/warehouse-stock")
- void createWarehouseStock(@RequestBody FeignWarehouseStockDTO dto);
-
- @Parameter(name = "FeignWashTransferInDTO", description = "调入量", required = true)
- @Operation(summary = "Feign接口-创建调入量")
- @PostMapping("/api/feign/create/wash-transfer-in")
- void createWashTransferIn(@RequestBody FeignWashTransferInDTO dto);
-
- @Parameter(name = "FeignPowerConsumeDTO", description = "电耗", required = true)
- @Operation(summary = "Feign接口-创建调入量")
- @PostMapping("/api/feign/create/power-consume")
- void createPowerConsume(@RequestBody FeignPowerConsumeDTO dto);
-
- @Parameter(name = "FeignRunTimeDTO", description = "入洗量", required = true)
- @Operation(summary = "Feign接口-创建入洗量")
- @PostMapping("/api/feign/create/wash-to-wash")
- void createWashToWash(@RequestBody FeignWashToWashDTO dto);
-
- @Parameter(name = "FeignRunTimeDTO", description = "生产量", required = true)
- @Operation(summary = "Feign接口-创建生产量")
- @PostMapping("/api/feign/create/wash-prod-volume")
- void createWashProdVolume(@RequestBody FeignWashProdVolumeDTO dto);
-
- @Parameter(name = "map", description = "查询库存", required = true)
- @Operation(summary = "Feign接口-查询库存")
- @PostMapping("/api/feign/select/warehouse-group")
- List<FeignWarehousePositionDTO> selectWarehouseGroupByCp(@RequestParam("params") Map<String, Object> params);
-
- @Parameter(name = "map", description = "查询当班总电耗", required = true)
- @Operation(summary = "Feign接口-查询当班总电耗")
- @PostMapping("/api/feign/select/powerConsume")
- BigDecimal sumData(@RequestParam("params") Map<String, Object> params);
-
- @Parameter(name = "String", description = "查询煤仓详情列表", required = true)
- @Operation(summary = "Feign接口-查询煤仓详情列表")
- @PostMapping("/api/feign/select/warehouse-item-list")
- List<FeignWarehouseItemDTO> selectWarehouseItemListByMclx(@RequestParam("mclx") String mclx);
-
- @Parameter(name = "String", description = "查询煤仓详情", required = true)
- @Operation(summary = "Feign接口-查询煤仓详情")
- @PostMapping("/api/feign/select/warehouse-item")
- FeignWarehouseItemDTO selectWarehouseItemByMc(@RequestParam("mc") String mc);
-
- @Parameter(name = "String", description = "查询煤仓煤种", required = true)
- @Operation(summary = "Feign接口-查询煤仓详情")
- @PostMapping("/api/feign/select/mc-mz")
- List<FeignMcMzDTO> selectMcMzByMc(@RequestParam("mc") String mc);
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignConsumeTargetDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignConsumeTargetDTO.java
deleted file mode 100644
index 7641ee6..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignConsumeTargetDTO.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年07月01日 10:00:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "消耗指标")
-public class FeignConsumeTargetDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "消耗指标")
- private String xhzb;
-
- @Schema(name = "单位")
- private String dw;
-
- @Schema(name = "内报当日量")
- private BigDecimal nbdrl;
-
- @Schema(name = "内报调整量")
- private BigDecimal nbtzl;
-
- @Schema(name = "外报当日量")
- private BigDecimal wbdrl;
-
- @Schema(name = "外报调整量")
- private BigDecimal wbtzl;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignHourVolumeDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignHourVolumeDTO.java
deleted file mode 100644
index 4d57f5f..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignHourVolumeDTO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年06月28日 10:02:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "小时量")
-public class FeignHourVolumeDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "时间")
- private Date sj;
-
- @Schema(name = "入洗量")
- private BigDecimal rxl;
-
- @Schema(name = "精煤量")
- private BigDecimal jml;
-
- @Schema(name = "混煤量")
- private BigDecimal hml;
-
- @Schema(name = "矸石量")
- private BigDecimal gsl;
-
- @Schema(name = "浮精板数")
- private BigDecimal fjbs;
-
- @Schema(name = "煤泥板数")
- private BigDecimal mnbs;
-
- @Schema(name = "备注")
- private String content;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignMcMzDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignMcMzDTO.java
deleted file mode 100644
index 24dddd9..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignMcMzDTO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "煤仓详情")
-public class FeignMcMzDTO {
- /**
- * id
- */
- private String id;
- /**
- * 煤仓
- */
- private String mc;
- /**
- * 煤种
- */
- private String mz;
- /**
- * 比例分母
- */
- private Integer den;
- /**
- * 比例
- */
- private Integer proportion;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 更新人
- */
- private String updateBy;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignPowerConsumeDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignPowerConsumeDTO.java
deleted file mode 100644
index cd8319c..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignPowerConsumeDTO.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.iailab.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年02月02日 17:00:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "电耗")
-public class FeignPowerConsumeDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "电耗系统")
- private String xt;
-
- /**
- * 内报当日量
- */
- @JsonFormat(shape =JsonFormat.Shape.STRING)
- private BigDecimal nbdrl;
-
- /**
- * 内报调整量
- */
- @JsonFormat(shape =JsonFormat.Shape.STRING)
- private BigDecimal nbtzl;
-
- /**
- * 外报当日量
- */
- @JsonFormat(shape =JsonFormat.Shape.STRING)
- private BigDecimal wbdrl;
-
- /**
- * 外报调整量
- */
- @JsonFormat(shape =JsonFormat.Shape.STRING)
- private BigDecimal wbtzl;
-
- /**
- * 备注
- */
- private String bz;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignRunTimeDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignRunTimeDTO.java
deleted file mode 100644
index ce313af..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignRunTimeDTO.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年06月28日 09:19:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "运行时长")
-public class FeignRunTimeDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "时长项目")
- private String scxm;
-
- @Schema(name = "时长类型")
- private String runTimeType;
-
- @Schema(name = "小时数")
- private Long xss;
-
- @Schema(name = "分钟数")
- private Long fzs;
-
- @Schema(name = "总时长(分钟)")
- private Long zsc;
-
- @Schema(name = "备注")
- private String content;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehouseItemDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehouseItemDTO.java
deleted file mode 100644
index 3ddc138..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehouseItemDTO.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "煤仓详情")
-public class FeignWarehouseItemDTO {
- /**
- * id
- */
- private String id;
- /**
- * 煤仓类型
- */
- private String mclx;
- /**
- * 煤仓名
- */
- private String mcName;
- /**
- * 煤仓
- */
- private String mc;
- /**
- * 单位
- */
- private String unit;
- /**
- * 容量
- */
- private Integer capacity;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 更新人
- */
- private String updateBy;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehousePositionDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehousePositionDTO.java
deleted file mode 100644
index b57de28..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehousePositionDTO.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年07月01日 10:20:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "仓位")
-public class FeignWarehousePositionDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "煤仓")
- private String mc;
-
- @Schema(name = "煤仓类型")
- private String mclx;
-
- @Schema(name = "仓容量")
- private String crl;
-
- @Schema(name = "产品")
- private String cp;
-
- @Schema(name = "内报估量")
- private BigDecimal nbgl;
-
- @Schema(name = "外报估量")
- private BigDecimal wbgl;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehouseStockDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehouseStockDTO.java
deleted file mode 100644
index b14bb8d..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWarehouseStockDTO.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年07月01日 10:42:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "库存")
-public class FeignWarehouseStockDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "流水号")
- private String lsh;
-
- @Schema(name = "库存煤种")
- private String kcmz;
-
- @Schema(name = "内报昨日库存")
- private BigDecimal nbzrkc;
-
- @Schema(name = "内报今日入库")
- private BigDecimal nbjrrk;
-
- @Schema(name = "内报今日出库")
- private BigDecimal nbjrck;
-
- @Schema(name = "内报调整量")
- private BigDecimal nbtzl;
-
- @Schema(name = "内报今日库存")
- private BigDecimal nbjrkc;
-
- @Schema(name = "外报昨日库存")
- private BigDecimal wbzrkc;
-
- @Schema(name = "外报今日入库")
- private BigDecimal wbjrrk;
-
- @Schema(name = "外报今日出库")
- private BigDecimal wbjrck;
-
- @Schema(name = "外报调整量")
- private BigDecimal wbtzl;
-
- @Schema(name = "外报今日库存")
- private BigDecimal wbjrkc;
-
- @Schema(name = "备注")
- private String bz;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-
- @Schema(name = "标识(0原煤库存、1产品库存)")
- private String bs;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashProdVolumeDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashProdVolumeDTO.java
deleted file mode 100644
index 53486bd..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashProdVolumeDTO.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年07月01日 13:05:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "生产量")
-public class FeignWashProdVolumeDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "产量煤种")
- private String clmz;
-
- @Schema(name = "内报当日量")
- private BigDecimal nbdrl;
-
- @Schema(name = "内报调整量")
- private BigDecimal nbtzl;
-
- @Schema(name = "外报当日量")
- private BigDecimal wbdrl;
-
- @Schema(name = "外报调整量")
- private BigDecimal wbtzl;
-
- @Schema(name = "采样点")
- private String cyd;
-
- @Schema(name = "采样数量")
- private BigDecimal cysl;
-
- @Schema(name = "化验时间")
- private Date hysj;
-
- @Schema(name = "灰分Ad%")
- private BigDecimal hf;
-
- @Schema(name = "水分Mt%")
- private BigDecimal sf;
-
- @Schema(name = "硫份St,d%")
- private BigDecimal lf;
-
- @Schema(name = "挥发分Vdaf%")
- private BigDecimal hff;
-
- @Schema(name = "粘结GR.I")
- private BigDecimal nj;
-
- @Schema(name = "胶质层Y（㎜）GR.I")
- private BigDecimal jzc;
-
- @Schema(name = "发热量(cal/g)")
- private BigDecimal frl;
-
- @Schema(name = "中损")
- private BigDecimal zs;
-
- @Schema(name = "矸损")
- private BigDecimal gs;
-
- @Schema(name = "压滤煤泥灰分Ad%")
- private BigDecimal ylmnHf;
-
- @Schema(name = "备注")
- private String bz;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashToWashDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashToWashDTO.java
deleted file mode 100644
index 355d8ee..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashToWashDTO.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年07月01日 11:48:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "入洗量")
-public class FeignWashToWashDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "洗选精煤")
- private String xxjm;
-
- @Schema(name = "入洗来源")
- private String rxly;
-
- @Schema(name = "入洗配比(:)")
- private BigDecimal rxpb;
-
- @Schema(name = "入洗比例(%)")
- private BigDecimal rxbl;
-
- @Schema(name = "内报当日量")
- private BigDecimal nbdrl;
-
- @Schema(name = "内报调整量")
- private BigDecimal nbtzl;
-
- @Schema(name = "外报当日量")
- private BigDecimal wbdrl;
-
- @Schema(name = "外报调整量")
- private BigDecimal wbtzl;
-
- @Schema(name = "备注")
- private String bz;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-}
diff --git a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashTransferInDTO.java b/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashTransferInDTO.java
deleted file mode 100644
index 421d814..0000000
--- a/iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/dto/FeignWashTransferInDTO.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.iailab.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年07月01日 10:57:00
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Schema(name = "调入量")
-public class FeignWashTransferInDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "日期")
- private String rq;
-
- @Schema(name = "班次")
- private String bc;
-
- @Schema(name = "调入来源")
- private String drly;
-
- @Schema(name = "内报当日量")
- private BigDecimal nbdrl;
-
- @Schema(name = "内报调整量")
- private BigDecimal nbtzl;
-
- @Schema(name = "外报当日量")
- private BigDecimal wbdrl;
-
- @Schema(name = "外报调整量")
- private BigDecimal wbtzl;
-
- @Schema(name = "采样点")
- private String cyd;
-
- @Schema(name = "采样数量")
- private BigDecimal cysl;
-
- @Schema(name = "化验时间")
- private Date hysj;
-
- @Schema(name = "灰分Ad%")
- private BigDecimal hf;
-
- @Schema(name = "水分Mt%")
- private BigDecimal sf;
-
- @Schema(name = "硫份St,d%")
- private BigDecimal lf;
-
- @Schema(name = "挥发分Vdaf%")
- private BigDecimal hff;
-
- @Schema(name = "粘结GR.I")
- private BigDecimal nj;
-
- @Schema(name = "胶质层Y（㎜）GR.I")
- private BigDecimal jzc;
-
- @Schema(name = "发热量(cal/g)")
- private BigDecimal frl;
-
- @Schema(name = "中损")
- private BigDecimal zs;
-
- @Schema(name = "矸损")
- private BigDecimal gs;
-
- @Schema(name = "压滤煤泥灰分Ad%")
- private BigDecimal ylmnHf;
-
- @Schema(name = "备注")
- private String bz;
-
- @Schema(name = "创建人")
- private String cjr;
-
- @Schema(name = "创建时间")
- private Date cjsj;
-
- @Schema(name = "修改人")
- private String xgr;
-
- @Schema(name = "修改时间")
- private Date xgsj;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/ModelServiceApplication.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/ModelServiceApplication.java
index e306c71..18ac48e 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/ModelServiceApplication.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/ModelServiceApplication.java
@@ -3,8 +3,6 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
public class ModelServiceApplication implements CommandLineRunner {
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/aspect/DictAspect.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/aspect/DictAspect.java
deleted file mode 100644
index baa98e5..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/aspect/DictAspect.java
+++ /dev/null
@@ -1,152 +0,0 @@
-//package com.iailab.common.aspect;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.alibaba.fastjson.parser.Feature;
-//import com.iailab.common.annotation.Dict;
-//import com.iailab.framework.common.page.PageData;
-//import com.iailab.framework.common.util.object.ConvertUtils;
-//import com.iailab.framework.common.pojo.CommonResult;
-//import com.iailab.entity.SysDictItem;
-//import com.iailab.module.infra.api.config.ConfigApi;
-//import lombok.extern.slf4j.Slf4j;
-//import org.aspectj.lang.ProceedingJoinPoint;
-//import org.aspectj.lang.annotation.Around;
-//import org.aspectj.lang.annotation.Aspect;
-//import org.aspectj.lang.annotation.Pointcut;
-//import javax.annotation.Resource;
-//import org.springframework.stereotype.Component;
-//import org.springframework.util.CollectionUtils;
-//
-//import java.beans.IntrospectionException;
-//import java.beans.PropertyDescriptor;
-//import java.lang.reflect.Field;
-//import java.lang.reflect.InvocationTargetException;
-//import java.lang.reflect.Method;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @author PanZhibao
-// * @Description
-// * @createTime 2022年05月21日 09:57:00
-// */
-//@Aspect
-//@Component
-//@Slf4j
-//public class DictAspect {
-//
-// private final String PAGE_CODE = "page";
-//
-// private final String DATA_CODE = "data";
-//
-// @Resource
-// private ConfigApi configApi;
-//
-// /**
-// * 定义切点Pointcut
-// */
-// @Pointcut("@annotation(com.iailab.common.annotation.AutoDict)")
-// public void excudeService() {
-// }
-//
-// @Around("excudeService()")
-// public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
-// Object result = pjp.proceed();
-// try {
-// this.parseDictText(result);
-// } catch (Exception ex) {
-// log.info(ex.getMessage());
-// }
-// return result;
-// }
-//
-// /**
-// * parseDictText
-// *
-// * @param result
-// * @throws IntrospectionException
-// * @throws InvocationTargetException
-// * @throws IllegalAccessException
-// */
-// private void parseDictText(Object result) throws IntrospectionException, InvocationTargetException, IllegalAccessException {
-// Map<String, List<SysDictItem>> mapList = configApi.queryAllDictItems();
-// Map<String,Map<String, String>> map = new HashMap<>();
-// if (!CollectionUtils.isEmpty(mapList)) {
-// mapList.forEach((k , v) -> {
-// Map<String, String> dictItems = new HashMap<>();
-// if (!CollectionUtils.isEmpty(v)) {
-// v.forEach(item -> {
-// dictItems.put(item.getItemValue(), item.getItemText());
-// });
-// }
-// map.put(k, dictItems);
-// });
-// }
-//
-// if(result instanceof CommonResult) {
-// if(((CommonResult) result).getData() != null) {
-// Object data = ((CommonResult) result).getData();
-// if (data instanceof List) {
-// for (Object record : (List)data) {
-// this.setDictText(record, map);
-// }
-// } else if(data instanceof PageData) {
-// Object list = ((PageData)data).getList();
-// for (Object record : (List)list) {
-// this.setDictText(record, map);
-// }
-// } else {
-// this.setDictText(data, map);
-// }
-// }
-// } else if (result instanceof List){
-// for (Object record : (List)result) {
-// this.setDictText(record, map);
-// }
-// }
-// }
-//
-// /**
-// * setDictText
-// *
-// * @param record
-// * @param map
-// * @throws IntrospectionException
-// * @throws InvocationTargetException
-// * @throws IllegalAccessException
-// */
-// private void setDictText(Object record, Map<String,Map<String, String>> map) throws IntrospectionException, InvocationTargetException, IllegalAccessException {
-// JSONObject item = JSONObject.parseObject(JSONObject.toJSONString(record), Feature.OrderedField);
-// for (Field field : ConvertUtils.getAllFields(record)) {
-// if (!field.isAnnotationPresent(Dict.class)) {
-// continue;
-// }
-// String dictCode = field.getAnnotation(Dict.class).dicCode();
-// String itemValue = field.getAnnotation(Dict.class).itemValue();
-// String value = item.getString(itemValue);
-// Method method = new PropertyDescriptor(field.getName(), record.getClass()).getWriteMethod();
-// method.invoke(record, this.getDictText(dictCode, value, map));
-// }
-// }
-//
-// /**
-// * getDictText
-// *
-// * @param dictCode
-// * @param itemValue
-// * @param map
-// * @return
-// */
-// private String getDictText(String dictCode, String itemValue, Map<String,Map<String, String>> map) {
-// String dictText = "";
-// try{
-// if (map != null || map.containsKey(dictCode)) {
-// dictText = map.get(dictCode).get(itemValue);
-// }
-// } catch (Exception ex) {
-// log.info("字典异常：" + dictCode );
-// }
-// return dictText;
-// }
-//}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/config/MybatisPlusConfig.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/config/MybatisPlusConfig.java
index a9ef27e..8a07c72 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/config/MybatisPlusConfig.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/config/MybatisPlusConfig.java
@@ -1,43 +1,35 @@
-///**
-// * Copyright (c) 2018 人人开源 All rights reserved.
-// *
-// * https://www.renren.io
-// *
-// * 版权所有，侵权必究！
-// */
-//
-//package com.iailab.common.config;
-//
-//import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-//import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
-//import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
-//import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-//import com.iailab.common.interceptor.DataFilterInterceptor;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-///**
-// * mybatis-plus配置
-// *
-// * @author Mark sunlightcs@gmail.com
-// * @since 1.0.0
-// */
-//@Configuration
-//public class MybatisPlusConfig {
-//
-// @Bean
-// public MybatisPlusInterceptor mybatisPlusInterceptor() {
-// MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
-// // 数据权限
-// mybatisPlusInterceptor.addInnerInterceptor(new DataFilterInterceptor());
-// // 分页插件
-// mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor());
-// // 乐观锁
-// mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
-// // 防止全表更新与删除
-// mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
-//
-// return mybatisPlusInterceptor;
-// }
-//
-//}
\ No newline at end of file
+package com.iailab.common.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.iailab.framework.mybatis.interceptor.DataFilterInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * mybatis-plus配置
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+ @Bean
+ public MybatisPlusInterceptor mybatisPlusInterceptor() {
+ MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+ // 数据权限
+ mybatisPlusInterceptor.addInnerInterceptor(new DataFilterInterceptor());
+ // 分页插件
+ mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+ // 乐观锁
+ mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
+ // 防止全表更新与删除
+ mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
+
+ return mybatisPlusInterceptor;
+ }
+
+}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/constant/BusinessConstant.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/constant/BusinessConstant.java
deleted file mode 100644
index ee0c7e8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/constant/BusinessConstant.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.iailab.common.constant;
-
-/**
- * 业务功能常量
- *
- * @author PanZhibao
- * @Description
- * @createTime 2023年06月14日 11:58:00
- */
-public interface BusinessConstant {
-
- String DEV_Y = "y";
-
- Integer granularity = 60; //时间粒度
-
-
- String MODEL_R_ERROR = "5"; // 模型结果错误
-
- String MODEL_R_WARN = "4"; // 模型结果警告
-
-
- String In_ControlModel_PointNo = "1000"; //控制模式
-
-
- String FXModelCode = "separation_control";//分选控制模型
-
- String JYModelCode = "dosing_control";//加药控制模型
-
- Integer Granularity60 = 60; //时间粒度
-
- Integer Granularity300 = 300; //时间粒度
- Integer Granularity10 = 10; //时间粒度
-
- //设备健康评价模型
- String MODEL_Health_Status_Evaluate = "1b703117-7e6a-4bb8-82ad-b485d81a4fe5";
-
-
- String MODEL_Density_ParamID = "preDensity"; //分选预测
-
- String MODEL_1315_ParamID = "V1315"; //1315/1分流阀开度给定值
- String MODEL_1308_ParamID= "V1308"; //1308/1分流阀开度给定值
- String MODEL_1355_ParamID = "V1355"; //1355/1分流阀开度给定值
- String MODEL_1309_ParamID = "V1309"; //1309/1分流阀开度给定值
-
- String MODEL_YIN1_ParamID = "Vyin1"; //阴离子泵1频率给定值
- String MODEL_YIN2_ParamID = "Vyin2"; //阴离子泵2频率给定值
- String MODEL_YANG1_ParamID = "Vyang1"; //阳离子泵1频率给定值
- String MODEL_YANG2_ParamID = "Vyang2"; //阳离子泵1频率给定值
-
- //OPCUA
- String OPCUA_1315_PointNo = "1315_1_KD";//1315/1加水阀开关反馈值(8011改成1315_1_KD)
- String OPCUA_1308_PointNo = "8002";//1308/1分流阀开度反馈值
- String OPCUA_1309_PointNo = "8004";//1309/1分流阀开度反馈值
- String OPCUA_1355_PointNo = "1355_1_KD";//1355/1加介阀开度反馈值(8033改成1355_1_KD)
- String OPCUA_13151_RunState_PointNo = "13151_RunState";//阀13151运行状态
- String OPCUA_1355_1_KD_net10 = "1355_1_KD_net10";//1355/1阀门开度(10s采集频率)
- String OPCUA_1315_1_KD_net10 = "1315_1_KD_net10";
- String OPCUA_1308_1_KD_net10 = "1308_1_KD_net10";
- String OPCUA_1309_1_KD_net10 = "1309_1_KD_net10";
- String OPCUA_1308_net10_PointNo = "8002_net10";//1308/1分流阀开度反馈值
- String OPCUA_1309_net10_PointNo = "8004_net10";//1309/1分流阀开度反馈值
-
-
- String OPCUA_1315_1_fh_PointNo = "1315_1_fh"; // 手动_稀介桶1315/1加水阀开度
- String OPCUA_1355_1_fh_PointNo = "1355_1_fh"; // 手动_1355/1分流阀开度
-
- String OPCUA_8039_PointNo = "8039";//合介浓度反馈值
- String OPCUA_8041_PointNo = "8041";//稀介桶位高度
- String OPCUA_8043_PointNo = "8043";//合介桶位高度
- String OPCUA_8031_PointNo = "8031";//原煤入料
- String OPCUA_7001_PointNo = "7001";//原煤灰分
- String OPCUA_2001_PointNo = "2001";//精煤在线灰分
-
- String OPCUA_1315_1_KD = "1315_1_KD";
- String OPCUA_1308_1_KD = "1308_1_KD";
- String OPCUA_1355_1_KD = "1355_1_KD";
- String OPCUA_1309_1_KD = "1309_1_KD";
-
- //OPCUA
- String OPCUA_8129_PointNo = "8129";//1610加药装置1#变频器频率返回
- String OPCUA_8130_PointNo = "8130";//1610加药装置2#变频器频率返回
- String OPCUA_8134_PointNo = "8134";//1611加药装置1#变频器频率返回
- String OPCUA_8135_PointNo = "8135";//1611加药装置2#变频器频率返回
- String OPCUA_3101_PointNo = "3101";//浓缩池入料浓度
- String OPCUA_3102_PointNo = "3102";//浓缩池入料流量1
- String OPCUA_3103_PointNo = "3103";//浓缩池入料流量2
- String OPCUA_8144_PointNo = "8144";//耙子1601靶位耙子NT
- String OPCUA_8143_PointNo = "8143";//耙子1601扭矩耙子NT
- String OPCUA_8149_PointNo = "8149";//耙子1602靶位耙子NT
- String OPCUA_8150_PointNo = "8150";//耙子1602扭矩耙子NT
- String OPCUA_8151_PointNo = "8151";//清水液位1
- String OPCUA_8161_PointNo = "8161";//清水液位2
- String OPCUA_3107_PointNo = "3107";//浓缩池出料浓度（底流浓度）
- String OPCUA_3112_PointNo = "3112";//循环水池浊度（溢流浊度）
-
- String OPCUA_set_1610_1_f = "set_1610_1_f"; // 1610_1上位机频率设定（阴）
- String OPCUA_set_1610_2_f = "set_1610_2_f"; // 1610_2上位机频率设定（阴）
-
- String OPCUA_i1610_1_f_set = "i1610_1_f_set";
- String OPCUA_i1610_2_f_set = "i1610_2_f_set";
- String OPCUA_i1611_1_f_set = "i1611_1_f_set";
- String OPCUA_i1611_2_f_set = "i1611_2_f_set";
-
- String OPCUA_i_1610_LL = "i_1610_LL"; // 1610加药装置 流量计（阳）
- String OPCUA_i_1611_LL = "i_1611_LL"; // 1611加药装置 流量计（阴）
- String OPCUA_i1610_LL_Set = "i1610_LL_Set"; // 1610流量设定（阳）
- String OPCUA_i1611_LL_Set = "i1611_LL_Set"; // 1611流量设定（阴）
-
- Integer SCHEDULEDCLEANDAYS = -10; //定时任务清理10天之前数据
-
- String Code_Model = "model";
-
- String Code_Model_Path = "path";
-
- String Code_Model_Start= "start";
-
- String MODELE_RESULT_STATUS = "status";
-
- Integer MODELE_RESULT_STATUS_200 = 200;
-
- Integer MODELE_RESULT_STATUS_401 = 401;
-
- String MODELE_RESULT_TIPS = "tips";
-
- /**
- * 智能浓缩加药控制器启动状态
- */
- String SYS_PARAM_Controller_ICAD_ONSTS = "Controller_ICAD_ONSTS";
-
- /**
- * 智能分选控制器启动状态
- */
- String SYS_PARAM_Controller_IHMS_ONSTS = "Controller_IHMS_ONSTS";
-
- String SYS_PARAM_Y = "y";
-
- /**
- * 分选启动，煤泥系统未启动
- */
- String ONSTS10 = "10";
-
- /**
- * 分选启动、煤泥系统启动
- */
- String ONSTS11 = "11";
-
- /**
- * 分选未启动、煤泥系统启动
- */
- String ONSTS01 = "01";
-
- String ONSTS10_NAME = "分选启动，煤泥未启";
-
- String ONSTS11_NAME = "分选启动，煤泥启动";
-
- String ONSTS01_NAME = "分选未启，煤泥启动";
-
- String RESULT = "CommonResult";
-
- String RESULT_TRUE = "true";
-
- String STATUS_TRUE = "true";
-
- String STATUS_FALSE = "false";
-
- String OPCUA_ZNJY_ALM = "ZNJY_ALM";
-
- String OPCUA_ZNFX_ALM = "ZNFX_ALM";
-
- long YEAR_MINUTE = 365 * 24 * 60;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/IndexQueryDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/IndexQueryDTO.java
deleted file mode 100644
index cc76369..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/IndexQueryDTO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.iailab.common.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class IndexQueryDTO {
-
- private Date startDate;
-
- private Date endDate;
-
- private String code;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/IndexStatisticDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/IndexStatisticDTO.java
deleted file mode 100644
index 5572bc6..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/IndexStatisticDTO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.iailab.common.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-@Data
-public class IndexStatisticDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- public Date dateTime;
- public BigDecimal data;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/echarts/BarLineDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/echarts/BarLineDTO.java
deleted file mode 100644
index 63c4c68..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/echarts/BarLineDTO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.iailab.common.dto.echarts;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author lirm
- * @Description
- * @createTime 2023.05.11
- */
-@Data
-@Schema(name = "图表")
-public class BarLineDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String valueName;//表名称
-
- private List<String> legend;//线的名称
-
- private List<String> categories;//X轴数据
-
- private List<SeriesItem> series;//Y轴数据集合
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/echarts/SeriesItem.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/echarts/SeriesItem.java
deleted file mode 100644
index 7ac0024..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/echarts/SeriesItem.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.iailab.common.dto.echarts;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author lirm
- * @Description
- * @createTime 2023.05.11
- */
-@Data
-public class SeriesItem {
-
- private String name;
-
- private List<Object[]> data;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/vue/CascaderOptionDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/vue/CascaderOptionDTO.java
deleted file mode 100644
index 24c2c10..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/dto/vue/CascaderOptionDTO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.iailab.common.dto.vue;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年05月15日 13:46:00
- */
-@Data
-public class CascaderOptionDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String value;
-
- private String label;
-
- private List<CascaderOptionDTO> children;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/CdbmEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/CdbmEnum.java
deleted file mode 100644
index 7cd3d1f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/CdbmEnum.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.iailab.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月12日 9:57:00
- */
-@Getter
-@AllArgsConstructor
-public enum CdbmEnum {
-
- //报表
- PLAN("plan", "计划","t"),
- CL("cl", "产量","t"),
- DBL("dbl", "达标率","%"),
- HF("hf", "灰分","%"),
- SF("sf", "水分","%"),
- LF("lf", "硫分","%"),
- RZ("rz", "热值","cal/g"),
-
- YIN("yin","阴离子消耗","kg"),
- YANG("yang","阳离子消耗","kg"),
- JH("jh","介耗","kg"),
-
- DXHM("groundsales","地销混煤","t"),
- XZKWY("medblock","洗中块外运","t"),
- XXKWY("nubmeasure","洗小块外运","t"),
- GSWY("gangue","矸石外运","t"),
- XKZZ("reshipped","小块转载","t"),
- HCWYT("trainTon","火车外运吨数","t"),
- HCWYC("trainCount","火车外运列数","列"),
-
- //测点
- AP1("M0000100373","1#低压风机出口压力","kpa"),
- AP2("M0000100374","2#低压风机出口压力","kpa"),
- HJMD3318("M0000100030","3318线路合介密度","kg/L"),
- HJMD3319("M0000100031","3319线路合介密度","kg/L"),
- HJMD315("M0000100084","307合介桶密度","kg/L"),
- HJMD316("M0000100078","308合介桶密度","kg/L"),
- BF401("M0000100108","401浓缩池出料浓度（底流浓度）","kg/L"),
- BF402("M0000100114","402浓缩池出料浓度（底流浓度）","kg/L"),
- BF501("M0000100120","501浓缩池出料浓度（底流浓度）","kg/L"),
- BF504("M0000100120","504浓缩池出料浓度（底流浓度）","kg/L"),
-
- PDC721("721.DayTotal","721皮带秤累计","t"),
- PDC722("722.DayTotal","722皮带秤累计","t");
- private String code;
- private String desc;
- private String unit;//单位
-
- public static CdbmEnum getEumByCode(String code) {
- if (code == null) {
- return null;
- }
-
- for (CdbmEnum cdbmEnum : CdbmEnum.values()) {
- if (cdbmEnum.getCode().equals(code)) {
- return cdbmEnum;
- }
- }
- return null;
- }
-
- public static CdbmEnum getEumByName(String name) {
- if (name == null) {
- return null;
- }
-
- for (CdbmEnum cdbmEnum : CdbmEnum.values()) {
- if (cdbmEnum.name().equals(name)) {
- return cdbmEnum;
- }
- }
- return null;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/CommonConstant.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/CommonConstant.java
index d83138d..bab24ad 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/CommonConstant.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/CommonConstant.java
@@ -6,428 +6,4 @@
*/
public interface CommonConstant {
- String STA_TRUE = "true";
-
- String ZX_RES = "res";
-
- String CJS_SYS = "system";
-
- /**
- * 启用
- */
- public static final int IS_ENABLE = 1;
-
- /**
- * 删除标志
- */
- public static final Integer BPM_FLAG_1 = 1;
-
- /**
- * 正常状态
- */
- public static final Integer STATUS_NORMAL = 0;
-
- /**
- * 禁用状态
- */
- public static final Integer STATUS_DISABLE = -1;
-
- /**
- * 删除标志
- */
- public static final Integer DEL_FLAG_1 = 1;
-
- /**
- * 未删除
- */
- public static final Integer DEL_FLAG_0 = 0;
-
- /**
- * 未提交
- */
- public static final Integer SUBMINT_STATUS_0 = 0;
-
- /**
- * 系统日志类型： 登录
- */
- public static final int LOG_TYPE_1 = 1;
-
- /**
- * 系统日志类型： 操作
- */
- public static final int LOG_TYPE_2 = 2;
-
- /**
- * 操作日志类型： 查询
- */
- public static final int OPERATE_TYPE_1 = 1;
-
- /**
- * 操作日志类型： 添加
- */
- public static final int OPERATE_TYPE_2 = 2;
-
- /**
- * 操作日志类型： 更新
- */
- public static final int OPERATE_TYPE_3 = 3;
-
- /**
- * 操作日志类型： 删除
- */
- public static final int OPERATE_TYPE_4 = 4;
-
- /**
- * 操作日志类型： 倒入
- */
- public static final int OPERATE_TYPE_5 = 5;
-
- /**
- * 操作日志类型： 导出
- */
- public static final int OPERATE_TYPE_6 = 6;
-
- /**
- * 提交
- */
- public static final int SUBMIT_FLAG_1 = 1;
-
- /**
- * 通过
- */
- public static final int SUBMIT_FLAG_2 = 2;
-
- /**
- * 驳回
- */
- public static final int SUBMIT_FLAG_3 = 3;
-
- /**
- * 提交
- */
- public static final int SUBMIT_FLAG_0 = 0;
-
- public static final int SUBMIT_FLAG_4 = 4;
-
- public static final int SUBMIT_FLAG_5 = 5;
-
- public static final int SUBMIT_FLAG_6 = 6;
-
- public static final Integer DANGER_STATUS = 1;
-
- public static final Integer DANGER_STATUS_2 = 2;
-
-
- /** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */
- public static final Integer SC_INTERNAL_SERVER_ERROR_500 = 500;
- /** {@code 200 OK} (HTTP/1.0 - RFC 1945) */
- public static final Integer SC_OK_200 = 200;
-
- /**访问权限认证未通过 510*/
- public static final Integer SC_JEECG_NO_AUTHZ=510;
-
- /** 登录用户Shiro权限缓存KEY前缀 */
- public static String PREFIX_USER_SHIRO_CACHE = "shiro:cache:org.jeecg.config.shiro.ShiroRealm.authorizationCache:";
- /** 登录用户Token令牌缓存KEY前缀 */
- public static final String PREFIX_USER_TOKEN = "prefix_user_token_";
-// /** Token缓存时间：3600秒即一小时 */
-// public static final int TOKEN_EXPIRE_TIME = 3600;
-
- /** 登录二维码 */
- public static final String LOGIN_QRCODE_PRE = "QRCODELOGIN:";
- public static final String LOGIN_QRCODE = "LQ:";
- /** 登录二维码token */
- public static final String LOGIN_QRCODE_TOKEN = "LQT:";
-
-
- /**
- * 0：一级菜单
- */
- public static final Integer MENU_TYPE_0 = 0;
- /**
- * 1：子菜单
- */
- public static final Integer MENU_TYPE_1 = 1;
- /**
- * 2：按钮权限
- */
- public static final Integer MENU_TYPE_2 = 2;
-
- /**通告对象类型（USER:指定用户，ALL:全体用户）*/
- public static final String MSG_TYPE_UESR = "USER";
- public static final String MSG_TYPE_ALL = "ALL";
-
- /**发布状态（0未发布，1已发布，2已撤销）*/
- public static final String NO_SEND = "0";
- public static final String HAS_SEND = "1";
- public static final String HAS_CANCLE = "2";
-
- /**阅读状态（0未读，1已读）*/
- public static final String HAS_READ_FLAG = "1";
- public static final String NO_READ_FLAG = "0";
-
- /**优先级（L低，M中，H高）*/
- public static final String PRIORITY_L = "L";
- public static final String PRIORITY_M = "M";
- public static final String PRIORITY_H = "H";
-
- /**
- * 短信模板方式 0 .登录模板、1.注册模板、2.忘记密码模板
- */
- public static final String SMS_TPL_TYPE_0 = "0";
- public static final String SMS_TPL_TYPE_1 = "1";
- public static final String SMS_TPL_TYPE_2 = "2";
-
- /**
- * 状态(0无效1有效)
- */
- public static final String STATUS_0 = "0";
- public static final String STATUS_1 = "1";
-
- /**
- * 状态(0无效1有效)
- */
- public static final Integer INT_STATUS_0 = 0;
- public static final Integer INT_STATUS_1 = 1;
-
- /**
- * 同步工作流引擎1同步0不同步
- */
- public static final Integer ACT_SYNC_1 = 1;
- public static final Integer ACT_SYNC_0 = 0;
-
- /**
- * 消息类型1:通知公告2:系统消息
- */
- public static final String MSG_CATEGORY_1 = "1";
- public static final String MSG_CATEGORY_2 = "2";
-
- /**
- * 是否配置菜单的数据权限 1是0否
- */
- public static final Integer RULE_FLAG_0 = 0;
- public static final Integer RULE_FLAG_1 = 1;
-
- /**
- * 是否用户已被冻结 1正常(解冻) 2冻结
- */
- public static final Integer USER_UNFREEZE = 1;
- public static final Integer USER_FREEZE = 2;
-
- /**字典翻译文本后缀*/
- public static final String DICT_TEXT_SUFFIX = "_dictText";
-
- /**
- * 表单设计器主表类型
- */
- public static final Integer DESIGN_FORM_TYPE_MAIN = 1;
-
- /**
- * 表单设计器子表表类型
- */
- public static final Integer DESIGN_FORM_TYPE_SUB = 2;
-
- /**
- * 表单设计器URL授权通过
- */
- public static final Integer DESIGN_FORM_URL_STATUS_PASSED = 1;
-
- /**
- * 表单设计器URL授权未通过
- */
- public static final Integer DESIGN_FORM_URL_STATUS_NOT_PASSED = 2;
-
- /**
- * 表单设计器新增 Flag
- */
- public static final String DESIGN_FORM_URL_TYPE_ADD = "add";
- /**
- * 表单设计器修改 Flag
- */
- public static final String DESIGN_FORM_URL_TYPE_EDIT = "edit";
- /**
- * 表单设计器详情 Flag
- */
- public static final String DESIGN_FORM_URL_TYPE_DETAIL = "detail";
- /**
- * 表单设计器复用数据 Flag
- */
- public static final String DESIGN_FORM_URL_TYPE_REUSE = "reuse";
- /**
- * 表单设计器编辑 Flag （已弃用）
- */
- public static final String DESIGN_FORM_URL_TYPE_VIEW = "view";
-
- /**
- * online参数值设置（是：Y, 否：N）
- */
- public static final String ONLINE_PARAM_VAL_IS_TURE = "Y";
- public static final String ONLINE_PARAM_VAL_IS_FALSE = "N";
-
- /**
- * 文件上传类型（本地：local，Minio：minio，阿里云：alioss）
- */
- public static final String UPLOAD_TYPE_LOCAL = "local";
- public static final String UPLOAD_TYPE_MINIO = "minio";
- public static final String UPLOAD_TYPE_OSS = "alioss";
-
- /**
- * 文档上传自定义桶名称
- */
- public static final String UPLOAD_CUSTOM_BUCKET = "eoafile";
- /**
- * 文档上传自定义路径
- */
- public static final String UPLOAD_CUSTOM_PATH = "eoafile";
- /**
- * 文件外链接有效天数
- */
- public static final Integer UPLOAD_EFFECTIVE_DAYS = 1;
-
- /**
- * 员工身份 （1:普通员工 2:上级）
- */
- public static final Integer USER_IDENTITY_1 = 1;
- public static final Integer USER_IDENTITY_2 = 2;
-
- /** sys_user 表 username 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_SYS_USER_USERNAME = "uniq_sys_user_username";
- /** sys_user 表 work_no 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_SYS_USER_WORK_NO = "uniq_sys_user_work_no";
- /** sys_user 表 phone 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_SYS_USER_PHONE = "uniq_sys_user_phone";
- /** 达梦数据库升提示。违反表[SYS_USER]唯一性约束 */
- public static final String SQL_INDEX_UNIQ_SYS_USER = "唯一性约束";
-
- /** sys_user 表 email 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_SYS_USER_EMAIL = "uniq_sys_user_email";
- /** sys_quartz_job 表 job_class_name 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_JOB_CLASS_NAME = "uniq_job_class_name";
- /** sys_position 表 code 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_CODE = "uniq_code";
- /** sys_role 表 code 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_SYS_ROLE_CODE = "uniq_sys_role_role_code";
- /** sys_depart 表 code 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_DEPART_ORG_CODE = "uniq_depart_org_code";
- /** sys_category 表 code 唯一键索引 */
- public static final String SQL_INDEX_UNIQ_CATEGORY_CODE = "idx_sc_code";
- /**
- * 在线聊天 是否为默认分组
- */
- public static final String IM_DEFAULT_GROUP = "1";
- /**
- * 在线聊天 图片文件保存路径
- */
- public static final String IM_UPLOAD_CUSTOM_PATH = "imfile";
- /**
- * 在线聊天 用户状态
- */
- public static final String IM_STATUS_ONLINE = "online";
-
- /**
- * 在线聊天 SOCKET消息类型
- */
- public static final String IM_SOCKET_TYPE = "chatMessage";
-
- /**
- * 在线聊天 是否开启默认添加好友 1是 0否
- */
- public static final String IM_DEFAULT_ADD_FRIEND = "1";
-
- /**
- * 在线聊天 用户好友缓存前缀
- */
- public static final String IM_PREFIX_USER_FRIEND_CACHE = "sys:cache:im:im_prefix_user_friend_";
-
- /**
- * 考勤补卡业务状态 （1：同意 2：不同意）
- */
- public static final String SIGN_PATCH_BIZ_STATUS_1 = "1";
- public static final String SIGN_PATCH_BIZ_STATUS_2 = "2";
-
- /**
- * 公文文档上传自定义路径
- */
- public static final String UPLOAD_CUSTOM_PATH_OFFICIAL = "officialdoc";
- /**
- * 公文文档下载自定义路径
- */
- public static final String DOWNLOAD_CUSTOM_PATH_OFFICIAL = "officaldown";
-
- /**
- * WPS存储值类别(1 code文号 2 text（WPS模板还是公文发文模板）)
- */
- public static final String WPS_TYPE_1="1";
- public static final String WPS_TYPE_2="2";
-
-
- public final static String X_ACCESS_TOKEN = "X-Access-Token";
- public final static String X_SIGN = "X-Sign";
- public final static String X_TIMESTAMP = "X-TIMESTAMP";
- public final static String TOKEN_IS_INVALID_MSG = "Token失效，请重新登录!";
-
- /**
- * 多租户 请求头
- */
- public final static String TENANT_ID = "tenant-id";
-
- /**
- * 微服务读取配置文件属性 服务地址
- */
- public final static String CLOUD_SERVER_KEY = "spring.cloud.nacos.discovery.server-addr";
-
- /**
- * 第三方登录 验证密码/创建用户 都需要设置一个操作码 防止被恶意调用
- */
- public final static String THIRD_LOGIN_CODE = "third_login_code";
-
- /**
- * 第三方APP同步方向：本地 --> 第三方APP
- */
- String THIRD_SYNC_TO_APP = "SYNC_TO_APP";
- /**
- * 第三方APP同步方向：第三方APP --> 本地
- */
- String THIRD_SYNC_TO_LOCAL = "SYNC_TO_LOCAL";
-
- /** 系统通告消息状态：0=未发布 */
- String ANNOUNCEMENT_SEND_STATUS_0 = "0";
- /** 系统通告消息状态：1=已发布 */
- String ANNOUNCEMENT_SEND_STATUS_1 = "1";
- /** 系统通告消息状态：2=已撤销 */
- String ANNOUNCEMENT_SEND_STATUS_2 = "2";
-
- /**ONLINE 报表权限用 从request中获取地址栏后的参数*/
- String ONL_REP_URL_PARAM_STR="onlRepUrlParamStr";
-
- /**POST请求*/
- String HTTP_POST = "POST";
-
- /**PUT请求*/
- String HTTP_PUT = "PUT";
-
- /**PATCH请求*/
- String HTTP_PATCH = "PATCH";
-
- /**未知的*/
- String UNKNOWN = "unknown";
-
- /**字符串http*/
- String STR_HTTP = "http";
-
- /**String 类型的空值*/
- String STRING_NULL = "null";
-
- /**java.util.Date 包*/
- String JAVA_UTIL_DATE = "java.util.Date";
-
- /**.do*/
- String SPOT_DO = ".do";
-
-
- /**前端vue版本标识*/
- String VERSION="X-Version";
-
- /**前端vue版本*/
- String VERSION_VUE3="vue3";
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/DataAshType.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/DataAshType.java
deleted file mode 100644
index 65f01e0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/DataAshType.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iailab.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年08月25日 18:03:00
- */
-@Getter
-@AllArgsConstructor
-public enum DataAshType {
- YM(1, "7001"), JM(2, "2001");
- private Integer code;
- private String desc;
-
- public static DataAshType getEumByCode(Integer code) {
- if (code == null) {
- return null;
- }
-
- for (DataAshType statusEnum : DataAshType.values()) {
- if (statusEnum.getCode().equals(code)) {
- return statusEnum;
- }
- }
- return null;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/DataTypeEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/DataTypeEnum.java
deleted file mode 100644
index 335da30..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/DataTypeEnum.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.iailab.common.enums;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年07月26日 15:06:00
- */
-public enum DataTypeEnum {
- Float("Float"),
- Int("Int"),
- Short("Short"),
- Boolean("Boolean"),
- String("String");
-
- private String value;
-
- DataTypeEnum(String value) {
- this.value = value;
- }
-
- public String value() {
- return this.value;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/PostalStatus.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/PostalStatus.java
deleted file mode 100644
index 8cb345a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/PostalStatus.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iailab.common.enums;
-
-/**
- * 通讯状态
- *
- * @author PanZhibao
- * @Description
- * @createTime 2023年05月22日 10:26:00
- */
-public enum PostalStatus {
- ABNORMAL("0"), // 0 异常
- NORMAL("1"); //1 正常
-
- private String value;
-
- PostalStatus(String value) {
- this.value = value;
- }
-
- public String value() {
- return this.value;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/SourceTypeEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/SourceTypeEnum.java
deleted file mode 100644
index 122ce50..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/SourceTypeEnum.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.iailab.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 数据源类型
- *
- * @author PanZhibao
- * @Description
- * @createTime 2023年05月15日 14:01:00
- */
-@Getter
-@AllArgsConstructor
-public enum SourceTypeEnum {
-
- HTTP("HTTP"),
-
- OPCUA("OPCUA"),
-
- MODBUS("MODBUS");
-
- private String code;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/SuperAdminEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/SuperAdminEnum.java
deleted file mode 100644
index 4bb69ec..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/SuperAdminEnum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有，侵权必究！
- */
-
-package com.iailab.common.enums;
-
-/**
- * 超级管理员枚举
- *
- * @author Mark sunlightcs@gmail.com
- * @since 1.0.0
- */
-public enum SuperAdminEnum {
- YES(1),
- NO(0);
-
- private int value;
-
- SuperAdminEnum(int value) {
- this.value = value;
- }
-
- public int value() {
- return this.value;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/WatchDogStsEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/WatchDogStsEnum.java
deleted file mode 100644
index ace482d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/enums/WatchDogStsEnum.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.iailab.common.enums;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年07月26日 16:33:00
- */
-public enum WatchDogStsEnum {
- CONNECT_TRUE("1"),
- CONNECT_FALSE("0");
-
- private String value;
-
- WatchDogStsEnum(String value) {
- this.value = value;
- }
-
- public String value() {
- return this.value;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/utils/DateUtils.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/utils/DateUtils.java
index e7b265a..ef64f0a 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/utils/DateUtils.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/common/utils/DateUtils.java
@@ -1,14 +1,5 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- * <p>
- * https://www.renren.io
- * <p>
- * 版权所有，侵权必究！
- */
-
package com.iailab.common.utils;
-import com.iailab.common.constant.BusinessConstant;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
@@ -201,12 +192,6 @@
return days;
}
- public static Date getTime(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- return calendar.getTime();
- }
-
public static List<String> getYearTime(Date startDate, Date endDate) {
List<String> days = new ArrayList<String>();
Calendar calendar = Calendar.getInstance();
@@ -229,74 +214,6 @@
calendar.add(Calendar.MONTH, 1);
}
return days;
- }
-
- public static List<String> getDayTime(Date startDate, Date endDate) {
- List<String> days = new ArrayList<String>();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(startDate);
-
- while (calendar.getTime().compareTo(endDate) <= 0) {
- days.add(DateUtils.format(calendar.getTime(), DATE_PATTERN));
- calendar.add(Calendar.DAY_OF_YEAR, 1);
- }
- return days;
- }
-
- public static List<String> getDayTime(Date startDate, Date endDate, int seconds) {
- List<String> days = new ArrayList<String>();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(startDate);
- while (calendar.getTime().compareTo(endDate) <= 0) {
- days.add(DateUtils.format(calendar.getTime(), DATE_TIME_PATTERN));
- calendar.add(Calendar.SECOND, seconds);
- }
- return days;
- }
-
- public static List<String> getClassTime(Date startDate, Date endDate) {
- List<String> days = new ArrayList<String>();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(startDate);
- while (calendar.getTime().compareTo(endDate) <= 0) {
- days.add(DateUtils.format(calendar.getTime(), DATE_PATTERN) + " 0点班");
- days.add(DateUtils.format(calendar.getTime(), DATE_PATTERN) + " 8点班");
- days.add(DateUtils.format(calendar.getTime(), DATE_PATTERN) + " 16点班");
- calendar.add(Calendar.DAY_OF_YEAR, 1);
- }
- return days;
- }
-
- public static Map<String, Date> getIntervalDate() {
- Date tEndDate = getTime(addDateDays(new Date(), BusinessConstant.SCHEDULEDCLEANDAYS)); //当前时间前10天
- Date tStartDate = getTime(addDateHours(tEndDate, -1));//当前时间前10天前一个小时
- Map<String, Date> tMap = new HashMap<String, Date>();
- tMap.put("startdate", tStartDate);
- tMap.put("enddate", tEndDate);
- return tMap;
-
- }
-
- public static Map<String, Date> getIntervalDate(int days) {
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DAY_OF_YEAR, days);
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- Date tEndDate = calendar.getTime();
- calendar.add(Calendar.HOUR_OF_DAY, -1);
- Date tStartDate = calendar.getTime();
- Map<String, Date> tMap = new HashMap<String, Date>(2);
- tMap.put("startdate", tStartDate);
- tMap.put("enddate", tEndDate);
- return tMap;
-
- }
-
- public static boolean isNotBlank(Date date) {
- if (date == null) {
- return false;
- }
- return true;
}
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyController.java
deleted file mode 100644
index 9cf2bd6..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyController.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.iailab.module.any.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.ApiIndValueDTO;
-import com.iailab.module.data.dto.FeignQueryPointDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.Constant;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.any.dto.AnyAllEvaluationDTO;
-import com.iailab.module.any.dto.AnyStoreReliabilityDTO;
-import com.iailab.module.any.dto.AnySugLibDTO;
-import com.iailab.module.any.dto.AnyTrendResultDTO;
-import com.iailab.module.any.service.AnySugLibService;
-import com.iailab.module.mcs.service.StModelResultService;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.param.service.PageParmService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Slf4j
-@RestController
-@RequestMapping("any")
-public class AnyController {
-
- @Resource
- private PageParmService pageParmService;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private AnySugLibService anySugLibService;
-
- @Resource
- private StModelResultService stModelCommonResultService;
-
- private String MODEL_CODE_TREND = "trend_analysis";
-
- /**
- * 仓储可靠性分析结果（分页）
- *
- * @param params
- * @return
- */
- @GetMapping("store/page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<AnyStoreReliabilityDTO>> storePage(@RequestParam Map<String, Object> params) {
- PageData<AnyStoreReliabilityDTO> page = stModelCommonResultService.getStorePage(params);
-
- return new CommonResult<PageData<AnyStoreReliabilityDTO>>().setData(page);
- }
-
- /**
- * 综合评价分析结果（分页）
- *
- * @param params
- * @return
- */
- @GetMapping("evaluation/page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<AnyAllEvaluationDTO>> evaluationPage(@RequestParam Map<String, Object> params) {
- PageData<AnyAllEvaluationDTO> page = stModelCommonResultService.getAllEvaluationPage(params);
-
- return new CommonResult<PageData<AnyAllEvaluationDTO>>().setData(page);
- }
-
-
- /**
- * 实时趋势分析
- *
- * @param params
- * @return
- */
- @GetMapping("ind-item/trend")
- public CommonResult<AnyTrendResultDTO> get(@RequestParam Map<String, Object> params) throws Exception {
- AnyTrendResultDTO result = new AnyTrendResultDTO();
- String paramCode = params.get("paramCode").toString();
- String paramValue = pageParmService.selectValue(params.get("page").toString(), params.get("paramCode").toString());
- if (StringUtils.isBlank(paramValue)) {
- return new CommonResult<AnyTrendResultDTO>();
- }
- JSONObject paramObj = JSONObject.parseObject(paramValue);
- result.setChartCode(paramObj.getString("chartCode"));
- result.setLength(Integer.parseInt(paramObj.getString("length")));
- result.setUnit(paramObj.getString("unit"));
- result.setMaxSlope(new BigDecimal(paramObj.getString("maxSlope")));
- result.setMinSlope(new BigDecimal(paramObj.getString("minSlope")));
-
- FeignQueryPointDTO queryIndDto = new FeignQueryPointDTO();
- queryIndDto.setPointCode(result.getChartCode());
- queryIndDto.setStartDate(params.get("startDate") == null ? null : params.get("startDate").toString());
- queryIndDto.setEndDate(params.get("endDate") == null ? null : params.get("endDate").toString());
- List<ApiIndValueDTO> indValues = feignDataApi.queryIndItemValuesRange(queryIndDto);
- result.setValueList(indValues);
- result.setLength(indValues.size());
- List<ApiIndValueDTO> nv = indValues.stream().filter(dto -> {return dto.getDataValue() != null;}).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(nv)) {
- result.setCurrentValue(nv.get(nv.size() - 1).getDataValue());
- }
- Map<String, Object> mr = new HashMap<>();
- mr.put("mean_value", "");
- mr.put("max_value", "");
- mr.put("min_value", "");
- try {
- List<double[][]> sampleDataList = new ArrayList<>();
- double[][] mix = new double[nv.size()][1];
- for (int i = 0; i < nv.size(); i++) {
- mix[i][0] = nv.get(i).getDataValue().doubleValue();
- }
- sampleDataList.add(mix);
- mr = modelHandler.run(MODEL_CODE_TREND, sampleDataList);
- String slopeFlag = mr.get("slope_flag").toString();
- switch (slopeFlag) {
- case "1":
- result.setTrend("上升");
- result.setIconClass("el-icon-top");
- result.setScopeValue("略有上升趋势");
- break;
- case "2":
- result.setTrend("上升");
- result.setIconClass("el-icon-top");
- result.setScopeValue("上升趋势过大");
- break;
- case "-1":
- result.setTrend("下降");
- result.setIconClass("el-icon-bottom");
- result.setScopeValue("略有下降趋势");
- break;
- case "-2":
- result.setTrend("下降");
- result.setIconClass("el-icon-bottom");
- result.setScopeValue("下降趋势过大");
- break;
- default:
- result.setTrend("平稳");
- result.setScopeValue("平稳");
- break;
-
- }
- AnySugLibDTO sugDto = anySugLibService.get("trend", paramCode, slopeFlag);
- if (sugDto != null) {
- result.setDispatchSug(sugDto.getContent());
- } else {
- result.setDispatchSug("生产正常，暂无建议");
- }
- } catch (Exception ex) {
- log.error("趋势模型运行异常");
- ex.printStackTrace();
- }
- result.setTrendValue(mr);
- return new CommonResult<AnyTrendResultDTO>().setData(result);
-
- }
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyProcCardController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyProcCardController.java
deleted file mode 100644
index c9e4a00..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyProcCardController.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.iailab.module.any.controller;
-
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.service.AnyProcCardService;
-import io.swagger.v3.oas.annotations.Operation;
-import lombok.extern.slf4j.Slf4j;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Slf4j
-@RestController
-@RequestMapping("any/proc-card")
-public class AnyProcCardController {
-
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @GetMapping("code/{code}")
- @Operation(summary = "信息")
- public CommonResult<AnyProcCardDTO> info(@PathVariable("code") String code) {
- AnyProcCardDTO data = anyProcCardService.getByCode(code);
-
- return new CommonResult<AnyProcCardDTO>().setData(data);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyProcReportController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyProcReportController.java
deleted file mode 100644
index c1525c5..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/controller/AnyProcReportController.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.iailab.module.any.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.Constant;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.any.dto.AnyProcReportDTO;
-import com.iailab.module.any.service.AnyProcReportService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import lombok.extern.slf4j.Slf4j;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Slf4j
-@RestController
-@RequestMapping("any/proc-report")
-public class AnyProcReportController {
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<AnyProcReportDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<AnyProcReportDTO> page = anyProcReportService.page(params);
-
- return new CommonResult<PageData<AnyProcReportDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<AnyProcReportDTO> get(@PathVariable("id") String id) {
- AnyProcReportDTO data = anyProcReportService.get(id);
-
- return new CommonResult<AnyProcReportDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- public CommonResult save(@RequestBody AnyProcReportDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- anyProcReportService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- public CommonResult update(@RequestBody AnyProcReportDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- anyProcReportService.update(dto);
-
- return new CommonResult();
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcCardDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcCardDao.java
deleted file mode 100644
index 6ce09b1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcCardDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.any.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.any.entity.AnyProcCardEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Mapper
-public interface AnyProcCardDao extends BaseDao<AnyProcCardEntity> {
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcParamDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcParamDao.java
deleted file mode 100644
index e9be450..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcParamDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.any.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.any.entity.AnyProcParamEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Mapper
-public interface AnyProcParamDao extends BaseDao<AnyProcParamEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcReportDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcReportDao.java
deleted file mode 100644
index a2303b0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcReportDao.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.iailab.module.any.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.any.entity.AnyProcReportEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Mapper
-public interface AnyProcReportDao extends BaseDao<AnyProcReportEntity> {
-// @DataSource("slave1")
- void migrationProcReport(List<AnyProcReportEntity> list);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcReportDetDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcReportDetDao.java
deleted file mode 100644
index 6c93503..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnyProcReportDetDao.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.iailab.module.any.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.any.entity.AnyProcReportDetEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Mapper
-public interface AnyProcReportDetDao extends BaseDao<AnyProcReportDetEntity> {
-// @DataSource("slave1")
- void migration(List<AnyProcReportDetEntity> list);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnySugLibDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnySugLibDao.java
deleted file mode 100644
index 96fa236..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dao/AnySugLibDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.any.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.any.entity.AnySugLibEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Mapper
-public interface AnySugLibDao extends BaseDao<AnySugLibEntity> {
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyAllEvaluationDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyAllEvaluationDTO.java
deleted file mode 100644
index df6c366..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyAllEvaluationDTO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.iailab.module.any.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月18日
- */
-@Data
-@Schema(name = "生产综合评价")
-public class AnyAllEvaluationDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String dateTime;
-
- private String firstLevel;
-
- private String zongLevel;
-
- private String shuLiangFen;
-
- private String zhiLiangFen;
-
- private String shengChanFen;
-
- private String guoChengFen;
-
- private String guanLiFen;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcCardDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcCardDTO.java
deleted file mode 100644
index 6473437..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcCardDTO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.any.dto;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Data
-@TableName("t_any_proc_card")
-public class AnyProcCardDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- private String code;
-
- private String name;
-
- private String status;
-
- private String alarmInfo;
-
- private String suggest;
-
- private Date anyTime;
-
- private Integer sort;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcParamDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcParamDTO.java
deleted file mode 100644
index a70259b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcParamDTO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.iailab.module.any.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Data
-@Schema(name = "生产过程分析参数")
-public class AnyProcParamDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- private String cardId;
-
- private String type;
-
- private String paramId;
-
- private Integer paramLength;
-
- private Integer sort;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcReportDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcReportDTO.java
deleted file mode 100644
index fa8731a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcReportDTO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.iailab.module.any.dto;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Data
-@Schema(name = "分析报告")
-public class AnyProcReportDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- private String procCode;
-
- private String procName;
-
- private String reportName;
-
- private Date reportDate;
-
- private String content;
-
- private Date createDate;
-
- private List<AnyProcReportDetDTO> detList;
-
- private List<BarLineDTO> chartList;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcReportDetDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcReportDetDTO.java
deleted file mode 100644
index d8d3bde..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyProcReportDetDTO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.iailab.module.any.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Data
-@Schema(name = "分析报告详情")
-public class AnyProcReportDetDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- private String reportId;
-
- private Integer sort;
-
- private String contentType;
-
- private String content;
-
- private String remark;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyStoreReliabilityDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyStoreReliabilityDTO.java
deleted file mode 100644
index 5e46ae1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyStoreReliabilityDTO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iailab.module.any.dto;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月23日
- */
-@Data
-@Schema(name = "仓储可靠性分析")
-public class AnyStoreReliabilityDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String dateTime;
- private String score;
- private String analysis;
- private String judgement;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnySugLibDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnySugLibDTO.java
deleted file mode 100644
index 8000c35..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnySugLibDTO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iailab.module.any.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Data
-@Schema(name = "分析建议库")
-public class AnySugLibDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- private String type;
-
- private String code;
-
- private String cond;
-
- private String content;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyTrendResultDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyTrendResultDTO.java
deleted file mode 100644
index ac8e958..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/dto/AnyTrendResultDTO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.iailab.module.any.dto;
-
-import com.iailab.module.data.dto.ApiIndValueDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Data
-@Schema(name = "趋势分析结果")
-public class AnyTrendResultDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String chartCode;
-
- private String chartName;
-
- private Integer length;
-
- private String unit;
-
- private BigDecimal maxSlope;
-
- private BigDecimal minSlope;
-
- private BigDecimal currentValue;
-
- private String trend;
-
- private String iconClass;
-
- private String scopeValue;
-
- private Map<String, Object> trendValue;
-
- private String dispatchSug;
-
- private List<ApiIndValueDTO> valueList;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcCardEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcCardEntity.java
deleted file mode 100644
index e27b98d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcCardEntity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.iailab.module.any.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月17日
- */
-@Data
-@TableName("t_any_proc_card")
-public class AnyProcCardEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- private String code;
-
- private String name;
-
- private String status;
-
- private String alarmInfo;
-
- private String suggest;
-
- private Date anyTime;
-
- private Integer sort;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcParamEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcParamEntity.java
deleted file mode 100644
index a623e3c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcParamEntity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.iailab.module.any.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 生产过程分析参数
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月17日
- */
-@Data
-@TableName("t_any_proc_param")
-public class AnyProcParamEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- private String cardId;
-
- private String type;
-
- private String paramId;
-
- private Integer paramLength;
-
- private Integer sort;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcReportDetEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcReportDetEntity.java
deleted file mode 100644
index a852860..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcReportDetEntity.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.iailab.module.any.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Data
-@TableName("t_any_proc_report_det")
-public class AnyProcReportDetEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- private String reportId;
-
- private Integer sort;
-
- private String contentType;
-
- private String content;
-
- private String remark;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcReportEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcReportEntity.java
deleted file mode 100644
index 4fce6cd..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnyProcReportEntity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.any.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月17日
- */
-@Data
-@TableName("t_any_proc_report")
-public class AnyProcReportEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- private String procCode;
-
- private String procName;
-
- private String reportName;
-
- private Date reportDate;
-
- private String content;
-
- private Date createDate;
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnySugLibEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnySugLibEntity.java
deleted file mode 100644
index 93d8d67..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/entity/AnySugLibEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.iailab.module.any.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Data
-@TableName("t_any_sug_lib")
-public class AnySugLibEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- private String type;
-
- private String code;
-
- private String cond;
-
- private String content;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcCardService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcCardService.java
deleted file mode 100644
index b922de4..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcCardService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.iailab.module.any.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.entity.AnyProcCardEntity;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-public interface AnyProcCardService extends BaseService<AnyProcCardEntity> {
-
- AnyProcCardDTO getByCode(String code);
-
- void updateByCode(AnyProcCardDTO dto);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcParamService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcParamService.java
deleted file mode 100644
index 8834f73..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcParamService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.iailab.module.any.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.any.dto.AnyProcParamDTO;
-import com.iailab.module.any.entity.AnyProcParamEntity;
-
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-public interface AnyProcParamService extends BaseService<AnyProcParamEntity> {
-
- List<AnyProcParamDTO> listByCardId(String cardId);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcReportDetService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcReportDetService.java
deleted file mode 100644
index 01742dd..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcReportDetService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.iailab.module.any.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.any.dto.AnyProcReportDetDTO;
-import com.iailab.module.any.entity.AnyProcReportDetEntity;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-public interface AnyProcReportDetService extends BaseService<AnyProcReportDetEntity> {
-
-
- List<AnyProcReportDetDTO> listByReportId(String reportId);
-
- void save(AnyProcReportDetDTO dto);
-
- void migrationProcReportDet(Map<String, Date> tMap);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcReportService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcReportService.java
deleted file mode 100644
index ead78d8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnyProcReportService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.iailab.module.any.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.any.dto.AnyProcReportDTO;
-import com.iailab.module.any.entity.AnyProcReportEntity;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-public interface AnyProcReportService extends BaseService<AnyProcReportEntity> {
-
- PageData<AnyProcReportDTO> page(Map<String, Object> params);
-
- AnyProcReportDTO get(String id);
-
- void save(AnyProcReportDTO dto);
-
- void update(AnyProcReportDTO dto);
-
- void delete(Long[] ids);
-
- void saveReport(String cardCode, String reportName, String content, Date runTime);
-
- void migrationProcReport(Map<String, Date> tMap);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnySugLibService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnySugLibService.java
deleted file mode 100644
index 4d519e9..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/AnySugLibService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.iailab.module.any.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.any.dto.AnySugLibDTO;
-import com.iailab.module.any.entity.AnySugLibEntity;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-public interface AnySugLibService extends BaseService<AnySugLibEntity> {
-
- AnySugLibDTO get(String type, String code, String condition);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcCardServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcCardServiceImpl.java
deleted file mode 100644
index 0f41634..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcCardServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.iailab.module.any.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.any.dao.AnyProcCardDao;
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.entity.AnyProcCardEntity;
-import com.iailab.module.any.service.AnyProcCardService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Service
-public class AnyProcCardServiceImpl extends BaseServiceImpl<AnyProcCardDao, AnyProcCardEntity> implements AnyProcCardService {
-
- @Override
- public AnyProcCardDTO getByCode(String code) {
- QueryWrapper<AnyProcCardEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("code", code);
- AnyProcCardEntity entity = baseDao.selectOne(wrapper);
- return ConvertUtils.sourceToTarget(entity, AnyProcCardDTO.class);
-
- }
-
- @Override
- public void updateByCode(AnyProcCardDTO dto) {
- AnyProcCardEntity entity = new AnyProcCardEntity();
- entity.setAlarmInfo(dto.getAlarmInfo());
- entity.setAnyTime(dto.getAnyTime());
- QueryWrapper<AnyProcCardEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("code", dto.getCode());
- baseDao.update(entity, wrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcParamServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcParamServiceImpl.java
deleted file mode 100644
index b280387..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcParamServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.iailab.module.any.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.any.dao.AnyProcParamDao;
-import com.iailab.module.any.dto.AnyProcParamDTO;
-import com.iailab.module.any.entity.AnyProcParamEntity;
-import com.iailab.module.any.service.AnyProcParamService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Service
-public class AnyProcParamServiceImpl extends BaseServiceImpl<AnyProcParamDao, AnyProcParamEntity> implements AnyProcParamService {
-
- @Override
- public List<AnyProcParamDTO> listByCardId(String cardId) {
- QueryWrapper<AnyProcParamEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("card_id", cardId)
- .orderByAsc("sort");
- List<AnyProcParamEntity> list = baseDao.selectList(wrapper);
- return ConvertUtils.sourceToTarget(list, AnyProcParamDTO.class);
-
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcReportDetServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcReportDetServiceImpl.java
deleted file mode 100644
index adbc06f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcReportDetServiceImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.iailab.module.any.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.any.dao.AnyProcReportDetDao;
-import com.iailab.module.any.dto.AnyProcReportDetDTO;
-import com.iailab.module.any.entity.AnyProcReportDetEntity;
-import com.iailab.module.any.service.AnyProcReportDetService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Service
-public class AnyProcReportDetServiceImpl extends BaseServiceImpl<AnyProcReportDetDao, AnyProcReportDetEntity> implements AnyProcReportDetService {
-
- @Override
- public List<AnyProcReportDetDTO> listByReportId(String reportId) {
- QueryWrapper<AnyProcReportDetEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("report_id", reportId)
- .orderByAsc("sort");
- List<AnyProcReportDetEntity> list = baseDao.selectList(wrapper);
- return ConvertUtils.sourceToTarget(list, AnyProcReportDetDTO.class);
- }
-
- @Override
- public void save(AnyProcReportDetDTO dto) {
- AnyProcReportDetEntity entity = ConvertUtils.sourceToTarget(dto, AnyProcReportDetEntity.class);
- entity.setId(UUID.randomUUID().toString());
- entity.setCreateDate(new Date());
- insert(entity);
- }
-
- @Override
- public void migrationProcReportDet(Map<String, Date> tMap) {
- List<AnyProcReportDetEntity> list = baseDao.selectList(getDateWrapper(tMap));
- if (CollectionUtils.isEmpty(list)){
- return;
- }
- baseDao.migration(list);
- baseDao.delete(getDateWrapper(tMap));
- }
-
- public QueryWrapper<AnyProcReportDetEntity> getDateWrapper(Map<String, Date> params) {
- String startDate = DateUtils.format(params.get("startdate"),DateUtils.DATE_TIME_PATTERN);
- String endDate = DateUtils.format(params.get("enddate"),DateUtils.DATE_TIME_PATTERN);
-
- QueryWrapper<AnyProcReportDetEntity> wrapper = new QueryWrapper<>();
- wrapper.ge(StringUtils.isNotBlank(startDate), "create_date", startDate);
- wrapper.le(StringUtils.isNotBlank(endDate), "create_date", endDate);
- return wrapper;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcReportServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcReportServiceImpl.java
deleted file mode 100644
index 6450707..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnyProcReportServiceImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.iailab.module.any.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.module.data.dto.ApiDataDTO;
-import com.iailab.module.data.dto.FeignQueryPointDTO;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.data.dto.ApiDataPointDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.any.dao.AnyProcReportDao;
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.dto.AnyProcParamDTO;
-import com.iailab.module.any.dto.AnyProcReportDTO;
-import com.iailab.module.any.dto.AnyProcReportDetDTO;
-import com.iailab.module.any.entity.AnyProcReportEntity;
-import com.iailab.module.any.service.AnyProcCardService;
-import com.iailab.module.any.service.AnyProcParamService;
-import com.iailab.module.any.service.AnyProcReportDetService;
-import com.iailab.module.any.service.AnyProcReportService;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Service
-public class AnyProcReportServiceImpl extends BaseServiceImpl<AnyProcReportDao, AnyProcReportEntity> implements AnyProcReportService {
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @Resource
- private AnyProcReportDetService anyProcReportDetService;
-
- @Resource
- private AnyProcParamService anyProcParamService;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Override
- public PageData<AnyProcReportDTO> page(Map<String, Object> params) {
- IPage<AnyProcReportEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, AnyProcReportDTO.class);
- }
-
- private QueryWrapper<AnyProcReportEntity> getWrapper(Map<String, Object> params) {
- String procCode = (String) params.get("procCode");
- String procName = (String) params.get("procName");
- String reportName = (String) params.get("reportName");
- String startTime = (String) params.get("startTime");
- String endTime = (String) params.get("endTime");
- QueryWrapper<AnyProcReportEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(procCode), "proc_code", procCode)
- .like(StringUtils.isNotBlank(procName), "proc_name", procName)
- .like(StringUtils.isNotBlank(reportName), "report_name", reportName)
- .ge(StringUtils.isNotBlank(startTime), "start_time", startTime)
- .le(StringUtils.isNotBlank(endTime), "end_time", endTime);
- return wrapper;
- }
-
- @Override
- public AnyProcReportDTO get(String id) {
- AnyProcReportEntity entity = baseDao.selectById(id);
- AnyProcReportDTO result = ConvertUtils.sourceToTarget(entity, AnyProcReportDTO.class);
- List<AnyProcReportDetDTO> detList = anyProcReportDetService.listByReportId(id);
-
- List<BarLineDTO> chartList = new ArrayList<>();
- if (CollectionUtils.isEmpty(detList)) {
- result.setChartList(chartList);
- return result;
- }
- List<String> ct = detList.stream().map(t -> {
- return t.getContentType();
- }).distinct().collect(Collectors.toList());
-
- Map<String, List<AnyProcReportDetDTO>> detGroup = detList.stream().collect(Collectors.groupingBy(AnyProcReportDetDTO::getContentType));
-
- ct.forEach(k -> {
- List<AnyProcReportDetDTO> v = detGroup.get(k);
- BarLineDTO dto = new BarLineDTO();
- dto.setValueName(k);
- List<String> legend = new ArrayList<>();
- List<SeriesItem> series = new ArrayList<>();
- List<String> categories = new ArrayList<>();
- v.forEach(item -> {
- legend.add(item.getRemark());
- SeriesItem seriesItem = new SeriesItem();
- seriesItem.setName(item.getRemark());
- List<Object[]> sData = new ArrayList<>();
- if (StringUtils.isNotBlank(item.getContent())) {
- sData = JSONArray.parseArray(item.getContent(), Object[].class);
- }
- seriesItem.setData(sData);
- series.add(seriesItem);
- });
- series.get(0).getData().forEach(item -> {
- categories.add(item[0].toString());
- });
- dto.setLegend(legend);
- dto.setSeries(series);
- dto.setCategories(categories);
- chartList.add(dto);
- });
-
- result.setChartList(chartList);
- return result;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void save(AnyProcReportDTO dto) {
- AnyProcReportEntity entity = ConvertUtils.sourceToTarget(dto, AnyProcReportEntity.class);
- entity.setId(UUID.randomUUID().toString());
- entity.setCreateDate(new Date());
- insert(entity);
-
- if (CollectionUtils.isEmpty(dto.getDetList())) {
- return;
- }
- for (int i = 0; i < dto.getDetList().size(); i++) {
- AnyProcReportDetDTO det = dto.getDetList().get(i);
- det.setReportId(entity.getId());
- det.setSort(i);
- anyProcReportDetService.save(det);
- }
- }
-
- @Override
- public void update(AnyProcReportDTO dto) {
- AnyProcReportEntity entity = ConvertUtils.sourceToTarget(dto, AnyProcReportEntity.class);
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(Long[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- public void saveReport(String cardCode, String reportName, String content, Date runTime) {
- AnyProcCardDTO card = anyProcCardService.getByCode(cardCode);
- AnyProcReportDTO reportDTO = new AnyProcReportDTO();
- reportDTO.setProcCode(card.getCode());
- reportDTO.setProcName(card.getName());
- reportDTO.setReportName(reportName);
- reportDTO.setReportDate(runTime);
- reportDTO.setContent(content);
- List<AnyProcReportDetDTO> detList = new ArrayList<>();
- List<AnyProcParamDTO> paramList = anyProcParamService.listByCardId(card.getId());
- for (int i = 0; i < paramList.size(); i++) {
- AnyProcParamDTO paramItem = paramList.get(i);
- FeignQueryPointDTO queryPointDTO = new FeignQueryPointDTO();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(runTime);
- queryPointDTO.setEndTime(calendar.getTime());
- calendar.add(Calendar.MINUTE, paramItem.getParamLength() * -1);
- queryPointDTO.setStartTime(calendar.getTime());
- queryPointDTO.setPointCode(paramItem.getParamId());
- List<ApiDataDTO> dataList = feignDataApi.queryPointValues(queryPointDTO);
- ApiDataPointDTO pointDTO = feignDataApi.getPoint(paramItem.getParamId());
- if (CollectionUtils.isEmpty(dataList)) {
- continue;
- }
- AnyProcReportDetDTO det = new AnyProcReportDetDTO();
- List<Object[]> dataCont = dataList.stream().map(t -> {
- return new Object[]{DateUtils.format(t.getTimeStamp(), DateUtils.DATE_TIME_PATTERN_MIN), new BigDecimal(t.getDataValue()).setScale(4, BigDecimal.ROUND_HALF_UP)};
- }).collect(Collectors.toList());
- det.setContent(JSONArray.toJSONString(dataCont));
- det.setContentType(paramItem.getType());
- det.setRemark(pointDTO.getPointName());
- detList.add(det);
- }
- reportDTO.setDetList(detList);
- this.save(reportDTO);
- }
-
- @Override
- public void migrationProcReport(Map<String, Date> tMap) {
- List<AnyProcReportEntity> list = baseDao.selectList(getDateWrapper(tMap));
- if (CollectionUtils.isEmpty(list)){
- return;
- }
- baseDao.migrationProcReport(list);
- baseDao.delete(getDateWrapper(tMap));
- }
-
- public QueryWrapper<AnyProcReportEntity> getDateWrapper(Map<String, Date> params) {
- String startDate = DateUtils.format(params.get("startdate"),DateUtils.DATE_TIME_PATTERN);
- String endDate = DateUtils.format(params.get("enddate"),DateUtils.DATE_TIME_PATTERN);
-
- QueryWrapper<AnyProcReportEntity> wrapper = new QueryWrapper<>();
- wrapper.ge(StringUtils.isNotBlank(startDate), "report_date", startDate);
- wrapper.le(StringUtils.isNotBlank(endDate), "report_date", endDate);
- return wrapper;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnySugLibServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnySugLibServiceImpl.java
deleted file mode 100644
index 29c2c86..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/any/service/impl/AnySugLibServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iailab.module.any.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.any.dao.AnySugLibDao;
-import com.iailab.module.any.dto.AnySugLibDTO;
-import com.iailab.module.any.entity.AnySugLibEntity;
-import com.iailab.module.any.service.AnySugLibService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Service
-public class AnySugLibServiceImpl extends BaseServiceImpl<AnySugLibDao, AnySugLibEntity> implements AnySugLibService {
-
- @Override
- public AnySugLibDTO get(String type, String code, String condition) {
- QueryWrapper<AnySugLibEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("type", type)
- .eq("code", code)
- .eq("cond", condition);
- AnySugLibEntity entity = baseDao.selectOne(wrapper);
- return ConvertUtils.sourceToTarget(entity, AnySugLibDTO.class);
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/dao/ConsDayDataDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/dao/ConsDayDataDao.java
deleted file mode 100644
index 5aaa558..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/dao/ConsDayDataDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.cons.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.cons.entity.ConsDayDataEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-@Mapper
-public interface ConsDayDataDao extends BaseDao<ConsDayDataEntity> {
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/dto/ConsDayDataDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/dto/ConsDayDataDTO.java
deleted file mode 100644
index 75dc073..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/dto/ConsDayDataDTO.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.iailab.module.cons.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-@Data
-@Schema(name = "日煤质趋势")
-public class ConsDayDataDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- private String id;
-
- @Schema(name = "月份")
- private String monthstr;
-
- @Schema(name = "日期")
- private String type;
-
- @Schema(name = "日期")
- private String date;
-
- @Schema(name = "阴离子kg")
- private BigDecimal anion;
-
- @Schema(name = "阴离子费用")
- private BigDecimal anionFee;
-
- @Schema(name = "阴离子吨耗")
- private BigDecimal anionPerCoal;
-
- @Schema(name = "阳离子kg")
- private BigDecimal cation;
-
- @Schema(name = "阳离子费用")
- private BigDecimal cationFee;
-
- @Schema(name = "阳离子吨耗")
- private BigDecimal cationPerCoal;
-
- @Schema(name = "入洗原煤量吨")
- private BigDecimal coalWeight;
-
- @Schema(name = "电耗kWh")
- private BigDecimal elec;
-
- @Schema(name = "电耗费用")
- private BigDecimal elecFee;
-
- @Schema(name = "电吨耗")
- private BigDecimal elecPerCoal;
-
- @Schema(name = "介质kg")
- private BigDecimal medium;
-
- @Schema(name = "介质费用")
- private BigDecimal mediumFee;
-
- @Schema(name = "介质吨耗")
- private BigDecimal mediumPerCoal;
-
- @Schema(name = "水耗m3")
- private BigDecimal water;
-
- @Schema(name = "水费用")
- private BigDecimal waterFee;
-
- @Schema(name = "水吨耗")
- private BigDecimal waterPerCoal;
-
- @Schema(name = "创建日期")
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/entity/ConsDayDataEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/entity/ConsDayDataEntity.java
deleted file mode 100644
index 2b28222..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/entity/ConsDayDataEntity.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.iailab.module.cons.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 日煤质趋势
- */
-@Data
-@TableName("t_cons_day_data")
-public class ConsDayDataEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
-
- /**
- * 月份
- */
- private String monthstr;
-
- /**
- * 类型
- */
- private String type;
-
- /**
- * 日期
- */
- private String date;
-
- /**
- * 阴离子kg
- */
- private BigDecimal anion;
-
- /**
- * 阴离子费用
- */
- private BigDecimal anionFee;
-
- /**
- * 阴离子吨耗
- */
- private BigDecimal anionPerCoal;
-
- /**
- * 阳离子kg
- */
- private BigDecimal cation;
-
- /**
- * 阳离子费用
- */
- private BigDecimal cationFee;
-
- /**
- * 阳离子吨耗
- */
- private BigDecimal cationPerCoal;
-
- /**
- * 入洗原煤量吨
- */
- private BigDecimal coalWeight;
-
- /**
- * 电耗kWh
- */
- private BigDecimal elec;
-
- /**
- * 电耗费用
- */
- private BigDecimal elecFee;
-
- /**
- * 电吨耗
- */
- private BigDecimal elecPerCoal;
-
- /**
- * 介质kg
- */
- private BigDecimal medium;
-
- /**
- * 介质费用
- */
- private BigDecimal mediumFee;
-
- /**
- * 介质吨耗
- */
- private BigDecimal mediumPerCoal;
-
- /**
- * 水耗m3
- */
- private BigDecimal water;
-
- /**
- * 水费用
- */
- private BigDecimal waterFee;
-
- /**
- * 水吨耗
- */
- private BigDecimal waterPerCoal;
-
- /**
- * 创建日期
- */
- private Date createDate;
-
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/service/ConsDayDataService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/service/ConsDayDataService.java
deleted file mode 100644
index d15b672..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/service/ConsDayDataService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.cons.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.cons.entity.ConsDayDataEntity;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-public interface ConsDayDataService extends BaseService<ConsDayDataEntity> {
-
- void syncData();
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/service/impl/ConsDayDataServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/service/impl/ConsDayDataServiceImpl.java
deleted file mode 100644
index da5cfee..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/cons/service/impl/ConsDayDataServiceImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.iailab.module.cons.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.cons.dao.ConsDayDataDao;
-import com.iailab.module.cons.entity.ConsDayDataEntity;
-import com.iailab.module.cons.service.ConsDayDataService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-@Slf4j
-@Service
-public class ConsDayDataServiceImpl extends BaseServiceImpl<ConsDayDataDao, ConsDayDataEntity> implements ConsDayDataService {
-
- private String HTTP_API_CODE = "Cons.MonthData";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- String monthstr = DateUtils.format(calendar.getTime(), DateUtils.DATE_PATTERN_MON);
- String type = "主洗系统";
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- params.put("monthstr", monthstr);
- params.put("type", type);
- String responseStr = httpsRequest.doGet(apiDTO.getUrl(), params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONObject dataObject = responseObj.getJSONObject(CommonConstant.ZX_RES);
- if (dataObject == null) {
- return;
- }
- this.deleteByMonth(monthstr);
- JSONArray rows = dataObject.getJSONArray("rows");
- List<ConsDayDataEntity> dataList = rows.toJavaList(ConsDayDataEntity.class);
-
- dataList.forEach(entity -> {
- entity.setId(UUID.randomUUID().toString());
- entity.setMonthstr(monthstr);
- entity.setType(type);
- entity.setCreateDate(new Date());
- insert(entity);
- });
- }
-
- private void deleteByMonth(String monthstr) {
- QueryWrapper<ConsDayDataEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(monthstr), "monthstr", monthstr);
- baseDao.delete(wrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/commons/HealthIndexTypeEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/commons/HealthIndexTypeEnum.java
deleted file mode 100644
index aefa636..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/commons/HealthIndexTypeEnum.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.iailab.module.device.commons;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 设备健康评价指标类型
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月30日
- */
-@Getter
-@AllArgsConstructor
-public enum HealthIndexTypeEnum {
- runTime("runTime", "运行时长"),
- elec("elec", "电流"),
- temperature("temperature", "温度"),
- flutter("flutter", "振动");
- private String code;
- private String desc;
-
- public static HealthIndexTypeEnum getEumByCode(String code) {
- if (code == null) {
- return null;
- }
-
- for (HealthIndexTypeEnum statusEnum : HealthIndexTypeEnum.values()) {
- if (statusEnum.getCode().equals(code)) {
- return statusEnum;
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/commons/HealthLevelEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/commons/HealthLevelEnum.java
deleted file mode 100644
index 2ee625c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/commons/HealthLevelEnum.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.iailab.module.device.commons;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年07月03日
- */
-@Getter
-@AllArgsConstructor
-public enum HealthLevelEnum {
-
- Level1("1", "健康"),
- Level2("2", "良好"),
- Level3("3", "不良");
- private String code;
- private String desc;
-
- public static HealthLevelEnum getEumByCode(String code) {
- if (code == null) {
- return null;
- }
-
- for (HealthLevelEnum statusEnum : HealthLevelEnum.values()) {
- if (statusEnum.getCode().equals(code)) {
- return statusEnum;
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAbnormalHistoryController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAbnormalHistoryController.java
deleted file mode 100644
index c958afc..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAbnormalHistoryController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.IndexQueryDTO;
-import com.iailab.common.dto.IndexStatisticDTO;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.data.dto.ApiDataDTO;
-import com.iailab.module.device.dto.DeviceAbnormalHistoryDTO;
-import com.iailab.module.device.service.DeviceAbnormalHistoryService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-/**
- * 异常设备历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@RestController
-@RequestMapping("device/device-abnormal-history")
-@Tag(name = "异常设备历史表")
-public class DeviceAbnormalHistoryController {
- @Resource
- private DeviceAbnormalHistoryService deviceAbnormalHistoryService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- @PreAuthorize("@ss.hasPermission('device:deviceabnormalhistory:page')")
- public CommonResult<PageData<DeviceAbnormalHistoryDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<DeviceAbnormalHistoryDTO> page = deviceAbnormalHistoryService.page(params);
-
- return new CommonResult<PageData<DeviceAbnormalHistoryDTO>>().setData(page);
- }
-
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- @PreAuthorize("@ss.hasPermission('device:deviceabnormalhistory:info')")
- public CommonResult<DeviceAbnormalHistoryDTO> get(@PathVariable("id") Long id) {
- DeviceAbnormalHistoryDTO data = deviceAbnormalHistoryService.get(id);
-
- return new CommonResult<DeviceAbnormalHistoryDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('device:deviceabnormalhistory:save')")
- public CommonResult save(@RequestBody DeviceAbnormalHistoryDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- deviceAbnormalHistoryService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('device:deviceabnormalhistory:update')")
- public CommonResult update(@RequestBody DeviceAbnormalHistoryDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- deviceAbnormalHistoryService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('device:deviceabnormalhistory:delete')")
- public CommonResult delete(@RequestBody Long[] ids) {
- deviceAbnormalHistoryService.delete(ids);
-
- return new CommonResult();
- }
-
- @PostMapping("chart")
- public CommonResult<BarLineDTO> chart(@RequestBody IndexQueryDTO dto) {
- BarLineDTO data = new BarLineDTO();
- List<String> legend = new ArrayList<>();
- List<SeriesItem> series = new ArrayList<>();
- String endDateStr = dto.getEndDate() == null ? DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") : DateUtils.format(dto.getEndDate(), "yyyy-MM-dd HH:mm:ss");
- Date endDate = DateUtils.parse(endDateStr, "yyyy-MM-dd HH:mm");
- Date startDate = dto.getStartDate() == null ? DateUtils.getTime(DateUtils.addDateHours(endDate, -2)) : dto.getStartDate();
- List<String> categories = DateUtils.getDayTime(startDate, endDate, BusinessConstant.Granularity60);
- List<DeviceAbnormalHistoryDTO> historyList = null;
- List<ApiDataDTO> dataList = new ArrayList<>();
- List<IndexStatisticDTO> indexList;
-
- legend.add("设备异常总数");
- SeriesItem deviceItem = new SeriesItem();
- deviceItem.setName("设备异常总数");
- Map<String, Object> params = new HashMap<>();
- params.put("startDate", startDate);
- params.put("endDate", endDate);
- historyList = deviceAbnormalHistoryService.getlist(params);
- if (!CollectionUtils.isEmpty(historyList)) {
- historyList.forEach(item -> {
- ApiDataDTO dataEntity = new ApiDataDTO();
- dataEntity.setTimeStamp(item.getCreateDate());
- dataEntity.setDataValue(item.getAbnormalCount());
- dataList.add(dataEntity);
- });
- }
- List<Object[]> deviceData = dataList.stream().map(item -> {
- Object[] valueArray = new Object[]{item.getTimeStamp(),
- item.getDataValue()};
- return valueArray;
- }).collect(Collectors.toList());
- deviceItem.setData(deviceData);
-
- series.add(deviceItem);
- data.setLegend(legend);
- data.setCategories(categories);
- data.setSeries(series);
- return new CommonResult<BarLineDTO>().setData(data);
- }
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAccountController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAccountController.java
deleted file mode 100644
index 6e02bda..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAccountController.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.device.dto.DeviceAccountDTO;
-import com.iailab.module.device.service.DeviceAccountService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 设备台账;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-20
- */
-@RestController
-@RequestMapping("device/device-account")
-@Tag(name = "设备台账")
-public class DeviceAccountController {
- @Resource
- private DeviceAccountService deviceAccountService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<DeviceAccountDTO>> page(@RequestParam Map<String, Object> params){
- PageData<DeviceAccountDTO> page = deviceAccountService.page(params);
-
- return new CommonResult<PageData<DeviceAccountDTO>>().setData(page);
- }
-
- @GetMapping("list")
- @Operation(summary = "设备健康评价")
- public CommonResult<List<DeviceAccountDTO>> list(@RequestParam Map<String, Object> params) {
- List<DeviceAccountDTO> list = deviceAccountService.list(params);
- return new CommonResult<List<DeviceAccountDTO>>().setData(list);
- }
-
- @GetMapping("log/abnormalList")
- @Operation(summary = "设备健康评价")
- public CommonResult<List<Object[]>> abnormalList(@RequestParam Map<String, Object> params) {
- List<Object[]> data = new ArrayList<>();
- List<DeviceAccountDTO> list = deviceAccountService.list(params);
- if (!CollectionUtils.isEmpty(list)) {
- list.forEach(item -> {
- if(item.getRunState().intValue() != 2){
- data.add(new Object[]{item.getDeviceName(), item.getUpdateDate(),item.getRemark()});
- }
- });
- }
- return new CommonResult<List<Object[]>>().setData(data);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- @PreAuthorize("@ss.hasPermission('device:device-account:info')")
- public CommonResult<DeviceAccountDTO> get(@PathVariable("id") Long id){
- DeviceAccountDTO data = deviceAccountService.get(id);
-
- return new CommonResult<DeviceAccountDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('device:device-account:save')")
- public CommonResult save(@RequestBody DeviceAccountDTO dto){
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- deviceAccountService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('device:device-account:update')")
- public CommonResult update(@RequestBody DeviceAccountDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
- deviceAccountService.update(dto);
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('device:device-account:delete')")
- public CommonResult delete(@RequestBody Long[] ids){
- deviceAccountService.delete(ids);
- return new CommonResult();
- }
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAccountHistoryController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAccountHistoryController.java
deleted file mode 100644
index e52f189..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceAccountHistoryController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.device.dto.DeviceAccountHistoryDTO;
-import com.iailab.module.device.service.DeviceAccountHistoryService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.Map;
-
-
-/**
- * 设备台账历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-@RestController
-@RequestMapping("device/device-account-history")
-@Tag(name = "设备台账历史表")
-public class DeviceAccountHistoryController {
- @Resource
- private DeviceAccountHistoryService deviceAccountHistoryService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<DeviceAccountHistoryDTO>> page(@RequestParam Map<String, Object> params){
- PageData<DeviceAccountHistoryDTO> page = deviceAccountHistoryService.page(params);
-
- return new CommonResult<PageData<DeviceAccountHistoryDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- @PreAuthorize("@ss.hasPermission('device:device-account-history:info')")
- public CommonResult<DeviceAccountHistoryDTO> get(@PathVariable("id") Long id){
- DeviceAccountHistoryDTO data = deviceAccountHistoryService.get(id);
-
- return new CommonResult<DeviceAccountHistoryDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('device:device-account-history:save')")
- public CommonResult save(@RequestBody DeviceAccountHistoryDTO dto){
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- deviceAccountHistoryService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('device:device-account-history:update')")
- public CommonResult update(@RequestBody DeviceAccountHistoryDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- deviceAccountHistoryService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('device:device-account-history:delete')")
- public CommonResult delete(@RequestBody Long[] ids){
- deviceAccountHistoryService.delete(ids);
-
- return new CommonResult();
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceFaultController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceFaultController.java
deleted file mode 100644
index eb4a1a7..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceFaultController.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.device.dto.DeviceFaultDTO;
-import com.iailab.module.device.service.DeviceFaultService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.Map;
-
-
-/**
- * 设备故障库;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-23
- */
-@RestController
-@RequestMapping("device/device-fault")
-@Tag(name = "设备故障库;")
-public class DeviceFaultController {
- @Resource
- private DeviceFaultService deviceFaultService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
-// @AutoDict
- @PreAuthorize("@ss.hasPermission('device:device-fault:page')")
- public CommonResult<PageData<DeviceFaultDTO>> page(@RequestParam Map<String, Object> params){
- PageData<DeviceFaultDTO> page = deviceFaultService.page(params);
-
- return new CommonResult<PageData<DeviceFaultDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- @PreAuthorize("@ss.hasPermission('device:device-fault:info')")
- public CommonResult<DeviceFaultDTO> get(@PathVariable("id") Long id){
- DeviceFaultDTO data = deviceFaultService.get(id);
-
- return new CommonResult<DeviceFaultDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('device:device-fault:save')")
- public CommonResult save(@RequestBody DeviceFaultDTO dto){
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- deviceFaultService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('device:device-fault:update')")
- public CommonResult update(@RequestBody DeviceFaultDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- deviceFaultService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('device:device-fault:delete')")
- public CommonResult delete(@RequestBody Long[] ids){
- deviceFaultService.delete(ids);
-
- return new CommonResult();
- }
-
-// @GetMapping("export")
-// @Operation(summary = "导出")
-// @LogOperation("导出")
-// @PreAuthorize("@ss.hasPermission('device:device-fault:export')")
-// public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-// List<DeviceFaultDTO> list = deviceFaultService.list(params);
-//
-// ExcelUtils.exportExcelToTarget(response, null, list, DeviceFaultExcel.class);
-// }
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthAlarmController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthAlarmController.java
deleted file mode 100644
index 4fbe8bb..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthAlarmController.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.device.dto.DeviceHealthAlarmDTO;
-import com.iailab.module.device.service.DeviceHealthAlarmService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @description: 设备健康故障记录
- * @author: dzd
- * @date: 2024/7/5 13:45
- **/
-@RestController
-@RequestMapping("device/health-alarm")
-@Tag(name = "设备健康故障记录")
-public class DeviceHealthAlarmController {
-
- @Resource
- private DeviceHealthAlarmService deviceHealthAlarmService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<DeviceHealthAlarmDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<DeviceHealthAlarmDTO> page = deviceHealthAlarmService.page(params);
-
- return new CommonResult<PageData<DeviceHealthAlarmDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<DeviceHealthAlarmDTO> get(@PathVariable("id") String id) {
- DeviceHealthAlarmDTO data = deviceHealthAlarmService.get(id);
- return new CommonResult<DeviceHealthAlarmDTO>().setData(data);
- }
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthEvaluateController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthEvaluateController.java
deleted file mode 100644
index 95b02c8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthEvaluateController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.device.dto.DeviceHealthEvaluateDTO;
-import com.iailab.module.device.service.DeviceHealthEvaluateService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@RestController
-@RequestMapping("device/health-evaluate")
-@Tag(name = "设备健康评价")
-public class DeviceHealthEvaluateController {
-
- @Resource
- private DeviceHealthEvaluateService deviceHealthEvaluateService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<DeviceHealthEvaluateDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<DeviceHealthEvaluateDTO> page = deviceHealthEvaluateService.page(params);
-
- return new CommonResult<PageData<DeviceHealthEvaluateDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<DeviceHealthEvaluateDTO> get(@PathVariable("id") String id) {
- DeviceHealthEvaluateDTO data = deviceHealthEvaluateService.get(id);
-
- return new CommonResult<DeviceHealthEvaluateDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- public CommonResult save(@RequestBody DeviceHealthEvaluateDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- deviceHealthEvaluateService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- public CommonResult update(@RequestBody DeviceHealthEvaluateDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- deviceHealthEvaluateService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- public CommonResult delete(@RequestBody String[] ids) {
- deviceHealthEvaluateService.delete(ids);
- return new CommonResult();
- }
-
- @PutMapping("/enable")
- @Operation(summary = "启用")
- public CommonResult enable(@RequestBody String[] ids) {
- deviceHealthEvaluateService.enableByIds(ids);
- return new CommonResult();
- }
-
- @PutMapping("/disable")
- @Operation(summary = "禁用")
- public CommonResult disable(@RequestBody String[] ids) {
- deviceHealthEvaluateService.disableByIds(ids);
- return new CommonResult();
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthReportController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthReportController.java
deleted file mode 100644
index be2409c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthReportController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.device.dto.DeviceHealthReportDTO;
-import com.iailab.module.device.service.DeviceHealthReportService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@RestController
-@RequestMapping("device/health-report")
-@Tag(name = "设备健康评价报告;")
-public class DeviceHealthReportController {
-
- @Resource
- private DeviceHealthReportService deviceHealthReportService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<DeviceHealthReportDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<DeviceHealthReportDTO> page = deviceHealthReportService.page(params);
-
- return new CommonResult<PageData<DeviceHealthReportDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<DeviceHealthReportDTO> get(@PathVariable("id") String id) {
- DeviceHealthReportDTO data = deviceHealthReportService.get(id);
-
- return new CommonResult<DeviceHealthReportDTO>().setData(data);
- }
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthStateController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthStateController.java
deleted file mode 100644
index f3a2e8a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceHealthStateController.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.device.dto.DeviceCurrentRateDTO;
-import com.iailab.module.device.dto.DeviceHealthStateDTO;
-import com.iailab.module.device.dto.DeviceStatCountDTO;
-import com.iailab.module.device.entity.DeviceStatUsageEntity;
-import com.iailab.module.device.service.DeviceStatCountService;
-import com.iailab.module.device.service.DeviceHealthStateService;
-import com.iailab.module.device.service.DeviceStatUsageService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@RestController
-@RequestMapping("device/device-health-state")
-@Tag(name = "设备健康状态表")
-public class DeviceHealthStateController {
- @Resource
- private DeviceHealthStateService deviceHealthStateService;
- @Resource
- private DeviceStatCountService deviceStatCountService;
- @Resource
- private DeviceStatUsageService deviceStatUsageService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- @PreAuthorize("@ss.hasPermission('device:device-health-state:page')")
- public CommonResult<PageData<DeviceHealthStateDTO>> page(@RequestParam Map<String, Object> params){
- PageData<DeviceHealthStateDTO> page = deviceHealthStateService.page(params);
-
- return new CommonResult<PageData<DeviceHealthStateDTO>>().setData(page);
- }
-
-
- @GetMapping("list")
- public CommonResult<DeviceHealthStateDTO> list(){
- List<DeviceHealthStateDTO> list = deviceHealthStateService.list(new HashMap<>());
- DeviceHealthStateDTO deviceHealthStateDTO = list.get(0);
- return new CommonResult<DeviceHealthStateDTO>().setData(deviceHealthStateDTO);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- @PreAuthorize("@ss.hasPermission('device:device-health-state:info')")
- public CommonResult<DeviceHealthStateDTO> get(@PathVariable("id") Long id){
- DeviceHealthStateDTO data = deviceHealthStateService.get(id);
-
- return new CommonResult<DeviceHealthStateDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('device:device-health-state:save')")
- public CommonResult save(@RequestBody DeviceHealthStateDTO dto){
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- deviceHealthStateService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('device:device-health-state:update')")
- public CommonResult update(@RequestBody DeviceHealthStateDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- deviceHealthStateService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('device:device-health-state:delete')")
- public CommonResult delete(@RequestBody Long[] ids){
- deviceHealthStateService.delete(ids);
- return new CommonResult();
- }
-
-// @GetMapping("export")
-// @Operation(summary = "导出")
-// @LogOperation("导出")
-// @PreAuthorize("@ss.hasPermission('device:device-health-state:export')")
-// public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-// List<DeviceHealthStateDTO> list = deviceHealthStateService.list(params);
-// ExcelUtils.exportExcelToTarget(response, null, list, DeviceHealthStateExcel.class);
-// }
-
- @GetMapping("getDeviceCurrentRate")
- @Operation(summary = "实时获取设备率")
- @LogOperation("实时获取设备率")
- public CommonResult<DeviceCurrentRateDTO> getDeviceCurrentRate() {
- DeviceCurrentRateDTO deviceCurrentRate = deviceStatUsageService.getDeviceCurrentRate();
- return new CommonResult<DeviceCurrentRateDTO>().setData(deviceCurrentRate);
- }
-
- @GetMapping("getDeviceStatCount")
- @Operation(summary = "实时获取设备数量统计")
- @LogOperation("实时获取设备数量统计")
- public CommonResult<DeviceStatCountDTO> getDeviceStatCount() {
- DeviceStatCountDTO deviceStatistics = deviceStatCountService.getDeviceStatCount();
- return new CommonResult<DeviceStatCountDTO>().setData(deviceStatistics);
- }
-
- @PostMapping("getDeviceStatCountHistory")
- @Operation(summary = "获取设备数量统计历史")
- @LogOperation("获取设备数量统计历史")
- public CommonResult<List<DeviceStatCountDTO>> getDeviceStatCountHistory(@RequestBody Map<String, Object> params) {
- List<DeviceStatCountDTO> list = deviceStatCountService.getHistory(params);
- return new CommonResult<List<DeviceStatCountDTO>>().setData(list);
- }
-
- @PostMapping("getDeviceRunTimeHistory")
- @Operation(summary = "获取设备历史使用时间")
- @LogOperation("获取设备历史使用时间")
- public CommonResult<List<DeviceStatUsageEntity>> getDeviceRunTimeHistory(@RequestBody Map<String, Object> params) {
- List<DeviceStatUsageEntity> list = deviceStatUsageService.list(params);
- return new CommonResult<List<DeviceStatUsageEntity>>().setData(list);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceInfoController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceInfoController.java
deleted file mode 100644
index 89ddc77..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceInfoController.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.device.dto.DeviceIndexDTO;
-import com.iailab.module.device.dto.DeviceInfoDTO;
-import com.iailab.module.device.entity.DeviceIndexEntity;
-import com.iailab.module.device.entity.DeviceInfoEntity;
-import com.iailab.module.device.entity.DeviceStatNewnessEntity;
-import com.iailab.module.device.entity.DeviceStatUsageEntity;
-import com.iailab.module.device.service.DeviceIndexService;
-import com.iailab.module.device.service.DeviceInfoService;
-import com.iailab.module.device.service.DeviceStatNewnessService;
-import com.iailab.module.device.service.DeviceStatUsageService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 中选设备信息表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-28
- */
-@RestController
-@RequestMapping("device/device-info")
-@Tag(name = "中选设备信息表")
-public class DeviceInfoController {
- @Resource
- private DeviceInfoService deviceInfoService;
- @Resource
- private DeviceIndexService deviceIndexService;
- @Resource
- private DeviceStatUsageService deviceStatUsageService;
- @Resource
- private DeviceStatNewnessService deviceStatNewnessService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<DeviceInfoDTO>> page(@RequestParam Map<String, Object> params){
- PageData<DeviceInfoDTO> page = deviceInfoService.page(params);
- if (!CollectionUtils.isEmpty(page.getList())) {
- page.getList().forEach(item -> {
- item.setChildren(deviceInfoService.getchildrenList(item.getId()));
- });
- }
-
- return new CommonResult<PageData<DeviceInfoDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<DeviceInfoDTO> get(@PathVariable("id") String id){
- DeviceInfoDTO data = deviceInfoService.get(id);
-
- List<DeviceIndexDTO> tIndexList= deviceIndexService.getByDeviceId(id);
- data.setDeviceIndexList(tIndexList);
-
- return new CommonResult<DeviceInfoDTO>().setData(data);
- }
-
- @GetMapping("list")
- @Operation(summary = "列表")
- public CommonResult<List<DeviceInfoDTO>> list(@RequestParam Map<String, Object> params){
- List<DeviceInfoDTO> data = deviceInfoService.list(params);
- return new CommonResult<List<DeviceInfoDTO>>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @Transactional
- public CommonResult save(@RequestBody DeviceInfoDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- List<DeviceIndexDTO> tIndexList = dto.getDeviceIndexList();
- if (tIndexList != null) {
- for (int i = 0; i < tIndexList.size(); i++) {
- DeviceIndexDTO tIndexDTO = tIndexList.get(i);
- DeviceIndexEntity tIndexEntity = new DeviceIndexEntity();
- tIndexEntity.setModelId(BusinessConstant.MODEL_Health_Status_Evaluate);
- tIndexEntity.setDeviceId(tIndexDTO.getDeviceId());
- tIndexEntity.setIndexNo(tIndexDTO.getIndexNo());
- tIndexEntity.setIndexUpperLimit(tIndexDTO.getIndexUpperLimit());
- tIndexEntity.setIndexLowerLimit(tIndexDTO.getIndexLowerLimit());
- tIndexEntity.setIndexOrder(tIndexDTO.getIndexOrder());
- tIndexEntity.setDataLength(tIndexDTO.getDataLength());
- tIndexEntity.setIndexType(tIndexDTO.getIndexType());
- deviceIndexService.insert(tIndexEntity);
- }
- }
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @Transactional
- public CommonResult update(@RequestBody DeviceInfoDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- List<DeviceIndexDTO> tIndexList = dto.getDeviceIndexList();
- if (tIndexList != null) {
- deviceIndexService.deleteByDeviceId(dto.getId());
- for (int i = 0; i < tIndexList.size(); i++) {
- DeviceIndexDTO tIndexDTO = tIndexList.get(i);
- DeviceIndexEntity tIndexEntity = new DeviceIndexEntity();
- tIndexEntity.setModelId(BusinessConstant.MODEL_Health_Status_Evaluate);
- tIndexEntity.setDeviceId(dto.getId());
- tIndexEntity.setIndexNo(tIndexDTO.getIndexNo());
- tIndexEntity.setIndexUpperLimit(tIndexDTO.getIndexUpperLimit());
- tIndexEntity.setIndexLowerLimit(tIndexDTO.getIndexLowerLimit());
- tIndexEntity.setIndexOrder(tIndexDTO.getIndexOrder());
- tIndexEntity.setDataLength(tIndexDTO.getDataLength());
- tIndexEntity.setIndexType(tIndexDTO.getIndexType());
- deviceIndexService.insert(tIndexEntity);
- }
- }
-
- return new CommonResult();
- }
-
- @PostMapping("/updatePlanTime")
- @Operation(summary = "修改计划运行时间")
- @LogOperation("修改计划运行时间")
- @Transactional
- public CommonResult updatePlanTime(@RequestBody DeviceInfoDTO dto) {
-
- Integer planTime = dto.getPlanTime();
-
- // 重新计算使用率
- DeviceStatUsageEntity deviceStatUsage = deviceStatUsageService.getLastByNo(dto.getNo());
- BigDecimal usage = null;
- if (deviceStatUsage != null){
- Integer runTime = deviceStatUsage.getRunTime();
- BigDecimal d1 = new BigDecimal(runTime);
- BigDecimal d2 = new BigDecimal(planTime*60);
- usage = d1.divide(d2, 4, RoundingMode.HALF_UP);
-
- DeviceStatUsageEntity insertUsageEntry = new DeviceStatUsageEntity();
- insertUsageEntry.setId(deviceStatUsage.getId());
- insertUsageEntry.setUsageRate(usage);
- insertUsageEntry.setPlanTime(planTime*60);
- deviceStatUsageService.updateById(insertUsageEntry);
- }
-
- // 重新计算新度系数
- // 设备使用年限（分钟）
- long durableMinutes = dto.getDurableYears() * BusinessConstant.YEAR_MINUTE;
- // 设备剩余使用分钟
- long residueTime = dto.getResidueTime();
- BigDecimal d1 = new BigDecimal(residueTime);
- BigDecimal d2 = new BigDecimal(durableMinutes);
- BigDecimal newnessRate = d1.divide(d2, 4, RoundingMode.HALF_UP);
-
- //修改最新新度系数历史
- DeviceStatNewnessEntity deviceStatNewness = deviceStatNewnessService.getLastByNo(dto.getNo());
- if (deviceStatNewness != null){
-
- DeviceStatNewnessEntity insertNewnessEntry = new DeviceStatNewnessEntity();
- insertNewnessEntry.setId(deviceStatNewness.getId());
- insertNewnessEntry.setNewnessRate(newnessRate);
- insertNewnessEntry.setDurableTime(durableMinutes);
- insertNewnessEntry.setResidueTime(residueTime);
- deviceStatNewnessService.updateById(insertNewnessEntry);
- }
-
-
- DeviceInfoEntity deviceInfoEntity = new DeviceInfoEntity();
- deviceInfoEntity.setId(dto.getId());
- deviceInfoEntity.setPlanTime(planTime);
- deviceInfoEntity.setUsageRate(usage);
- deviceInfoEntity.setIsMain(dto.getIsMain());
- deviceInfoEntity.setDurableYears(dto.getDurableYears());
- deviceInfoEntity.setNewnessRate(newnessRate);
- deviceInfoEntity.setResidueTime(dto.getResidueTime());
- deviceInfoEntity.setUseTime(dto.getUseTime());
- deviceInfoEntity.setUpdateDate(new Date());
- deviceInfoService.updateById(deviceInfoEntity);
-
- return new CommonResult();
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceRunStateController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceRunStateController.java
deleted file mode 100644
index 285a101..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceRunStateController.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.device.dto.DeviceRunStateDTO;
-import com.iailab.module.device.service.DeviceRunStateService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 设备运行状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@RestController
-@RequestMapping("device/device-run-state")
-@Tag(name = "设备运行状态表")
-public class DeviceRunStateController {
- @Resource
- private DeviceRunStateService deviceRunStateService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- @PreAuthorize("@ss.hasPermission('device:device-run-state:page')")
- public CommonResult<PageData<DeviceRunStateDTO>> page(@RequestParam Map<String, Object> params){
- PageData<DeviceRunStateDTO> page = deviceRunStateService.page(params);
-
- return new CommonResult<PageData<DeviceRunStateDTO>>().setData(page);
- }
-
- @GetMapping("list")
- public CommonResult<DeviceRunStateDTO> list(){
- List<DeviceRunStateDTO> list = deviceRunStateService.list(new HashMap<>());
- DeviceRunStateDTO deviceRunStateDTO = list.get(0);
- return new CommonResult<DeviceRunStateDTO>().setData(deviceRunStateDTO);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- @PreAuthorize("@ss.hasPermission('device:device-run-state:info')")
- public CommonResult<DeviceRunStateDTO> get(@PathVariable("id") Long id){
- DeviceRunStateDTO data = deviceRunStateService.get(id);
-
- return new CommonResult<DeviceRunStateDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('device:device-run-state:save')")
- public CommonResult save(@RequestBody DeviceRunStateDTO dto){
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
- deviceRunStateService.save(dto);
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('device:device-run-state:update')")
- public CommonResult update(@RequestBody DeviceRunStateDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
- deviceRunStateService.update(dto);
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('device:device-run-state:delete')")
- public CommonResult delete(@RequestBody Long[] ids){
- deviceRunStateService.delete(ids);
- return new CommonResult();
- }
-
-// @GetMapping("export")
-// @Operation(summary = "导出")
-// @LogOperation("导出")
-// @PreAuthorize("@ss.hasPermission('device:device-run-state:export')")
-// public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-// List<DeviceRunStateDTO> list = deviceRunStateService.list(params);
-//
-// ExcelUtils.exportExcelToTarget(response, null, list, DeviceRunStateExcel.class);
-// }
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceStatNewnessController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceStatNewnessController.java
deleted file mode 100644
index 2930241..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/controller/DeviceStatNewnessController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.iailab.module.device.controller;
-
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.device.dto.DeviceStatNewnessDTO;
-import com.iailab.module.device.service.DeviceStatNewnessService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 设备新度系数统计表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-28
- */
-@RestController
-@RequestMapping("device/newness")
-@Tag(name = "设备新度系数统计表")
-public class DeviceStatNewnessController {
- @Resource
- private DeviceStatNewnessService deviceStatNewnessService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<DeviceStatNewnessDTO>> page(@RequestParam Map<String, Object> params){
- PageData<DeviceStatNewnessDTO> page = deviceStatNewnessService.page(params);
-
- return new CommonResult<PageData<DeviceStatNewnessDTO>>().setData(page);
- }
-
- @GetMapping("list")
- @Operation(summary = "列表")
- public CommonResult<List<DeviceStatNewnessDTO>> list(@RequestParam Map<String, Object> params){
- List<DeviceStatNewnessDTO> data = deviceStatNewnessService.list(params);
- return new CommonResult<List<DeviceStatNewnessDTO>>().setData(data);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAbnormalHistoryDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAbnormalHistoryDao.java
deleted file mode 100644
index ce0c2db..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAbnormalHistoryDao.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.dto.DeviceAbnormalHistoryDTO;
-import com.iailab.module.device.entity.DeviceAbnormalHistoryEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 异常设备历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Mapper
-public interface DeviceAbnormalHistoryDao extends BaseDao<DeviceAbnormalHistoryEntity> {
-
- void insertHistory(Map<String, Integer> map);
-
- List<DeviceAbnormalHistoryDTO> getlist(Map<String, Object> params);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAccountDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAccountDao.java
deleted file mode 100644
index 3037e8c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAccountDao.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceAccountEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 设备台账;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-20
- */
-@Mapper
-public interface DeviceAccountDao extends BaseDao<DeviceAccountEntity> {
-
- @InterceptorIgnore(blockAttack = "true")
- void delete();
- @InterceptorIgnore(blockAttack = "true")
- void updateMonitorState();
-
- DeviceAccountEntity getByDeviceId( int id);
- @InterceptorIgnore(blockAttack = "true")
- List<String> getDeviceIdList();
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAccountHistoryDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAccountHistoryDao.java
deleted file mode 100644
index 2c48ed3..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceAccountHistoryDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceAccountHistoryEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 设备台账历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-@Mapper
-public interface DeviceAccountHistoryDao extends BaseDao<DeviceAccountHistoryEntity> {
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceEvaluateIndexDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceEvaluateIndexDao.java
deleted file mode 100644
index da91558..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceEvaluateIndexDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceEvaluateIndexEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Mapper
-public interface DeviceEvaluateIndexDao extends BaseDao<DeviceEvaluateIndexEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceFaultDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceFaultDao.java
deleted file mode 100644
index 5ef87f1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceFaultDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceFaultEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 设备故障库;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-23
- */
-@Mapper
-public interface DeviceFaultDao extends BaseDao<DeviceFaultEntity> {
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthAlarmDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthAlarmDao.java
deleted file mode 100644
index 88cd6a8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthAlarmDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.dto.DeviceHealthAlarmDTO;
-import com.iailab.module.device.entity.DeviceHealthAlarmEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Mapper
-public interface DeviceHealthAlarmDao extends BaseDao<DeviceHealthAlarmEntity> {
- DeviceHealthAlarmDTO getInfo(String id);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthAlarmDetailDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthAlarmDetailDao.java
deleted file mode 100644
index 7869112..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthAlarmDetailDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceHealthAlarmDetailEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Mapper
-public interface DeviceHealthAlarmDetailDao extends BaseDao<DeviceHealthAlarmDetailEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthEvaluateDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthEvaluateDao.java
deleted file mode 100644
index b28821c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthEvaluateDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceHealthEvaluateEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Mapper
-public interface DeviceHealthEvaluateDao extends BaseDao<DeviceHealthEvaluateEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthReportDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthReportDao.java
deleted file mode 100644
index e7b6b19..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthReportDao.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceHealthReportEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Mapper
-public interface DeviceHealthReportDao extends BaseDao<DeviceHealthReportEntity> {
-// @DataSource("slave1")
- void migration(List<DeviceHealthReportEntity> list);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthReportDataDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthReportDataDao.java
deleted file mode 100644
index e3f439a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthReportDataDao.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceHealthReportDataEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Mapper
-public interface DeviceHealthReportDataDao extends BaseDao<DeviceHealthReportDataEntity> {
-// @DataSource("slave1")
- void migration(List<DeviceHealthReportDataEntity> list);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthStateDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthStateDao.java
deleted file mode 100644
index 18af1ad..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceHealthStateDao.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceHealthStateEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Map;
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Mapper
-public interface DeviceHealthStateDao extends BaseDao<DeviceHealthStateEntity> {
-
- void insertHealthState(Map<String, Object> tMap);
-
- int getId();
-
- void updateHealthState(Map<String, Object> tMap);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceIndexDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceIndexDao.java
deleted file mode 100644
index 99f302a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceIndexDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceIndexEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-29
- */
-@Mapper
-public interface DeviceIndexDao extends BaseDao<DeviceIndexEntity> {
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceInfoDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceInfoDao.java
deleted file mode 100644
index dd0c1d5..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceInfoDao.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.dto.DeviceInfoDTO;
-import com.iailab.module.device.entity.DeviceInfoEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-@Mapper
-public interface DeviceInfoDao extends BaseDao<DeviceInfoEntity> {
- List<DeviceInfoDTO> getchildrenList(String deviceId);
-
- IPage<DeviceInfoDTO> getPageList(IPage<DeviceInfoEntity> page, @Param("params") Map<String, Object> params);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceMainDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceMainDao.java
deleted file mode 100644
index 289701b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceMainDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceMainEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-@Mapper
-public interface DeviceMainDao extends BaseDao<DeviceMainEntity> {
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceRunStateDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceRunStateDao.java
deleted file mode 100644
index 14dead2..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceRunStateDao.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceRunStateEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Map;
-
-/**
- * 设备运行状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Mapper
-public interface DeviceRunStateDao extends BaseDao<DeviceRunStateEntity> {
-
- void insertRunState(Map<String, Integer> tMap);
-
- int getId();
-
- void updateRunState(Map<String, Integer> tMap);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatCountDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatCountDao.java
deleted file mode 100644
index f12c26e..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatCountDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceStatCountEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Mapper
-public interface DeviceStatCountDao extends BaseDao<DeviceStatCountEntity> {
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatNewnessDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatNewnessDao.java
deleted file mode 100644
index 7acf25d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatNewnessDao.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.dto.DeviceStatNewnessDTO;
-import com.iailab.module.device.entity.DeviceStatNewnessEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 设备运行状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Mapper
-public interface DeviceStatNewnessDao extends BaseDao<DeviceStatNewnessEntity> {
-
- List<DeviceStatNewnessDTO> getLastDateList();
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatUsageDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatUsageDao.java
deleted file mode 100644
index 4bdde16..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dao/DeviceStatUsageDao.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.device.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.device.entity.DeviceStatUsageEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 设备运行状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Mapper
-public interface DeviceStatUsageDao extends BaseDao<DeviceStatUsageEntity> {
-
- void batchInsert(List<DeviceStatUsageEntity> list);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAbnormalHistoryDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAbnormalHistoryDTO.java
deleted file mode 100644
index dde134e..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAbnormalHistoryDTO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * 异常设备历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@Schema(name = "异常设备历史表")
-public class DeviceAbnormalHistoryDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- private Integer id;
-
- @Schema(name = "总设备数")
- private Integer totalCount;
-
- @Schema(name = "异常数量")
- private Integer abnormalCount;
-
- @Schema(name = "创建时间")
- private Date createDate;
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAccountDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAccountDTO.java
deleted file mode 100644
index 50f2020..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAccountDTO.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * 设备台账
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-@Data
-@Schema(name = "设备台账")
-public class DeviceAccountDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "ID")
- private String id;
-
- @Schema(name = "设备ID")
- private Integer deviceId;
-
- @Schema(name = "设备名称")
- private String deviceName;
-
- @Schema(name = "设备编码")
- private String deviceCode;
-
- @Schema(name = "设备类型")
- private String deviceCategory;
-
- @Schema(name = "设备分类")
- private String deviceClass;
-
- @Schema(name = "所属车间")
- private String workShop;
-
- @Schema(name = "规格型号")
- private String specification;
-
- @Schema(name = "是否推送工单")
- private Integer isPush;
-
- @Schema(name = "运行状态")
- private Integer runState;
-
- @Schema(name = "监测状态")
- private Integer monitorState;
-
- @Schema(name = "备注")
- private String remark;
- @Schema(name = "创建人")
- private String creator;
-
- @Schema(name = "创建时间")
- private Date createDate;
-
- @Schema(name = "更新人")
- private String updater;
-
- @Schema(name = "更新时间")
- private Date updateDate;
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAccountHistoryDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAccountHistoryDTO.java
deleted file mode 100644
index 66e4287..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceAccountHistoryDTO.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * 设备台账
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-@Data
-@Schema(name = "设备台账")
-public class DeviceAccountHistoryDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "ID")
- private String id;
-
- @Schema(name = "设备ID")
- private Integer deviceId;
-
- @Schema(name = "设备名称")
- private String deviceName;
-
- @Schema(name = "设备编码")
- private String deviceCode;
-
- @Schema(name = "设备类型")
- private String deviceCategory;
-
- @Schema(name = "设备分类")
- private String deviceClass;
-
- @Schema(name = "所属车间")
- private String workShop;
-
- @Schema(name = "规格型号")
- private String specification;
-
- @Schema(name = "是否推送工单")
- private Integer isPush;
-
- @Schema(name = "运行状态")
- private Integer runState;
-
- @Schema(name = "监测状态")
- private Integer monitorState;
-
- @Schema(name = "创建人")
- private String creator;
-
- @Schema(name = "创建时间")
- private Date createDate;
-
- @Schema(name = "更新人")
- private String updater;
-
- @Schema(name = "更新时间")
- private Date updateDate;
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceCurrentRateDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceCurrentRateDTO.java
deleted file mode 100644
index e30e127..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceCurrentRateDTO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@Schema(name = "设备实时率")
-public class DeviceCurrentRateDTO {
-
- /**
- * 完好率
- */
- private BigDecimal healthyRate;
-
- /**
- * 待修率
- */
- private BigDecimal repairRate;
-
- /**
- * 事故率
- */
- private BigDecimal accidentRate;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceEvaluateIndexDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceEvaluateIndexDTO.java
deleted file mode 100644
index b8bd7aa..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceEvaluateIndexDTO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Data
-@Schema(name = "设备健康评价指标")
-public class DeviceEvaluateIndexDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String evaluateId;
- private String indexType;
- private Integer paramOrder;
- private String paramType;
- private String paramId;
- private String paramName;
- private Integer dataLength;
- private BigDecimal upperLimit;
- private BigDecimal lowerLimit;
- private BigDecimal nominalValue;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceFaultDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceFaultDTO.java
deleted file mode 100644
index 62d9d24..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceFaultDTO.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.iailab.module.device.dto;
-
-import com.iailab.framework.excel.core.annotations.DictFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-
-/**
- * 设备故障库;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-23
- */
-@Data
-@Schema(name = "设备故障库")
-public class DeviceFaultDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- private Integer id;
-
- @Schema(name = "设备代码")
- private String classNo;
-
- @Schema(name = "设备类型")
- private String className;
-
- @Schema(name = "指标类型")
- @DictFormat("health_index_type")
- private String indexType;
-
- @Schema(name = "故障类型")
- @DictFormat("health_fault_type")
- private String faultType;
-
- @Schema(name = "故障码")
- private String faultCode;
-
- @Schema(name = "处理对策")
- private String solution;
-
- @Schema(name = "排序")
- private Integer sort;
-
- @Schema(name = "故障名称")
- private String faultName;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthAlarmDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthAlarmDTO.java
deleted file mode 100644
index d6e27eb..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthAlarmDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.iailab.module.device.dto;
-
-import com.iailab.module.device.dao.DeviceFaultDao;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @description: 设备健康故障记录
- * @author: dzd
- * @date: 2024/7/9 17:28
- **/
-@Data
-@Schema(name = "设备健康故障记录")
-public class DeviceHealthAlarmDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String reportId;
- private String devNo;
- private String devName;
- private String alarmIndexTypes;
- private String alarmSolutions;
- private Integer isPushed;
- private Integer pushType;
- private Date pushTime;
- private Date createDate;
- private Date faultTime;
-
- private List<DeviceFaultDao> deviceFaults;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthAlarmDetailDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthAlarmDetailDTO.java
deleted file mode 100644
index 0f1e640..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthAlarmDetailDTO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @description: 设备健康故障详情
- * @author: dzd
- * @date: 2024/7/9 17:28
- **/
-@Data
-@Schema(name = "设备健康故障详情")
-public class DeviceHealthAlarmDetailDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String alarmId;
- private String faultCode;
- private String faultName;
- private String solution;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthEvaluateDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthEvaluateDTO.java
deleted file mode 100644
index c305580..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthEvaluateDTO.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Data
-@Schema(name = "设备健康评价")
-public class DeviceHealthEvaluateDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String devId;
- private String devNo;
- private String devName;
- private String modelCode;
- private String modelUrl;
- private String healthLevel;
- private BigDecimal healthScore;
- private Integer abnormalCount;
- private String reportId;
- private Date reportDate;
- private String reportContent;
- private Integer isPushed;
- private Integer isEnable;
- private Long creator;
- private Date createDate;
- private Long updater;
- private Date updateDate;
-
- private List<DeviceEvaluateIndexDTO> indexList;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthReportDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthReportDTO.java
deleted file mode 100644
index b4a6d3c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthReportDTO.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.iailab.module.device.dto;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Data
-@Schema(name = "设备健康评价报告")
-public class DeviceHealthReportDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String devNo;
- private String devName;
- private String classNo;
- private String className;
- private String workshop;
- private String model;
- private String reportNo;
- private String reportName;
- private Date reportDate;
- private String healthLevel;
- private BigDecimal healthScore;
- private Integer abnormalCount;
- private Integer dataLength;
- private Integer runTime;
- private String content;
- private Date createDate;
- private String modelCode;
-
- private List<DeviceHealthReportDataDTO> detList;
- private DeviceHealthAlarmDTO deviceHealthAlarm;
- private List<DeviceHealthAlarmDetailDTO> deviceHealthAlarmDetails;
-
- private List<BarLineDTO> chartList;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthReportDataDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthReportDataDTO.java
deleted file mode 100644
index 0a3401f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthReportDataDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Data
-@Schema(name = "设备健康评价报告数据")
-public class DeviceHealthReportDataDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String reportId;
- private Integer sort;
- private String dataName;
- private String dataValue;
- private BigDecimal dataMax;
- private BigDecimal dataMin;
- private BigDecimal dataAvg;
- private String gradeCode;
- private String gradeName;
- private String solution;
- private String remark;
- private Date createDate;
- private String faultCode;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthStateDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthStateDTO.java
deleted file mode 100644
index 5a12069..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceHealthStateDTO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@Schema(name = "设备健康状态表")
-public class DeviceHealthStateDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- private Integer id;
-
- @Schema(name = "总设备数")
- private Integer totalCount;
-
- @Schema(name = "正常")
- private Integer normal;
-
- @Schema(name = "一般")
- private Integer common;
-
- @Schema(name = "较重")
- private Integer heavy;
-
- @Schema(name = "严重")
- private Integer serious;
-
- @Schema(name = "特别严重")
- private Integer espserious;
-
- @Schema(name = "创建时间")
- private Date creatorDate;
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceIndexDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceIndexDTO.java
deleted file mode 100644
index 3a0b9b9..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceIndexDTO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author lirm
- * @Description
- * @createTime 2024年05月29日
- */
-@Data
-@Schema(name = "设备指标")
-public class DeviceIndexDTO implements Serializable {
- private static final long serialVersionUID = 1L;
- private Integer id;
- private String deviceId;
- private String modelId;
- private String indexNo;
- private String indexUpperLimit;
- private String indexLowerLimit;
- private Integer indexOrder;
- private Integer dataLength;
- private String indexType;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceInfoDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceInfoDTO.java
deleted file mode 100644
index b8aa996..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceInfoDTO.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-@Data
-@Schema(name = "中选设备信息表")
-public class DeviceInfoDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String no;
- private String name;
- private String classNo;
- private String className;
- private String workshop;
- private String model;
- private String sn;
- private String position;
- private String manufacturer;
- private String installDate;
- private String plcDevNo;
- private String pid;
- private Date createDate;
- private Date updateDate;
-
- private List<DeviceInfoDTO> children;
-
- private String healthScore;
- private String healthEvaluate;
- private String isHealth;
- private String evaluateDate;
-
- private String deviceId;
-
- private List<DeviceIndexDTO> deviceIndexList;
- private BigDecimal usageRate;
- private Integer planTime;
- private Integer isMain;
- private BigDecimal newnessRate;
- private Integer durableYears;
- private Long residueTime;
- private Long useTime;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceListJsonDto.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceListJsonDto.java
deleted file mode 100644
index a0b9dc2..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceListJsonDto.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.iailab.module.device.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Map;
-
-@Data
-public class DeviceListJsonDto implements Serializable {
- private Map<String,String> items;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceMainDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceMainDTO.java
deleted file mode 100644
index 7c533bf..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceMainDTO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-@Data
-@Schema(name = "设备台账")
-public class DeviceMainDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "ID")
- private String id;
-
- @Schema(name = "设备编号")
- private String devno;
-
- @Schema(name = "设备名称")
- private String devname;
-
- @Schema(name = "common常规维保，timer定期维保")
- private String source;
-
- @Schema(name = "维护类型")
- private String type;
-
- @Schema(name = "维护日期")
- private String date;
-
- @Schema(name = "维护部位")
- private String part;
-
- @Schema(name = "维护内容")
- private String info;
-
- @Schema(name = "登记时间")
- private Date regTime;
-
- @Schema(name = "创建日期")
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceRunStateDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceRunStateDTO.java
deleted file mode 100644
index 442f8b1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceRunStateDTO.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * 设备运行状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@Schema(name = "设备运行状态表")
-public class DeviceRunStateDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- private Integer id;
-
- @Schema(name = "在线设备数量")
- private Integer totalCount;
-
- @Schema(name = "运行设备")
- private Integer runCount;
-
- @Schema(name = "停机设备")
- private Integer haltCount;
-
- @Schema(name = "离线设备")
- private Integer offlineCount;
-
- @Schema(name = "创建时间")
- private Date creatorDate;
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceStatCountDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceStatCountDTO.java
deleted file mode 100644
index 1bfd981..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceStatCountDTO.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@Schema(name = "设备实时统计")
-public class DeviceStatCountDTO {
- /**
- * id
- */
- private String id;
- /**
- * 统计日期
- */
- private Date date;
-
- /**
- * 所有设备
- */
- private Long totalCount;
-
- /**
- * 健康设备
- */
- private Long healthCount;
-
- /**
- * 良好设备
- */
- private Long goodCount;
-
- /**
- * 故障设备
- */
- private Long accidentCount;
- /**
- * 创建时间
- */
- private Date createDate;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceStatNewnessDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceStatNewnessDTO.java
deleted file mode 100644
index a30c6ca..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/dto/DeviceStatNewnessDTO.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.iailab.module.device.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 设备新度系数统计表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@Schema(name = "设备新度系数统计表")
-public class DeviceStatNewnessDTO {
-
- /**
- * id
- */
- private String id;
- /**
- * 设备编号
- */
- private String devNo;
- /**
- * 设备名称
- */
- private String devName;
- /**
- * 统计日期
- */
- private Date date;
- /**
- * 设备计划使用时长（分）
- */
- private Long durableTime;
- /**
- * 设备使用时长（分）
- */
- private Integer runTime;
- /**
- * 设备剩余时长（分）
- */
- private Long residueTime;
- /**
- * 新度系数
- */
- private BigDecimal newnessRate;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 设备损耗时长（分）
- */
- private Integer lossTime;
- /**
- * 损耗系数
- */
- private BigDecimal lossRate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAbnormalHistoryEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAbnormalHistoryEntity.java
deleted file mode 100644
index b2b1f63..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAbnormalHistoryEntity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 异常设备历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@TableName("t_device_abnormal_history")
-public class DeviceAbnormalHistoryEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- private Integer id;
- /**
- * 总设备数
- */
- private Integer totalCount;
- /**
- * 异常数量
- */
- private Integer abnormalCount;
- /**
- * 创建时间
- */
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAccountEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAccountEntity.java
deleted file mode 100644
index b0432bd..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAccountEntity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 设备台账
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-@Data
-@TableName("t_device_account")
-public class DeviceAccountEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- private String id;
- /**
- * 设备ID
- */
- private Integer deviceId;
- /**
- * 设备名称
- */
- private String deviceName;
- /**
- * 设备编码
- */
- private String deviceCode;
- /**
- * 设备类型
- */
- private String deviceCategory;
- /**
- * 设备分类
- */
- private String deviceClass;
- /**
- * 所属车间
- */
- private String workShop;
- /**
- * 规格型号
- */
- private String specification;
- /**
- * 是否推送工单
- */
- private Integer isPush;
- /**
- * 运行状态
- */
- private Integer runState;
- /**
- * 监测状态
- */
- private Integer monitorState;
-
- private String remark;
- /**
- * 创建人
- */
- private String creator;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 更新人
- */
- private String updater;
- /**
- * 更新时间
- */
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAccountHistoryEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAccountHistoryEntity.java
deleted file mode 100644
index 009dd14..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceAccountHistoryEntity.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 设备台账历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-@Data
-@TableName("t_device_account_history")
-public class DeviceAccountHistoryEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- private String id;
- /**
- * 设备ID
- */
- private Integer deviceId;
- /**
- * 设备名称
- */
- private String deviceName;
- /**
- * 设备编码
- */
- private String deviceCode;
- /**
- * 设备类型
- */
- private String deviceCategory;
- /**
- * 设备分类
- */
- private String deviceClass;
- /**
- * 所属车间
- */
- private String workShop;
- /**
- * 规格型号
- */
- private String specification;
- /**
- * 是否推送工单
- */
- private Integer isPush;
- /**
- * 运行状态
- */
- private Integer runState;
- /**
- * 监测状态
- */
- private Integer monitorState;
- /**
- * 创建人
- */
- private String creator;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 更新人
- */
- private String updater;
- /**
- * 更新时间
- */
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceEvaluateIndexEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceEvaluateIndexEntity.java
deleted file mode 100644
index c07b28f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceEvaluateIndexEntity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Data
-@TableName("t_device_evaluate_index")
-public class DeviceEvaluateIndexEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String evaluateId;
- private String indexType;
- private Integer paramOrder;
- private String paramType;
- private String paramId;
- private String paramName;
- private Integer dataLength;
- private BigDecimal upperLimit;
- private BigDecimal lowerLimit;
- private BigDecimal nominalValue;
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceFaultEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceFaultEntity.java
deleted file mode 100644
index 64d4f59..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceFaultEntity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 设备故障库;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-23
- */
-@Data
-@TableName("t_device_fault")
-public class DeviceFaultEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- private Integer id;
- /**
- * 设备代码
- */
- private String classNo;
- /**
- * 设备类型
- */
- private String className;
- /**
- * 指标类型
- */
- private String indexType;
-
- /**
- * 故障类型
- */
- private String faultType;
-
- /**
- * 故障码
- */
- private String faultCode;
-
- /**
- * 处理对策
- */
- private String solution;
-
- /**
- * 排序
- */
- private Integer sort;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceFaultHistoryEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceFaultHistoryEntity.java
deleted file mode 100644
index a7a77b6..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceFaultHistoryEntity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 设备故障历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-@Data
-@TableName("t_fault_account_history")
-public class DeviceFaultHistoryEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- private Integer id;
- /**
- * 故障设备
- */
- private String faultDevice;
- /**
- * 故障部件
- */
- private String faultParts;
- /**
- * 故障类型
- */
- private String faultType;
- /**
- * 故障原因
- */
- private String faultCause;
- /**
- * 处理对策
- */
- private String solution;
- /**
- * 处理状态
- */
- private String state;
- /**
- * 影响时长
- */
- private Integer affectHour;
- /**
- * 发生时间
- */
- private Date creatorDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthAlarmDetailEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthAlarmDetailEntity.java
deleted file mode 100644
index 7d30fa6..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthAlarmDetailEntity.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 设备健康故障详情
- */
-@Data
-@TableName("t_device_health_alarm_detail")
-public class DeviceHealthAlarmDetailEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String alarmId;
- private String faultCode;
- private String faultName;
- private String solution;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthAlarmEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthAlarmEntity.java
deleted file mode 100644
index 061e36c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthAlarmEntity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 设备健康故障记录
- */
-@Data
-@TableName("t_device_health_alarm")
-public class DeviceHealthAlarmEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String reportId;
- private String devNo;
- private String devName;
- private String alarmIndexTypes;
- private String alarmSolutions;
- private Integer isPushed;
- private Integer pushType;
- private Date pushTime;
- private Date createDate;
- private Date faultTime;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthEvaluateEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthEvaluateEntity.java
deleted file mode 100644
index 585d87f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthEvaluateEntity.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Data
-@TableName("t_device_health_evaluate")
-public class DeviceHealthEvaluateEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String devId;
- private String devNo;
- private String devName;
- private String modelCode;
- private String modelUrl;
- private String healthLevel;
- private BigDecimal healthScore;
- private Integer abnormalCount;
- private String reportId;
- private Date reportDate;
- private String reportContent;
- private Integer isPushed;
- private Integer isEnable;
-
- /**
- * 创建人
- */
- private Long creator;
-
- /**
- * 创建时间
- */
- private Date createDate;
-
- /**
- * 修改人
- */
- private Long updater;
-
- /**
- * 修改时间
- */
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthReportDataEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthReportDataEntity.java
deleted file mode 100644
index f049d89..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthReportDataEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 设备健康评价报告数据
- */
-@Data
-@TableName("t_device_health_report_data")
-public class DeviceHealthReportDataEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String reportId;
- private Integer sort;
- private String dataName;
- private String dataValue;
- private BigDecimal dataMax;
- private BigDecimal dataMin;
- private BigDecimal dataAvg;
- private String gradeCode;
- private String gradeName;
- private String solution;
- private String remark;
- private Date createDate;
- private String faultCode;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthReportEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthReportEntity.java
deleted file mode 100644
index e38be5f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthReportEntity.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 设备健康评价报告
- */
-@Data
-@TableName("t_device_health_report")
-public class DeviceHealthReportEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
- private String devNo;
- private String devName;
- private String classNo;
- private String className;
- private String workshop;
- private String model;
- private String reportNo;
- private String reportName;
- private Date reportDate;
- private String healthLevel;
- private BigDecimal healthScore;
- private Integer abnormalCount;
- private Integer dataLength;
- private Integer runTime;
- private String content;
- private String modelCode;
- private Date createDate;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthStateEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthStateEntity.java
deleted file mode 100644
index 1c97445..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceHealthStateEntity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@TableName("t_device_health_state")
-public class DeviceHealthStateEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- private Integer id;
- /**
- * 总设备数
- */
- private Integer totalCount;
- /**
- * 正常
- */
- private Integer normal;
- /**
- * 一般
- */
- private Integer common;
- /**
- * 较重
- */
- private Integer heavy;
- /**
- * 严重
- */
- private Integer serious;
- /**
- * 特别严重
- */
- private Integer espserious;
- /**
- * 创建时间
- */
- private Date creatorDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceIndexEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceIndexEntity.java
deleted file mode 100644
index bbd1d88..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceIndexEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 设备指标
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-29
- */
-@Data
-@TableName("t_device_index")
-public class DeviceIndexEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private Integer id;
- private String deviceId;
- private String modelId;
- private String indexNo;
- private String indexUpperLimit;
- private String indexLowerLimit;
- private Integer indexOrder;
- private Integer dataLength;
- private String indexType;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceInfoEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceInfoEntity.java
deleted file mode 100644
index 3a2c11d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceInfoEntity.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 中选设备信息表
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_device_info")
-public class DeviceInfoEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- private String id;
- private String no;
- private String name;
- private String classNo;
- private String className;
- private String workshop;
- private String model;
- private String sn;
- private String position;
- private String manufacturer;
- private String installDate;
- private String plcDevNo;
- private String pid;
- private Date createDate;
- private Date updateDate;
- private BigDecimal usageRate;
- private Integer planTime;
- private Integer isMain;
- private BigDecimal newnessRate;
- private Integer durableYears;
- private Long residueTime;
- private Long useTime;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceMainEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceMainEntity.java
deleted file mode 100644
index 26f0e21..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceMainEntity.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 中选设备维护记录
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_device_main")
-public class DeviceMainEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- private String devno;
-
- private String devname;
-
- private String source;
-
- private String type;
-
- private String date;
-
- private String part;
-
- private String info;
-
- private Date regTime;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceRunStateEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceRunStateEntity.java
deleted file mode 100644
index 71a0f19..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceRunStateEntity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 设备运行状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@TableName("t_device_run_state")
-public class DeviceRunStateEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- private Integer id;
- /**
- * 在线设备数量
- */
- private Integer totalCount;
- /**
- * 运行设备
- */
- private Integer runCount;
- /**
- * 停机设备
- */
- private Integer haltCount;
- /**
- * 离线设备
- */
- private Integer offlineCount;
- /**
- * 创建时间
- */
- private Date creatorDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatCountEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatCountEntity.java
deleted file mode 100644
index 0dc80e8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatCountEntity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@Schema(name = "设备实时统计")
-@TableName("t_device_stat_count")
-public class DeviceStatCountEntity {
- /**
- * id
- */
- private String id;
- /**
- * 统计日期
- */
- private Date date;
-
- /**
- * 所有设备
- */
- private Long totalCount;
-
- /**
- * 健康设备
- */
- private Long healthCount;
-
- /**
- * 良好设备
- */
- private Long goodCount;
-
- /**
- * 故障设备
- */
- private Long accidentCount;
- /**
- * 故障设备
- */
- private Date createDate;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatNewnessEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatNewnessEntity.java
deleted file mode 100644
index 24c7303..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatNewnessEntity.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 设备新度系数统计表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@TableName("t_device_stat_newness")
-public class DeviceStatNewnessEntity {
-
- /**
- * id
- */
- private String id;
- /**
- * 设备编号
- */
- private String devNo;
- /**
- * 设备名称
- */
- private String devName;
- /**
- * 统计日期
- */
- private Date date;
- /**
- * 设备使用年限（分）
- */
- private Long durableTime;
- /**
- * 设备使用时长（分）
- */
- private Integer runTime;
- /**
- * 设备剩余时长（分）
- */
- private Long residueTime;
- /**
- * 新度系数
- */
- private BigDecimal newnessRate;
- /**
- * 设备损耗时长（分）
- */
- private Integer lossTime;
-
- /**
- * 损耗系数
- */
- private BigDecimal lossRate;
-
- /**
- * 创建时间
- */
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatUsageEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatUsageEntity.java
deleted file mode 100644
index 5fa1a4d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/entity/DeviceStatUsageEntity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.iailab.module.device.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 异常设备历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Data
-@TableName("t_device_stat_usage")
-public class DeviceStatUsageEntity {
-
- /**
- * id
- */
- private String id;
- /**
- * 设备编号
- */
- private String devNo;
- /**
- * 设备名称
- */
- private String devName;
- /**
- * 统计日期
- */
- private String date;
- /**
- * 计划运行时长
- */
- private Integer planTime;
- /**
- * 实绩运行时长
- */
- private Integer runTime;
- /**
- * 使用率
- */
- private BigDecimal usageRate;
- /**
- * 创建时间
- */
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAbnormalHistoryExcel.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAbnormalHistoryExcel.java
deleted file mode 100644
index fd92172..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAbnormalHistoryExcel.java
+++ /dev/null
@@ -1,25 +0,0 @@
-//package com.iailab.module.device.excel;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import lombok.Data;
-//
-//import java.util.Date;
-//
-///**
-// * 异常设备历史表
-// *
-// * @author lirm ${email}
-// * @since 1.0.0 2024-05-22
-// */
-//@Data
-//public class DeviceAbnormalHistoryExcel {
-// @Excel(name = "id")
-// private String id;
-// @Excel(name = "总设备数")
-// private Integer totalCount;
-// @Excel(name = "异常数量")
-// private Integer abnormalCount;
-// @Excel(name = "创建时间")
-// private Date creatorDate;
-//
-//}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAccountExcel.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAccountExcel.java
deleted file mode 100644
index c6d8a3b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAccountExcel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-//package com.iailab.module.device.excel;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import lombok.Data;
-//
-//import java.util.Date;
-//
-///**
-// * 设备台账
-// *
-// * @author lirm ${email}
-// * @since 1.0.0 2024-05-27
-// */
-//@Data
-//public class DeviceAccountExcel {
-// @Excel(name = "ID")
-// private Integer id;
-// @Excel(name = "设备ID")
-// private Integer deviceId;
-// @Excel(name = "设备名称")
-// private String deviceName;
-// @Excel(name = "设备编码")
-// private String deviceCode;
-// @Excel(name = "设备类型")
-// private String deviceCategory;
-// @Excel(name = "设备分类")
-// private String deviceClass;
-// @Excel(name = "所属车间")
-// private String workShop;
-// @Excel(name = "规格型号")
-// private String specification;
-// @Excel(name = "是否推送工单")
-// private Integer isPush;
-// @Excel(name = "运行状态")
-// private Integer runState;
-// @Excel(name = "监测状态")
-// private Integer monitorState;
-// @Excel(name = "创建人")
-// private String creator;
-// @Excel(name = "创建时间")
-// private Date createDate;
-// @Excel(name = "更新人")
-// private String updater;
-// @Excel(name = "更新时间")
-// private Date updateDate;
-//
-//}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAccountHistoryExcel.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAccountHistoryExcel.java
deleted file mode 100644
index 6ea00ab..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceAccountHistoryExcel.java
+++ /dev/null
@@ -1,35 +0,0 @@
-//package com.iailab.module.device.excel;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import lombok.Data;
-//
-//import java.util.Date;
-//
-///**
-// * 设备台账历史表
-// *
-// * @author lirm ${email}
-// * @since 1.0.0 2024-05-27
-// */
-//@Data
-//public class DeviceAccountHistoryExcel {
-// @Excel(name = "id")
-// private Integer id;
-// @Excel(name = "故障设备")
-// private String faultDevice;
-// @Excel(name = "故障部件")
-// private String faultParts;
-// @Excel(name = "故障类型")
-// private String faultType;
-// @Excel(name = "故障原因")
-// private String faultCause;
-// @Excel(name = "处理对策")
-// private String solution;
-// @Excel(name = "处理状态")
-// private String state;
-// @Excel(name = "影响时长")
-// private Integer affectHour;
-// @Excel(name = "发生时间")
-// private Date creatorDate;
-//
-//}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceFaultExcel.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceFaultExcel.java
deleted file mode 100644
index bd5f1fe..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceFaultExcel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-//package com.iailab.module.device.excel;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import lombok.Data;
-//
-//import java.util.Date;
-//
-///**
-// * 设备故障库;
-// *
-// * @author lirm ${email}
-// * @since 1.0.0 2024-05-23
-// */
-//@Data
-//public class DeviceFaultExcel {
-// @Excel(name = "id")
-// private String id;
-// @Excel(name = "设备ID")
-// private String deviceId;
-// @Excel(name = "设备编号")
-// private String deviceCode;
-// @Excel(name = "设备名称")
-// private String deviceName;
-// @Excel(name = "设备信息")
-// private String deviceInfo;
-// @Excel(name = "故障码")
-// private String faultCode;
-// @Excel(name = "故障名称")
-// private String faultName;
-// @Excel(name = "解决方案")
-// private String solution;
-// @Excel(name = "备注")
-// private String remark;
-// @Excel(name = "创建人")
-// private String creator;
-// @Excel(name = "创建时间")
-// private Date createDate;
-// @Excel(name = "更新人")
-// private String updater;
-// @Excel(name = "更新时间")
-// private Date updateDate;
-//
-//}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceHealthStateExcel.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceHealthStateExcel.java
deleted file mode 100644
index a7c4231..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceHealthStateExcel.java
+++ /dev/null
@@ -1,33 +0,0 @@
-//package com.iailab.module.device.excel;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import lombok.Data;
-//
-//import java.util.Date;
-//
-///**
-// * 设备健康状态表
-// *
-// * @author lirm ${email}
-// * @since 1.0.0 2024-05-22
-// */
-//@Data
-//public class DeviceHealthStateExcel {
-// @Excel(name = "id")
-// private String id;
-// @Excel(name = "总设备数")
-// private Integer totalCount;
-// @Excel(name = "正常")
-// private Integer normal;
-// @Excel(name = "一般")
-// private Integer common;
-// @Excel(name = "较重")
-// private Integer heavy;
-// @Excel(name = "严重")
-// private Integer serious;
-// @Excel(name = "特别严重")
-// private Integer espserious;
-// @Excel(name = "创建时间")
-// private Date creatorDate;
-//
-//}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceInfoExcel.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceInfoExcel.java
deleted file mode 100644
index 951c263..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceInfoExcel.java
+++ /dev/null
@@ -1,45 +0,0 @@
-//package com.iailab.module.device.excel;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import lombok.Data;
-//
-//import java.util.Date;
-//
-///**
-// * 中选设备信息表
-// *
-// * @author lirm ${email}
-// * @since 1.0.0 2024-05-28
-// */
-//@Data
-//public class DeviceInfoExcel {
-// @Excel(name = "id")
-// private String id;
-// @Excel(name = "设备编号")
-// private String no;
-// @Excel(name = "设备名称")
-// private String name;
-// @Excel(name = "分类编号")
-// private String classNo;
-// @Excel(name = "给料机")
-// private String className;
-// @Excel(name = "所属车间")
-// private String workshop;
-// @Excel(name = "规格型号")
-// private String model;
-// @Excel(name = "出厂序号")
-// private String sn;
-// @Excel(name = "安装位置")
-// private String position;
-// @Excel(name = "制造商")
-// private String manufacturer;
-// @Excel(name = "安装日期")
-// private String installDate;
-// @Excel(name = "控制系统编号")
-// private String plcDevNo;
-// @Excel(name = "父ID")
-// private String pid;
-// @Excel(name = "创建日期")
-// private Date createDate;
-//
-//}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceRunStateExcel.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceRunStateExcel.java
deleted file mode 100644
index 6aff92c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/excel/DeviceRunStateExcel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-//package com.iailab.module.device.excel;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import lombok.Data;
-//
-//import java.util.Date;
-//
-///**
-// * 设备运行状态表
-// *
-// * @author lirm ${email}
-// * @since 1.0.0 2024-05-22
-// */
-//@Data
-//public class DeviceRunStateExcel {
-// @Excel(name = "id")
-// private String id;
-// @Excel(name = "在线设备数量")
-// private Integer totalCount;
-// @Excel(name = "运行设备")
-// private Integer runCount;
-// @Excel(name = "停机设备")
-// private Integer haltCount;
-// @Excel(name = "离线设备")
-// private Integer offlineCount;
-// @Excel(name = "创建时间")
-// private Date creatorDate;
-//
-//}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAbnormalHistoryService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAbnormalHistoryService.java
deleted file mode 100644
index 57edd30..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAbnormalHistoryService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.CrudService;
-import com.iailab.module.device.dto.DeviceAbnormalHistoryDTO;
-import com.iailab.module.device.entity.DeviceAbnormalHistoryEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 异常设备历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-public interface DeviceAbnormalHistoryService extends CrudService<DeviceAbnormalHistoryEntity, DeviceAbnormalHistoryDTO> {
-
- void insertHistory(Map<String, Object> tMap);
-
- List<DeviceAbnormalHistoryDTO> getlist(Map<String, Object> params);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAccountHistoryService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAccountHistoryService.java
deleted file mode 100644
index dd6dbb0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAccountHistoryService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.CrudService;
-import com.iailab.module.device.dto.DeviceAccountHistoryDTO;
-import com.iailab.module.device.entity.DeviceAccountHistoryEntity;
-
-/**
- * 设备台账历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-public interface DeviceAccountHistoryService extends CrudService<DeviceAccountHistoryEntity, DeviceAccountHistoryDTO> {
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAccountService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAccountService.java
deleted file mode 100644
index d551cfa..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceAccountService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.CrudService;
-import com.iailab.module.device.dto.DeviceAccountDTO;
-import com.iailab.module.device.entity.DeviceAccountEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备台账;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-20
- */
-public interface DeviceAccountService extends CrudService<DeviceAccountEntity, DeviceAccountDTO> {
-
- void insertDeviceList(Map<String, String> tMap);
-
- List<String> getDeviceIdList();
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceEvaluateIndexService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceEvaluateIndexService.java
deleted file mode 100644
index ada6369..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceEvaluateIndexService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.dto.DeviceEvaluateIndexDTO;
-import com.iailab.module.device.entity.DeviceEvaluateIndexEntity;
-
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-public interface DeviceEvaluateIndexService extends BaseService<DeviceEvaluateIndexEntity> {
-
- List<DeviceEvaluateIndexDTO> listByEvaluateId(String evaluateId);
-
- void updateList(String evaluateId, List<DeviceEvaluateIndexDTO> dtos);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceFaultService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceFaultService.java
deleted file mode 100644
index f618822..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceFaultService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.CrudService;
-import com.iailab.module.device.dto.DeviceFaultDTO;
-import com.iailab.module.device.entity.DeviceFaultEntity;
-
-/**
- * 设备故障库;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-23
- */
-public interface DeviceFaultService extends CrudService<DeviceFaultEntity, DeviceFaultDTO> {
-
- DeviceFaultDTO getSolution(DeviceFaultDTO queryDto);
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthAlarmDetailService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthAlarmDetailService.java
deleted file mode 100644
index cc66432..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthAlarmDetailService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.entity.DeviceHealthAlarmDetailEntity;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-public interface DeviceHealthAlarmDetailService extends BaseService<DeviceHealthAlarmDetailEntity> {
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthAlarmService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthAlarmService.java
deleted file mode 100644
index 3025883..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthAlarmService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.dto.DeviceHealthAlarmDTO;
-import com.iailab.module.device.entity.DeviceHealthAlarmEntity;
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-public interface DeviceHealthAlarmService extends BaseService<DeviceHealthAlarmEntity> {
- PageData<DeviceHealthAlarmDTO> page(Map<String, Object> params);
-
- DeviceHealthAlarmDTO get(String id);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthEvaluateService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthEvaluateService.java
deleted file mode 100644
index e68ba03..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthEvaluateService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.dto.DeviceHealthEvaluateDTO;
-import com.iailab.module.device.entity.DeviceHealthEvaluateEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-public interface DeviceHealthEvaluateService extends BaseService<DeviceHealthEvaluateEntity> {
-
- PageData<DeviceHealthEvaluateDTO> page(Map<String, Object> params);
-
- List<DeviceHealthEvaluateDTO> list(Map<String, Object> params);
-
- DeviceHealthEvaluateDTO get(String id);
-
- void save(DeviceHealthEvaluateDTO dto);
-
- void update(DeviceHealthEvaluateDTO dto);
-
- void updateReport(DeviceHealthEvaluateDTO dto);
-
- void delete(String[] ids);
-
- void enableByIds(String[] ids);
-
- void disableByIds(String[] ids);
-
- Long selectHealthLevalCount(String healthLeval);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthReportDataService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthReportDataService.java
deleted file mode 100644
index 7ef6b4d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthReportDataService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.dto.DeviceHealthReportDataDTO;
-import com.iailab.module.device.entity.DeviceHealthReportDataEntity;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-public interface DeviceHealthReportDataService extends BaseService<DeviceHealthReportDataEntity> {
-
- List<DeviceHealthReportDataDTO> listByReportId(String reportId);
-
- void save(DeviceHealthReportDataDTO dto);
-
- void migrationDeviceHealthReportData(Map<String, Date> tMap);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthReportService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthReportService.java
deleted file mode 100644
index 163cba0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthReportService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.dto.DeviceHealthReportDTO;
-import com.iailab.module.device.entity.DeviceHealthReportEntity;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-public interface DeviceHealthReportService extends BaseService<DeviceHealthReportEntity> {
-
- PageData<DeviceHealthReportDTO> page(Map<String, Object> params);
-
- DeviceHealthReportDTO get(String id);
-
- void save(DeviceHealthReportDTO dto);
-
- void migrationDeviceHealthReport(Map<String, Date> tMap);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthStateService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthStateService.java
deleted file mode 100644
index 67c09d1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceHealthStateService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.CrudService;
-import com.iailab.module.device.dto.DeviceHealthStateDTO;
-import com.iailab.module.device.entity.DeviceHealthStateEntity;
-
-import java.util.Map;
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-public interface DeviceHealthStateService extends CrudService<DeviceHealthStateEntity, DeviceHealthStateDTO> {
-
- void insertHealthState(Map<String, Object> tMap);
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceIndexService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceIndexService.java
deleted file mode 100644
index 8ed790b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceIndexService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.CrudService;
-import com.iailab.module.device.dto.DeviceIndexDTO;
-import com.iailab.module.device.entity.DeviceIndexEntity;
-
-import java.util.List;
-
-/**
- * 设备故障库;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-23
- */
-public interface DeviceIndexService extends CrudService<DeviceIndexEntity, DeviceIndexDTO> {
-
- void deleteByDeviceId(String id);
-
- List<DeviceIndexDTO> getByDeviceId(String id);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceInfoService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceInfoService.java
deleted file mode 100644
index 3fde83c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceInfoService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.dto.DeviceInfoDTO;
-import com.iailab.module.device.entity.DeviceInfoEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-public interface DeviceInfoService extends BaseService<DeviceInfoEntity> {
-
- List<DeviceInfoDTO> list(Map<String, Object> params);
-
- void syncData();
-
- PageData<DeviceInfoDTO> page(Map<String, Object> params);
-
- List<DeviceInfoDTO> getchildrenList(String deviceId);
-
- DeviceInfoDTO get(String id);
-
- void updateById(DeviceInfoDTO dto);
-
- DeviceInfoDTO getByDevNo(String devNo);
-
- Long getTotal();
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceMainService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceMainService.java
deleted file mode 100644
index 8880d59..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceMainService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.entity.DeviceMainEntity;
-
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-public interface DeviceMainService extends BaseService<DeviceMainEntity> {
-
- Integer getCount(String devno, Date startTime, Date endTime);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceRunStateService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceRunStateService.java
deleted file mode 100644
index edcc59c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceRunStateService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.device.service;
-
-
-import com.iailab.framework.common.service.CrudService;
-import com.iailab.module.device.dto.DeviceRunStateDTO;
-import com.iailab.module.device.entity.DeviceRunStateEntity;
-
-import java.util.Map;
-
-/**
- * 设备运行状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-public interface DeviceRunStateService extends CrudService<DeviceRunStateEntity, DeviceRunStateDTO> {
-
- void insertRunState(Map<String, Integer> tMap);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatCountService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatCountService.java
deleted file mode 100644
index 320ae9c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatCountService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.CrudService;
-import com.iailab.module.device.dto.DeviceStatCountDTO;
-import com.iailab.module.device.entity.DeviceStatCountEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-public interface DeviceStatCountService extends CrudService<DeviceStatCountEntity, DeviceStatCountDTO> {
-
- DeviceStatCountDTO getDeviceStatCount();
-
- List<DeviceStatCountDTO> getHistory(Map<String, Object> params);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatNewnessService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatNewnessService.java
deleted file mode 100644
index cc9d7d7..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatNewnessService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.dto.DeviceStatNewnessDTO;
-import com.iailab.module.device.entity.DeviceStatNewnessEntity;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-public interface DeviceStatNewnessService extends BaseService<DeviceStatNewnessEntity> {
-
- void statNewness(List<DeviceStatNewnessEntity> list, Date statDate);
-
- DeviceStatNewnessEntity getLastByNo(String no);
-
- List<DeviceStatNewnessDTO> list(Map<String, Object> params);
-
- PageData<DeviceStatNewnessDTO> page(Map<String, Object> params);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatUsageService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatUsageService.java
deleted file mode 100644
index ca1bf79..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/DeviceStatUsageService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.device.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.device.dto.DeviceCurrentRateDTO;
-import com.iailab.module.device.entity.DeviceStatUsageEntity;
-
-import java.util.List;
-import java.util.Map;
-
-public interface DeviceStatUsageService extends BaseService<DeviceStatUsageEntity> {
-
- void syncData();
-
- DeviceStatUsageEntity getLastByNo(String no);
-
- DeviceCurrentRateDTO getDeviceCurrentRate();
-
- List<DeviceStatUsageEntity> list(Map<String, Object> params);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAbnormalHistoryServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAbnormalHistoryServiceImpl.java
deleted file mode 100644
index 7b63f71..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAbnormalHistoryServiceImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.module.device.dao.DeviceAbnormalHistoryDao;
-import com.iailab.module.device.dto.DeviceAbnormalHistoryDTO;
-import com.iailab.module.device.entity.DeviceAbnormalHistoryEntity;
-import com.iailab.module.device.service.DeviceAbnormalHistoryService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 异常设备历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Service
-public class DeviceAbnormalHistoryServiceImpl extends CrudServiceImpl<DeviceAbnormalHistoryDao, DeviceAbnormalHistoryEntity, DeviceAbnormalHistoryDTO> implements DeviceAbnormalHistoryService {
-
- @Override
- public QueryWrapper<DeviceAbnormalHistoryEntity> getWrapper(Map<String, Object> params){
- String id = (String)params.get("id");
- String endDate = (String)params.get("endDate");
-
- QueryWrapper<DeviceAbnormalHistoryEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
- return wrapper;
- }
-
-
- @Override
- public void insertHistory(Map<String, Object> tMap) {
- Map<String, Integer> map = new HashMap<>();
- int normal = Integer.parseInt(tMap.get("normal").toString());
- int common = Integer.parseInt(tMap.get("common").toString());
- int heavy = Integer.parseInt(tMap.get("heavy").toString());
- int serious = Integer.parseInt(tMap.get("serious").toString());
- int espSerious = Integer.parseInt(tMap.get("espSerious").toString());
- int total_count = normal + common + heavy + serious + espSerious;
- int abnormal_count = common + heavy + serious + espSerious;
- map.put("total_count",total_count);
- map.put("abnormal_count",abnormal_count);
- baseDao.insertHistory(map);
- }
-
- @Override
- public List<DeviceAbnormalHistoryDTO> getlist(Map<String, Object> params) {
- return baseDao.getlist(params);
- }
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAccountHistoryServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAccountHistoryServiceImpl.java
deleted file mode 100644
index 497ed02..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAccountHistoryServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.module.device.dao.DeviceAccountHistoryDao;
-import com.iailab.module.device.dto.DeviceAccountHistoryDTO;
-import com.iailab.module.device.entity.DeviceAccountHistoryEntity;
-import com.iailab.module.device.service.DeviceAccountHistoryService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 设备台账历史表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-27
- */
-@Service
-public class DeviceAccountHistoryServiceImpl extends CrudServiceImpl<DeviceAccountHistoryDao, DeviceAccountHistoryEntity, DeviceAccountHistoryDTO> implements DeviceAccountHistoryService {
-
- @Override
- public QueryWrapper<DeviceAccountHistoryEntity> getWrapper(Map<String, Object> params){
- String deviceId = (String)params.get("deviceId");
-
- QueryWrapper<DeviceAccountHistoryEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(deviceId), "device_id", deviceId)
- .orderByDesc("create_date");
- return wrapper;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAccountServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAccountServiceImpl.java
deleted file mode 100644
index 8ee8952..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceAccountServiceImpl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.device.dao.DeviceAccountDao;
-import com.iailab.module.device.dto.DeviceAccountDTO;
-import com.iailab.module.device.entity.DeviceAccountEntity;
-import com.iailab.module.device.entity.DeviceAccountHistoryEntity;
-import com.iailab.module.device.service.DeviceAccountHistoryService;
-import com.iailab.module.device.service.DeviceAccountService;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
- * 设备台账;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-20
- */
-@Service
-public class DeviceAccountServiceImpl extends CrudServiceImpl<DeviceAccountDao, DeviceAccountEntity, DeviceAccountDTO> implements DeviceAccountService {
- @Resource
- DeviceAccountHistoryService deviceAccountHistoryService;
- @Resource
- HttpsRequest httpsRequest;
-
- @Override
- public QueryWrapper<DeviceAccountEntity> getWrapper(Map<String, Object> params) {
- String deviceCode = (String) params.get("deviceCode");
- String deviceName = (String) params.get("deviceName");
-
- QueryWrapper<DeviceAccountEntity> wrapper = new QueryWrapper<>();
- wrapper.like(StringUtils.isNotBlank(deviceCode), "device_code", deviceCode);
- wrapper.like(StringUtils.isNotBlank(deviceName), "device_name", deviceName);
- wrapper.orderByAsc("device_id");
- return wrapper;
- }
-
-
- @Override
- public void insertDeviceList(Map<String, String> tMap) {
- Map<String, String> queryParams = new HashMap<>();
- queryParams.put("per_page", "100");
- String responseStr = httpsRequest.doGetDeviceList(tMap.get("url"), queryParams, "utf-8", tMap.get("token"));
- JSONObject responseObj = JSON.parseObject(responseStr);
- if ("200".equals(responseObj.get("code").toString())) {
- JSONObject dataObject = (JSONObject) responseObj.get("data");
- JSONArray stateArray = dataObject.getJSONArray("items");
- if (!CollectionUtils.isEmpty(stateArray)) {
- if (!CollectionUtils.isEmpty(stateArray)) {
- baseDao.updateMonitorState();//先更新监测状态为0
- for (int i = 0; i < stateArray.size(); i++) {
- JSONObject item = stateArray.getJSONObject(i);
- if (!item.get("de_serial_no").toString().contains("ams")) {
- DeviceAccountEntity entity = baseDao.getByDeviceId(Integer.parseInt(item.get("id").toString()));
- if (entity != null) {
- entity.setRunState(Integer.parseInt(item.get("status").toString()));
- if(Integer.parseInt(item.get("status").toString()) == 0){
- entity.setRemark("设备离线");
- }else if(Integer.parseInt(item.get("status").toString()) == 1){
- entity.setRemark("设备空闲停机");
- }if(Integer.parseInt(item.get("status").toString()) == 2){
- entity.setRemark("设备运行正常");
- }
- entity.setMonitorState(1);
- entity.setUpdateDate(new Date());
- baseDao.updateById(entity);
- } else {
- //解析json
- DeviceAccountEntity deviceAccountEntity = new DeviceAccountEntity();
- deviceAccountEntity.setId(UUID.randomUUID().toString());
- deviceAccountEntity.setDeviceId(Integer.parseInt(item.get("id").toString()));
- deviceAccountEntity.setDeviceCode(item.get("de_serial_no").toString());
- deviceAccountEntity.setDeviceName(item.get("name").toString());
- deviceAccountEntity.setWorkShop(item.get("category").toString());
- deviceAccountEntity.setDeviceClass(item.get("class").toString());
- deviceAccountEntity.setRunState(Integer.parseInt(item.get("status").toString()));
- deviceAccountEntity.setMonitorState(1);
- deviceAccountEntity.setIsPush(0);
- deviceAccountEntity.setCreateDate(new Date());
- if(Integer.parseInt(item.get("status").toString()) == 0){
- entity.setRemark("设备离线");
- }else if(Integer.parseInt(item.get("status").toString()) == 1){
- entity.setRemark("设备空闲停机");
- }if(Integer.parseInt(item.get("status").toString()) == 2){
- entity.setRemark("设备运行正常");
- }
- baseDao.insert(deviceAccountEntity);
- }
- //解析json
- DeviceAccountHistoryEntity deviceAccountHistoryEntity = new DeviceAccountHistoryEntity();
- deviceAccountHistoryEntity.setId(UUID.randomUUID().toString());
- deviceAccountHistoryEntity.setDeviceId(Integer.parseInt(item.get("id").toString()));
- deviceAccountHistoryEntity.setDeviceCode(item.get("de_serial_no").toString());
- deviceAccountHistoryEntity.setDeviceName(item.get("name").toString());
- deviceAccountHistoryEntity.setWorkShop(item.get("category").toString());
- deviceAccountHistoryEntity.setDeviceClass(item.get("class").toString());
- deviceAccountHistoryEntity.setRunState(Integer.parseInt(item.get("status").toString()));
- deviceAccountHistoryEntity.setMonitorState(1);
- deviceAccountHistoryEntity.setIsPush(0);
- deviceAccountHistoryEntity.setCreateDate(new Date());
- deviceAccountHistoryService.insert(deviceAccountHistoryEntity);
- }
- }
- }
- }
- }
- }
-
- @Override
- public List<String> getDeviceIdList() {
- return baseDao.getDeviceIdList();
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceEvaluateIndexServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceEvaluateIndexServiceImpl.java
deleted file mode 100644
index 62d733b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceEvaluateIndexServiceImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.device.dao.DeviceEvaluateIndexDao;
-import com.iailab.module.device.dto.DeviceEvaluateIndexDTO;
-import com.iailab.module.device.entity.DeviceEvaluateIndexEntity;
-import com.iailab.module.device.service.DeviceEvaluateIndexService;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-import java.util.UUID;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Service
-public class DeviceEvaluateIndexServiceImpl extends BaseServiceImpl<DeviceEvaluateIndexDao, DeviceEvaluateIndexEntity>
- implements DeviceEvaluateIndexService {
-
- @Override
- public List<DeviceEvaluateIndexDTO> listByEvaluateId(String evaluateId) {
- QueryWrapper<DeviceEvaluateIndexEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("evaluate_id", evaluateId).orderByAsc("param_order");
- List<DeviceEvaluateIndexEntity> list = baseDao.selectList(wrapper);
- return ConvertUtils.sourceToTarget(list, DeviceEvaluateIndexDTO.class);
- }
-
- @Override
- public void updateList(String evaluateId, List<DeviceEvaluateIndexDTO> dtos) {
- this.deleteByEvaluateId(evaluateId);
- if(!CollectionUtils.isEmpty(dtos)) {
- dtos.forEach(item -> {
- DeviceEvaluateIndexEntity entity = ConvertUtils.sourceToTarget(item, DeviceEvaluateIndexEntity.class);
- entity.setId(UUID.randomUUID().toString());
- entity.setEvaluateId(evaluateId);
- baseDao.insert(entity);
- });
- }
-
- }
-
- private void deleteByEvaluateId(String evaluateId) {
- QueryWrapper<DeviceEvaluateIndexEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("evaluate_id", evaluateId);
- baseDao.delete(wrapper);
- }
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceFaultServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceFaultServiceImpl.java
deleted file mode 100644
index b896470..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceFaultServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.device.dao.DeviceFaultDao;
-import com.iailab.module.device.dto.DeviceFaultDTO;
-import com.iailab.module.device.entity.DeviceFaultEntity;
-import com.iailab.module.device.service.DeviceFaultService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 设备故障库;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-23
- */
-@Service
-public class DeviceFaultServiceImpl extends CrudServiceImpl<DeviceFaultDao, DeviceFaultEntity, DeviceFaultDTO> implements DeviceFaultService {
-
- @Override
- public QueryWrapper<DeviceFaultEntity> getWrapper(Map<String, Object> params) {
- String className = (String) params.get("className");
- String faultType = (String) params.get("faultType");
-
- QueryWrapper<DeviceFaultEntity> wrapper = new QueryWrapper<>();
- wrapper.like(StringUtils.isNotBlank(className), "class_name", className)
- .like(StringUtils.isNotBlank(faultType), "fault_type", faultType);
-
- return wrapper;
- }
-
- @Override
- public DeviceFaultDTO getSolution(DeviceFaultDTO queryDto) {
- QueryWrapper<DeviceFaultEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("class_no", queryDto.getClassNo())
- .eq("index_type", queryDto.getIndexType())
- .eq("fault_type", queryDto.getFaultType());
- DeviceFaultEntity entity = baseDao.selectOne(wrapper);
- return ConvertUtils.sourceToTarget(entity, DeviceFaultDTO.class);
- }
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthAlarmDetailServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthAlarmDetailServiceImpl.java
deleted file mode 100644
index 4f0cdbd..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthAlarmDetailServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.module.device.dao.DeviceHealthAlarmDetailDao;
-import com.iailab.module.device.entity.DeviceHealthAlarmDetailEntity;
-import com.iailab.module.device.service.DeviceHealthAlarmDetailService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Slf4j
-@Service
-public class DeviceHealthAlarmDetailServiceImpl extends BaseServiceImpl<DeviceHealthAlarmDetailDao, DeviceHealthAlarmDetailEntity>
- implements DeviceHealthAlarmDetailService {
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthAlarmServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthAlarmServiceImpl.java
deleted file mode 100644
index 946d667..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthAlarmServiceImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.module.device.dao.DeviceHealthAlarmDao;
-import com.iailab.module.device.dto.DeviceHealthAlarmDTO;
-import com.iailab.module.device.entity.DeviceHealthAlarmEntity;
-import com.iailab.module.device.service.DeviceHealthAlarmService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Slf4j
-@Service
-public class DeviceHealthAlarmServiceImpl extends BaseServiceImpl<DeviceHealthAlarmDao, DeviceHealthAlarmEntity>
- implements DeviceHealthAlarmService {
- @Override
- public PageData<DeviceHealthAlarmDTO> page(Map<String, Object> params) {
- IPage<DeviceHealthAlarmEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, DeviceHealthAlarmDTO.class);
- }
-
- @Override
- public DeviceHealthAlarmDTO get(String id) {
- return baseDao.getInfo(id);
- }
-
- private QueryWrapper<DeviceHealthAlarmEntity> getWrapper(Map<String, Object> params) {
- String devNo = (String) params.get("devNo");
- String devName = (String) params.get("devName");
- String faultName = (String) params.get("faultName");
- String startTime = (String) params.get("startTime");
- String endTime = (String) params.get("endTime");
- QueryWrapper<DeviceHealthAlarmEntity> wrapper = new QueryWrapper<>();
- wrapper.like(StringUtils.isNotBlank(devNo), "dev_no", devNo)
- .like(StringUtils.isNotBlank(devName), "dev_name", devName)
- .eq(StringUtils.isNotBlank(faultName), "fault_name", faultName)
- .ge(StringUtils.isNotBlank(startTime), "fault_time", startTime)
- .le(StringUtils.isNotBlank(endTime), "fault_time", endTime);
- return wrapper;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthEvaluateServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthEvaluateServiceImpl.java
deleted file mode 100644
index 061d544..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthEvaluateServiceImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.alibaba.nacos.client.naming.utils.CollectionUtils;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.enums.IsEnableEnum;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.device.dao.DeviceHealthEvaluateDao;
-import com.iailab.module.device.dto.DeviceHealthEvaluateDTO;
-import com.iailab.module.device.entity.DeviceHealthEvaluateEntity;
-import com.iailab.module.device.service.DeviceEvaluateIndexService;
-import com.iailab.module.device.service.DeviceHealthEvaluateService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Slf4j
-@Service
-public class DeviceHealthEvaluateServiceImpl extends BaseServiceImpl<DeviceHealthEvaluateDao, DeviceHealthEvaluateEntity>
- implements DeviceHealthEvaluateService {
-
- @Resource
- private DeviceEvaluateIndexService deviceEvaluateIndexService;
-
- @Override
- public PageData<DeviceHealthEvaluateDTO> page(Map<String, Object> params) {
- IPage<DeviceHealthEvaluateEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params).orderByAsc("dev_name")
- );
- return getPageData(page, DeviceHealthEvaluateDTO.class);
- }
-
- @Override
- public List<DeviceHealthEvaluateDTO> list(Map<String, Object> params) {
- List<DeviceHealthEvaluateEntity> list = baseDao.selectList(getWrapper(params));
-
- return ConvertUtils.sourceToTarget(list, DeviceHealthEvaluateDTO.class);
- }
-
- private QueryWrapper<DeviceHealthEvaluateEntity> getWrapper(Map<String, Object> params) {
- String devId = (String) params.get("devId");
- String devName = (String) params.get("devName");
- String healthLevel = (String) params.get("healthLevel");
- Integer isEnable = params.get("isEnable") == null ? null : Integer.parseInt(params.get("isEnable").toString());
- QueryWrapper<DeviceHealthEvaluateEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(devId), "dev_id", devId)
- .eq(isEnable != null, "is_enable", isEnable)
- .like(StringUtils.isNotBlank(devName), "dev_name", devName)
- .eq(StringUtils.isNotBlank(healthLevel), "health_level", healthLevel);
- return wrapper;
- }
-
- @Override
- public DeviceHealthEvaluateDTO get(String id) {
- DeviceHealthEvaluateEntity entity = baseDao.selectById(id);
- DeviceHealthEvaluateDTO result = ConvertUtils.sourceToTarget(entity, DeviceHealthEvaluateDTO.class);
- result.setIndexList(deviceEvaluateIndexService.listByEvaluateId(id));
- return result;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void save(DeviceHealthEvaluateDTO dto) {
- DeviceHealthEvaluateEntity entity = ConvertUtils.sourceToTarget(dto, DeviceHealthEvaluateEntity.class);
- entity.setId(UUID.randomUUID().toString());
- entity.setCreateDate(new Date());
- insert(entity);
- deviceEvaluateIndexService.updateList(entity.getId(), dto.getIndexList());
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void update(DeviceHealthEvaluateDTO dto) {
- DeviceHealthEvaluateEntity entity = ConvertUtils.sourceToTarget(dto, DeviceHealthEvaluateEntity.class);
- entity.setUpdateDate(new Date());
- updateById(entity);
- deviceEvaluateIndexService.updateList(entity.getId(), dto.getIndexList());
- }
-
- @Override
- public void updateReport(DeviceHealthEvaluateDTO dto) {
- DeviceHealthEvaluateEntity entity = ConvertUtils.sourceToTarget(dto, DeviceHealthEvaluateEntity.class);
- entity.setUpdateDate(new Date());
- updateById(entity);
- }
-
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void enableByIds(String[] ids) {
- if (CollectionUtils.isEmpty(Arrays.asList(ids))) {
- return;
- }
- Arrays.asList(ids).forEach(item -> {
- DeviceHealthEvaluateEntity entity = new DeviceHealthEvaluateEntity();
- entity.setId(item);
- entity.setIsEnable(IsEnableEnum.ENABLE.value());
- baseDao.updateById(entity);
- });
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void disableByIds(String[] ids) {
- if (CollectionUtils.isEmpty(Arrays.asList(ids))) {
- return;
- }
- Arrays.asList(ids).forEach(item -> {
- DeviceHealthEvaluateEntity entity = new DeviceHealthEvaluateEntity();
- entity.setId(item);
- entity.setIsEnable(IsEnableEnum.DISABLE.value());
- baseDao.updateById(entity);
- });
- }
-
- @Override
- public Long selectHealthLevalCount(String healthLeval) {
- QueryWrapper<DeviceHealthEvaluateEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(healthLeval),"health_level",healthLeval);
- wrapper.eq("is_enable",1);
- return baseDao.selectCount(wrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthReportDataServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthReportDataServiceImpl.java
deleted file mode 100644
index 3bea22a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthReportDataServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.device.dao.DeviceHealthReportDataDao;
-import com.iailab.module.device.dto.DeviceHealthReportDataDTO;
-import com.iailab.module.device.entity.DeviceHealthReportDataEntity;
-import com.iailab.module.device.service.DeviceHealthReportDataService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Slf4j
-@Service
-public class DeviceHealthReportDataServiceImpl extends BaseServiceImpl<DeviceHealthReportDataDao, DeviceHealthReportDataEntity>
- implements DeviceHealthReportDataService {
-
-
- @Override
- public List<DeviceHealthReportDataDTO> listByReportId(String reportId) {
- QueryWrapper<DeviceHealthReportDataEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("report_id", reportId)
- .orderByAsc("sort");
- List<DeviceHealthReportDataEntity> list = baseDao.selectList(wrapper);
- return ConvertUtils.sourceToTarget(list, DeviceHealthReportDataDTO.class);
- }
-
- @Override
- public void save(DeviceHealthReportDataDTO dto) {
- DeviceHealthReportDataEntity entity = ConvertUtils.sourceToTarget(dto, DeviceHealthReportDataEntity.class);
- entity.setId(UUID.randomUUID().toString());
- entity.setCreateDate(new Date());
- insert(entity);
- }
-
- @Override
- public void migrationDeviceHealthReportData(Map<String, Date> tMap) {
- List<DeviceHealthReportDataEntity> list = baseDao.selectList(getDateWrapper(tMap));
- if (CollectionUtils.isEmpty(list)){
- return;
- }
- baseDao.migration(list);
- baseDao.delete(getDateWrapper(tMap));
- }
-
- public QueryWrapper<DeviceHealthReportDataEntity> getDateWrapper(Map<String, Date> params) {
- String startDate = DateUtils.format(params.get("startdate"),DateUtils.DATE_TIME_PATTERN);
- String endDate = DateUtils.format(params.get("enddate"),DateUtils.DATE_TIME_PATTERN);
-
- QueryWrapper<DeviceHealthReportDataEntity> wrapper = new QueryWrapper<>();
- wrapper.ge(StringUtils.isNotBlank(startDate), "create_date", startDate);
- wrapper.le(StringUtils.isNotBlank(endDate), "create_date", endDate);
- return wrapper;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthReportServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthReportServiceImpl.java
deleted file mode 100644
index 36754ae..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthReportServiceImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.device.dao.DeviceHealthReportDao;
-import com.iailab.module.device.dto.DeviceHealthAlarmDTO;
-import com.iailab.module.device.dto.DeviceHealthAlarmDetailDTO;
-import com.iailab.module.device.dto.DeviceHealthReportDTO;
-import com.iailab.module.device.dto.DeviceHealthReportDataDTO;
-import com.iailab.module.device.entity.DeviceHealthAlarmDetailEntity;
-import com.iailab.module.device.entity.DeviceHealthAlarmEntity;
-import com.iailab.module.device.entity.DeviceHealthReportEntity;
-import com.iailab.module.device.service.DeviceHealthAlarmService;
-import com.iailab.module.device.service.DeviceHealthAlarmDetailService;
-import com.iailab.module.device.service.DeviceHealthReportDataService;
-import com.iailab.module.device.service.DeviceHealthReportService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月28日
- */
-@Slf4j
-@Service
-public class DeviceHealthReportServiceImpl extends BaseServiceImpl<DeviceHealthReportDao, DeviceHealthReportEntity>
- implements DeviceHealthReportService {
-
- @Resource
- private DeviceHealthReportDataService deviceHealthReportDataService;
- @Resource
- private DeviceHealthAlarmService deviceHealthAlarmService;
- @Resource
- private DeviceHealthAlarmDetailService deviceHealthAlarmDetailService;
-
- @Override
- public PageData<DeviceHealthReportDTO> page(Map<String, Object> params) {
- IPage<DeviceHealthReportEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, DeviceHealthReportDTO.class);
- }
-
- private QueryWrapper<DeviceHealthReportEntity> getWrapper(Map<String, Object> params) {
- String devNo = (String) params.get("devNo");
- String devName = (String) params.get("devName");
- String reportName = (String) params.get("reportName");
- String startTime = (String) params.get("startTime");
- String endTime = (String) params.get("endTime");
- QueryWrapper<DeviceHealthReportEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(devNo), "dev_no", devNo)
- .like(StringUtils.isNotBlank(devName), "dev_name", devName)
- .like(StringUtils.isNotBlank(reportName), "report_name", reportName)
- .ge(StringUtils.isNotBlank(startTime), "report_date", startTime)
- .le(StringUtils.isNotBlank(endTime), "report_date", endTime);
- return wrapper;
- }
-
- @Override
- public DeviceHealthReportDTO get(String id) {
- DeviceHealthReportEntity entity = baseDao.selectById(id);
- DeviceHealthReportDTO result = ConvertUtils.sourceToTarget(entity, DeviceHealthReportDTO.class);
- List<DeviceHealthReportDataDTO> detList = deviceHealthReportDataService.listByReportId(id);
- result.setDetList(detList);
-
- List<BarLineDTO> chartList = new ArrayList<>();
- if (CollectionUtils.isEmpty(detList)) {
- result.setChartList(chartList);
- return result;
- }
- detList.forEach(item -> {
- BarLineDTO dto = new BarLineDTO();
- dto.setValueName(item.getDataName());
- List<String> legend = new ArrayList<>();
- List<SeriesItem> series = new ArrayList<>();
- List<String> categories = new ArrayList<>();
-
- legend.add(item.getDataName());
- SeriesItem seriesItem = new SeriesItem();
- seriesItem.setName(item.getDataName());
- List<Object[]> sData = new ArrayList<>();
- if (StringUtils.isNotBlank(item.getDataValue())) {
- sData = JSONArray.parseArray(item.getDataValue(), Object[].class);
- }
- seriesItem.setData(sData);
- series.add(seriesItem);
- series.get(0).getData().forEach(v -> {
- categories.add(v[0].toString());
- });
-
- dto.setLegend(legend);
- dto.setSeries(series);
- dto.setCategories(categories);
- chartList.add(dto);
- });
- result.setChartList(chartList);
- return result;
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void save(DeviceHealthReportDTO dto) {
- DeviceHealthReportEntity entity = ConvertUtils.sourceToTarget(dto, DeviceHealthReportEntity.class);
- entity.setCreateDate(new Date());
- insert(entity);
- if (!CollectionUtils.isEmpty(dto.getDetList())) {
- for (int i = 0; i < dto.getDetList().size(); i++) {
- DeviceHealthReportDataDTO det = dto.getDetList().get(i);
- det.setReportId(entity.getId());
- det.setSort(i);
- deviceHealthReportDataService.save(det);
- }
- }
-
- // 设备健康故障记录
- DeviceHealthAlarmDTO deviceHealthAlarm = dto.getDeviceHealthAlarm();
- if ( null != deviceHealthAlarm ){
- DeviceHealthAlarmEntity deviceHealthAlarmEntitie = ConvertUtils.sourceToTarget(deviceHealthAlarm, DeviceHealthAlarmEntity.class);
- deviceHealthAlarmService.insert(deviceHealthAlarmEntitie);
-
- // 设备健康故障详情记录
- List<DeviceHealthAlarmDetailDTO> deviceHealthAlarmDetails = dto.getDeviceHealthAlarmDetails();
- List<DeviceHealthAlarmDetailEntity> deviceHealthAlarmDetailEntities = ConvertUtils.sourceToTarget(deviceHealthAlarmDetails, DeviceHealthAlarmDetailEntity.class);
- deviceHealthAlarmDetailService.insertBatch(deviceHealthAlarmDetailEntities);
- }
-
- }
-
- @Override
- public void migrationDeviceHealthReport(Map<String, Date> tMap) {
- List<DeviceHealthReportEntity> list = baseDao.selectList(getDateWrapper(tMap));
- if (CollectionUtils.isEmpty(list)){
- return;
- }
- baseDao.migration(list);
- baseDao.delete(getDateWrapper(tMap));
- }
-
- public QueryWrapper<DeviceHealthReportEntity> getDateWrapper(Map<String, Date> params) {
- String startDate = DateUtils.format(params.get("startdate"),DateUtils.DATE_TIME_PATTERN);
- String endDate = DateUtils.format(params.get("enddate"),DateUtils.DATE_TIME_PATTERN);
-
- QueryWrapper<DeviceHealthReportEntity> wrapper = new QueryWrapper<>();
- wrapper.ge(StringUtils.isNotBlank(startDate), "report_date", startDate);
- wrapper.le(StringUtils.isNotBlank(endDate), "report_date", endDate);
- return wrapper;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthStateServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthStateServiceImpl.java
deleted file mode 100644
index b877446..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceHealthStateServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.module.device.dao.DeviceHealthStateDao;
-import com.iailab.module.device.dto.DeviceHealthStateDTO;
-import com.iailab.module.device.entity.DeviceHealthStateEntity;
-import com.iailab.module.device.service.DeviceInfoService;
-import com.iailab.module.device.service.DeviceHealthEvaluateService;
-import com.iailab.module.device.service.DeviceHealthStateService;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Service
-public class DeviceHealthStateServiceImpl extends CrudServiceImpl<DeviceHealthStateDao, DeviceHealthStateEntity, DeviceHealthStateDTO> implements DeviceHealthStateService {
-
- @Resource
- DeviceHealthEvaluateService deviceHealthEvaluateService;
-
- @Resource
- DeviceInfoService deviceInfoService;
-
- @Override
- public QueryWrapper<DeviceHealthStateEntity> getWrapper(Map<String, Object> params){
- String id = (String)params.get("id");
-
- QueryWrapper<DeviceHealthStateEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
- return wrapper;
- }
-
-
- @Override
- public void insertHealthState(Map<String, Object> tMap) {
- int normal = Integer.parseInt(tMap.get("normal").toString());
- int common = Integer.parseInt(tMap.get("common").toString());
- int heavy = Integer.parseInt(tMap.get("heavy").toString());
- int serious = Integer.parseInt(tMap.get("serious").toString());
- int espSerious = Integer.parseInt(tMap.get("espSerious").toString());
- int total_count = normal + common + heavy + serious + espSerious;
- tMap.put("total_count",total_count);
- int id = baseDao.getId();
- if(id == 0){
- baseDao.insertHealthState(tMap);
- }else{
- tMap.put("id",id);
- baseDao.updateHealthState(tMap);
- }
- }
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceIndexServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceIndexServiceImpl.java
deleted file mode 100644
index 7bd92c3..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceIndexServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.device.dao.DeviceIndexDao;
-import com.iailab.module.device.dto.DeviceIndexDTO;
-import com.iailab.module.device.entity.DeviceIndexEntity;
-import com.iailab.module.device.service.DeviceIndexService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备故障库;
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-23
- */
-@Service
-public class DeviceIndexServiceImpl extends CrudServiceImpl<DeviceIndexDao, DeviceIndexEntity, DeviceIndexDTO> implements DeviceIndexService {
-
- @Override
- public QueryWrapper<DeviceIndexEntity> getWrapper(Map<String, Object> params){
- String faultType = (String)params.get("faultType");
-
- QueryWrapper<DeviceIndexEntity> wrapper = new QueryWrapper<>();
- wrapper.like(StringUtils.isNotBlank(faultType), "fault_type", faultType);
-
- return wrapper;
- }
-
-
- @Override
- public void deleteByDeviceId(String id) {
- QueryWrapper<DeviceIndexEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(id), "device_id", id);
- baseDao.delete(wrapper);
- }
-
- @Override
- public List<DeviceIndexDTO> getByDeviceId(String id) {
- QueryWrapper<DeviceIndexEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(id), "device_id", id);
- return ConvertUtils.sourceToTarget(baseDao.selectList(wrapper), DeviceIndexDTO.class);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceInfoServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceInfoServiceImpl.java
deleted file mode 100644
index d4ec73e..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceInfoServiceImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.device.dao.DeviceInfoDao;
-import com.iailab.module.device.dto.DeviceInfoDTO;
-import com.iailab.module.device.entity.DeviceInfoEntity;
-import com.iailab.module.device.service.DeviceInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-@Slf4j
-@Service
-public class DeviceInfoServiceImpl extends BaseServiceImpl<DeviceInfoDao, DeviceInfoEntity> implements DeviceInfoService {
-
- private String HTTP_API_CODE = "Dev.DeviceTree";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
-
- @Override
- public List<DeviceInfoDTO> list(Map<String, Object> params) {
- List<DeviceInfoEntity> list = baseDao.selectList(getWrapper(params));
- return ConvertUtils.sourceToTarget(list, DeviceInfoDTO.class);
- }
-
- private QueryWrapper<DeviceInfoEntity> getWrapper(Map<String, Object> params) {
- String pid = (String) params.get("pid");
- String no = (String) params.get("no");
- String name = (String) params.get("name");
- String isMain = (String) params.get("isMain");
- QueryWrapper<DeviceInfoEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(pid), "pid", pid)
- .like(StringUtils.isNotBlank(no), "no", no)
- .like(StringUtils.isNotBlank(name), "name", name)
- .eq(StringUtils.isNotBlank(isMain), "is_main", isMain);
- return wrapper;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl(), params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONArray dataArray = responseObj.getJSONArray(CommonConstant.ZX_RES);
- if (CollectionUtils.isEmpty(dataArray)) {
- return;
- }
- List<DeviceInfoDTO> deviceInfoDTOS = dataArray.toJavaList(DeviceInfoDTO.class);
- for (int i = 0; i < deviceInfoDTOS.size(); i++) {
- DeviceInfoEntity entity0 = ConvertUtils.sourceToTarget(deviceInfoDTOS.get(i), DeviceInfoEntity.class);
- entity0.setId(UUID.randomUUID().toString());
- entity0.setCreateDate(new Date());
- entity0.setPid("0");
- baseDao.insert(entity0);
- List<DeviceInfoDTO> chd = deviceInfoDTOS.get(i).getChildren();
- if (CollectionUtils.isEmpty(chd)) {
- continue;
- }
- for (int j = 0; j < chd.size(); j++) {
- DeviceInfoEntity entity1 = ConvertUtils.sourceToTarget(chd.get(j), DeviceInfoEntity.class);
- entity1.setId(UUID.randomUUID().toString());
- entity1.setCreateDate(new Date());
- entity1.setPid(entity0.getId());
- baseDao.insert(entity1);
- }
- }
- }
-
- @Override
- public PageData<DeviceInfoDTO> page(Map<String, Object> params) {
- params.put("pid","0");
- IPage<DeviceInfoEntity> page = baseDao.selectPage(getPage(params, "no", true), getWrapper(params));
- return getPageData(page, DeviceInfoDTO.class);
- }
-
- @Override
- public List<DeviceInfoDTO> getchildrenList(String deviceId) {
- return baseDao.getchildrenList(deviceId);
- }
-
- @Override
- public DeviceInfoDTO get(String id) {
-
- DeviceInfoEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, DeviceInfoDTO.class);
- }
-
- @Override
- public void updateById(DeviceInfoDTO dto) {
- DeviceInfoEntity entity = ConvertUtils.sourceToTarget(dto, DeviceInfoEntity.class);
- baseDao.updateById(entity);
- }
-
- @Override
- public DeviceInfoDTO getByDevNo(String devNo) {
- QueryWrapper<DeviceInfoEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("no", devNo);
- DeviceInfoEntity entity = baseDao.selectOne(wrapper);
- return ConvertUtils.sourceToTarget(entity, DeviceInfoDTO.class);
- }
-
- @Override
- public Long getTotal() {
- QueryWrapper<DeviceInfoEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("pid","0");
- return baseDao.selectCount(queryWrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceMainServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceMainServiceImpl.java
deleted file mode 100644
index 5395c0c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceMainServiceImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.device.dao.DeviceMainDao;
-import com.iailab.module.device.dto.DeviceMainDTO;
-import com.iailab.module.device.entity.DeviceMainEntity;
-import com.iailab.module.device.service.DeviceMainService;
-import lombok.extern.slf4j.Slf4j;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-@Slf4j
-@Service
-public class DeviceMainServiceImpl extends BaseServiceImpl<DeviceMainDao, DeviceMainEntity> implements DeviceMainService {
-
- private String HTTP_API_CODE = "Dev.DeviceMaintQuery";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
-
- @Override
- public Integer getCount(String devno, Date startTime, Date endTime) {
- Integer result = 0;
- Map<String, String> params = new HashMap<>(3);
- params.put("devno", devno);
- params.put("startdate", DateUtils.format(startTime));
- params.put("enddate", DateUtils.format(endTime));
-
- List<DeviceMainDTO> list = this.getList(params);
- return list.size();
- }
-
- private List<DeviceMainDTO> getList(Map<String, String> params) {
- List<DeviceMainDTO> result = new ArrayList<>();
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- String responseStr = httpsRequest.doGet(apiDTO.getUrl(), params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONArray dataArray = responseObj.getJSONArray(CommonConstant.ZX_RES);
- if (CollectionUtils.isEmpty(dataArray)) {
- return result;
- }
- return dataArray.toJavaList(DeviceMainDTO.class);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceRunStateServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceRunStateServiceImpl.java
deleted file mode 100644
index 38bcb70..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceRunStateServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.module.device.dao.DeviceRunStateDao;
-import com.iailab.module.device.dto.DeviceRunStateDTO;
-import com.iailab.module.device.entity.DeviceRunStateEntity;
-import com.iailab.module.device.service.DeviceRunStateService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 设备运行状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Service
-public class DeviceRunStateServiceImpl extends CrudServiceImpl<DeviceRunStateDao, DeviceRunStateEntity, DeviceRunStateDTO> implements DeviceRunStateService {
-
- @Override
- public QueryWrapper<DeviceRunStateEntity> getWrapper(Map<String, Object> params){
- String id = (String)params.get("id");
-
- QueryWrapper<DeviceRunStateEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-
- return wrapper;
- }
-
-
- @Override
- public void insertRunState(Map<String, Integer> tMap) {
- int id = baseDao.getId();
- if(id == 0){
- baseDao.insertRunState(tMap);
- }else{
- tMap.put("id",id);
- baseDao.updateRunState(tMap);
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatCountServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatCountServiceImpl.java
deleted file mode 100644
index bdd585d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatCountServiceImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.device.commons.HealthLevelEnum;
-import com.iailab.module.device.dao.DeviceStatCountDao;
-import com.iailab.module.device.dto.DeviceStatCountDTO;
-import com.iailab.module.device.entity.DeviceStatCountEntity;
-import com.iailab.module.device.service.DeviceStatCountService;
-import com.iailab.module.device.service.DeviceHealthEvaluateService;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设备健康状态表
- *
- * @author lirm ${email}
- * @since 1.0.0 2024-05-22
- */
-@Service
-public class DeviceStatCountServiceImpl extends CrudServiceImpl<DeviceStatCountDao, DeviceStatCountEntity, DeviceStatCountDTO> implements DeviceStatCountService {
-
- @Resource
- DeviceHealthEvaluateService deviceHealthEvaluateService;
-
- public QueryWrapper<DeviceStatCountEntity> getWrapper(Map<String, Object> params){
- String startTime = (String)params.get("startTime");
- String endTime = (String)params.get("endTime");
-
- QueryWrapper<DeviceStatCountEntity> wrapper = new QueryWrapper<>();
- wrapper.ge(StringUtils.isNotBlank(startTime), "date", startTime);
- wrapper.le(StringUtils.isNotBlank(endTime), "date", endTime);
- wrapper.orderByDesc("create_date");
-
- return wrapper;
- }
-
- @Override
- public DeviceStatCountDTO getDeviceStatCount() {
- DeviceStatCountDTO result = new DeviceStatCountDTO();
- //健康设备数量
- Long healthyNum = deviceHealthEvaluateService.selectHealthLevalCount(HealthLevelEnum.Level1.getCode());
- result.setHealthCount(healthyNum);
- //良好设备数量
- Long goodNum = deviceHealthEvaluateService.selectHealthLevalCount(HealthLevelEnum.Level2.getCode());
- result.setGoodCount(goodNum);
- //故障设备数量
- Long accidentNum = deviceHealthEvaluateService.selectHealthLevalCount(HealthLevelEnum.Level3.getCode());
- result.setAccidentCount(accidentNum);
- //总设备数量
- Long totalNum = deviceHealthEvaluateService.selectHealthLevalCount(null);
- result.setTotalCount(totalNum);
- return result;
- }
-
- @Override
- public List<DeviceStatCountDTO> getHistory(Map<String, Object> params) {
- List<DeviceStatCountEntity> list = baseDao.selectList(getWrapper(params));
- return ConvertUtils.sourceToTarget(list,DeviceStatCountDTO.class);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatNewnessServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatNewnessServiceImpl.java
deleted file mode 100644
index 6b1121f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatNewnessServiceImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.device.dao.DeviceStatNewnessDao;
-import com.iailab.module.device.dto.DeviceInfoDTO;
-import com.iailab.module.device.dto.DeviceStatNewnessDTO;
-import com.iailab.module.device.entity.DeviceStatNewnessEntity;
-import com.iailab.module.device.service.DeviceInfoService;
-import com.iailab.module.device.service.DeviceStatNewnessService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-@Slf4j
-@Service
-public class DeviceStatNewnessServiceImpl extends BaseServiceImpl<DeviceStatNewnessDao, DeviceStatNewnessEntity> implements DeviceStatNewnessService {
-
- @Resource
- private DeviceInfoService deviceInfoService;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void statNewness(List<DeviceStatNewnessEntity> list,Date statDate) {
- // 计划运行时间
- Map<String, Object> ListParams = new HashMap<>();
- ListParams.put("pid", "0");
- List<DeviceInfoDTO> deviceInfoList = deviceInfoService.list(ListParams);
- Map<String, DeviceInfoDTO> deviceInfoMap = new HashMap<>();
- deviceInfoList.forEach(item -> {
- deviceInfoMap.put(item.getNo(), item);
- });
-
- List<DeviceStatNewnessEntity> deviceStatNewnessList = new ArrayList<>();
- for (DeviceStatNewnessEntity entity : list) {
- DeviceInfoDTO devInfo = deviceInfoMap.get(entity.getDevNo());
- if (devInfo == null) {
- continue;
- }
- DeviceInfoDTO devInfoUpdate = new DeviceInfoDTO();
- devInfoUpdate.setId(devInfo.getId());
-
- entity.setId(UUID.randomUUID().toString());
- entity.setDate(statDate);
- entity.setCreateDate(new Date());
- // 使用年限
- Integer durableYears = devInfo.getDurableYears() == null ? 0 : devInfo.getDurableYears();
- BigDecimal durMins = new BigDecimal(durableYears.longValue() * BusinessConstant.YEAR_MINUTE);
- entity.setDurableTime(durMins.longValue());
-
- // 已用时长
- BigDecimal useTime = devInfo.getUseTime() == null ? BigDecimal.ZERO : new BigDecimal(devInfo.getUseTime());
- BigDecimal useNew = useTime.add(new BigDecimal(entity.getLossTime()));
- devInfoUpdate.setUseTime(useNew.longValue());
-
- // 剩余时长
- BigDecimal residueNew = new BigDecimal(entity.getDurableTime() - useNew.longValue());
- devInfoUpdate.setResidueTime(residueNew.longValue());
- entity.setResidueTime(residueNew.longValue());
-
- // 新度系数
- BigDecimal newnessRate = residueNew.divide(durMins, 4, BigDecimal.ROUND_FLOOR);
- devInfoUpdate.setNewnessRate(newnessRate);
- entity.setNewnessRate(newnessRate);
-
- deviceStatNewnessList.add(entity);
- // 更新设备信息
- deviceInfoService.updateById(devInfoUpdate);
-
-
- }
- // 插入明细
- insertBatch(deviceStatNewnessList);
- }
-
- @Override
- public DeviceStatNewnessEntity getLastByNo(String no) {
- QueryWrapper<DeviceStatNewnessEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("dev_no",no);
- wrapper.orderByDesc("create_date");
- wrapper.last("limit 1");
- return baseDao.selectOne(wrapper);
- }
-
- @Override
- public List<DeviceStatNewnessDTO> list(Map<String, Object> params) {
- List<DeviceStatNewnessEntity> list = baseDao.selectList(getWrapper(params));
- return ConvertUtils.sourceToTarget(list,DeviceStatNewnessDTO.class);
- }
-
- @Override
- public PageData<DeviceStatNewnessDTO> page(Map<String, Object> params) {
- params.put("pid","0");
- IPage<DeviceStatNewnessEntity> page = baseDao.selectPage(getPage(params, "create_date", false), getWrapper(params));
- return getPageData(page, DeviceStatNewnessDTO.class);
- }
-
- public QueryWrapper<DeviceStatNewnessEntity> getWrapper(Map<String, Object> params) {
- String no = (String) params.get("no");
- String startTime = (String) params.get("startTime");
- String endTime = (String) params.get("endTime");
-
- QueryWrapper<DeviceStatNewnessEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(no), "dev_no", no);
- wrapper.ge(StringUtils.isNotBlank(startTime), "date", startTime);
- wrapper.le(StringUtils.isNotBlank(endTime), "date", endTime);
- wrapper.orderByDesc("create_date");
- return wrapper;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatUsageServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatUsageServiceImpl.java
deleted file mode 100644
index d9dcd71..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/device/service/impl/DeviceStatUsageServiceImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.iailab.module.device.service.impl;
-
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.device.commons.HealthLevelEnum;
-import com.iailab.module.device.dao.DeviceStatUsageDao;
-import com.iailab.module.device.dto.DeviceCurrentRateDTO;
-import com.iailab.module.device.dto.DeviceInfoDTO;
-import com.iailab.module.device.entity.DeviceInfoEntity;
-import com.iailab.module.device.entity.DeviceStatUsageEntity;
-import com.iailab.module.device.service.DeviceInfoService;
-import com.iailab.module.device.service.DeviceHealthEvaluateService;
-import com.iailab.module.device.service.DeviceStatUsageService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class DeviceStatUsageServiceImpl extends BaseServiceImpl<DeviceStatUsageDao, DeviceStatUsageEntity> implements DeviceStatUsageService {
-
- private String HTTP_API_CODE = "Dev.RunReportSumMonth";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Resource
- private DeviceInfoService deviceInfoService;
-
- @Resource
- private DeviceHealthEvaluateService deviceHealthEvaluateService;
-
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DAY_OF_YEAR,-1);
- String ym = DateUtils.format(calendar.getTime(), DateUtils.DATE_PATTERN_MON);
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- params.put("ym", ym);
- String responseStr = httpsRequest.doGet(apiDTO.getUrl(), params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONArray datas = responseObj.getJSONArray(CommonConstant.ZX_RES);
- if (CollectionUtils.isEmpty(datas)) {
- return;
- }
-
- // 计划运行时间
- Map<String,Object> ListParams = new HashMap<>();
- ListParams.put("pid","0");
- List<DeviceInfoDTO> deviceInfoList = deviceInfoService.list(ListParams);
- Map<String, Integer> noPlanTimeMap = deviceInfoList.stream().filter(e -> ObjectUtil.isNotNull(e.getPlanTime())).collect(Collectors.toMap(DeviceInfoDTO::getNo, e -> e.getPlanTime() * 60));
- int planTime = 24;
- String key = "z" + calendar.get(Calendar.DAY_OF_MONTH);
-
- List<DeviceStatUsageEntity> list = new ArrayList<>(datas.size());
- List<DeviceInfoEntity> deviceInfoEntities = new ArrayList<>(datas.size());
- for (Object data : datas) {
- JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
-
- DeviceStatUsageEntity deviceStatUsageEntity = new DeviceStatUsageEntity();
- DeviceInfoEntity deviceInfoEntity = new DeviceInfoEntity();
-
- deviceStatUsageEntity.setId(UUID.randomUUID().toString());
- String deviceNo = jsonObject.get("no").toString();
- deviceStatUsageEntity.setDevNo(deviceNo);
- deviceStatUsageEntity.setDevName(jsonObject.get("name").toString());
- deviceStatUsageEntity.setDate(DateUtils.format(calendar.getTime()));
- int runTime = Integer.parseInt(jsonObject.get(key).toString());
- deviceStatUsageEntity.setRunTime(runTime);
-
- if (noPlanTimeMap.containsKey(deviceNo)){
- // 计划运行时间
- planTime = MapUtil.get(noPlanTimeMap,deviceNo,Integer.class);
- // 计算使用率
- deviceStatUsageEntity.setPlanTime(planTime);
- BigDecimal d1 = new BigDecimal(runTime);
- BigDecimal d2 = new BigDecimal(planTime);
- BigDecimal usage = d1.divide(d2, 4, RoundingMode.HALF_UP);
- deviceStatUsageEntity.setUsageRate(usage);
- deviceInfoEntity.setUsageRate(usage);
- }else {
- deviceStatUsageEntity.setPlanTime(null);
- }
-
- deviceStatUsageEntity.setCreateDate(new Date());
- list.add(deviceStatUsageEntity);
-
- deviceInfoEntity.setNo(deviceNo);
- deviceInfoEntity.setUpdateDate(calendar.getTime());
- deviceInfoEntities.add(deviceInfoEntity);
- }
- insertBatch(list);
- // 修改deviceInfo
- for (DeviceInfoEntity entity : deviceInfoEntities) {
- QueryWrapper<DeviceInfoEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("no",entity.getNo());
- wrapper.eq("pid","0");
- deviceInfoService.update(entity,wrapper);
- }
-
- }
-
- @Override
- public DeviceStatUsageEntity getLastByNo(String no) {
- QueryWrapper<DeviceStatUsageEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("dev_no",no);
- wrapper.orderByDesc("create_date");
- wrapper.last("limit 1");
- return baseDao.selectOne(wrapper);
- }
-
- @Override
- public DeviceCurrentRateDTO getDeviceCurrentRate() {
- DeviceCurrentRateDTO result = new DeviceCurrentRateDTO();
- //健康设备数量
- Long healthyNum = deviceHealthEvaluateService.selectHealthLevalCount(HealthLevelEnum.Level1.getCode());
- //待检修设备数量
- Long repairNum = deviceHealthEvaluateService.selectHealthLevalCount(HealthLevelEnum.Level3.getCode());
- //总设备数量
- Long totalNum = deviceHealthEvaluateService.selectHealthLevalCount(null);
-
- //完好率
- BigDecimal healthRate = BigDecimal.valueOf(healthyNum).divide(BigDecimal.valueOf(totalNum), 4, RoundingMode.HALF_UP);
- result.setHealthyRate(healthRate);
- //待修率
- BigDecimal repairRate = BigDecimal.valueOf(repairNum).divide(BigDecimal.valueOf(totalNum), 4, RoundingMode.HALF_UP);
- result.setRepairRate(repairRate);
- //todo 事故率
- result.setAccidentRate(BigDecimal.valueOf(0));
-
- return result;
- }
-
- @Override
- public List<DeviceStatUsageEntity> list(Map<String, Object> params) {
- return baseDao.selectList(getWrapper(params));
- }
-
- public QueryWrapper<DeviceStatUsageEntity> getWrapper(Map<String, Object> params) {
- String no = (String) params.get("no");
- String startTime = (String) params.get("startTime");
- String endTime = (String) params.get("endTime");
-
- QueryWrapper<DeviceStatUsageEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(no), "dev_no", no);
- wrapper.ge(StringUtils.isNotBlank(startTime), "date", startTime);
- wrapper.le(StringUtils.isNotBlank(endTime), "date", endTime);
- wrapper.orderByDesc("create_date");
- return wrapper;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/dao/EventInfoDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/dao/EventInfoDao.java
deleted file mode 100644
index b177def..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/dao/EventInfoDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.event.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.event.entity.EventInfoEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-@Mapper
-public interface EventInfoDao extends BaseDao<EventInfoEntity> {
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/dto/EventInfoDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/dto/EventInfoDTO.java
deleted file mode 100644
index aafe100..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/dto/EventInfoDTO.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.iailab.module.event.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-@Data
-@Schema(name = "中选事件信息表")
-public class EventInfoDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- /**
- * 记录时间
- */
- private String logTime;
-
- /**
- * 事件发生时间
- */
- private String eventTime;
-
- /**
- * 系统Key
- */
- private String systemKey;
-
- /**
- * 系统名称
- */
- private String systemName;
-
- /**
- * 事件Key
- */
- private String eventKey;
-
- /**
- * 事件名称
- */
- private String eventName;
-
- /**
- * 消息
- */
- private String message;
-
- /**
- * 事件分类
- */
- private String eventCategory;
-
- /**
- * 事件等级，1低，2中，3高
- */
- private Integer eventLevel;
-
- /**
- * 数据创建时间
- */
- private Date createTime;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/entity/EventInfoEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/entity/EventInfoEntity.java
deleted file mode 100644
index d2733d0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/entity/EventInfoEntity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.iailab.module.event.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("t_event_info")
-public class EventInfoEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @TableId(type = IdType.INPUT)
- private String id;
-
- /**
- * 记录时间
- */
- private String logTime;
-
- /**
- * 事件发生时间
- */
- private String eventTime;
-
- /**
- * 系统Key
- */
- private String systemKey;
-
- /**
- * 系统名称
- */
- private String systemName;
-
- /**
- * 事件Key
- */
- private String eventKey;
-
- /**
- * 事件名称
- */
- private String eventName;
-
- /**
- * 消息
- */
- private String message;
-
- /**
- * 事件分类
- */
- private String eventCategory;
-
- /**
- * 事件等级，1低，2中，3高
- */
- private Integer eventLevel;
-
- /**
- * 数据创建时间
- */
- private Date createTime;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/service/EventInfoService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/service/EventInfoService.java
deleted file mode 100644
index c2685e9..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/service/EventInfoService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.event.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.event.dto.EventInfoDTO;
-import com.iailab.module.event.entity.EventInfoEntity;
-
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-public interface EventInfoService extends BaseService<EventInfoEntity> {
-
- void save(EventInfoDTO dto);
-
- Long getCount(String eventDevice, Date startTime, Date endTime);
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/service/impl/EventInfoServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/service/impl/EventInfoServiceImpl.java
deleted file mode 100644
index cd35790..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/service/impl/EventInfoServiceImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.iailab.module.event.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.event.dao.EventInfoDao;
-import com.iailab.module.event.dto.EventInfoDTO;
-import com.iailab.module.event.entity.EventInfoEntity;
-import com.iailab.module.event.service.EventInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月30日
- */
-@Slf4j
-@Service
-public class EventInfoServiceImpl extends BaseServiceImpl<EventInfoDao, EventInfoEntity> implements EventInfoService {
-
- @Override
- public void save(EventInfoDTO dto) {
- EventInfoEntity entity = ConvertUtils.sourceToTarget(dto, EventInfoEntity.class);
- insert(entity);
- }
-
- @Override
- public Long getCount(String eventName, Date startTime, Date endTime) {
- Integer result = 0;
- QueryWrapper<EventInfoEntity> wrapper = new QueryWrapper<>();
- wrapper.like(StringUtils.isNotBlank(eventName), "event_name", eventName)
- .gt("event_time", DateUtils.format(startTime,DateUtils.DATE_TIME_PATTERN ))
- .lt("event_time", DateUtils.format(startTime,DateUtils.DATE_TIME_PATTERN ));
-
-
- return baseDao.selectCount(wrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/EventWebSocketClient.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/EventWebSocketClient.java
deleted file mode 100644
index cf43d1e..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/EventWebSocketClient.java
+++ /dev/null
@@ -1,82 +0,0 @@
-//package com.iailab.module.event.ws;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.iailab.module.event.dto.EventInfoDTO;
-//import com.iailab.module.event.service.EventInfoService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.java_websocket.client.WebSocketClient;
-//import org.java_websocket.handshake.ServerHandshake;
-//import javax.annotation.Resource;
-//
-//import java.net.URI;
-//import java.util.Date;
-//
-//@Slf4j
-//public class EventWebSocketClient extends WebSocketClient {
-//
-// private static boolean WEBSTATUS = false;
-//
-// private String TYPE = "event";
-//
-// private static String LISTEN_SystemName = "生产控制系统";
-//
-// @Resource
-// private EventInfoService eventInfoService;
-//
-// //连接
-// public EventWebSocketClient(URI serverUri) {
-// super(serverUri);
-// }
-//
-// //打开连接
-// @Override
-// public void onOpen(ServerHandshake serverHandshake) {
-// WEBSTATUS = true;
-// }
-//
-// @Override
-// public void onMessage(String mesg) {
-// // log.info("event.mesg=" + mesg);
-// JSONObject jo = JSONObject.parseObject(mesg);
-// String type = jo.getString("type");
-// if (!TYPE.equals(jo.getString("type"))) {
-// return;
-// }
-// String msg = jo.getString("msg");
-// JSONObject jomsg = JSONObject.parseObject(msg);
-// log.info("msg=" + msg);
-// if (!LISTEN_SystemName.equals(jo.getString("SystemName"))) {
-// return;
-// }
-//
-// EventInfoDTO entity = new EventInfoDTO();
-// entity.setId(jomsg.getString("Id"));
-// entity.setLogTime(jomsg.getString("LogTime"));
-// entity.setEventTime(jomsg.getString("EventTime"));
-// entity.setSystemKey(jomsg.getString("SystemKey"));
-// entity.setSystemName(jomsg.getString("SystemName"));
-// entity.setEventTime(jomsg.getString("EventTime"));
-// entity.setMessage(jomsg.getString("Message"));
-// entity.setEventCategory(jomsg.getString("EventCategory"));
-// entity.setEventLevel(jomsg.getInteger("EventLevel"));
-// entity.setCreateTime(new Date());
-// try {
-// eventInfoService.save(entity);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
-//
-// @Override
-// public void onClose(int i, String s, boolean b) {
-// WEBSTATUS = false;
-// //重连
-// ReconnectThreadEnum.getInstance().reconnectWs(this);
-// }
-//
-// @Override
-// public void onError(Exception e) {
-// WEBSTATUS = false;
-// }
-//
-//}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/EventWsBean.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/EventWsBean.java
deleted file mode 100644
index 55fed84..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/EventWsBean.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//package com.iailab.module.event.ws;
-//
-//import org.java_websocket.client.WebSocketClient;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//import java.net.URI;
-//import java.net.URISyntaxException;
-//
-//@Configuration
-//public class EventWsBean {
-//
-// @Bean
-// public WebSocketClient webServiceClient() {
-// try {
-// EventWebSocketClient mWebSocketClient = new EventWebSocketClient(new URI("ws://192.168.55.127/api/Ws/Event"));
-// mWebSocketClient.connect();
-// return mWebSocketClient;
-// } catch (URISyntaxException e) {
-// e.printStackTrace();
-// }
-// return null;
-// }
-//}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/ReconnectThreadEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/ReconnectThreadEnum.java
deleted file mode 100644
index 7ad877d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/event/ws/ReconnectThreadEnum.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//package com.iailab.module.event.ws;
-//
-//import java.util.concurrent.ExecutorService;
-//import java.util.concurrent.Executors;
-//
-//public enum ReconnectThreadEnum {
-//
-// WebSocketInstance(){
-// @Override
-// public void reconnectWs(EventWebSocketClient demoWebSocketClient) {
-// cachedThreadPool.execute(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// //重连间隔一秒
-// Thread.sleep(10000000);
-// System.out.println("重新连接");
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
-// demoWebSocketClient.reconnect();
-// }
-// });
-// }
-// };
-//
-// private static final ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
-//
-// public abstract void reconnectWs(EventWebSocketClient demoWebSocketClient);
-//
-// public static ReconnectThreadEnum getInstance(){
-// return WebSocketInstance;
-// }
-//}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/feign/FeignModelImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/feign/FeignModelImpl.java
deleted file mode 100644
index 85c0836..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/feign/FeignModelImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.iailab.module.feign;
-
-import com.iailab.api.IFeignModelApi;
-import com.iailab.module.device.service.DeviceAbnormalHistoryService;
-import com.iailab.module.device.service.DeviceAccountService;
-import com.iailab.module.device.service.DeviceHealthStateService;
-import com.iailab.module.device.service.DeviceRunStateService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author lirm
- * @Description
- * @createTime 2024年05月22日
- */
-@RestController
-public class FeignModelImpl implements IFeignModelApi {
-
- @Resource
- private DeviceRunStateService deviceRunStateService;
-
- @Resource
- private DeviceHealthStateService deviceHealthStateService;
-
- @Resource
- private DeviceAbnormalHistoryService deviceAbnormalHistoryService;
-
- @Resource
- private DeviceAccountService deviceAccountService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Override
- public void insertRunState(Map<String, Integer> tMap) {
- deviceRunStateService.insertRunState(tMap);
- }
-
- @Override
- public void insertHealthState(Map<String, Object> tMap) {
- deviceHealthStateService.insertHealthState(tMap);
- deviceAbnormalHistoryService.insertHistory(tMap);
- }
-
- @Override
- public void insertDeviceList(Map<String, String> tMap) {
- deviceAccountService.insertDeviceList(tMap);
- }
-
- @Override
- public Map<String, Object> runModel(Map<String, Object> params, List<double[][]> sampleDataList) {
- Map<String, Object> result = new HashMap<>();
- try {
- String modelCode = (String) params.get("modelCode");
- if (StringUtils.isBlank(modelCode)) {
- return result;
- }
- if (CollectionUtils.isEmpty(sampleDataList)) {
- return result;
- }
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- result = modelHandler.run(modelCode, sampleDataList);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return result;
- }
-
- @Override
- public List<String> getDeviceIdList() {
- return deviceAccountService.getDeviceIdList();
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/package-info.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/package-info.java
deleted file mode 100644
index e04f72a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * 属于 infra 模块的 framework 封装
- *
- * @author iailab
- */
-package com.iailab.module.framework;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/rpc/config/RpcConfiguration.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/rpc/config/RpcConfiguration.java
deleted file mode 100644
index eb751ee..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/rpc/config/RpcConfiguration.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.framework.rpc.config;
-
-import com.iailab.api.IFeignProddispApi;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.system.api.permission.RoleApi;
-import com.iailab.module.system.api.user.AdminUserApi;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {IFeignDataApi.class, AdminUserApi.class, RoleApi.class, IFeignProddispApi.class, ConfigApi.class})
-public class RpcConfiguration {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/rpc/package-info.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/rpc/package-info.java
deleted file mode 100644
index 16e3ea0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/rpc/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 占位
- */
-package com.iailab.module.framework.rpc;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/security/config/SecurityConfiguration.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/security/config/SecurityConfiguration.java
deleted file mode 100644
index 848671d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/security/config/SecurityConfiguration.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.iailab.module.framework.security.config;
-
-import com.iailab.framework.security.config.AuthorizeRequestsCustomizer;
-import com.iailab.module.infra.enums.ApiConstants;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer;
-
-/**
- * data 模块的 Security 配置
- */
-@Configuration(proxyBeanMethods = false, value = "dataSecurityConfiguration")
-public class SecurityConfiguration {
-
- @Value("${spring.boot.admin.context-path:''}")
- private String adminSeverContextPath;
-
- @Bean("infraAuthorizeRequestsCustomizer")
- public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() {
- return new AuthorizeRequestsCustomizer() {
-
- @Override
- public void customize(ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry registry) {
- // Swagger 接口文档
- registry.antMatchers("/v3/api-docs/**").permitAll() // 元数据
- .antMatchers("/swagger-ui.html").permitAll(); // Swagger UI
- // Spring Boot Actuator 的安全配置
- registry.antMatchers("/actuator").anonymous()
- .antMatchers("/actuator/**").anonymous();
- // Druid 监控
- registry.antMatchers("/druid/**").anonymous();
- // Spring Boot Admin Server 的安全配置
- registry.antMatchers(adminSeverContextPath).anonymous()
- .antMatchers(adminSeverContextPath + "/**").anonymous();
- // 文件读取
- registry.antMatchers(buildAdminApi("/data/file/*/get/**")).permitAll();
-
- // TODO iailab：这个每个项目都需要重复配置，得捉摸有没通用的方案
- // RPC 服务的安全配置
- registry.antMatchers(ApiConstants.PREFIX + "/**").permitAll();
- }
-
- };
- }
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/security/core/package-info.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/security/core/package-info.java
deleted file mode 100644
index 9f4a10b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/framework/security/core/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 占位
- */
-package com.iailab.module.framework.security.core;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/controller/ScheduleJobLogController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/controller/ScheduleJobLogController.java
index a50a26f..b66e558 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/controller/ScheduleJobLogController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/controller/ScheduleJobLogController.java
@@ -1,11 +1,3 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有，侵权必究！
- */
-
package com.iailab.module.job.controller;
import com.iailab.framework.common.page.PageData;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobDao.java
index 045b81f..1bc0880 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobDao.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobDao.java
@@ -1,11 +1,3 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有，侵权必究！
- */
-
package com.iailab.module.job.dao;
import com.iailab.framework.common.dao.BaseDao;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobLogDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobLogDao.java
index 3140cbd..89954da 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobLogDao.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dao/ScheduleJobLogDao.java
@@ -1,11 +1,3 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有，侵权必究！
- */
-
package com.iailab.module.job.dao;
import com.iailab.framework.common.dao.BaseDao;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobDTO.java
index 72c6ce5..3b8ab42 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobDTO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobDTO.java
@@ -1,11 +1,3 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有，侵权必究！
- */
-
package com.iailab.module.job.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobLogDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobLogDTO.java
index 765578f..7fa7cd7 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobLogDTO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/dto/ScheduleJobLogDTO.java
@@ -1,11 +1,3 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有，侵权必究！
- */
-
package com.iailab.module.job.dto;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc1Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc1Task.java
deleted file mode 100644
index 8b56e1f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc1Task.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.service.AnyProcCardService;
-import com.iailab.module.any.service.AnyProcReportService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 浅槽分选307控制诊断
- * 10 0 0/2 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Component("anyProc1Task")
-public class AnyProc1Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "shallow_separation_diagnosis_307";
-
- private final String CARD_CODE = "C01";
-
- private final String REPORT_NAME = "浅槽分选307控制诊断";
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- Map<String, Object> modelCommonResult = modelHandler.run(MODEL_CODE, calendar.getTime());
-
- StringBuilder sb = new StringBuilder();
- sb.append(modelCommonResult.get("hj_str_307") + "；");
- sb.append(modelCommonResult.get("xj_str_307") + "；");
- sb.append(modelCommonResult.get("mn_str_307") + "；");
- sb.append(modelCommonResult.get("cxw_str_307") + "；");
- sb.append(modelCommonResult.get("hj_md_str_307") + "；");
- sb.append(modelCommonResult.get("hf_str_307") + "；");
-
- // 更新状态
- this.updateCard(sb.toString(), calendar.getTime());
-
- // 生成报告
- anyProcReportService.saveReport(CARD_CODE, REPORT_NAME, sb.toString(), calendar.getTime());
- } catch (Exception ex) {
- logger.error("AnyProc1Task运行异常");
- ex.printStackTrace();
- }
- logger.info("AnyProc1Task运行完成");
-
- }
-
- private void updateCard(String content, Date runTime) {
- AnyProcCardDTO dto = new AnyProcCardDTO();
- dto.setCode(CARD_CODE);
- dto.setAlarmInfo(content);
- dto.setAnyTime(runTime);
- anyProcCardService.updateByCode(dto);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc2Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc2Task.java
deleted file mode 100644
index 2182484..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc2Task.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.service.AnyProcCardService;
-import com.iailab.module.any.service.AnyProcReportService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 浅槽分选308控制诊断
- * 10 0 0/2 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月25日
- */
-@Component("anyProc2Task")
-public class AnyProc2Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "shallow_separation_diagnosis_308";
-
- private final String CARD_CODE = "C02";
-
- private final String REPORT_NAME = "浅槽分选308控制诊断";
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- Map<String, Object> modelCommonResult = modelHandler.run(MODEL_CODE, calendar.getTime());
-
- StringBuilder sb = new StringBuilder();
- sb.append(modelCommonResult.get("hj_str_308") + "；");
- sb.append(modelCommonResult.get("xj_str_308") + "；");
- sb.append(modelCommonResult.get("mn_str_308") + "；");
- sb.append(modelCommonResult.get("cxw_str_308") + "；");
- sb.append(modelCommonResult.get("hj_md_str_308") + "；");
- sb.append(modelCommonResult.get("hf_str_308") + "；");
-
- // 更新状态
- this.updateCard(sb.toString(), calendar.getTime());
-
- // 生成报告
- anyProcReportService.saveReport(CARD_CODE, REPORT_NAME, sb.toString(), calendar.getTime());
- } catch (Exception ex) {
- logger.error("AnyProc2Task运行异常");
- ex.printStackTrace();
- }
- logger.info("AnyProc2Task运行完成");
-
- }
-
- private void updateCard(String content, Date runTime) {
- AnyProcCardDTO dto = new AnyProcCardDTO();
- dto.setCode(CARD_CODE);
- dto.setAlarmInfo(content);
- dto.setAnyTime(runTime);
- anyProcCardService.updateByCode(dto);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc3Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc3Task.java
deleted file mode 100644
index 92e977c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc3Task.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.service.AnyProcCardService;
-import com.iailab.module.any.service.AnyProcReportService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 旋流器分选3318控制诊断
- * 10 0 0/2 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月26日
- */
-@Component("anyProc3Task")
-public class AnyProc3Task implements ITask {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "separation_diagnosis_3318";
-
- private final String CARD_CODE = "C03";
-
- private final String REPORT_NAME = "旋流器分选3318控制诊断";
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- Map<String, Object> modelCommonResult = modelHandler.run(MODEL_CODE, calendar.getTime());
-
- StringBuilder sb = new StringBuilder();
- sb.append(modelCommonResult.get("hl_str") + "；");
- sb.append(modelCommonResult.get("hj_str") + "；");
- sb.append(modelCommonResult.get("xj_str") + "；");
- sb.append(modelCommonResult.get("mn_str") + "；");
- sb.append(modelCommonResult.get("yl_str") + "；");
- sb.append(modelCommonResult.get("cxw_str") + "；");
- sb.append(modelCommonResult.get("hj_md_str") + "；");
- sb.append(modelCommonResult.get("hf_str") + "；");
-
- // 更新状态
- this.updateCard(sb.toString(), calendar.getTime());
-
- // 生成报告
- anyProcReportService.saveReport(CARD_CODE, REPORT_NAME, sb.toString(), calendar.getTime());
- } catch (Exception ex) {
- logger.error("AnyProc1Task运行异常");
- ex.printStackTrace();
- }
- logger.info("AnyProc1Task运行完成");
-
- }
-
- private void updateCard(String content, Date runTime) {
- AnyProcCardDTO dto = new AnyProcCardDTO();
- dto.setCode(CARD_CODE);
- dto.setAlarmInfo(content);
- dto.setAnyTime(runTime);
- anyProcCardService.updateByCode(dto);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc4Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc4Task.java
deleted file mode 100644
index 39fc6b5..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc4Task.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.service.AnyProcCardService;
-import com.iailab.module.any.service.AnyProcReportService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 旋流器分选3319控制诊断
- * 10 0 0/2 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月26日
- */
-@Component("anyProc4Task")
-public class AnyProc4Task implements ITask {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "separation_diagnosis_3319";
-
- private final String CARD_CODE = "C04";
-
- private final String REPORT_NAME = "旋流器分选3319控制诊断";
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- Map<String, Object> modelCommonResult = modelHandler.run(MODEL_CODE, calendar.getTime());
-
- StringBuilder sb = new StringBuilder();
- sb.append(modelCommonResult.get("hl_str") + "；");
- sb.append(modelCommonResult.get("hj_str") + "；");
- sb.append(modelCommonResult.get("xj_str") + "；");
- sb.append(modelCommonResult.get("mn_str") + "；");
- sb.append(modelCommonResult.get("yl_str") + "；");
- sb.append(modelCommonResult.get("cxw_str") + "；");
- sb.append(modelCommonResult.get("hj_md_str") + "；");
- sb.append(modelCommonResult.get("hf_str") + "；");
-
- // 更新状态
- this.updateCard(sb.toString(), calendar.getTime());
-
- // 生成报告
- anyProcReportService.saveReport(CARD_CODE, REPORT_NAME, sb.toString(), calendar.getTime());
- } catch (Exception ex) {
- logger.error("AnyProc1Task运行异常");
- ex.printStackTrace();
- }
- logger.info("AnyProc1Task运行完成");
-
- }
-
- private void updateCard(String content, Date runTime) {
- AnyProcCardDTO dto = new AnyProcCardDTO();
- dto.setCode(CARD_CODE);
- dto.setAlarmInfo(content);
- dto.setAnyTime(runTime);
- anyProcCardService.updateByCode(dto);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc5Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc5Task.java
deleted file mode 100644
index 318b300..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc5Task.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.service.AnyProcCardService;
-import com.iailab.module.any.service.AnyProcReportService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 浅槽浓缩控制诊断
- * 10 0 0/2 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月26日
- */
-@Component("anyProc5Task")
-public class AnyProc5Task implements ITask {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "thickener_qc_analyis";
-
- private final String CARD_CODE = "C05";
-
- private final String REPORT_NAME = "浅槽浓缩控制诊断";
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- Map<String, Object> modelCommonResult = modelHandler.run(MODEL_CODE, calendar.getTime());
-
- StringBuilder sb = new StringBuilder();
- sb.append(modelCommonResult.get("qs_str") + "；");
- sb.append(modelCommonResult.get("yl_str") + "；");
- sb.append(modelCommonResult.get("dl_str") + "；");
- // 更新状态
- this.updateCard(sb.toString(), calendar.getTime());
-
- // 生成报告
- anyProcReportService.saveReport(CARD_CODE, REPORT_NAME, sb.toString(), calendar.getTime());
- } catch (Exception ex) {
- logger.error("AnyProc1Task运行异常");
- ex.printStackTrace();
- }
- logger.info("AnyProc1Task运行完成");
-
- }
-
- private void updateCard(String content, Date runTime) {
- AnyProcCardDTO dto = new AnyProcCardDTO();
- dto.setCode(CARD_CODE);
- dto.setAlarmInfo(content);
- dto.setAnyTime(runTime);
- anyProcCardService.updateByCode(dto);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc6Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc6Task.java
deleted file mode 100644
index 91b12d9..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc6Task.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.service.AnyProcCardService;
-import com.iailab.module.any.service.AnyProcReportService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 旋流浓缩控制诊断
- * 10 0 0/2 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月26日
- */
-@Component("anyProc6Task")
-public class AnyProc6Task implements ITask {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "thickener_xl_analyis";
-
- private final String CARD_CODE = "C06";
-
- private final String REPORT_NAME = "旋流浓缩控制诊断";
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- Map<String, Object> modelCommonResult = modelHandler.run(MODEL_CODE, calendar.getTime());
-
- StringBuilder sb = new StringBuilder();
- sb.append(modelCommonResult.get("qs_str") + "；");
- sb.append(modelCommonResult.get("yl_str") + "；");
- sb.append(modelCommonResult.get("dl_str") + "；");
-
- // 更新状态
- this.updateCard(sb.toString(), calendar.getTime());
-
- // 生成报告
- anyProcReportService.saveReport(CARD_CODE, REPORT_NAME, sb.toString(), calendar.getTime());
- } catch (Exception ex) {
- logger.error("AnyProc1Task运行异常");
- ex.printStackTrace();
- }
- logger.info("AnyProc1Task运行完成");
-
- }
-
- private void updateCard(String content, Date runTime) {
- AnyProcCardDTO dto = new AnyProcCardDTO();
- dto.setCode(CARD_CODE);
- dto.setAlarmInfo(content);
- dto.setAnyTime(runTime);
- anyProcCardService.updateByCode(dto);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc7Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc7Task.java
deleted file mode 100644
index fbb2170..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/AnyProc7Task.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.any.dto.AnyProcCardDTO;
-import com.iailab.module.any.service.AnyProcCardService;
-import com.iailab.module.any.service.AnyProcReportService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 旋流压滤控制诊断
- * 10 0 0/2 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月26日
- */
-@Component("anyProc7Task")
-public class AnyProc7Task implements ITask {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "filter_analyis";
-
- private final String CARD_CODE = "C07";
-
- private final String REPORT_NAME = "旋流压滤控制诊断";
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private AnyProcCardService anyProcCardService;
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- Map<String, Object> modelCommonResult = modelHandler.run(MODEL_CODE, calendar.getTime());
-
- StringBuilder sb = new StringBuilder();
- sb.append(modelCommonResult.get("rlc_str") + "；");
- sb.append(modelCommonResult.get("pd_str") + "；");
- sb.append(modelCommonResult.get("dl_str") + "；");
- sb.append(modelCommonResult.get("str_4423") + "；");
- sb.append(modelCommonResult.get("str_4424") + "；");
- sb.append(modelCommonResult.get("str_4425") + "；");
- sb.append(modelCommonResult.get("str_4426") + "；");
- sb.append(modelCommonResult.get("str_4427") + "；");
-
- // 更新状态
- this.updateCard(sb.toString(), calendar.getTime());
-
- // 生成报告
- anyProcReportService.saveReport(CARD_CODE, REPORT_NAME, sb.toString(), calendar.getTime());
- } catch (Exception ex) {
- logger.error("AnyProc1Task运行异常");
- ex.printStackTrace();
- }
- logger.info("AnyProc1Task运行完成");
-
- }
-
- private void updateCard(String content, Date runTime) {
- AnyProcCardDTO dto = new AnyProcCardDTO();
- dto.setCode(CARD_CODE);
- dto.setAlarmInfo(content);
- dto.setAnyTime(runTime);
- anyProcCardService.updateByCode(dto);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/DeviceHealthTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/DeviceHealthTask.java
deleted file mode 100644
index dd8e8b0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/DeviceHealthTask.java
+++ /dev/null
@@ -1,382 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.device.commons.HealthIndexTypeEnum;
-import com.iailab.module.device.commons.HealthLevelEnum;
-import com.iailab.module.device.entity.DeviceStatCountEntity;
-import com.iailab.module.device.entity.DeviceStatNewnessEntity;
-import com.iailab.module.device.dto.*;
-import com.iailab.module.device.service.*;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.model.sample.constructor.SampleDataConstructor;
-import com.iailab.module.model.sample.constructor.SampleInfoConstructor;
-import com.iailab.module.model.sample.dto.ColumnItem;
-import com.iailab.module.model.sample.entity.DataEntity;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 设备健康评价
- * 10 0 0/1 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月29日
- */
-@Component("deviceHealthTask")
-public class DeviceHealthTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
-
- private BigDecimal DEFAULT_HEALTH_SCORE = new BigDecimal(100);
-
- private String DEFAULT_REPORT_CONTENT = "设备运行正常";
-
- private int DEFAULT_DATA_LENGTH = 60;
-
- @Resource
- private DeviceHealthEvaluateService deviceHealthEvaluateService;
-
- @Resource
- private DeviceEvaluateIndexService deviceEvaluateIndexService;
-
- @Resource
- private SampleInfoConstructor sampleInfoConstructor;
-
- @Resource
- private SampleDataConstructor sampleDataConstructor;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private DeviceHealthReportService deviceHealthReportService;
-
- @Resource
- private DeviceStatCountService deviceStatCountService;
-
- @Resource
- private DeviceInfoService deviceInfoService;
-
- @Resource
- private DeviceFaultService deviceFaultService;
-
- @Resource
- private DeviceStatNewnessService deviceStatNewnessService;
-
- private final int GRANULARITY = 60;
-
- private Map<Integer, String> HEALTH_FAULT_TYPE = new HashMap<>();
- private Map<String, String> ALARM_INDEX_TYPE = new HashMap<>();
-
- private String[] indexArr = new String[]{HealthIndexTypeEnum.elec.getCode(), HealthIndexTypeEnum.temperature.getCode(),
- HealthIndexTypeEnum.flutter.getCode(), HealthIndexTypeEnum.runTime.getCode()};
-
-
-
- DeviceHealthTask() {
- HEALTH_FAULT_TYPE.put(1, "波动正常，趋势正常");
- HEALTH_FAULT_TYPE.put(2, "波动正常，趋势异常");
- HEALTH_FAULT_TYPE.put(3, "波动异常，趋势正常");
- HEALTH_FAULT_TYPE.put(4, "波动异常，趋势异常");
-
- ALARM_INDEX_TYPE.put("temperature", "温度");
- ALARM_INDEX_TYPE.put("flutter", "震动");
- ALARM_INDEX_TYPE.put("elec", "电流");
- }
-
- @Override
- @XxlJob("deviceHealthTask")
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- List<DeviceStatNewnessEntity> newnessList = new ArrayList<>();
- Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("isEnable", 1);
- List<DeviceHealthEvaluateDTO> evaList = deviceHealthEvaluateService.list(queryParams);
- if (CollectionUtils.isEmpty(evaList)) {
- return;
- }
- // 开始健康评价
- evaList.forEach(item -> {
- this.runModel(item, calendar.getTime(), newnessList);
- });
-
- // 统计数量
- deviceStatCount(calendar);
-
- // 更新设备新度系数
- deviceStatNewnessService.statNewness(newnessList, calendar.getTime());
-
- } catch (Exception ex) {
- logger.error("DeviceHealthTask运行异常");
- ex.printStackTrace();
- }
- logger.info("DeviceHealthTask运行完成");
- }
-
- public void runModel(DeviceHealthEvaluateDTO dto, Date runTime, List<DeviceStatNewnessEntity> newnessList) {
- try {
- List<DeviceEvaluateIndexDTO> indexList = deviceEvaluateIndexService.listByEvaluateId(dto.getId());
- if (CollectionUtils.isEmpty(indexList)) {
- DeviceHealthEvaluateDTO updateDto = new DeviceHealthEvaluateDTO();
- updateDto.setId(dto.getId());
- updateDto.setReportContent(DEFAULT_REPORT_CONTENT);
- updateDto.setReportDate(runTime);
- updateDto.setReportId("");
- updateDto.setAbnormalCount(0);
- updateDto.setHealthScore(DEFAULT_HEALTH_SCORE);
- updateDto.setHealthLevel(HealthLevelEnum.Level1.getCode());
- deviceHealthEvaluateService.updateReport(updateDto);
- return;
- }
- Map<String, DeviceEvaluateIndexDTO> indexMap = new HashMap<>();
- indexList.forEach(item -> {
- indexMap.put(item.getIndexType(), item);
- });
-
- DEFAULT_DATA_LENGTH = indexList.get(0).getDataLength();
-
- ColumnItem columnItem = new ColumnItem();
- columnItem.setEndTime(runTime);
- columnItem.setStartTime(sampleInfoConstructor.calculateTime(runTime, true, DEFAULT_DATA_LENGTH - 1, GRANULARITY));
- List<double[][]> sampleDataList = new ArrayList<>();
- Map<String, List<DataEntity>> dataMap = new LinkedHashMap<>();
-
- double[][] matrix1 = new double[DEFAULT_DATA_LENGTH][indexArr.length];
- double[][] matrix2 = new double[1][3];
- for (int i = 0; i < indexArr.length; i++) {
- if (indexMap.get(indexArr[i]) == null) {
- for (int k = 0; k < DEFAULT_DATA_LENGTH; k++) {
- matrix1[k][i] = -2;
- }
- continue;
- }
- DeviceEvaluateIndexDTO indDTO = indexMap.get(indexArr[i]);
- columnItem.setParamId(indDTO.getParamId());
- columnItem.setParamType(indDTO.getParamType());
- List<DataEntity> dataEntityList = sampleDataConstructor.getColumnData(columnItem);
- logger.info("BEF:ParamType=" + indDTO.getParamType() + ";ParamId=" + indDTO.getParamId() + ";size=" + dataEntityList.size());
- //补全数据
- dataEntityList = sampleDataConstructor.completionData(matrix1.length, dataEntityList, columnItem.startTime, columnItem.endTime, GRANULARITY);
- logger.info("AFT:ParamType=" + indDTO.getParamType() + ";ParamId=" + indDTO.getParamId() + ";size=" + dataEntityList.size());
- if (CollectionUtils.isEmpty(dataEntityList)) {
- continue;
- }
- for (int k = 0; k < DEFAULT_DATA_LENGTH; k++) {
- matrix1[k][i] = dataEntityList.get(k).getDataValue();
- }
- dataMap.put(indexArr[i], dataEntityList);
-
- if (i < 3) {
- matrix2[0][i] = indDTO.getNominalValue().doubleValue();
- }
- }
- sampleDataList.add(matrix1);
- sampleDataList.add(matrix2);
-
- // 调用模型
- logger.info("调用模型，DevNo=" + dto.getDevNo());
- Map<String, Object> modelCommonResult = modelHandler.run(dto.getModelCode(), sampleDataList);
-
- // 生成评价报告
- this.saveReport(dto, runTime, modelCommonResult, dataMap, indexMap);
-
- // 更新新度系数
- if (modelCommonResult.get("run_time_adjust") != null) {
- DeviceStatNewnessEntity deviceStatNewness = new DeviceStatNewnessEntity();
- deviceStatNewness.setDevNo(dto.getDevNo());
- deviceStatNewness.setDevName(dto.getDevName());
- deviceStatNewness.setRunTime(new BigDecimal(modelCommonResult.get("run_time_normal").toString()).intValue());
- deviceStatNewness.setLossTime(new BigDecimal(modelCommonResult.get("run_time_adjust").toString()).intValue());
- deviceStatNewness.setLossRate(new BigDecimal(deviceStatNewness.getLossTime()).divide(new BigDecimal(deviceStatNewness.getRunTime()),2,BigDecimal.ROUND_HALF_UP));
- newnessList.add(deviceStatNewness);
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- logger.error("设备健康评价计算异常，devNo=" + dto.getDevNo());
- }
- }
-
- public void saveReport(DeviceHealthEvaluateDTO evaluateDTO, Date runTime, Map<String, Object> modelCommonResult,
- Map<String, List<DataEntity>> dataMap, Map<String, DeviceEvaluateIndexDTO> indexMap) {
-
- DeviceInfoDTO deviceInfo = deviceInfoService.getByDevNo(evaluateDTO.getDevNo());
-
- DeviceHealthReportDTO reportDTO = new DeviceHealthReportDTO();
- reportDTO.setId(UUID.randomUUID().toString());
- reportDTO.setReportNo("H" + DateUtils.format(runTime, "yyyyMMddHHmmss") + getRand(evaluateDTO.getDevNo()));
- reportDTO.setReportName(evaluateDTO.getDevName() + "健康评价报告");
- reportDTO.setReportDate(runTime);
- String deviceHealthLevel = modelCommonResult.get("isqualified").toString();
- reportDTO.setHealthLevel(deviceHealthLevel);
- reportDTO.setAbnormalCount(getAbnormalCount(JSONArray.toJSONString(modelCommonResult.get("part_grade"))));
- reportDTO.setContent(modelCommonResult.get("health_evaluate").toString());
- reportDTO.setHealthScore(new BigDecimal(modelCommonResult.get("health_score").toString()));
- reportDTO.setDataLength(DEFAULT_DATA_LENGTH);
- reportDTO.setRunTime(new BigDecimal(modelCommonResult.get("run_time_adjust").toString()).intValue());
- reportDTO.setDevNo(evaluateDTO.getDevNo());
- reportDTO.setDevName(evaluateDTO.getDevName());
- if (deviceInfo != null) {
- reportDTO.setClassNo(deviceInfo.getClassNo());
- reportDTO.setClassName(deviceInfo.getClassName());
- reportDTO.setWorkshop(deviceInfo.getWorkshop());
- reportDTO.setModel(deviceInfo.getModel());
- }
- List<Integer> partGrade = getIntValueArr(modelCommonResult.get("part_grade"));
- List<BigDecimal> maxArr = getValueArr(modelCommonResult.get("max_arr"));
- List<BigDecimal> minArr = getValueArr(modelCommonResult.get("min_arr"));
- List<BigDecimal> meanArr = getValueArr(modelCommonResult.get("mean_arr"));
- List<DeviceHealthReportDataDTO> detList = new ArrayList<>();
- List<DeviceHealthAlarmDetailDTO> deviceHealthAlarmDetailDTOList = new ArrayList<>();
- List<String> alarmIndexTypes = new ArrayList<>();
- List<String> alarmSolutions = new ArrayList<>();
- // 故障id
- String alarmId = UUID.randomUUID().toString();
- for (int i = 0; i < indexArr.length; i++) {
- List<DataEntity> dataList = dataMap.get(indexArr[i]);
- if (CollectionUtils.isEmpty(dataList)) {
- continue;
- }
- List<Object[]> dataCont = dataList.stream().map(t -> {
- return new Object[]{DateUtils.format(t.getTimeStamp(), DateUtils.DATE_TIME_PATTERN_MIN), new BigDecimal(t.getDataValue()).setScale(4, BigDecimal.ROUND_HALF_UP)};
- }).collect(Collectors.toList());
- DeviceHealthReportDataDTO det = new DeviceHealthReportDataDTO();
- det.setSort(i);
- det.setDataName(indexMap.get(indexArr[i]).getParamName());
- det.setDataValue(JSONArray.toJSONString(dataCont));
- if (!HealthIndexTypeEnum.runTime.getCode().equals(indexArr[i])) {
- det.setDataMax(maxArr.get(i));
- det.setDataMin(minArr.get(i));
- det.setDataAvg(meanArr.get(i));
- det.setGradeCode(partGrade.get(i).toString());
- det.setGradeName(HEALTH_FAULT_TYPE.get(partGrade.get(i)));
-
- DeviceFaultDTO querySoluDto = new DeviceFaultDTO();
- querySoluDto.setClassNo(deviceInfo.getClassNo());
- querySoluDto.setIndexType(indexArr[i]);
- querySoluDto.setFaultType(det.getGradeCode());
- DeviceFaultDTO faultDTO = deviceFaultService.getSolution(querySoluDto);
- if (faultDTO != null) {
- det.setSolution(faultDTO.getSolution());
- det.setFaultCode(faultDTO.getFaultCode());
- }
-
- // 设备健康故障详情记录
- if (HealthLevelEnum.Level3.getCode().equals(deviceHealthLevel) && faultDTO != null){
- DeviceHealthAlarmDetailDTO deviceHealthAlarmDetail = new DeviceHealthAlarmDetailDTO();
- deviceHealthAlarmDetail.setId(UUID.randomUUID().toString());
- deviceHealthAlarmDetail.setAlarmId(alarmId);
- deviceHealthAlarmDetail.setFaultCode(faultDTO.getFaultCode());
- deviceHealthAlarmDetail.setFaultName(HEALTH_FAULT_TYPE.get(partGrade.get(i)));
- deviceHealthAlarmDetail.setSolution(faultDTO.getSolution());
-
- alarmIndexTypes.add(ALARM_INDEX_TYPE.get(faultDTO.getIndexType()));
- alarmSolutions.add(faultDTO.getSolution());
- deviceHealthAlarmDetailDTOList.add(deviceHealthAlarmDetail);
- }
- } else {
- StringBuilder rsb = new StringBuilder();
- rsb.append("运行时长：");
- rsb.append(modelCommonResult.get("run_time_normal").toString());
- det.setRemark(rsb.toString());
- }
- detList.add(det);
- }
-
- // 设备健康故障记录
- if (deviceHealthAlarmDetailDTOList.size() > 0) {
- DeviceHealthAlarmDTO deviceHealthAlarm = new DeviceHealthAlarmDTO();
- deviceHealthAlarm.setId(alarmId);
- deviceHealthAlarm.setReportId(reportDTO.getId());
- deviceHealthAlarm.setDevNo(evaluateDTO.getDevNo());
- deviceHealthAlarm.setDevName(evaluateDTO.getDevName());
- deviceHealthAlarm.setFaultTime(runTime);
- deviceHealthAlarm.setIsPushed(0);
- deviceHealthAlarm.setPushType(evaluateDTO.getIsPushed() == 0 ? 2 : 1);
- deviceHealthAlarm.setCreateDate(new Date());
- deviceHealthAlarm.setAlarmIndexTypes(String.join(",", alarmIndexTypes));
- deviceHealthAlarm.setAlarmSolutions(String.join("\n", alarmSolutions));
-
- reportDTO.setDeviceHealthAlarm(deviceHealthAlarm);
- reportDTO.setDeviceHealthAlarmDetails(deviceHealthAlarmDetailDTOList);
- }
- reportDTO.setDetList(detList);
-
- deviceHealthReportService.save(reportDTO);
-
- DeviceHealthEvaluateDTO updateDto = new DeviceHealthEvaluateDTO();
- updateDto.setId(evaluateDTO.getId());
- updateDto.setReportContent(reportDTO.getContent());
- updateDto.setReportDate(runTime);
- updateDto.setReportId(reportDTO.getId());
- updateDto.setAbnormalCount(reportDTO.getAbnormalCount());
- updateDto.setHealthScore(reportDTO.getHealthScore());
- updateDto.setHealthLevel(reportDTO.getHealthLevel());
- deviceHealthEvaluateService.updateReport(updateDto);
- }
- public void deviceStatCount(Calendar calendar) {
- DeviceStatCountDTO deviceStatCountDTO = deviceStatCountService.getDeviceStatCount();
- DeviceStatCountEntity deviceStatCount = ConvertUtils.sourceToTarget(deviceStatCountDTO, DeviceStatCountEntity.class);
- deviceStatCount.setId(UUID.randomUUID().toString());
- deviceStatCount.setDate(calendar.getTime());
- deviceStatCount.setCreateDate(new Date());
- deviceStatCountService.insert(deviceStatCount);
- }
-
- private String getRand(String devNo) {
- String t = Long.toString(System.currentTimeMillis());
- return devNo.substring(0, 1) + t.substring(t.length() - 4);
- }
-
- private int getAbnormalCount(String partGrade) {
- int result = 0;
- if (StringUtils.isBlank(partGrade)) {
- return result;
- }
- List<Integer> pgList = JSONArray.parseArray(partGrade, Integer.class);
- if (CollectionUtils.isEmpty(pgList)) {
- return result;
- }
- for (int i = 0; i < pgList.size(); i++) {
- if (pgList.get(i) != 1) {
- result = result + 1;
- }
- }
- return result;
- }
-
- private List<BigDecimal> getValueArr(Object value) {
- List<BigDecimal> result = new ArrayList<>();
- if (value == null) {
- return result;
- }
- result = JSONArray.parseArray(JSON.toJSONString(value), BigDecimal.class);
- return result;
-
- }
-
- private List<Integer> getIntValueArr(Object value) {
- List<Integer> result = new ArrayList<>();
- if (value == null) {
- return result;
- }
- result = JSONArray.parseArray(JSON.toJSONString(value), Integer.class);
- return result;
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/FakeDataTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/FakeDataTask.java
deleted file mode 100644
index 3e66030..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/FakeDataTask.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSON;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.mcs.service.StModelResultService;
-import com.iailab.module.model.handler.ModelHandler;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年07月08日
- */
-@Component("fakeDataTask")
-public class FakeDataTask implements ITask {
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private StModelResultService stModelCommonResultService;
-
- // private final String MODEL_CODE = "shallow_groove_separation_control307";
-
- // private final String MODEL_CODE = "shallow_groove_separation_control308";
-
- // private final String MODEL_CODE = "separation_control3318";
-
- // private final String MODEL_CODE = "separation_control3319";
-
- // private final String MODEL_CODE = "thickener_control_qc";
-
- // private final String MODEL_CODE = "thickener_control_xl";
-
- // private final String MODEL_CODE = "filter";
-
- private final String MODEL_CODE = "warehouse_allocation";
-
- private Date startDate = DateUtils.stringToDate("2024-05-15 12:00:00", DateUtils.DATE_TIME_PATTERN);
-
- private Date endDate = DateUtils.stringToDate("2024-07-01 12:00:00", DateUtils.DATE_TIME_PATTERN);
-
- private int sc = 60;
-
- private List<Integer> inHours = new ArrayList<>();
-
- FakeDataTask() {
- inHours.add(18);
- }
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(startDate);
- do {
- calendar.add(Calendar.SECOND, sc);
- int hour = calendar.get(Calendar.HOUR_OF_DAY);
- System.out.println("hour=" + hour);
- System.out.println(DateUtils.format(calendar.getTime(), DateUtils.DATE_TIME_PATTERN));
- if (!inHours.contains(hour) || calendar.get(Calendar.MINUTE) > 10) {
- continue;
- }
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE);
-
- // 307
- // String jsonString = "{\"mv_fl_kd_307\":14,\"mv_hj_water_valve_main_307\":0,\"mv_xj_water_valve_307\":51,\"mv_hj_water_valve_small_307\":0,\"mv_mn_water_valve_307\":0,\"status\":200,\"tips\":\"OK\"}";
-
- // 308
- // String jsonString = "{\"mv_fl_kd_308\":14,\"mv_hj_water_valve_main_308\":0,\"mv_xj_water_valve_308\":51,\"mv_hj_water_valve_small_308\":0,\"mv_mn_water_valve_308\":0,\"status\":200,\"tips\":\"OK\"}";
-
- // 3318
- //String jsonString = "{\"mv_pump_hl_3318\":9,\"mv_valve_fl_3318\":0,\"mv_pump_hj_3318\":11,\"mv_pump_xj_3318\":12,\"mv_value_hj_water_3318\":0,\"mv_value_xj_water_3318\":10,\"mv_valve_jj_3318\":0,\"mv_pump_mn_3318\":0,\"mv_valve_mn_water_3318\":30,\"target_md_3318\":15,\"status\":200,\"tips\":\"OK\"}";
-
- // 3319
- // String jsonString = "{\"mv_pump_hl_3319\":9,\"mv_valve_fl_3319\":0,\"mv_pump_hj_3319\":11,\"mv_pump_xj_3319\":12,\"mv_value_hj_water_3319\":0,\"mv_value_xj_water_3319\":10,\"mv_valve_jj_3319\":0,\"mv_pump_mn_3319\":0,\"mv_valve_mn_water_3319\":30,\"target_md_3319\":15,\"status\":200,\"tips\":\"OK\"}";
-
- // 浅槽浓缩
- // String jsonString = "{\"Dos_yang_det_QC\":35.5,\"Dos_yin_det_QC\":28.0,\"status\":200}";
-
- // 旋流浓缩
- // String jsonString = "{\"Dos_yang_det1_XL\":38.0,\"Dos_yang_det2_XL\":0,\"Dos_yin_det1_XL\":31.0,\"Dos_yin_det2_XL\":0,\"status\":200}";
-
- // 智能压滤
- // String jsonString = "{\"zt4429_res\":0,\"UF_pumb2\":0.0,\"zt4430_res\":-1,\"zt4422_res\":-1,\"zt4428_res\":1,\"zt4431_res\":1,\"zt4432_res\":-1,\"zt4419_res\":1,\"UF_pumb1\":1.0,\"zt4420_res\":-1,\"zt4418_res\":-1,\"zt4421_res\":-1,\"status\":200}";
-
- // 智能配仓
- String jsonString = "{\"status\":200,\"tips\":\"OK\",\"unloader_state1\":0,\"unloader_state2\":0,\"unloader_state3\":0,\"unloader_state4\":0,\"unloader_state5\":0,\"unloader_state6\":0,\"unloader_state7\":0,\"unloader_state8\":0,\"unloader_state9\":0,\"unloader_state10\":1,\"bunker_ash\":7.74,\"bunker_water\":6.78,\"bunker_heat_val\":4617,\"bunker_number\":[4,12]}";
-
- Map<String, Object> result = JSON.parseObject(jsonString);
- stModelCommonResultService.addML(stModel.getId(), result, calendar.getTime());
- modelHandler.addLog(stModel.getId(), MODEL_CODE, calendar.getTime(), modelHandler.dealResult(result));
- } while (calendar.getTime().getTime() <= endDate.getTime());
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/MigrationTableDataTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/MigrationTableDataTask.java
deleted file mode 100644
index 4b6eb4d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/MigrationTableDataTask.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.any.service.AnyProcReportDetService;
-import com.iailab.module.any.service.AnyProcReportService;
-import com.iailab.module.device.service.DeviceHealthReportDataService;
-import com.iailab.module.device.service.DeviceHealthReportService;
-import com.iailab.module.mcs.service.StModelResultService;
-import com.iailab.module.mcs.service.StModelRunlogService;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 迁移表数据
- *
- */
-@Component("migrationTableDataTask")
-public class MigrationTableDataTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
-
- @Resource
- private DeviceHealthReportDataService deviceHealthReportDataService;
-
- @Resource
- private DeviceHealthReportService deviceHealthReportService;
-
- @Resource
- private StModelResultService stModelCommonResultService;
-
- @Resource
- private StModelRunlogService stModelRunlogService;
-
- @Resource
- private AnyProcReportDetService anyProcReportDetService;
-
- @Resource
- private AnyProcReportService anyProcReportService;
-
- @Override
- public void run(String params) {
- logger.info("migrationTableDataTask定时任务正在执行，参数为：{}",params );
- try {
- int days = -90;
- if (StringUtils.isNotBlank(params)) {
- days = Math.abs(Integer.parseInt(params)) * -1;
- }
- Map<String, Date> tMap = DateUtils.getIntervalDate(days);
- deviceHealthReportDataService.migrationDeviceHealthReportData(tMap);
- deviceHealthReportService.migrationDeviceHealthReport(tMap);
- stModelCommonResultService.migrationModelResult(tMap);
- stModelRunlogService.migrationModelRunlog(tMap);
- anyProcReportService.migrationProcReport(tMap);
- anyProcReportDetService.migrationProcReportDet(tMap);
- } catch (Exception ex) {
- logger.error("migrationTableDataTask运行异常");
- ex.printStackTrace();
- }
- logger.info("migrationTableDataTask运行完成");
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelAllEvaluationTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelAllEvaluationTask.java
deleted file mode 100644
index 5875d42..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelAllEvaluationTask.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-
-/**
- * 生产综合评价
- * 每天08:00运行
- * 0 0 8 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月04日
- */
-@Component("modelAllEvaluationTask")
-public class ModelAllEvaluationTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "all_evaluation";
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE);
- logger.info("运行模型：" + MODEL_CODE);
- modelHandler.run(stModel.getModelCode(), calendar.getTime());
- } catch (Exception ex) {
- logger.info("运行模型异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelBlowerTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelBlowerTask.java
deleted file mode 100644
index 7353d00..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelBlowerTask.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.FeignWritePointValueDTO;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.dto.StModelOutDTO;
-import com.iailab.module.mcs.service.StModelOutService;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * 智能压风
- * ZX1,ZX2
- * blower_control
- * 5 0/1 * * * ?
- */
-@Component("modelBlowerTask")
-public class ModelBlowerTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "blower_control";
-
- private final String mParamCode = "isDev";
-
- private final List<String> MODEL_CODE_LIST = new ArrayList<>();
-
-
- private final String ALM_POINT = WatchConstant.CONTROLLER_ALM_6;
-
- private final String unWrite = "-1";
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private StModelOutService stModelOutService;
-
- @Resource
- private WatchDog watchDog;
-
- ModelBlowerTask() {
- MODEL_CODE_LIST.add(MODEL_CODE);
- }
-
- @Override
- public void run(String params) {
- String isDev = configApi.queryConfigByCode(mParamCode);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- logger.info("ModelBlowerTask定时任务正在执行，参数为：{}", params);
- if (BusinessConstant.DEV_Y.equals(isDev)) {
- logger.info("模型采用开发模型");
- } else {
- logger.info("模型采用生产模型");
- }
- try {
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- // 1、判断通讯是否正常
- if (!watchDog.isConnect(WatchConstant.ZX1_STATUS)) {
- logger.info("watchDog.isConnect=false");
- return;
- }
- if (!watchDog.isConnect(WatchConstant.ZX2_STATUS)) {
- logger.info("watchDog.isConnect=false");
- return;
- }
-
- // 2、判断控制器状态
- if (!watchDog.isUse(WatchConstant.CONTROLLER_ONSTS_6)) {
- logger.info("将反馈值写入下发值，无扰动切换");
- MODEL_CODE_LIST.forEach(item -> {
- this.writeBySetValue(item);
- });
- return;
- }
- logger.info("控制器启动");
- }
-
- // 3、运行模型
- Map<String, Map<String, Object>> allCommonResult = new HashMap<>();
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE_LIST.get(i));
- if (stModel == null) {
- logger.info("model为空！");
- return;
- }
- logger.info("运行模型：" + stModel.getModelCode());
- Map<String, Object> modelCommonResult = modelHandler.run(stModel.getModelCode(), calendar.getTime());
- allCommonResult.put(MODEL_CODE_LIST.get(i), modelCommonResult);
- }
-
- // 4、下发数据
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- if (!writeToDcs(allCommonResult.get(MODEL_CODE_LIST.get(i)), MODEL_CODE_LIST.get(i))) {
- throw new Exception(MODEL_CODE_LIST.get(i) + "下发数据异常");
- }
- }
- }
- } catch (Exception ex) {
- logger.error("ModelBlowerTask运行异常");
- ex.printStackTrace();
- }
- logger.info("ModelBlowerTask运行完成");
- }
-
- /**
- * 数据下发
- *
- * @param data
- * @param modelCode
- */
- private boolean writeToDcs(Map<String, Object> data, String modelCode) {
- String code = data.get(BusinessConstant.MODELE_RESULT_STATUS).toString();
- if (BusinessConstant.MODEL_R_ERROR.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果异常，不下发数据！恢复手动");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_6);
- return false;
- } else if (BusinessConstant.MODEL_R_WARN.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果警告");
- FeignWritePointValueDTO writeAlm = new FeignWritePointValueDTO();
- writeAlm.setPointCode(ALM_POINT);
- writeAlm.setPointValue(BusinessConstant.STATUS_FALSE);
- feignDataApi.setPointValue(writeAlm);
- }
-
- logger.info("下发的数据=" + JSONObject.toJSONString(data));
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- logger.info("outPoints 为空！");
- return true;
- }
- outPoints.forEach(pointItem -> {
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- if (!unWrite.equals(data.get(pointItem.getResultKey()).toString())) {
- writePointValue.setPointCode(pointItem.getPointNo());
- writePointValue.setPointValue(new BigDecimal(data.get(pointItem.getResultKey()).toString()));
- feignDataApi.setPointValue(writePointValue);
- }
- });
- return true;
- }
-
- /**
- * 无扰模式
- * 反馈写入下发点位
- */
- private void writeBySetValue(String modelCode) {
- logger.info("=====writeBySetValue Start=======");
- // 低压输出KEY要特殊处理
- String dy_key = "_control";
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- return;
- }
- outPoints.forEach(item -> {
- if (StringUtils.isNotBlank(item.getPointNo()) && StringUtils.isNotBlank(item.getDisturbancePointNo())) {
- List<String> points = new ArrayList<>();
- points.add(item.getDisturbancePointNo());
- Map<String, Object> value = feignDataApi.getCurrentValue(points);
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(item.getPointNo());
- writePointValue.setPointValue(value.get(item.getDisturbancePointNo()));
- if(item.getResultKey().contains(dy_key)) {
- Object tempValue = value.get(item.getDisturbancePointNo());
- // 7或8：启动；10：停止
- if (tempValue.toString().equals("7") || tempValue.toString().equals("8")) {
- writePointValue.setPointValue(new Integer(1));
- } else if (tempValue.toString().equals("10")) {
- writePointValue.setPointValue(new Integer(0));
- }
- }
- feignDataApi.setPointValue(writePointValue);
- }
- });
- logger.info("=====智能压风无扰完成=======");
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelControlReliabilityTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelControlReliabilityTask.java
deleted file mode 100644
index 1f43cac..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelControlReliabilityTask.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-/**
- * 控制系统可靠性评价
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月15日
- */
-@Component("modelControlReliabilityTask")
-public class ModelControlReliabilityTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- private final List<String> MODEL_CODE_LIST = new ArrayList<>();
-
- ModelControlReliabilityTask() {
- MODEL_CODE_LIST.add("control_reliability_mm");
- MODEL_CODE_LIST.add("control_reliability_km");
- MODEL_CODE_LIST.add("control_reliability_blow1");
- MODEL_CODE_LIST.add("control_reliability_blow2");
-
- MODEL_CODE_LIST.add("control_reliability_dl401");
- MODEL_CODE_LIST.add("control_reliability_dl402");
- MODEL_CODE_LIST.add("control_reliability_dl501");
- MODEL_CODE_LIST.add("control_reliability_hm");
- }
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- logger.info("ModelControlReliabilityTask定时任务正在执行，参数为：{}", params);
-
- try {
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE_LIST.get(i));
- if (stModel == null) {
- logger.info("model为空！");
- return;
- }
- logger.info("运行模型：" + stModel.getModelCode());
- modelHandler.run(stModel.getModelCode(), calendar.getTime());
- }
-
- } catch (Exception ex) {
- logger.error("ModelControlReliabilityTask运行异常");
- ex.printStackTrace();
- }
- logger.info("ModelControlReliabilityTask运行完成");
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelQCThickenerTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelQCThickenerTask.java
deleted file mode 100644
index a8ff4d2..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelQCThickenerTask.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.module.data.dto.FeignWritePointValueDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.dto.StModelOutDTO;
-import com.iailab.module.mcs.service.StModelOutService;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * 浅槽浓缩
- * ZX1
- * thickener_control_qc
- * 5 0/1 * * * ?
- */
-@Component("modelQCThickenerTask")
-public class ModelQCThickenerTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "thickener_control_qc";
-
- private final String mParamCode = "isDev";
-
- private final List<String> MODEL_CODE_LIST = new ArrayList<>();
-
- private final String ALM_POINT = WatchConstant.CONTROLLER_ALM_5;
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private StModelOutService stModelOutService;
-
- @Resource
- private WatchDog watchDog;
-
- ModelQCThickenerTask() {
- MODEL_CODE_LIST.add(MODEL_CODE);
- }
-
- @Override
- public void run(String params) {
- String isDev = configApi.queryConfigByCode(mParamCode);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- logger.info("ModelXLFilterTask定时任务正在执行，参数为：{}", params);
- if (BusinessConstant.DEV_Y.equals(isDev)) {
- logger.info("模型采用开发模型");
- } else {
- logger.info("模型采用生产模型");
- }
- try {
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- // 1、判断通讯是否正常
- if (!watchDog.isConnect(WatchConstant.ZX1_STATUS)) {
- logger.info("watchDog.isConnect=false");
- return;
- }
-
- // 2、判断控制器状态
- if (!watchDog.isUse(WatchConstant.CONTROLLER_ONSTS_5)) {
- logger.info("将反馈值写入下发值，无扰动切换");
- MODEL_CODE_LIST.forEach(item -> {
- this.writeBySetValue(item);
- });
- return;
- }
- logger.info("控制器启动");
- }
-
- // 3、运行模型
- Map<String, Map<String, Object>> allCommonResult = new HashMap<>();
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE_LIST.get(i));
- if (stModel == null) {
- logger.info("model为空！");
- return;
- }
- logger.info("运行模型：" + stModel.getModelCode());
- Map<String, Object> modelCommonResult = modelHandler.run(stModel.getModelCode(), calendar.getTime());
- allCommonResult.put(MODEL_CODE_LIST.get(i), modelCommonResult);
- }
-
- // 4、下发数据
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- if (!writeToDcs(allCommonResult.get(MODEL_CODE_LIST.get(i)), MODEL_CODE_LIST.get(i))) {
- throw new Exception(MODEL_CODE_LIST.get(i) + "下发数据异常");
- }
- }
- }
- } catch (Exception ex) {
- logger.error("ModelXLFilterTask运行异常");
- ex.printStackTrace();
- }
- logger.info("ModelXLFilterTask运行完成");
- }
-
- /**
- * 数据下发
- *
- * @param data
- * @param modelCode
- */
- private boolean writeToDcs(Map<String, Object> data, String modelCode) {
- String code = data.get(BusinessConstant.MODELE_RESULT_STATUS).toString();
- if (BusinessConstant.MODEL_R_ERROR.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果异常，不下发数据！恢复手动");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_5);
- return false;
- } else if (BusinessConstant.MODEL_R_WARN.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果警告");
- FeignWritePointValueDTO writeAlm = new FeignWritePointValueDTO();
- writeAlm.setPointCode(ALM_POINT);
- writeAlm.setPointValue(BusinessConstant.STATUS_FALSE);
- feignDataApi.setPointValue(writeAlm);
- }
-
- logger.info("下发的数据=" + JSONObject.toJSONString(data));
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- logger.info("outPoints 为空！");
- return true;
- }
- outPoints.forEach(pointItem -> {
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(pointItem.getPointNo());
- writePointValue.setPointValue(new BigDecimal(data.get(pointItem.getResultKey()).toString()));
- feignDataApi.setPointValue(writePointValue);
- });
- return true;
- }
-
- /**
- * 无扰模式
- * 反馈写入下发点位
- */
- private void writeBySetValue(String modelCode) {
- logger.info("=====writeBySetValue Start=======");
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- return;
- }
- outPoints.forEach(item -> {
- if (StringUtils.isNotBlank(item.getPointNo()) && StringUtils.isNotBlank(item.getDisturbancePointNo())) {
- List<String> points = new ArrayList<>();
- points.add(item.getDisturbancePointNo());
- Map<String, Object> value = feignDataApi.getCurrentValue(points);
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(item.getPointNo());
- writePointValue.setPointValue(value.get(item.getDisturbancePointNo()));
- feignDataApi.setPointValue(writePointValue);
- }
- });
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelSeparationTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelSeparationTask.java
deleted file mode 100644
index 6e61856..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelSeparationTask.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.FeignWritePointValueDTO;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.dto.StModelOutDTO;
-import com.iailab.module.mcs.service.StModelOutService;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 旋流器分选控制
- * ZX2
- * 5 0/1 * * * ?
- */
-@Component("modelSeparationTask")
-public class ModelSeparationTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE_3318 = "separation_control3318";
-
- private final String MODEL_CODE_3319 = "separation_control3319";
-
- private final String mParamCode = "isDev";
-
- private final List<String> MODEL_CODE_LIST = new ArrayList<>();
-
- private final String ALM_POINT = WatchConstant.CONTROLLER_ALM_2;
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private StModelOutService stModelOutService;
-
- @Resource
- private WatchDog watchDog;
-
- private final String MV_VALVE_JJ = "mv_valve_jj";
-
- private int writeDelayTime = 20;
-
- private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
-
- ModelSeparationTask() {
- MODEL_CODE_LIST.add(MODEL_CODE_3318);
- MODEL_CODE_LIST.add(MODEL_CODE_3319);
- }
-
- @Override
- public void run(String params) {
- String isDev = configApi.queryConfigByCode(mParamCode);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.add(Calendar.SECOND, -5); // 滞后5s
- logger.info("ModelSeparationTask定时任务正在执行，参数为：{}", params);
- if (BusinessConstant.DEV_Y.equals(isDev)) {
- logger.info("模型采用开发模型");
- } else {
- logger.info("模型采用生产模型");
- }
- try {
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- // 1、判断通讯是否正常
- if (!watchDog.isConnect(WatchConstant.ZX2_STATUS)) {
- logger.info("watchDog.isConnect=false");
- return;
- }
-
- // 2、判断控制器状态
- if (!watchDog.isUse(WatchConstant.CONTROLLER_ONSTS_2)) {
- logger.info("将反馈值写入下发值，无扰动切换");
- MODEL_CODE_LIST.forEach(item -> {
- this.writeBySetValue(item);
- });
- return;
- }
- logger.info("控制器启动");
- }
-
- // 3、运行模型
- Map<String, Map<String, Object>> allCommonResult = new HashMap<>();
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE_LIST.get(i));
- if (stModel == null) {
- logger.info("model为空！");
- return;
- }
- logger.info("运行模型：" + stModel.getModelCode());
- Map<String, Object> modelCommonResult = modelHandler.run(stModel.getModelCode(), calendar.getTime());
- allCommonResult.put(MODEL_CODE_LIST.get(i), modelCommonResult);
- }
-
- // 4、下发数据
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- if (!writeToDcs(allCommonResult.get(MODEL_CODE_LIST.get(i)), MODEL_CODE_LIST.get(i))) {
- throw new Exception(MODEL_CODE_LIST.get(i) + "下发数据异常");
- }
- }
- }
- } catch (Exception ex) {
- logger.error("ModelSeparationTask运行异常");
- ex.printStackTrace();
- }
- logger.info("ModelSeparationTask运行完成");
- }
-
- /**
- * 数据下发
- *
- * @param data
- * @param modelCode
- */
- private boolean writeToDcs(Map<String, Object> data, String modelCode) {
- String code = data.get(BusinessConstant.MODELE_RESULT_STATUS).toString();
-
- if (BusinessConstant.MODEL_R_ERROR.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果异常，不下发数据！恢复手动");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_2);
- return false;
- } else if (BusinessConstant.MODEL_R_WARN.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果警告");
- FeignWritePointValueDTO writeAlm = new FeignWritePointValueDTO();
- writeAlm.setPointCode(ALM_POINT);
- writeAlm.setPointValue(BusinessConstant.STATUS_FALSE);
- feignDataApi.setPointValue(writeAlm);
- }
-
- logger.info("下发的数据=" + JSONObject.toJSONString(data));
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- logger.info("outPoints 为空！");
- return true;
- }
- outPoints.forEach(pointItem -> {
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(pointItem.getPointNo());
- writePointValue.setPointValue(new BigDecimal(data.get(pointItem.getResultKey()).toString()));
- feignDataApi.setPointValue(writePointValue);
-
- if (pointItem.getResultKey().contains(MV_VALVE_JJ)) {
- executor.schedule(() -> {
- try {
- logger.info("20秒后加介阀开度复位0!");
- FeignWritePointValueDTO fw = new FeignWritePointValueDTO();
- fw.setPointCode(pointItem.getPointNo());
- fw.setPointValue(BigDecimal.ZERO);
- feignDataApi.setPointValue(fw);
- logger.info("复位完成!");
- } catch (Exception ex) {
- logger.info("复位失败!");
- ex.printStackTrace();
- }
- }, writeDelayTime, TimeUnit.SECONDS);
- }
- });
- return true;
- }
-
- /**
- * 无扰模式
- * 反馈写入下发点位
- */
- private void writeBySetValue(String modelCode) {
- logger.info("=====writeBySetValue Start=======");
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- return;
- }
- outPoints.forEach(item -> {
- if (StringUtils.isNotBlank(item.getPointNo()) && StringUtils.isNotBlank(item.getDisturbancePointNo())) {
- List<String> points = new ArrayList<>();
- points.add(item.getDisturbancePointNo());
- Map<String, Object> value = feignDataApi.getCurrentValue(points);
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(item.getPointNo());
- writePointValue.setPointValue(value.get(item.getDisturbancePointNo()));
- feignDataApi.setPointValue(writePointValue);
- }
- });
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelShallowTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelShallowTask.java
deleted file mode 100644
index 4d5e1a7..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelShallowTask.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.FeignWritePointValueDTO;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.dto.StModelOutDTO;
-import com.iailab.module.mcs.service.StModelOutService;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * 浅槽分选控制
- * ZX1
- * 5 0/1 * * * ?
- */
-@Component("modelShallowTask")
-public class ModelShallowTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE_307 = "shallow_groove_separation_control307";
-
- private final String MODEL_CODE_308 = "shallow_groove_separation_control308";
-
- private final String mParamCode = "isDev";
-
- private final List<String> MODEL_CODE_LIST = new ArrayList<>();
-
- // 浅槽分选故障需切换手动
- private final String ALM_POINT = WatchConstant.CONTROLLER_ALM_1;
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private IFeignDataApi feignDataApi;
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private StModelOutService stModelOutService;
-
- @Resource
- private WatchDog watchDog;
-
- ModelShallowTask() {
- MODEL_CODE_LIST.add(MODEL_CODE_307);
- MODEL_CODE_LIST.add(MODEL_CODE_308);
- }
-
- @Override
- public void run(String params) {
- String isDev = configApi.queryConfigByCode(mParamCode);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.add(Calendar.SECOND, -5); // 滞后5s
- logger.info("ModelShallowTask定时任务正在执行，参数为：{}", params);
- if (BusinessConstant.DEV_Y.equals(isDev)) {
- logger.info("模型采用开发模型");
- } else {
- logger.info("模型采用生产模型");
- }
- try {
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- // 1、判断通讯是否正常
- if (!watchDog.isConnect(WatchConstant.ZX1_STATUS)) {
- logger.info("watchDog.isConnect=false");
- return;
- }
-
- // 2、判断控制器状态
- if (!watchDog.isUse(WatchConstant.CONTROLLER_ONSTS_1)) {
- logger.info("将反馈值写入下发值，无扰动切换");
- MODEL_CODE_LIST.forEach(item -> {
- this.writeBySetValue(item);
- });
- return;
- }
- logger.info("控制器启动");
- }
-
- // 3、运行模型
- Map<String, Map<String, Object>> allCommonResult = new HashMap<>();
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE_LIST.get(i));
- if (stModel == null) {
- logger.info("model为空！");
- return;
- }
- logger.info("运行模型：" + stModel.getModelCode());
- Map<String, Object> modelCommonResult = modelHandler.run(stModel.getModelCode(), calendar.getTime());
- allCommonResult.put(MODEL_CODE_LIST.get(i), modelCommonResult);
- }
-
- // 4、下发数据
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- if (!writeToDcs(allCommonResult.get(MODEL_CODE_LIST.get(i)), MODEL_CODE_LIST.get(i))) {
- throw new Exception(MODEL_CODE_LIST.get(i) + "下发数据异常");
- }
- }
- }
- } catch (Exception ex) {
- logger.error("ModelShallowTask运行异常");
- ex.printStackTrace();
- }
- logger.info("ModelShallowTask运行完成");
- }
-
- /**
- * 数据下发
- *
- * @param data
- * @param modelCode
- */
- private boolean writeToDcs(Map<String, Object> data, String modelCode) {
- String code = data.get(BusinessConstant.MODELE_RESULT_STATUS).toString();
- if (BusinessConstant.MODEL_R_ERROR.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果异常，不下发数据！恢复手动");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_1);
- return false;
- } else if (BusinessConstant.MODEL_R_WARN.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果警告");
- FeignWritePointValueDTO writeAlm = new FeignWritePointValueDTO();
- writeAlm.setPointCode(ALM_POINT);
- writeAlm.setPointValue(BusinessConstant.STATUS_FALSE);
- feignDataApi.setPointValue(writeAlm);
- }
-
- logger.info("下发的数据=" + JSONObject.toJSONString(data));
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- logger.info("outPoints 为空！");
- return true;
- }
- outPoints.forEach(pointItem -> {
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(pointItem.getPointNo());
- writePointValue.setPointValue(new BigDecimal(data.get(pointItem.getResultKey()).toString()));
- feignDataApi.setPointValue(writePointValue);
- });
- return true;
- }
-
- /**
- * 无扰模式
- * 反馈写入下发点位
- */
- private void writeBySetValue(String modelCode) {
- logger.info("=====writeBySetValue Start=======");
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- return;
- }
- outPoints.forEach(item -> {
- if (StringUtils.isNotBlank(item.getPointNo()) && StringUtils.isNotBlank(item.getDisturbancePointNo())) {
- List<String> points = new ArrayList<>();
- points.add(item.getDisturbancePointNo());
- Map<String, Object> value = feignDataApi.getCurrentValue(points);
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(item.getPointNo());
- writePointValue.setPointValue(value.get(item.getDisturbancePointNo()));
- feignDataApi.setPointValue(writePointValue);
- }
- });
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelStorageReliabilityTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelStorageReliabilityTask.java
deleted file mode 100644
index 2cd38ae..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelStorageReliabilityTask.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Calendar;
-
-/**
- * 仓储可靠性分析
- * 每天08:00运行
- * 0 0 8 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月02日
- */
-@Component("modelStorageReliabilityTask")
-public class ModelStorageReliabilityTask implements ITask {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "storage_reliability";
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Override
- public void run(String params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- try {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE);
- logger.info("运行模型：" + MODEL_CODE);
- modelHandler.run(stModel.getModelCode(), calendar.getTime());
- } catch (Exception ex) {
- logger.info("运行模型异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelWarehouseTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelWarehouseTask.java
deleted file mode 100644
index fb53b2a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelWarehouseTask.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.module.data.dto.FeignWritePointValueDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.dto.StModelOutDTO;
-import com.iailab.module.mcs.service.StModelOutService;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
- * 智能配仓
- * ZX1
- * warehouse_allocation
- * 5 0/1 * * * ?
- *
- */
-@Component("modelWarehouseTask")
-public class ModelWarehouseTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "warehouse_allocation";
-
- private final String mParamCode = "isDev";
-
- private final List<String> MODEL_CODE_LIST = new ArrayList<>();
-
- private final String ALM_POINT = WatchConstant.CONTROLLER_ALM_7;
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private StModelOutService stModelOutService;
-
- @Resource
- private WatchDog watchDog;
-
- ModelWarehouseTask() {
- MODEL_CODE_LIST.add(MODEL_CODE);
- }
-
- @Override
- public void run(String params) {
- String isDev = configApi.queryConfigByCode(mParamCode);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- logger.info("ModelWarehouseTask定时任务正在执行，参数为：{}", params);
- if (BusinessConstant.DEV_Y.equals(isDev)) {
- logger.info("模型采用开发模型");
- } else {
- logger.info("模型采用生产模型");
- }
- try {
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- // 1、判断通讯是否正常
- if (!watchDog.isConnect(WatchConstant.ZX1_STATUS)) {
- logger.info("watchDog.isConnect=false");
- return;
- }
-
- // 2、判断控制器状态
- if (!watchDog.isUse(WatchConstant.CONTROLLER_ONSTS_7)) {
- logger.info("将反馈值写入下发值，无扰动切换");
- MODEL_CODE_LIST.forEach(item -> {
- this.writeBySetValue(item);
- });
- return;
- }
- logger.info("控制器启动");
- }
-
- // 3、运行模型
- Map<String, Map<String, Object>> allCommonResult = new HashMap<>();
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE_LIST.get(i));
- if (stModel == null) {
- logger.info("model为空！");
- return;
- }
- logger.info("运行模型：" + stModel.getModelCode());
- Map<String, Object> modelCommonResult = modelHandler.run(stModel.getModelCode(), calendar.getTime());
- allCommonResult.put(MODEL_CODE_LIST.get(i), modelCommonResult);
- }
-
- // 4、下发数据
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- if (!writeToDcs(allCommonResult.get(MODEL_CODE_LIST.get(i)), MODEL_CODE_LIST.get(i))) {
- throw new Exception(MODEL_CODE_LIST.get(i) + "下发数据异常");
- }
- }
- }
- } catch (Exception ex) {
- logger.error("ModelWarehouseTask运行异常");
- ex.printStackTrace();
- }
- logger.info("ModelWarehouseTask运行完成");
- }
-
- /**
- * 数据下发
- *
- * @param data
- * @param modelCode
- */
- private boolean writeToDcs(Map<String, Object> data, String modelCode) {
- String code = data.get(BusinessConstant.MODELE_RESULT_STATUS).toString();
- if (BusinessConstant.MODEL_R_ERROR.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果异常，不下发数据！恢复手动");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_7);
- return false;
- } else if (BusinessConstant.MODEL_R_WARN.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果警告");
- FeignWritePointValueDTO writeAlm = new FeignWritePointValueDTO();
- writeAlm.setPointCode(ALM_POINT);
- writeAlm.setPointValue(BusinessConstant.STATUS_FALSE);
- feignDataApi.setPointValue(writeAlm);
- }
-
- logger.info("下发的数据=" + JSONObject.toJSONString(data));
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- logger.info("outPoints 为空！");
- return true;
- }
- outPoints.forEach(pointItem -> {
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(pointItem.getPointNo());
- writePointValue.setPointValue(data.get(pointItem.getResultKey()));
- feignDataApi.setPointValue(writePointValue);
- });
- return true;
- }
-
- /**
- * 无扰模式
- * 反馈写入下发点位
- */
- private void writeBySetValue(String modelCode) {
- logger.info("=====writeBySetValue Start=======");
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- return;
- }
- outPoints.forEach(item -> {
- if (StringUtils.isNotBlank(item.getPointNo()) && StringUtils.isNotBlank(item.getDisturbancePointNo())) {
- List<String> points = new ArrayList<>();
- points.add(item.getDisturbancePointNo());
- Map<String, Object> value = feignDataApi.getCurrentValue(points);
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(item.getPointNo());
- writePointValue.setPointValue(value.get(item.getDisturbancePointNo()));
- feignDataApi.setPointValue(writePointValue);
- }
- });
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelXLFilterTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelXLFilterTask.java
deleted file mode 100644
index 58a8c16..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelXLFilterTask.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.module.data.dto.FeignWritePointValueDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.dto.StModelOutDTO;
-import com.iailab.module.mcs.service.StModelOutService;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * 智能压滤
- * ZX2
- * 5 0/1 * * * ?
- */
-@Component("modelXLFilterTask")
-public class ModelXLFilterTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "filter";
-
- private final String mParamCode = "isDev";
-
- private final List<String> MODEL_CODE_LIST = new ArrayList<>();
-
- private final String ALM_POINT = WatchConstant.CONTROLLER_ALM_4;
-
- private final String unWrite = "-1";
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private StModelOutService stModelOutService;
-
- @Resource
- private WatchDog watchDog;
-
- ModelXLFilterTask() {
- MODEL_CODE_LIST.add(MODEL_CODE);
- }
-
- @Override
- public void run(String params) {
- String isDev = configApi.queryConfigByCode(mParamCode);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- logger.info("ModelXLFilterTask定时任务正在执行，参数为：{}", params);
- if (BusinessConstant.DEV_Y.equals(isDev)) {
- logger.info("模型采用开发模型");
- } else {
- logger.info("模型采用生产模型");
- }
- try {
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- // 1、判断通讯是否正常
- if (!watchDog.isConnect(WatchConstant.ZX2_STATUS)) {
- logger.info("watchDog.isConnect=false");
- return;
- }
-
- // 2、判断控制器状态
- if (!watchDog.isUse(WatchConstant.CONTROLLER_ONSTS_4)) {
- logger.info("将反馈值写入下发值，无扰动切换");
- MODEL_CODE_LIST.forEach(item -> {
- this.writeBySetValue(item);
- });
- return;
- }
- logger.info("控制器启动");
- }
-
- // 3、运行模型
- Map<String, Map<String, Object>> allCommonResult = new HashMap<>();
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE_LIST.get(i));
- if (stModel == null) {
- logger.info("model为空！");
- return;
- }
- logger.info("运行模型：" + stModel.getModelCode());
- Map<String, Object> modelCommonResult = modelHandler.run(stModel.getModelCode(), calendar.getTime());
- allCommonResult.put(MODEL_CODE_LIST.get(i), modelCommonResult);
- }
-
- // 4、下发数据
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- if (!writeToDcs(allCommonResult.get(MODEL_CODE_LIST.get(i)), MODEL_CODE_LIST.get(i))) {
- throw new Exception(MODEL_CODE_LIST.get(i) + "下发数据异常");
- }
- }
- }
- } catch (Exception ex) {
- logger.error("ModelXLFilterTask运行异常");
- ex.printStackTrace();
- }
- logger.info("ModelXLFilterTask运行完成");
- }
-
- /**
- * 数据下发
- *
- * @param data
- * @param modelCode
- */
- private boolean writeToDcs(Map<String, Object> data, String modelCode) {
- String code = data.get(BusinessConstant.MODELE_RESULT_STATUS).toString();
- if (BusinessConstant.MODEL_R_ERROR.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果异常，不下发数据！恢复手动");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_4);
- return false;
- } else if (BusinessConstant.MODEL_R_WARN.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果警告");
- FeignWritePointValueDTO writeAlm = new FeignWritePointValueDTO();
- writeAlm.setPointCode(ALM_POINT);
- writeAlm.setPointValue(BusinessConstant.STATUS_FALSE);
- feignDataApi.setPointValue(writeAlm);
- }
-
- logger.info("下发的数据=" + JSONObject.toJSONString(data));
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- logger.info("outPoints 为空！");
- return true;
- }
- outPoints.forEach(pointItem -> {
- if (!unWrite.equals(data.get(pointItem.getResultKey()).toString())) {
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(pointItem.getPointNo());
- writePointValue.setPointValue(new BigDecimal(data.get(pointItem.getResultKey()).toString()));
- feignDataApi.setPointValue(writePointValue);
- }
- });
- return true;
- }
-
- /**
- * 无扰模式
- * 反馈写入下发点位
- */
- private void writeBySetValue(String modelCode) {
- logger.info("=====writeBySetValue Start=======");
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- return;
- }
- outPoints.forEach(item -> {
- if (StringUtils.isNotBlank(item.getPointNo()) && StringUtils.isNotBlank(item.getDisturbancePointNo())) {
- List<String> points = new ArrayList<>();
- points.add(item.getDisturbancePointNo());
- Map<String, Object> value = feignDataApi.getCurrentValue(points);
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(item.getPointNo());
- writePointValue.setPointValue(value.get(item.getDisturbancePointNo()));
- feignDataApi.setPointValue(writePointValue);
- }
- });
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelXLThickenerTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelXLThickenerTask.java
deleted file mode 100644
index ccb0e89..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/ModelXLThickenerTask.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.module.data.dto.FeignWritePointValueDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.dto.StModelOutDTO;
-import com.iailab.module.mcs.service.StModelOutService;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * 旋流浓缩
- * ZX2
- * 5 0/1 * * * ?
- */
-@Component("modelXLThickenerTask")
-public class ModelXLThickenerTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- private final String MODEL_CODE = "thickener_control_xl";
-
- private final String mParamCode = "isDev";
-
- private final List<String> MODEL_CODE_LIST = new ArrayList<>();
-
- private final String ALM_POINT = WatchConstant.CONTROLLER_ALM_3;
-
- @Resource
- private StModelService stModelService;
-
- @Resource
- private ModelHandler modelHandler;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private StModelOutService stModelOutService;
-
- @Resource
- private WatchDog watchDog;
-
- ModelXLThickenerTask() {
- MODEL_CODE_LIST.add(MODEL_CODE);
- }
-
- @Override
- public void run(String params) {
- String isDev = configApi.queryConfigByCode(mParamCode);
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- logger.info("ModelXLThickenerTask定时任务正在执行，参数为：{}", params);
- if (BusinessConstant.DEV_Y.equals(isDev)) {
- logger.info("模型采用开发模型");
- } else {
- logger.info("模型采用生产模型");
- }
- try {
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- // 1、判断通讯是否正常
- if (!watchDog.isConnect(WatchConstant.ZX2_STATUS)) {
- logger.info("watchDog.isConnect=false");
- return;
- }
-
- // 2、判断控制器状态
- if (!watchDog.isUse(WatchConstant.CONTROLLER_ONSTS_3)) {
- logger.info("将反馈值写入下发值，无扰动切换");
- MODEL_CODE_LIST.forEach(item -> {
- this.writeBySetValue(item);
- });
- return;
- }
- logger.info("控制器启动");
- }
-
- // 3、运行模型
- Map<String, Map<String, Object>> allCommonResult = new HashMap<>();
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- StModelDTO stModel = stModelService.getByCode(MODEL_CODE_LIST.get(i));
- if (stModel == null) {
- logger.info("model为空！");
- return;
- }
- logger.info("运行模型：" + stModel.getModelCode());
- Map<String, Object> modelCommonResult = modelHandler.run(stModel.getModelCode(), calendar.getTime());
- allCommonResult.put(MODEL_CODE_LIST.get(i), modelCommonResult);
- }
-
- // 4、下发数据
- if (!BusinessConstant.DEV_Y.equals(isDev)) {
- for (int i = 0; i < MODEL_CODE_LIST.size(); i++) {
- if (!writeToDcs(allCommonResult.get(MODEL_CODE_LIST.get(i)), MODEL_CODE_LIST.get(i))) {
- throw new Exception(MODEL_CODE_LIST.get(i) + "下发数据异常");
- }
- }
- }
- } catch (Exception ex) {
- logger.error("ModelXLThickenerTask运行异常");
- ex.printStackTrace();
- }
- logger.info("ModelXLThickenerTask运行完成");
- }
-
- /**
- * 数据下发
- *
- * @param data
- * @param modelCode
- */
- private boolean writeToDcs(Map<String, Object> data, String modelCode) {
- String code = data.get(BusinessConstant.MODELE_RESULT_STATUS).toString();
- if (BusinessConstant.MODEL_R_ERROR.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果异常，不下发数据！恢复手动");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_3);
- return false;
- } else if (BusinessConstant.MODEL_R_WARN.equals(code.substring(0,1))) {
- logger.warn("code=" + code + "，结果警告");
- FeignWritePointValueDTO writeAlm = new FeignWritePointValueDTO();
- writeAlm.setPointCode(ALM_POINT);
- writeAlm.setPointValue(BusinessConstant.STATUS_FALSE);
- feignDataApi.setPointValue(writeAlm);
- }
-
- logger.info("下发的数据=" + JSONObject.toJSONString(data));
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- logger.info("outPoints 为空！");
- return true;
- }
- outPoints.forEach(pointItem -> {
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(pointItem.getPointNo());
- writePointValue.setPointValue(new BigDecimal(data.get(pointItem.getResultKey()).toString()));
- feignDataApi.setPointValue(writePointValue);
- });
- return true;
- }
-
- /**
- * 无扰模式
- * 反馈写入下发点位
- */
- private void writeBySetValue(String modelCode) {
- logger.info("=====writeBySetValue Start=======");
- List<StModelOutDTO> outPoints = stModelOutService.getOutPoint(modelCode);
- if (CollectionUtils.isEmpty(outPoints)) {
- return;
- }
- outPoints.forEach(item -> {
- if (StringUtils.isNotBlank(item.getPointNo()) && StringUtils.isNotBlank(item.getDisturbancePointNo())) {
- List<String> points = new ArrayList<>();
- points.add(item.getDisturbancePointNo());
- Map<String, Object> value = feignDataApi.getCurrentValue(points);
- FeignWritePointValueDTO writePointValue = new FeignWritePointValueDTO();
- writePointValue.setPointCode(item.getPointNo());
- writePointValue.setPointValue(value.get(item.getDisturbancePointNo()));
- feignDataApi.setPointValue(writePointValue);
- }
- });
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncConsDayDataTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncConsDayDataTask.java
deleted file mode 100644
index 2a6946b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncConsDayDataTask.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.cons.service.ConsDayDataService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步消耗数据
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-@Component("syncConsDayDataTask")
-public class SyncConsDayDataTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private ConsDayDataService consDayDataService;
-
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncConsDayDataTask 开始");
-
- consDayDataService.syncData();
- logger.info("SyncConsDayDataTask 完成");
- } catch (Exception ex) {
- logger.info("SyncConsDayDataTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncDeviceInfoTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncDeviceInfoTask.java
deleted file mode 100644
index 83d6833..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncDeviceInfoTask.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.device.service.DeviceInfoService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步中选设备
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月27日
- */
-@Component("syncDeviceInfoTask")
-public class SyncDeviceInfoTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private DeviceInfoService deviceInfoService;
-
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncDeviceInfoTask 开始");
-
- deviceInfoService.syncData();
- logger.info("SyncDeviceInfoTask 完成");
- } catch (Exception ex) {
- logger.info("SyncDeviceInfoTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncDeviceStatUsageTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncDeviceStatUsageTask.java
deleted file mode 100644
index fc1ed52..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncDeviceStatUsageTask.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.device.service.DeviceStatUsageService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步中选设备运行时间
- * 计算设备使用率
- * 每天8:00执行
- * 0 0 8 * * ?
- */
-@Component("syncDeviceStatUsageTask")
-public class SyncDeviceStatUsageTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private DeviceStatUsageService deviceStatUsageService;
-
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncDeviceStatUsageTask 开始");
-
- deviceStatUsageService.syncData();
- logger.info("SyncDeviceStatUsageTask 完成");
- } catch (Exception ex) {
- logger.info("SyncDeviceStatUsageTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdCurrentSaleTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdCurrentSaleTask.java
deleted file mode 100644
index 393d78f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdCurrentSaleTask.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.prod.service.PrdCurrentSaleService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步当前销量
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Component("syncPrdCurrentSaleTask")
-public class SyncPrdCurrentSaleTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private PrdCurrentSaleService prdCurrentSaleService;
-
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncPrdCurrentSaleTask 开始");
-
- prdCurrentSaleService.syncData();
- logger.info("SyncPrdCurrentSaleTask 完成");
- } catch (Exception ex) {
- logger.info("SyncPrdCurrentSaleTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdDayDutyTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdDayDutyTask.java
deleted file mode 100644
index 0d60358..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdDayDutyTask.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.prod.service.PrdDayDutyService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步值班信息
- * 0 0 0/2 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Component("syncPrdDayDutyTask")
-public class SyncPrdDayDutyTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private PrdDayDutyService prdDayDutyService;
-
-
- @Override
- public void run(String params) {
- try {
- logger.info("syncPrdDayDutyTask 开始");
-
- prdDayDutyService.syncData();
- logger.info("syncPrdDayDutyTask 完成");
- } catch (Exception ex) {
- logger.info("syncPrdDayDutyTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdDayProdTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdDayProdTask.java
deleted file mode 100644
index c1340fd..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdDayProdTask.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.prod.service.PrdDayProdService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步日产品产量
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Component("syncPrdDayProdTask")
-public class SyncPrdDayProdTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private PrdDayProdService prdDayProdService;
-
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncPrdDayProdTask 开始");
-
- prdDayProdService.syncData(params);
- logger.info("SyncPrdDayProdTask 完成");
- } catch (Exception ex) {
- logger.info("SyncPrdDayProdTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdPerformanceTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdPerformanceTask.java
deleted file mode 100644
index e42bb72..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdPerformanceTask.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.prod.service.PrdCurrentPerformanceService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步当前产量
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月28日
- */
-@Component("syncPrdPerformanceTask")
-public class SyncPrdPerformanceTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private PrdCurrentPerformanceService prdCurrentPerformanceService;
-
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncPrdPerformanceTask 开始");
-
- prdCurrentPerformanceService.syncData();
- logger.info("SyncPrdPerformanceTask 完成");
- } catch (Exception ex) {
- logger.info("SyncPrdPerformanceTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdPlanTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdPlanTask.java
deleted file mode 100644
index 0d25098..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdPlanTask.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.prod.service.PrdPlanMonService;
-import com.iailab.module.prod.service.PrdPlanYearService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Component("syncPrdPlanTask")
-public class SyncPrdPlanTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private PrdPlanYearService prdPlanYearService;
-
- @Resource
- private PrdPlanMonService prdPlanMonService;
-
- @Override
- public void run(String params) {
- try {
- logger.info("syncPrdDayDutyTask 开始");
-
- prdPlanYearService.syncData();
- prdPlanMonService.syncData();
- logger.info("syncPrdDayDutyTask 完成");
- } catch (Exception ex) {
- logger.info("syncPrdDayDutyTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdStorageDayTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdStorageDayTask.java
deleted file mode 100644
index 34d84ca..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdStorageDayTask.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.prod.service.StorageDayService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步日仓储趋势
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月01日
- */
-@Component("syncPrdStorageDayTask")
-public class SyncPrdStorageDayTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private StorageDayService storageDayService;
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncPrdStorageDayTask 开始");
-
- storageDayService.syncData();
- logger.info("SyncPrdStorageDayTask 完成");
- } catch (Exception ex) {
- logger.info("SyncPrdStorageDayTask 异常");
- ex.printStackTrace();
- }
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdTimeDayTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdTimeDayTask.java
deleted file mode 100644
index 9a866fc..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncPrdTimeDayTask.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.prod.service.PrdTimeDayService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步生产时间分布
- * 0 0 0/1 * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Component("syncPrdTimeDayTask")
-public class SyncPrdTimeDayTask implements ITask {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private PrdTimeDayService prdTimeDayService;
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncPrdTimeDayTask 开始");
-
- prdTimeDayService.syncData(params);
- logger.info("SyncPrdTimeDayTask 完成");
- } catch (Exception ex) {
- logger.info("SyncPrdTimeDayTask 异常");
- ex.printStackTrace();
- }
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncQualityTrendDayTask.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncQualityTrendDayTask.java
deleted file mode 100644
index 636af3c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/SyncQualityTrendDayTask.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.quality.service.QualityQualityTrendDayService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 同步日煤质趋势
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Component("syncQualityTrendDayTask")
-public class SyncQualityTrendDayTask implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private QualityQualityTrendDayService qualityQualityTrendDayService;
-
-
- @Override
- public void run(String params) {
- try {
- logger.info("SyncQualityTrendDayTask 开始");
-
- qualityQualityTrendDayService.syncData();
- logger.info("SyncQualityTrendDayTask 完成");
- } catch (Exception ex) {
- logger.info("SyncQualityTrendDayTask 异常");
- ex.printStackTrace();
- }
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn1Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn1Task.java
deleted file mode 100644
index c391abb..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn1Task.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 监听浅槽分选控制器状态
- * ZX1
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月06日
- */
-@Slf4j
-@Component("watchControllerOn1Task")
-public class WatchControllerOn1Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- @Override
- public void run(String params) {
- // logger.info("WatchControllerOn1Task定时任务正在执行，参数为：{}", params);
- try {
- if (!watchDog.isConnect(WatchConstant.ZX1_STATUS)) {
- log.info("通讯异常，投入智能化状态复位！");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_1);
- return;
- }
- if (watchDog.isUse(WatchConstant.CONTROLLER_USE_1)) {
- watchDog.startControllerSts(WatchConstant.CONTROLLER_ONSTS_1);
- } else {
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_1);
- }
- } catch (Exception ex) {
- logger.error("WatchControllerOn1Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchControllerOn1Task运行完成");
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn2Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn2Task.java
deleted file mode 100644
index 6f55152..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn2Task.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 监听旋流分选控制器状态
- * ZX2
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月07日
- */
-@Slf4j
-@Component("watchControllerOn2Task")
-public class WatchControllerOn2Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- @Override
- public void run(String params) {
- // logger.info("WatchControllerOn2Task定时任务正在执行，参数为：{}", params);
- try {
- if (!watchDog.isConnect(WatchConstant.ZX2_STATUS)) {
- log.info("通讯异常，投入智能化状态复位！");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_2);
- return;
- }
- if (watchDog.isUse(WatchConstant.CONTROLLER_USE_2)) {
- watchDog.startControllerSts(WatchConstant.CONTROLLER_ONSTS_2);
- } else {
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_2);
- }
- } catch (Exception ex) {
- logger.error("WatchControllerOn2Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchControllerOn2Task运行完成");
- }
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn3Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn3Task.java
deleted file mode 100644
index 508af2f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn3Task.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 监听旋流器浓缩智能控制器状态
- * ZX2
- *
- * 0/2 * * * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月05日
- */
-@Slf4j
-@Component("watchControllerOn3Task")
-public class WatchControllerOn3Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- @Override
- public void run(String params) {
- // logger.info("WatchControllerOn3Task定时任务正在执行，参数为：{}", params);
- try {
- if (!watchDog.isConnect(WatchConstant.ZX2_STATUS)) {
- log.info("通讯异常，投入智能化状态复位！");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_3);
- return;
- }
- if (watchDog.isUse(WatchConstant.CONTROLLER_USE_3)) {
- watchDog.startControllerSts(WatchConstant.CONTROLLER_ONSTS_3);
- } else {
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_3);
- }
- } catch (Exception ex) {
- logger.error("WatchControllerOn3Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchControllerOn3Task运行完成");
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn4Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn4Task.java
deleted file mode 100644
index 2336aa0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn4Task.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 监听旋流压滤智能控制器状态
- * ZX2
- *
- * 0/2 * * * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月07日
- */
-@Slf4j
-@Component("watchControllerOn4Task")
-public class WatchControllerOn4Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- @Override
- public void run(String params) {
- // logger.info("WatchControllerOn4Task定时任务正在执行，参数为：{}", params);
- try {
- if (!watchDog.isConnect(WatchConstant.ZX2_STATUS)) {
- log.info("通讯异常，投入智能化状态复位！");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_4);
- return;
- }
- if (watchDog.isUse(WatchConstant.CONTROLLER_USE_4)) {
- watchDog.startControllerSts(WatchConstant.CONTROLLER_ONSTS_4);
- } else {
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_4);
- }
- } catch (Exception ex) {
- logger.error("WatchControllerOn4Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchControllerOn4Task运行完成");
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn5Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn5Task.java
deleted file mode 100644
index 5fa19f2..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn5Task.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 监听浅槽浓缩智能控制器状态
- * ZX1
- *
- * 0/2 * * * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月07日
- */
-@Slf4j
-@Component("watchControllerOn5Task")
-public class WatchControllerOn5Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- @Override
- public void run(String params) {
- // logger.info("WatchControllerOn5Task定时任务正在执行，参数为：{}", params);
- try {
- if (!watchDog.isConnect(WatchConstant.ZX1_STATUS)) {
- log.info("通讯异常，投入智能化状态复位！");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_5);
- return;
- }
- if (watchDog.isUse(WatchConstant.CONTROLLER_USE_5)) {
- watchDog.startControllerSts(WatchConstant.CONTROLLER_ONSTS_5);
- } else {
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_5);
- }
- } catch (Exception ex) {
- logger.error("WatchControllerOn5Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchControllerOn5Task运行完成");
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn6Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn6Task.java
deleted file mode 100644
index 68148e6..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn6Task.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 智能压风
- * ZX1
- *
- * 0/2 * * * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月07日
- */
-@Slf4j
-@Component("watchControllerOn6Task")
-public class WatchControllerOn6Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- @Override
- public void run(String params) {
- // logger.info("WatchControllerOn6Task定时任务正在执行，参数为：{}", params);
- try {
- if (!watchDog.isConnect(WatchConstant.ZX1_STATUS)) {
- log.info("通讯异常，投入智能化状态复位！");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_6);
- return;
- }
- if (watchDog.isUse(WatchConstant.CONTROLLER_USE_6)) {
- watchDog.startControllerSts(WatchConstant.CONTROLLER_ONSTS_6);
- } else {
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_6);
- }
- } catch (Exception ex) {
- logger.error("WatchControllerOn6Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchControllerOn6Task运行完成");
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn7Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn7Task.java
deleted file mode 100644
index cf69833..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchControllerOn7Task.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * 配仓
- * ZX1
- *
- * 0/2 * * * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月11日
- */
-@Slf4j
-@Component("watchControllerOn7Task")
-public class WatchControllerOn7Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- @Override
- public void run(String params) {
- // logger.info("WatchControllerOn7Task定时任务正在执行，参数为：{}", params);
- try {
- if (!watchDog.isConnect(WatchConstant.ZX1_STATUS)) {
- log.info("通讯异常，投入智能化状态复位！");
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_7);
- return;
- }
- if (watchDog.isUse(WatchConstant.CONTROLLER_USE_7)) {
- watchDog.startControllerSts(WatchConstant.CONTROLLER_ONSTS_7);
- } else {
- watchDog.stopControllerSts(WatchConstant.CONTROLLER_ONSTS_7);
- }
- } catch (Exception ex) {
- logger.error("WatchControllerOn7Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchControllerOn7Task运行完成");
-
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchDogZX1Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchDogZX1Task.java
deleted file mode 100644
index d9c7269..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchDogZX1Task.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * ZX1心跳
- * 0/2 * * * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月04日
- */
-@Component("watchDogZX1Task")
-public class WatchDogZX1Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- private int lastHeat = 0;
-
- private final String mParamCode = "isWriteTime";
-
- @Override
- public void run(String params) {
- // logger.info("WatchDogZX1Task定时任务正在执行，参数为：{}", params);
- try {
- lastHeat = watchDog.writeWatchDogTime(WatchConstant.ZX1_HEART_SET, WatchConstant.ZX1_HEART,
- WatchConstant.ZX1_STATUS, lastHeat);
- } catch (Exception ex) {
- logger.error("WatchDogZX1Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchDogZX1Task运行完成");
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchDogZX2Task.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchDogZX2Task.java
deleted file mode 100644
index 080bf38..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/job/task/WatchDogZX2Task.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.iailab.module.job.task;
-
-import com.iailab.module.watch.WatchConstant;
-import com.iailab.module.watch.WatchDog;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-/**
- * ZX2心跳
- * 0/2 * * * * ?
- *
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月05日
- */
-@Component("watchDogZX2Task")
-public class WatchDogZX2Task implements ITask {
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private WatchDog watchDog;
-
- private int lastHeat = 0;
-
- private final String mParamCode = "isWriteTime";
-
- @Override
- public void run(String params) {
- // logger.info("WatchDogZX2Task定时任务正在执行，参数为：{}", params);
- try {
- lastHeat = watchDog.writeWatchDogTime(WatchConstant.ZX2_HEART_SET, WatchConstant.ZX2_HEART,
- WatchConstant.ZX2_STATUS, lastHeat);
- } catch (Exception ex) {
- logger.error("WatchDogZX2Task运行异常");
- ex.printStackTrace();
- }
- logger.info("WatchDogZX2Task运行完成");
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/controller/KnowledgeDetController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/controller/KnowledgeDetController.java
deleted file mode 100644
index d2f49d8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/controller/KnowledgeDetController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.iailab.module.knowledge.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.common.utils.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.knowledge.dto.KnowledgeDetDTO;
-import com.iailab.module.knowledge.service.KnowledgeDetService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 09:12:00
- */
-@RestController
-@RequestMapping("/knowledge/det")
-@Tag(name = "知识详情")
-public class KnowledgeDetController {
- @Resource
- private KnowledgeDetService knowledgeDetService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<KnowledgeDetDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<KnowledgeDetDTO> page = knowledgeDetService.page(params);
-
- return new CommonResult<PageData<KnowledgeDetDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<KnowledgeDetDTO> get(@PathVariable("id") String id) {
- KnowledgeDetDTO data = knowledgeDetService.get(id);
-
- return new CommonResult<KnowledgeDetDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('knowledge:det:save')")
- public CommonResult save(@RequestBody KnowledgeDetDTO dto) {
- //效验数据
- dto.setId(null);
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- knowledgeDetService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('knowledge:det:update')")
- public CommonResult update(@RequestBody KnowledgeDetDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- knowledgeDetService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('knowledge:det:delete')")
- public CommonResult delete(@RequestBody String[] ids) {
- knowledgeDetService.delete(ids);
- return new CommonResult();
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/controller/KnowledgePathController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/controller/KnowledgePathController.java
deleted file mode 100644
index 18bbca3..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/controller/KnowledgePathController.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.iailab.module.knowledge.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.Constant;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.knowledge.dto.KnowledgePathDTO;
-import com.iailab.module.knowledge.service.KnowledgePathService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 09:12:00
- */
-@RestController
-@RequestMapping("/knowledge/path")
-@Tag(name = "知识库目录")
-public class
-KnowledgePathController {
-
- @Resource
- private KnowledgePathService knowledgePathService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<KnowledgePathDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<KnowledgePathDTO> page = knowledgePathService.page(params);
-
- return new CommonResult<PageData<KnowledgePathDTO>>().setData(page);
- }
-
- @GetMapping("list")
- @Operation(summary = "列表")
- public CommonResult<List<KnowledgePathDTO>> list(@RequestParam Map<String, Object> params) {
- List<KnowledgePathDTO> data = knowledgePathService.list(params);
-
- return new CommonResult<List<KnowledgePathDTO>>().setData(data);
- }
-
- @GetMapping("tree")
- @Operation(summary = "列表")
- public CommonResult<List<KnowledgePathDTO>> tree() {
- List<KnowledgePathDTO> data = knowledgePathService.tree();
-
- return new CommonResult<List<KnowledgePathDTO>>().setData(data);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<KnowledgePathDTO> get(@PathVariable("id") String id) {
- KnowledgePathDTO data = knowledgePathService.get(id);
-
- return new CommonResult<KnowledgePathDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- public CommonResult save(@RequestBody KnowledgePathDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- knowledgePathService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- public CommonResult update(@RequestBody KnowledgePathDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- knowledgePathService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping("{id}")
- @Operation(summary = "删除")
- @LogOperation("删除")
- public CommonResult delete(@PathVariable("id") String id) {
- knowledgePathService.delete(id);
-
- return new CommonResult();
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dao/KnowledgeDetDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dao/KnowledgeDetDao.java
deleted file mode 100644
index e95b366..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dao/KnowledgeDetDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.knowledge.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.knowledge.entity.KnowledgeDetEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月25日 17:20:00
- */
-@Mapper
-public interface KnowledgeDetDao extends BaseDao<KnowledgeDetEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dao/KnowledgePathDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dao/KnowledgePathDao.java
deleted file mode 100644
index 6785503..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dao/KnowledgePathDao.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.iailab.module.knowledge.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.knowledge.dto.KnowledgePathDTO;
-import com.iailab.module.knowledge.entity.KnowledgePathEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月25日 17:19:00
- */
-@Mapper
-public interface KnowledgePathDao extends BaseDao<KnowledgePathEntity> {
-
- List<KnowledgePathDTO> selectPathList();
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dto/KnowledgeDetDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dto/KnowledgeDetDTO.java
deleted file mode 100644
index d9fec7c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dto/KnowledgeDetDTO.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.iailab.module.knowledge.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.framework.excel.core.annotations.DictFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 08:39:00
- */
-@Data
-@Schema(name = "知识详情")
-public class KnowledgeDetDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
-
- @Schema(name = "树形图节点id")
- private String treeId;
-
- @Schema(name = "类型")
- private String typeId;
-
- @DictFormat("knowledge-type")
- @Schema(name = "类型")
- private String typeName;
-
- @Schema(name = "标题")
- private String title;
-
- @Schema(name = "关键词")
- private String keyWords;
-
- @Schema(name = "技术分类")
- private String skillTypeId;
-
- @Schema(name = "网址")
- private String website;
-
- @Schema(name = "摘要")
- private String content;
-
- @Schema(name = "文件名称")
- private String fileName;
-
- @Schema(name = "文件后缀")
- private String filePostfix;
-
- @Schema(name = "文件地址")
- private String url;
-
- @Schema(name = "创建时间")
- private Date createDate;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dto/KnowledgePathDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dto/KnowledgePathDTO.java
deleted file mode 100644
index 24c59b3..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/dto/KnowledgePathDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.iailab.module.knowledge.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 09:09:00
- */
-@Data
-@Schema(name = "知识库目录")
-public class KnowledgePathDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- private String id;
-
- @Schema(name = "级联value")
- private String value;
-
- @Schema(name = "标签")
- private String label;
-
- @Schema(name = "父ID")
- private String parentId;
-
- @Schema(name = "children")
- private List<KnowledgePathDTO> children;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/entity/KnowledgeDetEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/entity/KnowledgeDetEntity.java
deleted file mode 100644
index 883f4b9..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/entity/KnowledgeDetEntity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.iailab.module.knowledge.entity;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月25日 16:53:00
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_knowledge_det")
-public class KnowledgeDetEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId
- private String id;
-
- /**
- * 树形图节点id
- */
- private String treeId;
-
- /**
- * 类型
- */
- private String typeId;
-
- /**
- * 标题
- */
- private String title;
-
- /**
- * 关键词
- */
- private String keyWords;
-
- /**
- * 技术分类
- */
- private String skillTypeId;
-
- /**
- * 网址
- */
- private String website;
-
- /**
- * 摘要
- */
- private String content;
-
- /**
- * 创建者
- */
- private Long creator;
-
- /**
- * 创建时间
- */
- private Date createDate;
-
- /**
- * 创建者
- */
- private Long updater;
-
- /**
- * 创建时间
- */
- private Date updateDate;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/entity/KnowledgePathEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/entity/KnowledgePathEntity.java
deleted file mode 100644
index 11d4197..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/entity/KnowledgePathEntity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.knowledge.entity;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月24日 21:10:00
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_knowledge_path")
-public class KnowledgePathEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId
- private String id;
-
- /**
- * 标签
- */
- private String label;
-
- /**
- * 父ID
- */
- private String parentId;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/KnowledgeDetService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/KnowledgeDetService.java
deleted file mode 100644
index e4a15aa..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/KnowledgeDetService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.iailab.module.knowledge.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.knowledge.dto.KnowledgeDetDTO;
-import com.iailab.module.knowledge.entity.KnowledgeDetEntity;
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月25日 17:20:00
- */
-public interface KnowledgeDetService extends BaseService<KnowledgeDetEntity> {
-
- PageData<KnowledgeDetDTO> page(Map<String, Object> params);
-
- KnowledgeDetDTO get(String id);
-
- void save(KnowledgeDetDTO dto);
-
- void update(KnowledgeDetDTO dto);
-
- void delete(String[] ids);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/KnowledgePathService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/KnowledgePathService.java
deleted file mode 100644
index 94c7c12..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/KnowledgePathService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.iailab.module.knowledge.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.knowledge.dto.KnowledgePathDTO;
-import com.iailab.module.knowledge.entity.KnowledgePathEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月25日 17:21:00
- */
-public interface KnowledgePathService extends BaseService<KnowledgePathEntity> {
-
- PageData<KnowledgePathDTO> page(Map<String, Object> params);
-
- List<KnowledgePathDTO> list(Map<String, Object> params);
-
- List<KnowledgePathDTO> tree();
-
- KnowledgePathDTO get(String id);
-
- void save(KnowledgePathDTO dto);
-
- void update(KnowledgePathDTO dto);
-
- void delete(String id);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/impl/KnowledgeDetServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/impl/KnowledgeDetServiceImpl.java
deleted file mode 100644
index dff9918..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/impl/KnowledgeDetServiceImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.iailab.module.knowledge.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.knowledge.dao.KnowledgeDetDao;
-import com.iailab.module.knowledge.dto.KnowledgeDetDTO;
-import com.iailab.module.knowledge.entity.KnowledgeDetEntity;
-import com.iailab.module.knowledge.service.KnowledgeDetService;
-import com.iailab.module.oss.dto.OssFileDTO;
-import com.iailab.module.oss.service.OssFileService;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月25日 17:33:00
- */
-@Service
-public class KnowledgeDetServiceImpl extends BaseServiceImpl<KnowledgeDetDao, KnowledgeDetEntity> implements KnowledgeDetService {
-
- @Resource
- private OssFileService ossAppService;
-
- private final String BUSINESS_TYPE = "knowledge";
-
- @Override
- public PageData<KnowledgeDetDTO> page(Map<String, Object> params) {
- IPage<KnowledgeDetEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- PageData<KnowledgeDetDTO> result = getPageData(page, KnowledgeDetDTO.class);
- result.getList().forEach(item -> {
- List<OssFileDTO> fileDTOS = ossAppService.getByBusinessId(item.getId());
- if (!CollectionUtils.isEmpty(fileDTOS)) {
- OssFileDTO fileDTO = fileDTOS.get(0);
- item.setFileName(fileDTO.getFileName());
- item.setFilePostfix(fileDTO.getFilePostfix());
- item.setUrl(fileDTO.getUrl());
- }
- });
- return result;
- }
-
- private QueryWrapper<KnowledgeDetEntity> getWrapper(Map<String, Object> params) {
- String treeId = (String) params.get("treeId");
- String title = (String) params.get("title");
- String keyWords = (String) params.get("keyWords");
- QueryWrapper<KnowledgeDetEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(treeId), "tree_id", treeId)
- .like(StringUtils.isNotBlank(title), "title", title)
- .like(StringUtils.isNotBlank(keyWords), "key_words", keyWords);
- return wrapper;
- }
-
- @Override
- public KnowledgeDetDTO get(String id) {
- KnowledgeDetEntity entity = baseDao.selectById(id);
- KnowledgeDetDTO dto = ConvertUtils.sourceToTarget(entity, KnowledgeDetDTO.class);
- List<OssFileDTO> fileDTOS = ossAppService.getByBusinessId(dto.getId());
- if (!CollectionUtils.isEmpty(fileDTOS)) {
- OssFileDTO fileDTO = fileDTOS.get(0);
- dto.setFileName(fileDTO.getFileName());
- dto.setFilePostfix(fileDTO.getFilePostfix());
- dto.setUrl(fileDTO.getUrl());
- }
- return dto;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void save(KnowledgeDetDTO dto) {
- KnowledgeDetEntity entity = ConvertUtils.sourceToTarget(dto, KnowledgeDetEntity.class);
- entity.setId(UUID.randomUUID().toString());
- entity.setCreateDate(new Date());
- insert(entity);
- OssFileDTO fileDTO = new OssFileDTO();
- fileDTO.setBusinessId(entity.getId());
- fileDTO.setType(BUSINESS_TYPE);
- fileDTO.setFileName(dto.getFileName());
- fileDTO.setFilePostfix(dto.getFilePostfix());
- fileDTO.setUrl(dto.getUrl());
- fileDTO.setSort(0);
- ossAppService.save(fileDTO);
- }
-
- @Override
- public void update(KnowledgeDetDTO dto) {
- KnowledgeDetEntity entity = ConvertUtils.sourceToTarget(dto, KnowledgeDetEntity.class);
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/impl/KnowledgePathServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/impl/KnowledgePathServiceImpl.java
deleted file mode 100644
index 171bc87..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/knowledge/service/impl/KnowledgePathServiceImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.iailab.module.knowledge.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.knowledge.dao.KnowledgePathDao;
-import com.iailab.module.knowledge.dto.KnowledgePathDTO;
-import com.iailab.module.knowledge.entity.KnowledgePathEntity;
-import com.iailab.module.knowledge.service.KnowledgePathService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月25日 17:33:00
- */
-@Service
-public class KnowledgePathServiceImpl extends BaseServiceImpl<KnowledgePathDao, KnowledgePathEntity> implements KnowledgePathService {
- @Resource
- public KnowledgePathDao knowledgePathDao;
-
- final String ROOT = "0000000000";
-
- @Override
- public PageData<KnowledgePathDTO> page(Map<String, Object> params) {
- IPage<KnowledgePathEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, KnowledgePathDTO.class);
- }
-
- private QueryWrapper<KnowledgePathEntity> getWrapper(Map<String, Object> params) {
- String treeId = (String) params.get("treeId");
- String title = (String) params.get("title");
- String keyWords = (String) params.get("keyWords");
- QueryWrapper<KnowledgePathEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(treeId), "tree_id", treeId)
- .like(StringUtils.isNotBlank(title), "title", title)
- .like(StringUtils.isNotBlank(keyWords), "key_words", keyWords);
- return wrapper;
- }
-
- @Override
- public List<KnowledgePathDTO> list(Map<String, Object> params) {
- return baseDao.selectPathList();
- }
-
- /**
- * 查询树形图
- *
- * @return 树形图
- */
- @Override
- public List<KnowledgePathDTO> tree() {
- List<KnowledgePathDTO> resultList = new ArrayList<>();
- // 所有树形图节点
- List<KnowledgePathDTO> dataList = knowledgePathDao.selectPathList();
- // 先取出根节点
- for (KnowledgePathDTO item : dataList) {
- // 根节点的父id为0000000000
- if (ROOT.equals(item.getParentId())) {
- resultList.add(item);
- }
- }
- // 根据根节点id，查询对应子节点
- for (KnowledgePathDTO parent : resultList) {
- List<KnowledgePathDTO> childList = getChild(parent.getId(), dataList);
- parent.setChildren(childList);
- }
-
- return resultList;
- }
-
- /**
- * 设置子节点
- *
- * @param parentId 父节点id
- * @param dataList 所有节点
- * @return 子节点列表
- */
- private List<KnowledgePathDTO> getChild(String parentId, List<KnowledgePathDTO> dataList) {
- List<KnowledgePathDTO> childList = new ArrayList<>();
- // 把节点的子节点找出
- for (KnowledgePathDTO item : dataList) {
- if (parentId.equals(item.getParentId())) {
- childList.add(item);
- }
- }
- // 递归
- for (KnowledgePathDTO parent : childList) {
- parent.setChildren(getChild(parent.getId(), dataList));
- }
- // 如果没有子节点了，设置一个空列表
- if (childList.size() == 0) {
- return new ArrayList<>();
- }
- return childList;
- }
-
- @Override
- public KnowledgePathDTO get(String id) {
- KnowledgePathEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, KnowledgePathDTO.class);
- }
-
- @Override
- public void save(KnowledgePathDTO dto) {
- KnowledgePathEntity entity = ConvertUtils.sourceToTarget(dto, KnowledgePathEntity.class);
- insert(entity);
- }
-
- @Override
- public void update(KnowledgePathDTO dto) {
- KnowledgePathEntity entity = ConvertUtils.sourceToTarget(dto, KnowledgePathEntity.class);
- updateById(entity);
- }
-
- @Override
- public void delete(String id) {
- baseDao.delete(new QueryWrapper<KnowledgePathEntity>()
- .eq(StringUtils.isNotBlank(id), "id", id)
- .or().eq(StringUtils.isNotBlank(id), "parent_id", id)
- );
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelController.java
new file mode 100644
index 0000000..5f18372
--- /dev/null
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelController.java
@@ -0,0 +1,250 @@
+package com.iailab.module.mcs.controller;
+
+import com.iailab.common.annotation.LogOperation;
+import com.iailab.common.enums.IsEnableEnum;
+import com.iailab.framework.common.page.PageData;
+import com.iailab.common.utils.Constant;
+import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.util.validation.ValidationUtils;
+import com.iailab.framework.common.validation.group.AddGroup;
+import com.iailab.framework.common.validation.group.DefaultGroup;
+import com.iailab.framework.common.validation.group.UpdateGroup;
+import com.iailab.framework.security.core.util.SecurityFrameworkUtils;
+import com.iailab.module.mcs.dto.StModelDTO;
+import com.iailab.module.mcs.dto.StModelOutDTO;
+import com.iailab.module.mcs.dto.StModelParamDTO;
+import com.iailab.module.mcs.dto.StModelSettingDTO;
+import com.iailab.module.mcs.entity.StModelOutEntity;
+import com.iailab.module.mcs.entity.StModelParamEntity;
+import com.iailab.module.mcs.entity.StModelSettingEntity;
+import com.iailab.module.mcs.service.StModelOutService;
+import com.iailab.module.mcs.service.StModelParamService;
+import com.iailab.module.mcs.service.StModelService;
+import com.iailab.module.mcs.service.StModelSettingService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import javax.annotation.Resource;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.*;
+
+import static com.iailab.framework.common.pojo.CommonResult.success;
+
+
+/**
+ * @author lirm 1343021927@qq.com
+ * @since 1.0.0 2023-05-10
+ */
+@RestController
+@RequestMapping("/model/mcs/st-model")
+public class StModelController {
+ @Resource
+ private StModelService stModelService;
+
+ @Resource
+ private StModelParamService stModelParamService;
+
+ @Resource
+ private StModelSettingService stModelSettingService;
+
+ @Resource
+ private StModelOutService stModelOutService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
+ })
+ public CommonResult<PageData<StModelDTO>> page(@RequestParam Map<String, Object> params) {
+ PageData<StModelDTO> page = stModelService.page(params);
+
+ return success(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ public CommonResult<StModelDTO> get(@PathVariable("id") String id) {
+ StModelDTO data = stModelService.get(id);
+
+ List<StModelParamDTO> tParamPage = stModelParamService.getByModelId(id);
+ data.setModelParamList(tParamPage);
+
+ Map<String, Object> params = new HashMap<String, Object>(1);
+ params.put("modelId", data.getId());
+ List<StModelSettingDTO> tSettingPage = stModelSettingService.getAll(params);
+ data.setModelSettingList(tSettingPage);
+
+ Map<String, Object> out = new HashMap<String, Object>(1);
+ out.put("modelId", data.getId());
+ List<StModelOutDTO> tOutPage = stModelOutService.getAll(out);
+ data.setModelOutList(tOutPage);
+
+ return new CommonResult<StModelDTO>().setData(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @Transactional
+ public CommonResult save(@RequestBody StModelDTO dto) {
+ //效验数据
+ ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
+
+ dto.setId(UUID.randomUUID().toString());
+ List<StModelParamDTO> tParamList = dto.getModelParamList();
+ if (tParamList != null) {
+ for (int i = 0; i < tParamList.size(); i++) {
+ StModelParamDTO tParamDTO = new StModelParamDTO();
+ tParamDTO = tParamList.get(i);
+ StModelParamEntity tParamEntity = new StModelParamEntity();
+ tParamEntity.setModelId(dto.getId());
+ tParamEntity.setParamName(tParamDTO.getParamName());
+ tParamEntity.setParamId(tParamDTO.getParamId());
+ tParamEntity.setParamOrder(tParamDTO.getParamOrder());
+ tParamEntity.setParamPortOrder(tParamDTO.getParamPortOrder());
+ tParamEntity.setDataLength(tParamDTO.getDataLength());
+ tParamEntity.setParamType(tParamDTO.getParamType());
+ stModelParamService.insert(tParamEntity);
+ }
+ }
+ List<StModelSettingDTO> tSettingList = dto.getModelSettingList();
+ if (tSettingList != null) {
+ for (int i = 0; i < tSettingList.size(); i++) {
+ StModelSettingEntity tSettingEntity = ConvertUtils.sourceToTarget(tSettingList.get(i), StModelSettingEntity.class);
+ tSettingEntity.setModelId(dto.getId());
+ stModelSettingService.insert(tSettingEntity);
+ }
+ }
+
+ List<StModelOutDTO> tOutList = dto.getModelOutList();
+ if (tOutList != null) {
+ for (int i = 0; i < tOutList.size(); i++) {
+ StModelOutEntity tOutEntity = ConvertUtils.sourceToTarget(tOutList.get(i), StModelOutEntity.class);
+ tOutEntity.setModelId(dto.getId());
+ tOutEntity.setSort(i+1);
+ stModelOutService.insert(tOutEntity);
+ }
+ }
+ dto.setCreator(SecurityFrameworkUtils.getLoginUserId());
+ dto.setCreateDate(new Date());
+ dto.setUpdater(SecurityFrameworkUtils.getLoginUserId());
+ dto.setUpdateDate(new Date());
+ dto.setIsEnable(IsEnableEnum.ENABLE.value());
+ stModelService.save(dto);
+ return new CommonResult();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @Transactional
+ public CommonResult update(@RequestBody StModelDTO dto) {
+ //效验数据
+ ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
+
+ List<StModelParamDTO> tParamList = dto.getModelParamList();
+ if (tParamList != null) {
+ stModelParamService.deleteByModelId(dto.getId());
+ for (int i = 0; i < tParamList.size(); i++) {
+ StModelParamDTO tParamDTO = new StModelParamDTO();
+ tParamDTO = tParamList.get(i);
+ StModelParamEntity tParamEntity = new StModelParamEntity();
+ tParamEntity.setModelId(dto.getId());
+ tParamEntity.setParamName(tParamDTO.getParamName());
+ tParamEntity.setParamId(tParamDTO.getParamId());
+ tParamEntity.setParamOrder(tParamDTO.getParamOrder());
+ tParamEntity.setParamPortOrder(tParamDTO.getParamPortOrder());
+ tParamEntity.setDataLength(tParamDTO.getDataLength());
+ tParamEntity.setParamType(tParamDTO.getParamType());
+
+ stModelParamService.insert(tParamEntity);
+ }
+ }
+ List<StModelSettingDTO> tSettingList = dto.getModelSettingList();
+ if (tSettingList != null) {
+ stModelSettingService.deleteByModelId(dto.getId());
+ for (int i = 0; i < tSettingList.size(); i++) {
+ StModelSettingEntity tSettingEntity = ConvertUtils.sourceToTarget(tSettingList.get(i), StModelSettingEntity.class);
+ tSettingEntity.setModelId(dto.getId());
+ stModelSettingService.insert(tSettingEntity);
+ }
+ }
+ List<StModelOutDTO> tOutList = dto.getModelOutList();
+ if (tOutList != null) {
+ stModelOutService.deleteByModelId(dto.getId());
+ for (int i = 0; i < tOutList.size(); i++) {
+ StModelOutEntity tOutEntity = ConvertUtils.sourceToTarget(tOutList.get(i), StModelOutEntity.class);
+ tOutEntity.setModelId(dto.getId());
+ tOutEntity.setSort(i+1);
+ stModelOutService.insert(tOutEntity);
+ }
+ }
+
+ Long id = SecurityFrameworkUtils.getLoginUserId();
+ dto.setUpdater(id);
+ dto.setUpdateDate(new Date());
+ stModelService.update(dto);
+
+ return new CommonResult<Object>();
+ }
+
+ @DeleteMapping
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @Transactional
+ public CommonResult delete(@RequestBody String[] ids) {
+ List<String> idsList = Arrays.asList(ids);
+ for (int i = 0; i < idsList.size(); i++) {
+ stModelParamService.deleteByModelId(idsList.get(i));//删除模型参数表数据
+ stModelSettingService.deleteByModelId(idsList.get(i));//删除模型设置表数据
+ }
+
+ stModelService.deleteByIds(ids);//删除模型表数据
+
+ return new CommonResult();
+ }
+
+ @PutMapping("/enable")
+ @Operation(summary = "启用")
+ @LogOperation("启用")
+ @Transactional
+ public CommonResult enable(@RequestBody String[] ids) {
+ stModelService.enableByIds(ids);
+ return new CommonResult();
+ }
+
+ @PutMapping("/disable")
+ @Operation(summary = "禁用")
+ @LogOperation("禁用")
+ @Transactional
+ public CommonResult disable(@RequestBody String[] ids) {
+ stModelService.disableByIds(ids);
+ return new CommonResult();
+ }
+
+
+ /**
+ * 上传模型
+ */
+ @Operation(summary = "上传模型")
+ @PostMapping("/upload")
+ public CommonResult<Map<String, Object>> upload(@RequestParam("file") MultipartFile file) throws IOException {
+ Map<String, Object> data = stModelService.upload(file);
+ return new CommonResult<Map<String, Object>>().setData(data);
+ }
+
+ @Operation(summary = "上传模型")
+ @GetMapping("/relation")
+ public CommonResult getRelation() {
+ Map<String, Object> data = stModelService.getRelation();
+ return new CommonResult().setData(data);
+ }
+}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelDocController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelDocController.java
new file mode 100644
index 0000000..6cd8d06
--- /dev/null
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelDocController.java
@@ -0,0 +1,51 @@
+package com.iailab.module.mcs.controller;
+
+import com.iailab.common.annotation.LogOperation;
+import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.framework.common.util.validation.ValidationUtils;
+import com.iailab.framework.common.validation.group.DefaultGroup;
+import com.iailab.framework.common.validation.group.UpdateGroup;
+import com.iailab.module.mcs.dto.StModelDocDTO;
+import com.iailab.module.mcs.service.StModelDocService;
+import io.swagger.v3.oas.annotations.Operation;
+import javax.annotation.Resource;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequestMapping("/model/mcs/st-model-doc")
+public class StModelDocController {
+
+ @Resource
+ private StModelDocService stModelDocService;
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ public CommonResult<StModelDocDTO> get(@PathVariable("id") String id) {
+ StModelDocDTO data = stModelDocService.get(id);
+
+ return new CommonResult<StModelDocDTO>().setData(data);
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ public CommonResult update(@RequestBody StModelDocDTO dto){
+ //效验数据
+ ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
+ stModelDocService.update(dto);
+ return new CommonResult();
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @Transactional
+ public CommonResult save(@RequestBody StModelDocDTO dto){
+ //效验数据
+ ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
+ stModelDocService.save(dto);
+ return new CommonResult();
+ }
+}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelRequestLogController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelRequestLogController.java
new file mode 100644
index 0000000..b1a636d
--- /dev/null
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelRequestLogController.java
@@ -0,0 +1,46 @@
+package com.iailab.module.mcs.controller;
+
+import com.iailab.framework.common.constant.Constant;
+import com.iailab.framework.common.page.PageData;
+import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.module.mcs.dto.StModelRequestLogDTO;
+import com.iailab.module.mcs.service.StModelRequestLogService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+import java.util.Map;
+
+/**
+ * @author PanZhibao
+ * @Description
+ * @createTime 2024年05月22日
+ */
+@RestController
+@RequestMapping("/model/mcs/model-request-log")
+@Tag(name = "模型调用日志表")
+public class StModelRequestLogController {
+
+ @Resource
+ private StModelRequestLogService stModelRequestLogService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
+ })
+ public CommonResult<PageData<StModelRequestLogDTO>> page(@RequestParam Map<String, Object> params){
+ PageData<StModelRequestLogDTO> page = stModelRequestLogService.page(params);
+ return new CommonResult<PageData<StModelRequestLogDTO>>().setData(page);
+ }
+}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelRunlogController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelRunlogController.java
new file mode 100644
index 0000000..77d97d1
--- /dev/null
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/StModelRunlogController.java
@@ -0,0 +1,96 @@
+package com.iailab.module.mcs.controller;
+
+import com.iailab.common.annotation.LogOperation;
+import com.iailab.framework.common.page.PageData;
+import com.iailab.common.utils.Constant;
+import com.iailab.framework.common.pojo.CommonResult;
+
+import com.iailab.framework.common.util.validation.ValidationUtils;
+import com.iailab.framework.common.validation.group.AddGroup;
+import com.iailab.framework.common.validation.group.DefaultGroup;
+import com.iailab.framework.common.validation.group.UpdateGroup;
+import com.iailab.module.mcs.dto.StModelRunlogDTO;
+import com.iailab.module.mcs.service.StModelRunlogService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import javax.annotation.Resource;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+
+import java.util.Map;
+
+
+/**
+ * 运行日志表
+ *
+ * @author lirm ${email}
+ * @since 1.0.0 2023-07-04
+ */
+@RestController
+@RequestMapping("/model/mcs/runlog")
+@Tag(name = "运行日志表")
+public class StModelRunlogController {
+ @Resource
+ private StModelRunlogService runlogService;
+
+ @GetMapping("page")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
+ })
+ public CommonResult<PageData<StModelRunlogDTO>> page(@RequestParam Map<String, Object> params){
+ PageData<StModelRunlogDTO> page = runlogService.queryPage(params);
+
+ return new CommonResult<PageData<StModelRunlogDTO>>().setData(page);
+ }
+
+ @GetMapping("{id}")
+ @Operation(summary = "信息")
+ @PreAuthorize("@ss.hasPermission('mcs:runlog:info')")
+ public CommonResult<StModelRunlogDTO> get(@PathVariable("id") Long id){
+ StModelRunlogDTO data = runlogService.get(id);
+
+ return new CommonResult<StModelRunlogDTO>().setData(data);
+ }
+
+ @PostMapping
+ @Operation(summary = "保存")
+ @LogOperation("保存")
+ @PreAuthorize("@ss.hasPermission('mcs:runlog:save')")
+ public CommonResult save(@RequestBody StModelRunlogDTO dto){
+ //效验数据
+ ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
+
+ runlogService.save(dto);
+
+ return new CommonResult();
+ }
+
+ @PutMapping
+ @Operation(summary = "修改")
+ @LogOperation("修改")
+ @PreAuthorize("@ss.hasPermission('mcs:runlog:update')")
+ public CommonResult update(@RequestBody StModelRunlogDTO dto){
+ //效验数据
+ ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
+
+ runlogService.update(dto);
+
+ return new CommonResult();
+ }
+
+ @DeleteMapping
+ @Operation(summary = "删除")
+ @LogOperation("删除")
+ @PreAuthorize("@ss.hasPermission('mcs:runlog:delete')")
+ public CommonResult delete(@RequestBody Long[] ids){
+ runlogService.delete(ids);
+ return new CommonResult();
+ }
+}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelController.java
deleted file mode 100644
index c51113e..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelController.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package com.iailab.module.mcs.controller.admin;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.common.enums.IsEnableEnum;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.Constant;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.framework.security.core.util.SecurityFrameworkUtils;
-import com.iailab.module.mcs.dto.StModelDTO;
-import com.iailab.module.mcs.dto.StModelOutDTO;
-import com.iailab.module.mcs.dto.StModelParamDTO;
-import com.iailab.module.mcs.dto.StModelSettingDTO;
-import com.iailab.module.mcs.entity.StModelOutEntity;
-import com.iailab.module.mcs.entity.StModelParamEntity;
-import com.iailab.module.mcs.entity.StModelSettingEntity;
-import com.iailab.module.mcs.service.StModelOutService;
-import com.iailab.module.mcs.service.StModelParamService;
-import com.iailab.module.mcs.service.StModelService;
-import com.iailab.module.mcs.service.StModelSettingService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.util.*;
-
-import static com.iailab.framework.common.pojo.CommonResult.success;
-
-
-/**
- * @author lirm 1343021927@qq.com
- * @since 1.0.0 2023-05-10
- */
-@RestController
-@RequestMapping("/model/mcs/st-model")
-public class StModelController {
- @Resource
- private StModelService stModelService;
-
- @Resource
- private StModelParamService stModelParamService;
-
- @Resource
- private StModelSettingService stModelSettingService;
-
- @Resource
- private StModelOutService stModelOutService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<StModelDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<StModelDTO> page = stModelService.page(params);
-
- return success(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<StModelDTO> get(@PathVariable("id") String id) {
- StModelDTO data = stModelService.get(id);
-
- List<StModelParamDTO> tParamPage = stModelParamService.getByModelId(id);
- data.setModelParamList(tParamPage);
-
- Map<String, Object> params = new HashMap<String, Object>(1);
- params.put("modelId", data.getId());
- List<StModelSettingDTO> tSettingPage = stModelSettingService.getAll(params);
- data.setModelSettingList(tSettingPage);
-
- Map<String, Object> out = new HashMap<String, Object>(1);
- out.put("modelId", data.getId());
- List<StModelOutDTO> tOutPage = stModelOutService.getAll(out);
- data.setModelOutList(tOutPage);
-
- return new CommonResult<StModelDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @Transactional
- public CommonResult save(@RequestBody StModelDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- dto.setId(UUID.randomUUID().toString());
- List<StModelParamDTO> tParamList = dto.getModelParamList();
- if (tParamList != null) {
- for (int i = 0; i < tParamList.size(); i++) {
- StModelParamDTO tParamDTO = new StModelParamDTO();
- tParamDTO = tParamList.get(i);
- StModelParamEntity tParamEntity = new StModelParamEntity();
- tParamEntity.setModelId(dto.getId());
- tParamEntity.setParamName(tParamDTO.getParamName());
- tParamEntity.setParamId(tParamDTO.getParamId());
- tParamEntity.setParamOrder(tParamDTO.getParamOrder());
- tParamEntity.setParamPortOrder(tParamDTO.getParamPortOrder());
- tParamEntity.setDataLength(tParamDTO.getDataLength());
- tParamEntity.setParamType(tParamDTO.getParamType());
- stModelParamService.insert(tParamEntity);
- }
- }
- List<StModelSettingDTO> tSettingList = dto.getModelSettingList();
- if (tSettingList != null) {
- for (int i = 0; i < tSettingList.size(); i++) {
- StModelSettingEntity tSettingEntity = ConvertUtils.sourceToTarget(tSettingList.get(i), StModelSettingEntity.class);
- tSettingEntity.setModelId(dto.getId());
- stModelSettingService.insert(tSettingEntity);
- }
- }
-
- List<StModelOutDTO> tOutList = dto.getModelOutList();
- if (tOutList != null) {
- for (int i = 0; i < tOutList.size(); i++) {
- StModelOutEntity tOutEntity = ConvertUtils.sourceToTarget(tOutList.get(i), StModelOutEntity.class);
- tOutEntity.setModelId(dto.getId());
- tOutEntity.setSort(i+1);
- stModelOutService.insert(tOutEntity);
- }
- }
- dto.setCreator(SecurityFrameworkUtils.getLoginUserId());
- dto.setCreateDate(new Date());
- dto.setUpdater(SecurityFrameworkUtils.getLoginUserId());
- dto.setUpdateDate(new Date());
- dto.setIsEnable(IsEnableEnum.ENABLE.value());
- stModelService.save(dto);
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @Transactional
- public CommonResult update(@RequestBody StModelDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- List<StModelParamDTO> tParamList = dto.getModelParamList();
- if (tParamList != null) {
- stModelParamService.deleteByModelId(dto.getId());
- for (int i = 0; i < tParamList.size(); i++) {
- StModelParamDTO tParamDTO = new StModelParamDTO();
- tParamDTO = tParamList.get(i);
- StModelParamEntity tParamEntity = new StModelParamEntity();
- tParamEntity.setModelId(dto.getId());
- tParamEntity.setParamName(tParamDTO.getParamName());
- tParamEntity.setParamId(tParamDTO.getParamId());
- tParamEntity.setParamOrder(tParamDTO.getParamOrder());
- tParamEntity.setParamPortOrder(tParamDTO.getParamPortOrder());
- tParamEntity.setDataLength(tParamDTO.getDataLength());
- tParamEntity.setParamType(tParamDTO.getParamType());
-
- stModelParamService.insert(tParamEntity);
- }
- }
- List<StModelSettingDTO> tSettingList = dto.getModelSettingList();
- if (tSettingList != null) {
- stModelSettingService.deleteByModelId(dto.getId());
- for (int i = 0; i < tSettingList.size(); i++) {
- StModelSettingEntity tSettingEntity = ConvertUtils.sourceToTarget(tSettingList.get(i), StModelSettingEntity.class);
- tSettingEntity.setModelId(dto.getId());
- stModelSettingService.insert(tSettingEntity);
- }
- }
- List<StModelOutDTO> tOutList = dto.getModelOutList();
- if (tOutList != null) {
- stModelOutService.deleteByModelId(dto.getId());
- for (int i = 0; i < tOutList.size(); i++) {
- StModelOutEntity tOutEntity = ConvertUtils.sourceToTarget(tOutList.get(i), StModelOutEntity.class);
- tOutEntity.setModelId(dto.getId());
- tOutEntity.setSort(i+1);
- stModelOutService.insert(tOutEntity);
- }
- }
-
- Long id = SecurityFrameworkUtils.getLoginUserId();
- dto.setUpdater(id);
- dto.setUpdateDate(new Date());
- stModelService.update(dto);
-
- return new CommonResult<Object>();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @Transactional
- public CommonResult delete(@RequestBody String[] ids) {
- List<String> idsList = Arrays.asList(ids);
- for (int i = 0; i < idsList.size(); i++) {
- stModelParamService.deleteByModelId(idsList.get(i));//删除模型参数表数据
- stModelSettingService.deleteByModelId(idsList.get(i));//删除模型设置表数据
- }
-
- stModelService.deleteByIds(ids);//删除模型表数据
-
- return new CommonResult();
- }
-
- @PutMapping("/enable")
- @Operation(summary = "启用")
- @LogOperation("启用")
- @Transactional
- public CommonResult enable(@RequestBody String[] ids) {
- stModelService.enableByIds(ids);
- return new CommonResult();
- }
-
- @PutMapping("/disable")
- @Operation(summary = "禁用")
- @LogOperation("禁用")
- @Transactional
- public CommonResult disable(@RequestBody String[] ids) {
- stModelService.disableByIds(ids);
- return new CommonResult();
- }
-
-
- /**
- * 上传模型
- */
- @Operation(summary = "上传模型")
- @PostMapping("/upload")
- public CommonResult<Map<String, Object>> upload(@RequestParam("file") MultipartFile file) throws IOException {
- Map<String, Object> data = stModelService.upload(file);
- return new CommonResult<Map<String, Object>>().setData(data);
- }
-
- @Operation(summary = "上传模型")
- @GetMapping("/relation")
- public CommonResult getRelation() {
- Map<String, Object> data = stModelService.getRelation();
- return new CommonResult().setData(data);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelDocController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelDocController.java
deleted file mode 100644
index fa93249..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelDocController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.iailab.module.mcs.controller.admin;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.mcs.dto.StModelDocDTO;
-import com.iailab.module.mcs.service.StModelDocService;
-import io.swagger.v3.oas.annotations.Operation;
-import javax.annotation.Resource;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-
-@RestController
-@RequestMapping("/model/mcs/st-model-doc")
-public class StModelDocController {
-
- @Resource
- private StModelDocService stModelDocService;
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<StModelDocDTO> get(@PathVariable("id") String id) {
- StModelDocDTO data = stModelDocService.get(id);
-
- return new CommonResult<StModelDocDTO>().setData(data);
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- public CommonResult update(@RequestBody StModelDocDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
- stModelDocService.update(dto);
- return new CommonResult();
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @Transactional
- public CommonResult save(@RequestBody StModelDocDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
- stModelDocService.save(dto);
- return new CommonResult();
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelRequestLogController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelRequestLogController.java
deleted file mode 100644
index d0c3bfe..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelRequestLogController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.iailab.module.mcs.controller.admin;
-
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.mcs.dto.StModelRequestLogDTO;
-import com.iailab.module.mcs.service.StModelRequestLogService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月22日
- */
-@RestController
-@RequestMapping("/model/mcs/model-request-log")
-@Tag(name = "模型调用日志表")
-public class StModelRequestLogController {
-
- @Resource
- private StModelRequestLogService stModelRequestLogService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<StModelRequestLogDTO>> page(@RequestParam Map<String, Object> params){
- PageData<StModelRequestLogDTO> page = stModelRequestLogService.page(params);
- return new CommonResult<PageData<StModelRequestLogDTO>>().setData(page);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelRunlogController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelRunlogController.java
deleted file mode 100644
index c41299f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/admin/StModelRunlogController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.iailab.module.mcs.controller.admin;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.Constant;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.mcs.dto.StModelRunlogDTO;
-import com.iailab.module.mcs.service.StModelRunlogService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.Map;
-
-
-/**
- * 运行日志表
- *
- * @author lirm ${email}
- * @since 1.0.0 2023-07-04
- */
-@RestController
-@RequestMapping("/model/mcs/runlog")
-@Tag(name = "运行日志表")
-public class StModelRunlogController {
- @Resource
- private StModelRunlogService runlogService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) ,
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) ,
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") ,
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<StModelRunlogDTO>> page(@RequestParam Map<String, Object> params){
- PageData<StModelRunlogDTO> page = runlogService.queryPage(params);
-
- return new CommonResult<PageData<StModelRunlogDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- @PreAuthorize("@ss.hasPermission('mcs:runlog:info')")
- public CommonResult<StModelRunlogDTO> get(@PathVariable("id") Long id){
- StModelRunlogDTO data = runlogService.get(id);
-
- return new CommonResult<StModelRunlogDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('mcs:runlog:save')")
- public CommonResult save(@RequestBody StModelRunlogDTO dto){
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- runlogService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('mcs:runlog:update')")
- public CommonResult update(@RequestBody StModelRunlogDTO dto){
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- runlogService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('mcs:runlog:delete')")
- public CommonResult delete(@RequestBody Long[] ids){
- runlogService.delete(ids);
- return new CommonResult();
- }
-
-// @GetMapping("export")
-// @Operation(summary = "导出")
-// @LogOperation("导出")
-// @PreAuthorize("@ss.hasPermission('mcs:runlog:export')")
-// public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-// List<StModelRunlogDTO> list = runlogService.listAll(params);
-//
-// ExcelUtils.exportExcelToTarget(response, null, list, StModelRunlogExcel.class);
-// }
-
- @GetMapping("list")
- @LogOperation("日志")
- public CommonResult<PageData<StModelRunlogDTO>> runlog(@RequestParam Map<String, Object> params) {
- params.put("limit", "8");
- PageData<StModelRunlogDTO> page = runlogService.queryPage(params);
-
- return new CommonResult<PageData<StModelRunlogDTO>>().setData(page);
- }
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/package-info.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/package-info.java
deleted file mode 100644
index 3bebde8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/controller/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.iailab.module.mcs.controller;
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelResultDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelResultDao.java
index 4b1c67e..0c25bb3 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelResultDao.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelResultDao.java
@@ -1,16 +1,10 @@
package com.iailab.module.mcs.dao;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.module.any.dto.AnyAllEvaluationDTO;
-import com.iailab.module.any.dto.AnyStoreReliabilityDTO;
-import com.iailab.module.data.dto.FeignQueryPointDTO;
-import com.iailab.common.dto.IndexStatisticDTO;
import com.iailab.framework.common.dao.BaseDao;
import com.iailab.module.mcs.dto.StModelResultDTO;
import com.iailab.module.mcs.entity.StModelResultEntity;
import org.apache.ibatis.annotations.Mapper;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -29,16 +23,7 @@
List<StModelResultDTO> getResultByCodeDate(Map<String, Object> params);
- void cleanModelResult(Map<String, Date> tMap);
-
void insertList(List<StModelResultEntity> list);
- List<IndexStatisticDTO> getModelResultList(FeignQueryPointDTO feignQueryPointDTO);
-
- IPage<AnyStoreReliabilityDTO> getStorePageList(IPage<StModelResultEntity> page, Map<String, Object> params);
-
- IPage<AnyAllEvaluationDTO> getEvaluationPageList(IPage<StModelResultEntity> page, Map<String, Object> params);
-
-// @DataSource("slave1")
- void migrationModelResult(List<StModelResultEntity> list);
+ void cleanModelResult(Map<String, Object> params);
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelRunlogDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelRunlogDao.java
index 38a90a2..ee9970c 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelRunlogDao.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dao/StModelRunlogDao.java
@@ -20,9 +20,6 @@
@Mapper
public interface StModelRunlogDao extends BaseDao<StModelRunlogEntity> {
- List<StModelRunlogDTO> getLastFxLog();
-
- List<StModelRunlogDTO> getLastJyLog();
List<StModelRunlogDTO> getLastLog(Map<String, Object> params);
@@ -31,7 +28,4 @@
IPage<StModelRunlogEntity> queryList(IPage<StModelRunlogEntity> page, @Param("params") Map<String, Object> params);
List<StModelRunlogDTO> listAll(Map<String, Object> params);
-
-// @DataSource("slave1")
- void migrationModelRunlog(List<StModelRunlogEntity> list);
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dto/StModelDocDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dto/StModelDocDTO.java
index 2aee4a8..e4dfbd7 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dto/StModelDocDTO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/dto/StModelDocDTO.java
@@ -1,7 +1,5 @@
package com.iailab.module.mcs.dto;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -20,66 +18,39 @@
public class StModelDocDTO implements Serializable {
private static final long serialVersionUID = 1L;
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_UUID)
+ @Schema(name = "id")
private String id;
- /**
- * 模型ID
- */
+ @Schema(name = "模型ID")
private String modelId;
- /**
- * URL
- */
+ @Schema(name = "URL")
private String url;
- /**
- * 方法
- */
+ @Schema(name = "方法")
private String method;
- /**
- * 输入参数
- */
+ @Schema(name = "输入参数")
private String params;
- /**
- * 参数示例
- */
+ @Schema(name = "参数示例")
private String paramsExample;
- /**
- * 输出结果
- */
+ @Schema(name = "输出结果")
private String result;
- /**
- * 结果示例
- */
+ @Schema(name = "结果示例")
private String resultExample;
- /**
- * 创建人
- */
+ @Schema(name = "创建人")
private Long creator;
- /**
- * 创建时间
- */
+ @Schema(name = "创建时间")
private Date createDate;
- /**
- * 修改人
- */
+ @Schema(name = "修改人")
private Long updater;
- /**
- * 修改时间
- */
+ @Schema(name = "修改时间")
private Date updateDate;
-
-
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/excel/StModelRunlogExcel.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/excel/StModelRunlogExcel.java
deleted file mode 100644
index ee30466..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/excel/StModelRunlogExcel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//package com.iailab.module.mcs.excel;
-//
-//import cn.afterturn.easypoi.excel.annotation.Excel;
-//import lombok.Data;
-//
-//import java.util.Date;
-//
-///**
-// * 运行日志表
-// *
-// * @author lirm ${email}
-// * @since 1.0.0 2023-06-21
-// */
-//@Data
-//public class StModelRunlogExcel {
-// @Excel(name = "id")
-// private Integer id;
-// @Excel(name = "模型代码")
-// private String modelCode;
-// @Excel(name = "模型名称")
-// private String modelName;
-// @Excel(name = "运行时间")
-// private Date runTime;
-// @Excel(name = "类别")
-// private String runType;
-// @Excel(name = "运行结果")
-// private String runCommonResult;
-//}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelResultService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelResultService.java
index b729f43..bd2c2b7 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelResultService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelResultService.java
@@ -1,10 +1,5 @@
package com.iailab.module.mcs.service;
-import com.iailab.common.dto.IndexStatisticDTO;
-import com.iailab.module.any.dto.AnyAllEvaluationDTO;
-import com.iailab.module.any.dto.AnyStoreReliabilityDTO;
-import com.iailab.module.data.dto.FeignQueryPointDTO;
-import com.iailab.framework.common.page.PageData;
import com.iailab.framework.common.service.CrudService;
import com.iailab.module.mcs.dto.StModelResultDTO;
import com.iailab.module.mcs.entity.StModelResultEntity;
@@ -22,27 +17,13 @@
*/
public interface StModelResultService extends CrudService<StModelResultEntity, StModelResultDTO> {
- Map<String, List<IndexStatisticDTO>> getResultList(Map<String, Object> params);
-
Map<String, Object> getLastResultMap(Map<String, Object> params);
Map<String, Object> getResultByCodeDate(Map<String, Object> params);
-
- List<StModelResultDTO> getLastResultByCode(Map<String, Object> params);
-
- void migrationModelResult(Map<String, Date> params);
-
- void addPy(String modelId, List<String> lines, Date runTime);
List<DataEntity> getValueList(String resultKey, Date startTime, Date endTime);
void addML(String id, Map<String, Object> result, Date runTime);
-
- List<IndexStatisticDTO> getModelResultList(FeignQueryPointDTO feignQueryPointDTO);
-
- PageData<AnyStoreReliabilityDTO> getStorePage(Map<String, Object> params);
-
- PageData<AnyAllEvaluationDTO> getAllEvaluationPage(Map<String, Object> params);
List<Map<String, Object>> getList(Map<String, Object> params);
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelRunlogService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelRunlogService.java
index d15860c..824c066 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelRunlogService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/StModelRunlogService.java
@@ -16,18 +16,9 @@
* @since 1.0.0 2023-06-21
*/
public interface StModelRunlogService extends CrudService<StModelRunlogEntity, StModelRunlogDTO> {
-
- List<StModelRunlogDTO> getLastFxLog(Integer limit);
-
- List<StModelRunlogDTO> getLastJyLog(Integer limit);
- void cleanRunlogTask(Map<String, Date> tMap);
+ void add(StModelRunlogDTO dto);
- PageData<StModelRunlogDTO> queryPage(Map<String, Object> params);
+ PageData<StModelRunlogDTO> queryPage(Map<String, Object> params);
- List<StModelRunlogDTO> listAll(Map<String, Object> params);
-
- void add(StModelRunlogDTO dto);
-
- void migrationModelRunlog(Map<String, Date> tMap);
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelResultServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelResultServiceImpl.java
index 4966719..1883ad5 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelResultServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelResultServiceImpl.java
@@ -1,13 +1,6 @@
package com.iailab.module.mcs.service.impl;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.common.dto.IndexStatisticDTO;
-import com.iailab.module.any.dto.AnyAllEvaluationDTO;
-import com.iailab.module.any.dto.AnyStoreReliabilityDTO;
-import com.iailab.module.data.dto.FeignQueryPointDTO;
-import com.iailab.framework.common.page.PageData;
import com.iailab.framework.common.service.impl.CrudServiceImpl;
import com.iailab.common.utils.DateUtils;
import com.iailab.module.mcs.dao.StModelResultDao;
@@ -20,7 +13,6 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -47,31 +39,6 @@
}
@Override
- public Map<String, List<IndexStatisticDTO>> getResultList(Map<String, Object> params) {
- params.put("sortType", "asc");
- Map<String, List<IndexStatisticDTO>> result = new HashMap<>(5);
- List<StModelResultEntity> list = stModelResultDao.getResultList(params);
- if (CollectionUtils.isEmpty(list)) {
- return result;
- }
- Map<String, List<StModelResultEntity>> groupList = list.stream().collect(Collectors.groupingBy(StModelResultEntity::getResultKey));
- groupList.forEach((k, v) -> {
- try{
- List<IndexStatisticDTO> itemList = v.stream().map(item -> {
- IndexStatisticDTO dto = new IndexStatisticDTO();
- dto.setData(new BigDecimal(item.getResultValue()));
- dto.setDateTime(item.getResultTime());
- return dto;
- }).collect(Collectors.toList());
- result.put(k, itemList);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- });
- return result;
- }
-
- @Override
public List<Map<String, Object>> getList(Map<String, Object> params) {
if (params.get("isAsc") != null && params.get("isAsc").toString().equals("false")) {
params.put("sortType", "desc");
@@ -91,11 +58,6 @@
result.add(vt);
});
return result;
- }
-
- @Override
- public List<StModelResultDTO> getLastResultByCode(Map<String, Object> params) {
- return baseDao.getLastResultByCode(params);
}
@Override
@@ -124,39 +86,6 @@
});
result.put("result_time", list.get(0).getResultTime());
return result;
- }
-
- @Override
- public void migrationModelResult(Map<String, Date> params) {
- List<StModelResultEntity> list = stModelResultDao.selectList(getDateWrapper(params));
- if (CollectionUtils.isEmpty(list)){
- return;
- }
- stModelResultDao.migrationModelResult(list);
- stModelResultDao.delete(getDateWrapper(params));
- }
-
- @Override
- public void addPy(String modelId, List<String> lines, Date runTime) {
- List<StModelResultEntity> list = new ArrayList<>();
-
- if (CollectionUtils.isEmpty(lines)) {
- return;
- }
- for (int i = 0; i < lines.size(); i ++) {
- JSONObject josnObject = JSONObject.parseObject(lines.get(i));
- for (String key : josnObject.keySet()) {
- StModelResultEntity entity = new StModelResultEntity();
- entity.setId(UUID.randomUUID().toString());
- entity.setModelId(modelId);
- entity.setLineIndex(i);
- entity.setResultKey(key);
- entity.setResultValue(josnObject.getString(key));
- entity.setResultTime(runTime);
- list.add(entity);
- }
- }
- baseDao.insertList(list);
}
@Override
@@ -201,30 +130,6 @@
baseDao.insertList(list);
}
-
- @Override
- public List<IndexStatisticDTO> getModelResultList(FeignQueryPointDTO feignQueryPointDTO) {
- return baseDao.getModelResultList(feignQueryPointDTO);
- }
-
- @Override
- public PageData<AnyStoreReliabilityDTO> getStorePage(Map<String, Object> params) {
- IPage<AnyStoreReliabilityDTO> page = baseDao.getStorePageList(
- getPage(params, "dateTime", false),
- params
- );
- return getPageData(page, AnyStoreReliabilityDTO.class);
- }
-
- @Override
- public PageData<AnyAllEvaluationDTO> getAllEvaluationPage(Map<String, Object> params) {
- IPage<AnyAllEvaluationDTO> page = baseDao.getEvaluationPageList(
- getPage(params, "dateTime", false),
- params
- );
- return getPageData(page, AnyAllEvaluationDTO.class);
-
- }
public QueryWrapper<StModelResultEntity> getDateWrapper(Map<String, Date> params) {
String startDate = DateUtils.format(params.get("startdate"),DateUtils.DATE_TIME_PATTERN);
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelRunlogServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelRunlogServiceImpl.java
index 9e1305a..0b34b95 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelRunlogServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/mcs/service/impl/StModelRunlogServiceImpl.java
@@ -3,23 +3,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.iailab.common.utils.Constant;
import com.iailab.framework.common.page.PageData;
import com.iailab.framework.common.service.impl.CrudServiceImpl;
-import com.iailab.common.utils.Constant;
import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
import com.iailab.module.mcs.dao.StModelRunlogDao;
import com.iailab.module.mcs.dto.StModelRunlogDTO;
import com.iailab.module.mcs.entity.StModelRunlogEntity;
import com.iailab.module.mcs.service.StModelRunlogService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@@ -32,9 +27,22 @@
@Service
public class StModelRunlogServiceImpl extends CrudServiceImpl<StModelRunlogDao, StModelRunlogEntity, StModelRunlogDTO> implements StModelRunlogService {
- @Resource
- private StModelRunlogDao runlogDao;
-
+ @Override
+ public PageData<StModelRunlogDTO> queryPage(Map<String, Object> params) {
+ long curPage = 1;
+ long limit = 10;
+
+ if(params.get(Constant.PAGE) != null){
+ curPage = Long.parseLong((String)params.get(Constant.PAGE));
+ }
+ if(params.get(Constant.LIMIT) != null){
+ limit = Long.parseLong((String)params.get(Constant.LIMIT));
+ }
+
+ IPage<StModelRunlogEntity> page = baseDao.queryList(new Page<>(curPage, limit), params);
+ return getPageData(page, StModelRunlogDTO.class);
+ }
+
@Override
public QueryWrapper<StModelRunlogEntity> getWrapper(Map<String, Object> params){
String modelCode = (String)params.get("modelCode");
@@ -48,71 +56,9 @@
}
@Override
- public List<StModelRunlogDTO> getLastFxLog(Integer limit) {
- Map<String, Object> params = new HashMap<>(1);
- params.put("runType", "separation_control");
- params.put("limit", limit == null ? 5 : limit);
- return runlogDao.getLastLog(params);
- }
-
- @Override
- public List<StModelRunlogDTO> getLastJyLog(Integer limit) {
- Map<String, Object> params = new HashMap<>(1);
- params.put("runType", "dosing_control");
- params.put("limit", limit == null ? 5 : limit);
- return runlogDao.getLastLog(params);
- }
-
- @Override
- public void cleanRunlogTask(Map<String, Date> tMap) {
- runlogDao.cleanRunlogTask(tMap);
- }
-
- @Override
- public PageData<StModelRunlogDTO> queryPage(Map<String, Object> params) {
- long curPage = 1;
- long limit = 10;
-
- if(params.get(Constant.PAGE) != null){
- curPage = Long.parseLong((String)params.get(Constant.PAGE));
- }
- if(params.get(Constant.LIMIT) != null){
- limit = Long.parseLong((String)params.get(Constant.LIMIT));
- }
-
- IPage<StModelRunlogEntity> page = baseDao.queryList(new Page<>(curPage, limit), params);
- return getPageData(page, StModelRunlogDTO.class);
- }
-
- @Override
- public List<StModelRunlogDTO> listAll(Map<String, Object> params) {
- return runlogDao.listAll(params);
- }
-
- @Override
public void add(StModelRunlogDTO dto) {
StModelRunlogEntity entity = ConvertUtils.sourceToTarget(dto, StModelRunlogEntity.class);
baseDao.insert(entity);
- }
-
- @Override
- public void migrationModelRunlog(Map<String, Date> tMap) {
- List<StModelRunlogEntity> list = runlogDao.selectList(getDateWrapper(tMap));
- if (CollectionUtils.isEmpty(list)){
- return;
- }
- runlogDao.migrationModelRunlog(list);
- runlogDao.delete(getDateWrapper(tMap));
- }
-
- public QueryWrapper<StModelRunlogEntity> getDateWrapper(Map<String, Date> params) {
- String startDate = DateUtils.format(params.get("startdate"),DateUtils.DATE_TIME_PATTERN);
- String endDate = DateUtils.format(params.get("enddate"),DateUtils.DATE_TIME_PATTERN);
-
- QueryWrapper<StModelRunlogEntity> wrapper = new QueryWrapper<>();
- wrapper.ge(StringUtils.isNotBlank(startDate), "run_time", startDate);
- wrapper.le(StringUtils.isNotBlank(endDate), "run_time", endDate);
- return wrapper;
}
}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/ApiModelController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/ApiModelController.java
deleted file mode 100644
index 9c37943..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/ApiModelController.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.iailab.module.model.api;
-
-import com.iailab.common.utils.DateUtils;
-
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.mcs.service.StModelResultService;
-import com.iailab.module.model.dto.RunSetDTO;
-import com.iailab.module.model.handler.ModelHandler;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-/**
- * scada接口数据
- *
- * @author lirm
- * @date 2024/4/9
- * @since 1.0
- */
-@RestController
-@RequestMapping("api/model")
-@Tag(name = "数据接口")
-public class ApiModelController {
-
- @Resource
- private IFeignDataApi iFeignDataApi;
-
- @Resource
- private StModelResultService stModelResultService;
-
- @Resource
- private ModelHandler modelHandler;
-
- private static String mFx1315SwitchInName = "1315/1给定";
- private static String mFx1308SwitchInName = "1308/1给定";
- private static String mFx1301AshInName = "1308/1给定";
-
-
- @PostMapping("execute")
- public CommonResult execute(@RequestParam Map<String, Object> params, @RequestBody List<double[][]> sampleDataList) {
- Map<String, Object> result = new HashMap<>();
- try {
- String appKey = "admin";
- String modelCode = (String)params.get("modelCode");
- if (StringUtils.isBlank(modelCode)) {
- return new CommonResult().setMsg("modelCode不能为空！");
- }
- if (CollectionUtils.isEmpty(sampleDataList)) {
- return new CommonResult().setMsg("参数不能为空！");
- }
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- result = modelHandler.run(modelCode, calendar.getTime(), sampleDataList, appKey);
- return new CommonResult<Map<String, Object>>().setData(result);
- } catch (Exception ex) {
- return new CommonResult().setMsg(ex.getMessage());
- }
- }
-
- @PostMapping("run")
- public CommonResult run(@RequestParam Map<String, Object> params, @RequestBody List<double[][]> sampleDataList) {
- Map<String, Object> result = new HashMap<>();
- try {
- String modelCode = (String)params.get("modelCode");
- if (StringUtils.isBlank(modelCode)) {
- return new CommonResult().setMsg("modelCode不能为空！");
- }
- if (CollectionUtils.isEmpty(sampleDataList)) {
- return new CommonResult().setMsg("参数不能为空！");
- }
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- result = modelHandler.run(modelCode, sampleDataList);
- return new CommonResult<Map<String, Object>>().setData(result);
- } catch (Exception ex) {
- return new CommonResult().setMsg(ex.getMessage());
- }
- }
-
- @PostMapping("run-set")
- public CommonResult runSet(@RequestParam Map<String, Object> params, @RequestBody RunSetDTO dto) {
- Map<String, Object> result = new HashMap<>();
- try {
- List<double[][]> sampleDataList = dto.getDataList();
- String modelCode = (String)params.get("modelCode");
- if (StringUtils.isBlank(modelCode)) {
- return new CommonResult().setMsg("modelCode不能为空！");
- }
- if (CollectionUtils.isEmpty(sampleDataList)) {
- return new CommonResult().setMsg("参数不能为空！");
- }
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- result = modelHandler.run(modelCode, sampleDataList, dto.getSettings());
- return new CommonResult<Map<String, Object>>().setData(result);
- } catch (Exception ex) {
- return new CommonResult().setMsg(ex.getMessage());
- }
- }
-
- @GetMapping("model-result/{modelCode}")
- public CommonResult<Map<String, Object>> getResultByModelCode(@PathVariable("modelCode") String modelCode) {
- Map<String, Object> data = new HashMap<>();
- Map<String, Object> modelParams = new HashMap<>(1);
- try {
- modelParams.put("modelCode", modelCode);
- data = stModelResultService.getLastResultMap(modelParams);
- if (CollectionUtils.isEmpty(data)) {
- return new CommonResult<>();
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return new CommonResult<Map<String, Object>>().setData(data);
- }
-
- @GetMapping("model-date-result")
- public CommonResult<Map<String, Object>> getTimeResult(@RequestParam Map<String, Object> params) {
- Map<String, Object> data = new HashMap<>();
- try {
- data = stModelResultService.getResultByCodeDate(params);
- if (CollectionUtils.isEmpty(data)) {
- return new CommonResult<>();
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return new CommonResult<Map<String, Object>>().setData(data);
- }
-
- @GetMapping("model-result/list")
- public CommonResult<List<Map<String, Object>>> geModelResultList(@RequestParam Map<String, Object> params) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- calendar.set(Calendar.SECOND, 0);
- if (params.get("lastHour") != null) {
- calendar.add(Calendar.HOUR_OF_DAY, Integer.parseInt(params.get("lastHour").toString()) * -1);
- }
- Date startDate = calendar.getTime();
- Date endDate = new Date();
-
- if ((params.get("startDate") != null && StringUtils.isNotBlank(params.get("startDate").toString()))) {
- String ts = params.get("startDate").toString();
- if (ts.length() < 12) {
- ts = ts + " 00:00:00";
- }
- startDate = DateUtils.parse(ts, DateUtils.DATE_TIME_PATTERN);
- }
- if ((params.get("endDate") != null && StringUtils.isNotBlank(params.get("endDate").toString()))) {
- String ts = params.get("endDate").toString();
- if (ts.length() < 12) {
- ts = ts + " 23:59:59";
- }
- endDate = DateUtils.parse(ts, DateUtils.DATE_TIME_PATTERN);
- }
-
- params.put("startDate", startDate);
- params.put("endDate", endDate);
- List<Map<String, Object>> list = stModelResultService.getList(params);
- return new CommonResult<List<Map<String, Object>>>().setData(list);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/enums/ModelResultEnum.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/enums/ModelResultEnum.java
deleted file mode 100644
index bc47ea4..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/enums/ModelResultEnum.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.iailab.module.model.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年11月26日 10:17:00
- */
-@Getter
-@AllArgsConstructor
-public enum ModelResultEnum {
- OK(200, "正常", ""),
- BAD(401, "输入值非法", ""),
- HJTW(402, "合介桶位异常，请切回手动控制", "Result402"),
- XJTW(403, "稀介桶位异常，请切回手动控制", "Result403"),
- HJMD(404, "合介密度异常，请切回手动控制", "Result404"),
- JMHF(405, "精煤灰分异常，请切回手动控制", "Result405"),
- YLND(406, "溢流浊度异常，请切回手动控制", "Result406"),
- DLND(407, "底流浓度异常，请切回手动控制", "Result407"),
- QSWG(408, "清水位高度异常，请切回手动控制", "Result408");
- private Integer code;
- private String desc;
- private String point;
-
- public static ModelResultEnum getEumByCode(Integer code) {
- if (code == null) {
- return null;
- }
-
- for (ModelResultEnum statusEnum : ModelResultEnum.values()) {
- if (statusEnum.getCode().equals(code)) {
- return statusEnum;
- }
- }
- return null;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleDataConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleDataConstructor.java
index 4d64df2..dc89335 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleDataConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleDataConstructor.java
@@ -1,17 +1,14 @@
package com.iailab.module.model.sample.constructor;
-import com.iailab.module.data.dto.ApiDataDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.ApiDataPointDTO;
-import com.iailab.module.data.dto.FeignQueryPointDTO;
-import com.iailab.module.device.service.DeviceMainService;
-import com.iailab.module.event.service.EventInfoService;
+import com.iailab.module.data.api.point.DataPointApi;
+import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
+import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
+import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.mcs.service.StModelResultService;
import com.iailab.module.model.sample.dto.ColumnItem;
import com.iailab.module.model.sample.dto.ColumnItemPort;
import com.iailab.module.model.sample.dto.SampleData;
import com.iailab.module.model.sample.dto.SampleInfo;
import com.iailab.module.model.sample.entity.DataEntity;
-import com.iailab.module.prod.service.IndexEvaluateSystemService;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import org.springframework.stereotype.Component;
@@ -31,22 +28,10 @@
public class SampleDataConstructor {
@Resource
- private IFeignDataApi iFeignDataApi;
+ private DataPointApi dataPointApi;
@Resource
private StModelResultService modelResultService;
-
- @Resource
- private EventInfoService eventInfoService;
-
- @Resource
- private DeviceMainService deviceMainService;
-
- @Resource
- private IndexEvaluateSystemService indexEvaluateSystemService;
-
- @Resource
- private IFeignDataApi feignDataController;
public List<SampleData> prepareSampleData(SampleInfo sampleInfo) {
List<SampleData> sampleDataList = new ArrayList<>();
@@ -83,90 +68,20 @@
break;
case "point":
// 测点值
- FeignQueryPointDTO dto = new FeignQueryPointDTO();
- dto.setEndTime(columnItem.endTime);
- dto.setStartTime(columnItem.startTime);
- dto.setPointCode(columnItem.getParamId());
- List<ApiDataDTO> pointValues = iFeignDataApi.queryPointValues(dto);
+ ApiPointValueQueryDTO dto = new ApiPointValueQueryDTO();
+ dto.setEnd(columnItem.endTime);
+ dto.setStart(columnItem.startTime);
+ dto.setPointNo(columnItem.getParamId());
+ List<ApiPointValueDTO> pointValues = dataPointApi.getValue(dto);
List<DataEntity> tempList = new ArrayList<>();
pointValues.forEach(item -> {
DataEntity dataEntity = new DataEntity();
dataEntity.setDataValue(item.getDataValue());
- dataEntity.setTimeStamp(item.getTimeStamp());
+ dataEntity.setTimeStamp(item.getDataTime());
tempList.add(dataEntity);
});
dataEntityList = tempList;
- break;
- case "wz":
- FeignQueryPointDTO queryTag = new FeignQueryPointDTO();
- queryTag.setEndTime(columnItem.endTime);
- queryTag.setStartTime(columnItem.startTime);
- queryTag.setPointCode(columnItem.getParamId());
- List<ApiDataDTO> tagValues = iFeignDataApi.querySimTagValues(queryTag);
-
- List<DataEntity> tempListTag = new ArrayList<>();
- tagValues.forEach(item -> {
- DataEntity dataEntity = new DataEntity();
- dataEntity.setDataValue(item.getDataValue());
- dataEntity.setTimeStamp(item.getTimeStamp());
- tempListTag.add(dataEntity);
- });
- dataEntityList = tempListTag;
- break;
- case "real":
- // 实时值
- List<String> pointNos = new ArrayList<>();
- pointNos.add(columnItem.getParamId());
- Map<String, Object> data = iFeignDataApi.getCurrentValue(pointNos);
- DataEntity realData = new DataEntity();
- realData.setTimeStamp(new Date());
- realData.setDataValue(Double.parseDouble(data.get(columnItem.getParamId()).toString()));
- dataEntityList.add(realData);
- break;
- case "ind":
- // 指标数据
- FeignQueryPointDTO dto1 = new FeignQueryPointDTO();
- dto1.setEndTime(columnItem.endTime);
- dto1.setStartTime(columnItem.startTime);
- dto1.setPointCode(columnItem.getParamId());
- List<ApiDataDTO> indItemValues = iFeignDataApi.queryIndItemValues(dto1);
- List<DataEntity> tempList1 = new ArrayList<>();
- indItemValues.forEach(item -> {
- DataEntity dataEntity = new DataEntity();
- dataEntity.setDataValue(item.getDataValue());
- dataEntity.setTimeStamp(item.getTimeStamp());
- tempList1.add(dataEntity);
- });
- dataEntityList = tempList1;
- break;
- case "device-main":
- // 检修记录
- Integer mainTimes = deviceMainService.getCount(columnItem.getParamId(), columnItem.startTime, columnItem.endTime);
- DataEntity mainData = new DataEntity();
- mainData.setTimeStamp(columnItem.endTime);
- mainData.setDataValue(mainTimes.doubleValue());
- dataEntityList.add(mainData);
- break;
- case "event":
- // 报警事件
- Long eventTimes = eventInfoService.getCount(columnItem.getParamId(), columnItem.startTime, columnItem.endTime);
- DataEntity eventData = new DataEntity();
- eventData.setTimeStamp(columnItem.endTime);
- eventData.setDataValue(eventTimes.doubleValue());
- dataEntityList.add(eventData);
- break;
- case "evaluate_weight":
- // 指标权重
- List<Double> weightList = indexEvaluateSystemService.getWeight();
- List<DataEntity> weightDataList = new ArrayList<>();
- weightList.forEach(item -> {
- DataEntity weightData = new DataEntity();
- weightData.setTimeStamp(columnItem.endTime);
- weightData.setDataValue(item);
- weightDataList.add(weightData);
- });
- dataEntityList = weightDataList;
break;
default:
break;
@@ -187,10 +102,10 @@
if (CollectionUtils.isEmpty(dataEntityList) || length <= dataEntityList.size()) {
return dataEntityList;
}
- // log.info("补全数据, length =" + length + "; size = " + dataEntityList.size() + "; startTime = " + startTime + "; endTime = " + endTime);
- // log.info("补全前：" + dataEntityList);
+ /*log.info("补全数据, length =" + length + "; size = " + dataEntityList.size() + "; startTime = " + startTime + "; endTime = " + endTime);
+ log.info("补全前：" + dataEntityList);*/
- ApiDataPointDTO dataPoint = feignDataController.getPoint(paramId);
+ ApiPointDTO dataPoint = dataPointApi.getPoint(paramId);
Map<Long, Double> sourceDataMap = new HashMap<>(dataEntityList.size());
for (DataEntity dataEntity : dataEntityList) {
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleInfoConstructor.java
index a8ade2c..196fff9 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleInfoConstructor.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/sample/constructor/SampleInfoConstructor.java
@@ -1,9 +1,8 @@
package com.iailab.module.model.sample.constructor;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.ApiDataPointDTO;
-import com.iailab.module.data.api.IFeignDataApi;
+import com.iailab.module.data.api.point.DataPointApi;
+import com.iailab.module.data.api.point.dto.ApiPointDTO;
import com.iailab.module.mcs.dto.StModelParamDTO;
import com.iailab.module.mcs.service.StModelParamService;
import com.iailab.module.model.sample.dto.ColumnItem;
@@ -27,7 +26,7 @@
private StModelParamService stModelParamService;
@Resource
- private IFeignDataApi feignDataApi;
+ private DataPointApi dataPointApi;
public static final Map<String, Integer> minFreqMap = new HashMap<>();
@@ -100,23 +99,23 @@
calendar.setTime(originalTime);
switch (columnItem.getParamType()) {
case "point":
- ApiDataPointDTO dataPoint = feignDataApi.getPoint(columnItem.paramId);
+ ApiPointDTO dataPoint = dataPointApi.getPoint(columnItem.paramId);
if (dataPoint == null) {
throw new Exception("apiDataPointDTO is null");
}
- dateTime = calculateTime(dateTime, true, columnItem.getDataLength(), minFreqMap.get(dataPoint.getMinfreqid()));
+ dateTime = calculateTime(calendar.getTime(), true, columnItem.getDataLength(), minFreqMap.get(dataPoint.getMinfreqid()));
break;
case "predict":
dateTime = calendar.getTime();
break;
case "ind":
- dateTime = calculateTime(dateTime, true, columnItem.getDataLength(), DAY_SECOND);
+ dateTime = calculateTime(calendar.getTime(), true, columnItem.getDataLength(), DAY_SECOND);
break;
case "device-main":
- dateTime = calculateTime(dateTime, true, columnItem.getDataLength(), DAY_SECOND);
+ dateTime = calculateTime(calendar.getTime(), true, columnItem.getDataLength(), DAY_SECOND);
break;
case "event":
- dateTime = calculateTime(dateTime, true, columnItem.getDataLength(), DAY_SECOND);
+ dateTime = calculateTime(calendar.getTime(), true, columnItem.getDataLength(), DAY_SECOND);
break;
default:
break;
@@ -130,7 +129,7 @@
calendar.setTime(originalTime);
switch (columnItem.getParamType()) {
case "point":
- ApiDataPointDTO dataPoint = feignDataApi.getPoint(columnItem.paramId);
+ ApiPointDTO dataPoint = dataPointApi.getPoint(columnItem.paramId);
if (dataPoint == null) {
throw new Exception("apiDataPointDTO is null");
}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/utils/DcsUtils.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/utils/DcsUtils.java
deleted file mode 100644
index 2844da4..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/utils/DcsUtils.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.iailab.module.model.utils;
-
-import com.iailab.common.constant.BusinessConstant;
-import com.iailab.module.infra.api.config.ConfigApi;
-import com.iailab.module.model.enums.ModelResultEnum;
-import com.iailab.module.websocket.server.WebSocketServer;
-import lombok.extern.slf4j.Slf4j;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年11月26日 12:58:00
- */
-@Slf4j
-@Component
-public class DcsUtils {
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private WebSocketServer webSocketServer;
-
-
- private String IS_TIP = "isTip";
-
- private String DEV_Y = "y";
-
- public void sendTips(Map<String, Object> data, String modelName) {
- if (!data.containsKey(BusinessConstant.MODELE_RESULT_STATUS)) {
- return;
- }
- Integer code = Integer.parseInt(data.get(BusinessConstant.MODELE_RESULT_STATUS).toString());
- if (BusinessConstant.MODELE_RESULT_STATUS_200.equals(code)) {
- return;
- }
- String isTip = configApi.queryConfigByCode(IS_TIP);
- if (!DEV_Y.equals(isTip)) {
- return;
- }
- StringBuilder sb = new StringBuilder();
- sb.append(modelName);
- sb.append("：");
- sb.append(ModelResultEnum.getEumByCode(code).getDesc());
- webSocketServer.onMessage(sb.toString());
-
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/controller/OssFileController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/controller/OssFileController.java
deleted file mode 100644
index 80d114c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/controller/OssFileController.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.iailab.module.oss.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.Constant;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.oss.dto.OssFileDTO;
-import com.iailab.module.oss.service.OssFileService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 11:14:00
- */
-@RestController
-@RequestMapping("/oss/file")
-@Tag(name = "应用程序表")
-public class OssFileController {
- @Resource
- private OssFileService ossAppService;
- @Value("${iems.upload}")
- private String upload;
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- @PreAuthorize("@ss.hasPermission('oss:file:page')")
- public CommonResult<PageData<OssFileDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<OssFileDTO> page = ossAppService.page(params);
-
- return new CommonResult<PageData<OssFileDTO>>().setData(page);
- }
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- @PreAuthorize("@ss.hasPermission('oss:file:info')")
- public CommonResult<OssFileDTO> get(@PathVariable("id") String id) {
- OssFileDTO data = ossAppService.get(id);
-
- return new CommonResult<OssFileDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- @PreAuthorize("@ss.hasPermission('oss:file:save')")
- public CommonResult save(@RequestBody OssFileDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- ossAppService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- @PreAuthorize("@ss.hasPermission('oss:file:update')")
- public CommonResult update(@RequestBody OssFileDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- ossAppService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping("{id}")
- @Operation(summary = "删除")
- @LogOperation("删除")
- @PreAuthorize("@ss.hasPermission('oss:file:delete')")
- public CommonResult delete(@PathVariable("id") Long[] ids) {
- ossAppService.delete(ids);
- return new CommonResult();
- }
-
- /**
- * 上传文件
- *
- * @param file
- * @return
- */
- @PostMapping("/upload")
- public CommonResult<Map<String, String>> upload(@RequestParam("file") MultipartFile file) throws Exception {
- String postfix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1);
- String path = MessageFormat.format("{0}/{1}/{2}", upload, DateUtils.format(new Date()), postfix);
- File dir = new File(path);
- dir.mkdirs();
- String filePath = MessageFormat.format("{0}/{1}.{2}", path, file.getOriginalFilename(), postfix);
- file.transferTo(new File(filePath));
- Map<String, String> data = new HashMap<>(2);
- data.put("url", filePath.replace(upload, ""));
- data.put("name", file.getOriginalFilename());
- return new CommonResult<Map<String, String>>().setData(data);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/dao/OssFileDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/dao/OssFileDao.java
deleted file mode 100644
index af925a7..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/dao/OssFileDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.oss.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.oss.entity.OssFileEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 11:01:00
- */
-@Mapper
-public interface OssFileDao extends BaseDao<OssFileEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/dto/OssFileDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/dto/OssFileDTO.java
deleted file mode 100644
index ddb1165..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/dto/OssFileDTO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.iailab.module.oss.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 10:44:00
- */
-@Data
-@Schema(name = "业务文件")
-public class OssFileDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
-
- @Schema(name = "业务ID", required = true)
- @NotBlank(message="{sysapp.appcode.require}", groups = DefaultGroup.class)
- private String businessId;
-
- @Schema(name = "类型")
- private String type;
-
- @Schema(name = "文件名称")
- private String fileName;
-
- @Schema(name = "文件后缀")
- private String filePostfix;
-
- @Schema(name = "文件地址")
- private String url;
-
- @Schema(name = "排序")
- private Integer sort;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/entity/OssFileEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/entity/OssFileEntity.java
deleted file mode 100644
index 3e54d2c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/entity/OssFileEntity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.iailab.module.oss.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 10:41:00
- */
-@Data
-@TableName("t_oss_file")
-public class OssFileEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_ID)
- private String id;
-
- /**
- * 业务ID
- */
- private String businessId;
-
- /**
- * 类型(推荐格式：实体名_上传类型，例如，意见反馈图片：appComment_image)
- */
- private String type;
-
- /**
- * 文件名称
- */
- private String fileName;
-
- /**
- * 文件后缀
- */
- private String filePostfix;
-
- /**
- * 文件地址
- */
- private String url;
-
- /**
- * 排序
- */
- private Integer sort;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/service/OssFileService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/service/OssFileService.java
deleted file mode 100644
index 60f4796..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/service/OssFileService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.iailab.module.oss.service;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.oss.dto.OssFileDTO;
-import com.iailab.module.oss.entity.OssFileEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 11:07:00
- */
-public interface OssFileService extends BaseService<OssFileEntity> {
-
- PageData<OssFileDTO> page(Map<String, Object> params);
-
- OssFileDTO get(String id);
-
- List<OssFileEntity> list(Map<String, Object> params);
-
- void save(OssFileDTO dto);
-
- void saveList(String businessId, List<OssFileDTO> list);
-
- void update(OssFileDTO dto);
-
- void delete(Long[] ids);
-
- List<OssFileDTO> getByBusinessId(String businessId);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/service/impl/OssFileServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/service/impl/OssFileServiceImpl.java
deleted file mode 100644
index 46d827f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/oss/service/impl/OssFileServiceImpl.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.iailab.module.oss.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.oss.dao.OssFileDao;
-import com.iailab.module.oss.dto.OssFileDTO;
-import com.iailab.module.oss.entity.OssFileEntity;
-import com.iailab.module.oss.service.OssFileService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年12月26日 11:12:00
- */
-@Service
-public class OssFileServiceImpl extends BaseServiceImpl<OssFileDao, OssFileEntity> implements OssFileService {
-
- @Override
- public PageData<OssFileDTO> page(Map<String, Object> params) {
- IPage<OssFileEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, OssFileDTO.class);
- }
-
- private QueryWrapper<OssFileEntity> getWrapper(Map<String, Object> params) {
- String businessId = (String) params.get("businessId");
- String type = (String) params.get("type");
- String fileName = (String) params.get("fileName");
- QueryWrapper<OssFileEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(businessId), "business_id", businessId)
- .like(StringUtils.isNotBlank(type), "type", type)
- .like(StringUtils.isNotBlank(fileName), "file_name", fileName);
- return wrapper;
- }
-
- @Override
- public List<OssFileEntity> list(Map<String, Object> params) {
- QueryWrapper<OssFileEntity> wrapper = getWrapper(params);
- wrapper.orderByAsc("sort");
- return baseDao.selectList(wrapper);
- }
-
- @Override
- public OssFileDTO get(String id) {
- OssFileEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, OssFileDTO.class);
- }
-
- @Override
- public List<OssFileDTO> getByBusinessId(String businessId) {
- QueryWrapper<OssFileEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(businessId), "business_id", businessId);
- List<OssFileEntity> list = baseDao.selectList(wrapper);
-
- return ConvertUtils.sourceToTarget(list, OssFileDTO.class);
- }
-
- @Override
- public void save(OssFileDTO dto) {
- OssFileEntity entity = ConvertUtils.sourceToTarget(dto, OssFileEntity.class);
- insert(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void saveList(String businessId, List<OssFileDTO> list) {
- deleteByBusinessId(businessId);
- if (CollectionUtils.isEmpty(list)) {
- return;
- }
- list.forEach(item -> {
- save(item);
- });
- }
-
- @Override
- public void update(OssFileDTO dto) {
- OssFileEntity entity = ConvertUtils.sourceToTarget(dto, OssFileEntity.class);
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(Long[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- private void deleteByBusinessId(String businessId) {
- QueryWrapper<OssFileEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("business_id", businessId);
- baseDao.delete(queryWrapper);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/package-info.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/package-info.java
deleted file mode 100644
index c343803..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.iailab.module;
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/controller/PageParamController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/controller/PageParamController.java
deleted file mode 100644
index 26e7397..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/controller/PageParamController.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.iailab.module.param.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.common.enums.CdbmEnum;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.ApiDataDTO;
-import com.iailab.module.data.dto.FeignQueryPointDTO;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.model.handler.ModelHandler;
-import com.iailab.module.param.dto.PageParamDTO;
-import com.iailab.module.param.dto.PageParamResultValueDTO;
-import com.iailab.module.param.dto.PointDataValueDTO;
-import com.iailab.module.param.dto.ResultPointAndTrendDataDTO;
-import com.iailab.module.param.service.PageParmService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年5月10日 15:06:00
- */
-@RestController
-@RequestMapping("/param/page")
-@Tag(name = "原煤趋势分析")
-@Slf4j
-public class PageParamController {
-
- private final String[] rowCoalPageCode = {"ymrxl","ymhf","ymsf","ymlf","ymrz"};
- private final String[] washPageCode = {"hmcl","xxkcl","xzkcl","hmhf","hmlf","hmsf","hmrz"};
-
- private final String[] wyPageCode = {"dxhm","xxkwy","xzkwy","gswy","xkzz","hcwyds","hcwyls"};
-
- @Resource
- PageParmService pageParmService;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private ModelHandler modelHandler;
-
- @GetMapping("{page}")
- @Operation(summary = "趋势分析数据")
- public CommonResult<List<PageParamResultValueDTO>> get(@PathVariable("page") String page) {
- List<PageParamDTO> dtoList = pageParmService.selectPageParamByPage(page);
- List<PageParamResultValueDTO> resultData = new ArrayList<>();
- switch (page){
- case "rowCoal":
- resultData = collateCommonResultValueDate(dtoList,rowCoalPageCode);
- break;
- case "wash":
- resultData = collateCommonResultValueDate(dtoList,washPageCode);
- break;
- case "wy":
- resultData = collateCommonResultValueDate(dtoList,wyPageCode);
- break;
- }
- return new CommonResult<List<PageParamResultValueDTO>>().setData(resultData);
- }
-
- @GetMapping("/point/{page}")
- @Operation(summary = "获取point数据")
- public CommonResult<List<ResultPointAndTrendDataDTO>> getPointData(@PathVariable("page") String page) {
- List<ResultPointAndTrendDataDTO> result;
- String pointLength = pageParmService.selectValue(page, "point_length");
- String point = pageParmService.selectValue(page, "point")==null?"":pageParmService.selectValue(page, "point");
- List<String> pointList = Arrays.asList(point.split(";"));
- log.info("页面需要的point值:" + pointList);
- result = getPoints(pointList,pointLength);
- log.info("查询point返回的values" + result);
- Map<String, Object> params = new HashMap<>(1);
- params.put("modelCode", "trend_analysis");
- result.forEach(e -> {
- try {
- List<double[][]> sampleDataList = new ArrayList<>();
- List<PointDataValueDTO> nv = e.getDataValue().stream().filter(dto -> dto.getDataValue() != null).collect(Collectors.toList());
- double[][] mix = new double[nv.size()][1];
- for (int i = 0; i < nv.size(); i++) {
- mix[i][0] = nv.get(i).getDataValue().doubleValue();
- }
- sampleDataList.add(mix);
- Map<String, Object> trendItem = runModel(params, sampleDataList);
- log.info("根据point查询的values查询模型返回的trend" + trendItem);
- e.setTrendValue(trendItem);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- });
- return new CommonResult<List<ResultPointAndTrendDataDTO>>().setData(result);
- }
-
- private List<PageParamResultValueDTO> collateCommonResultValueDate(List<PageParamDTO> dtoList, String[] pageCode){
- List<PageParamResultValueDTO> resultDataList = new ArrayList<>();
- dtoList.forEach(e->{
- if(Arrays.asList(pageCode).contains(e.getParamCode())){
- resultDataList.add(JSONObject.parseObject(e.getParamValue(), PageParamResultValueDTO.class));
- }
- });
- return resultDataList;
- }
-
- public List<ResultPointAndTrendDataDTO> getPoints(List<String> pointList,String length){
- List<ResultPointAndTrendDataDTO> result = new ArrayList<>();
- if (CollectionUtils.isEmpty(pointList)) {
- return result;
- }
- try {
- pointList.forEach(point->{
- ResultPointAndTrendDataDTO dto = new ResultPointAndTrendDataDTO();
- dto.setPointNo(point);
- dto.setChartName(CdbmEnum.getEumByName(point).getDesc());
- dto.setUnit(CdbmEnum.getEumByName(point).getUnit());
- dto.setLength(length);
- dto.setDataValue(getPointData(point,length));
- result.add(dto);
- }
- );
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return result;
- }
-
- public List<PointDataValueDTO> getPointData(String param, String length){
- FeignQueryPointDTO dto = new FeignQueryPointDTO();
- dto.setEndTime(new Date());
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(length));
- dto.setStartTime(calendar.getTime());
- dto.setPointCode(CdbmEnum.getEumByName(param).getCode());
- dto.setType("float");
- log.info("开始获取point数据");
- List<ApiDataDTO> pointValues = feignDataApi.queryPointValues(dto);
- log.info("获取的point数据pointValues:" + pointValues);
- List<PointDataValueDTO> dots = new ArrayList<>();
- pointValues.forEach(e->{
- PointDataValueDTO pointDataValueDTO = new PointDataValueDTO();
- pointDataValueDTO.setItemNo(param);
- pointDataValueDTO.setDataTime(new SimpleDateFormat("yyyy-MM-dd").format(e.getTimeStamp()));
- pointDataValueDTO.setDataValue(BigDecimal.valueOf(e.getDataValue()));
- dots.add(pointDataValueDTO);
- }
- );
- log.info("转换成的PointDataValueDTOS:" + dots);
- return dots;
- }
- public Map<String, Object> runModel(Map<String, Object> params, List<double[][]> sampleDataList) {
- Map<String, Object> result = new HashMap<>();
- try {
- String modelCode = (String) params.get("modelCode");
- if (StringUtils.isBlank(modelCode)) {
- return result;
- }
- if (CollectionUtils.isEmpty(sampleDataList)) {
- return result;
- }
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.MILLISECOND, 0);
- result = modelHandler.run(modelCode, sampleDataList);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- return result;
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dao/PageParamDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dao/PageParamDao.java
deleted file mode 100644
index 15e8dd2..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dao/PageParamDao.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.iailab.module.param.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.param.entity.PageParamEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface PageParamDao extends BaseDao<PageParamEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PageParamDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PageParamDTO.java
deleted file mode 100644
index ebf7425..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PageParamDTO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.iailab.module.param.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@Schema(name = "页面参数")
-public class PageParamDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- private String page;
-
- private String paramCode = "";
-
- private String paramValue = "";
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PageParamResultValueDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PageParamResultValueDTO.java
deleted file mode 100644
index 5bc3ae0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PageParamResultValueDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.iailab.module.param.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class PageParamResultValueDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String chartCode;
-
- private String length;
-
- private String unit;
-
- private String maxSlope;
-
- private String minSlope;
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PointDataValueDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PointDataValueDTO.java
deleted file mode 100644
index e4d8e86..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/PointDataValueDTO.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.iailab.module.param.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月25日
- */
-@Data
-@Schema(name = "point值")
-public class PointDataValueDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "point编码")
- private String itemNo;
-
- @Schema(name = "数据时间")
- private String dataTime;
-
- @Schema(name = "数据值")
- private BigDecimal dataValue;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/ResultPointAndTrendDataDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/ResultPointAndTrendDataDTO.java
deleted file mode 100644
index 4edfa38..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/dto/ResultPointAndTrendDataDTO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.iailab.module.param.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月25日
- */
-@Data
-@Schema(name = "point值")
-public class ResultPointAndTrendDataDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "point编码")
- private String pointNo;
-
- @Schema(name = "图形名称")
- private String chartName;
-
- @Schema(name = "图形单位")
- private String unit;
-
- @Schema(name = "时间长度")
- private String length;
-
- @Schema(name = "趋势")
- private Map<String, Object> trendValue;
-
- @Schema(name = "数据值")
- private List<PointDataValueDTO> dataValue;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/entity/PageParamEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/entity/PageParamEntity.java
deleted file mode 100644
index 262ecdd..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/entity/PageParamEntity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.iailab.module.param.entity;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author DongYukun
- * @Description 页面
- * @createTime 2024年05月17日 09:55:00
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_page_param")
-public class PageParamEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId
- private String id;
-
- /**
- * 页面编码
- */
- private String page;
-
- /**
- * 参数编码
- */
- private String paramCode;
-
- /**
- * 参数值
- */
- private String paramValue;
-
- /**
- * 创建者
- */
- private Long creator;
-
- /**
- * 创建时间
- */
- private Date createDate;
-
- /**
- * 创建者
- */
- private Long updater;
-
- /**
- * 创建时间
- */
- private Date updateDate;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/service/PageParmService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/service/PageParmService.java
deleted file mode 100644
index dcf0cba..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/service/PageParmService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.iailab.module.param.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.param.dto.PageParamDTO;
-import com.iailab.module.param.entity.PageParamEntity;
-
-import java.util.List;
-
-public interface PageParmService extends BaseService<PageParamEntity> {
-
- //根据页面和参数编码查询参数值
- String selectValue(String page , String paramCode);
-
- List<PageParamDTO> selectPageParamByPage(String page);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/service/impl/PageParamServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/service/impl/PageParamServiceImpl.java
deleted file mode 100644
index cee429a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/param/service/impl/PageParamServiceImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.iailab.module.param.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.param.dao.PageParamDao;
-import com.iailab.module.param.dto.PageParamDTO;
-import com.iailab.module.param.entity.PageParamEntity;
-import com.iailab.module.param.service.PageParmService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author Jay
- */
-@Service
-public class PageParamServiceImpl extends BaseServiceImpl<PageParamDao, PageParamEntity> implements PageParmService {
- @Override
- public String selectValue(String page, String paramCode) {
-
- String value = baseDao.selectOne(
- new QueryWrapper<PageParamEntity>()
- .eq("page",page)
- .eq("param_code",paramCode)
- )==null?"":baseDao.selectOne(
- new QueryWrapper<PageParamEntity>()
- .eq("page",page)
- .eq("param_code",paramCode)
- ).getParamValue();
-
- return value;
- }
-
- @Override
- public List<PageParamDTO> selectPageParamByPage(String page) {
- QueryWrapper<PageParamEntity> queryWrapper = new QueryWrapper<PageParamEntity>()
- .eq("page", page)
- .orderByAsc("id");
- return ConvertUtils.sourceToTarget(baseDao.selectList(queryWrapper), PageParamDTO.class);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/IndexEvaluateSystemController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/IndexEvaluateSystemController.java
deleted file mode 100644
index fefd6fb..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/IndexEvaluateSystemController.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.iailab.module.prod.controller;
-
-import com.iailab.common.annotation.LogOperation;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.Constant;
-import com.iailab.framework.common.pojo.CommonResult;
-
-import com.iailab.framework.common.util.validation.ValidationUtils;
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.DefaultGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import com.iailab.module.prod.dto.IndexEvaluateSystemDTO;
-import com.iailab.module.prod.entity.IndexEvaluateSystemEntity;
-import com.iailab.module.prod.service.IndexEvaluateSystemService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
-
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年5月24日 21:58:00
- */
-@RestController
-@RequestMapping("/index/evaluate")
-@Tag(name = "指标评价体系")
-public class IndexEvaluateSystemController {
-
- @Resource
- private IndexEvaluateSystemService indexEvaluateSystemService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<IndexEvaluateSystemDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<IndexEvaluateSystemDTO> page = indexEvaluateSystemService.page(params);
-
- return new CommonResult<PageData<IndexEvaluateSystemDTO>>().setData(page);
- }
-
- @GetMapping("systemWeightList")
- @Operation(summary = "获取指标体系权重")
- public CommonResult<Map<String,String>> systemWeightList() {
- Map<String,String> data = indexEvaluateSystemService.systemWeightList();
-
- return new CommonResult<Map<String,String>>().setData(data);
- }
-
- @PostMapping("updataSystemWeight")
- @Operation(summary = "修改指标体系权重")
- public CommonResult updataSystemWeight(@RequestBody Map<String, String> params) {
-
- indexEvaluateSystemService.updataSystemWeight(params);
-
- return new CommonResult();
- }
-
- @PostMapping("updataWeight")
- @Operation(summary = "修改指标权重")
- public CommonResult updataWeight(@RequestBody List<IndexEvaluateSystemEntity> list) {
-
- indexEvaluateSystemService.updataWeight(list);
-
- return new CommonResult();
- }
-
-
- @GetMapping("{id}")
- @Operation(summary = "信息")
- public CommonResult<IndexEvaluateSystemDTO> get(@PathVariable("id") String id) {
- IndexEvaluateSystemDTO data = indexEvaluateSystemService.get(id);
-
- return new CommonResult<IndexEvaluateSystemDTO>().setData(data);
- }
-
- @PostMapping
- @Operation(summary = "保存")
- @LogOperation("保存")
- public CommonResult save(@RequestBody IndexEvaluateSystemDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, AddGroup.class, DefaultGroup.class);
-
- indexEvaluateSystemService.save(dto);
-
- return new CommonResult();
- }
-
- @PutMapping
- @Operation(summary = "修改")
- @LogOperation("修改")
- public CommonResult update(@RequestBody IndexEvaluateSystemDTO dto) {
- //效验数据
- ValidationUtils.validate(dto, UpdateGroup.class, DefaultGroup.class);
-
- indexEvaluateSystemService.update(dto);
-
- return new CommonResult();
- }
-
- @DeleteMapping
- @Operation(summary = "删除")
- @LogOperation("删除")
- public CommonResult delete(@RequestBody String[] ids) {
- indexEvaluateSystemService.delete(ids);
- return new CommonResult();
- }
-
- @GetMapping("chart/{pid}")
- @Operation(summary = "信息")
- public CommonResult<BarLineDTO> getChart(@PathVariable("pid") String pid) {
- BarLineDTO data = indexEvaluateSystemService.getChart(pid);
-
- return new CommonResult<BarLineDTO>().setData(data);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/PageCharsController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/PageCharsController.java
deleted file mode 100644
index 81424a8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/PageCharsController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.prod.controller;
-
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.prod.dto.PageCharsDTO;
-import com.iailab.module.prod.service.PageCharsService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年5月10日 15:06:00
- */
-@RestController
-@RequestMapping("/analysis/raw")
-@Tag(name = "原煤趋势分析")
-public class PageCharsController {
-
- @Resource
- PageCharsService pageCharsService;
-
- @GetMapping("{page}")
- @Operation(summary = "原煤趋势分析数据")
- public CommonResult<List<PageCharsDTO>> get(@PathVariable("page") String page) {
- List<PageCharsDTO> dtoList = pageCharsService.getData(page);
-
- return new CommonResult<List<PageCharsDTO>>().setData(dtoList);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/StoreDependableAnalysisController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/StoreDependableAnalysisController.java
deleted file mode 100644
index 3bb5314..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/controller/StoreDependableAnalysisController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.iailab.module.prod.controller;
-
-import com.iailab.framework.common.page.PageData;
-import com.iailab.common.utils.Constant;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.any.dto.AnyStoreReliabilityDTO;
-import com.iailab.module.mcs.service.StModelResultService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年5月23日 15:06:00
- */
-@RestController
-@RequestMapping("/store")
-@Tag(name = "仓储可靠性分析")
-public class StoreDependableAnalysisController {
-
- @Resource
- private StModelResultService stModelCommonResultService;
-
- @GetMapping("page")
- @Operation(summary = "分页")
- @Parameters({
- @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
- @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
- @Parameter(name = Constant.ORDER_FIELD, description = "排序字段"),
- @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)")
- })
- public CommonResult<PageData<AnyStoreReliabilityDTO>> page(@RequestParam Map<String, Object> params) {
- PageData<AnyStoreReliabilityDTO> page = stModelCommonResultService.getStorePage(params);
-
- return new CommonResult<PageData<AnyStoreReliabilityDTO>>().setData(page);
- }
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/IndexEvaluateSystemDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/IndexEvaluateSystemDao.java
deleted file mode 100644
index 5d9d5cd..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/IndexEvaluateSystemDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.IndexEvaluateSystemEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月25日
- */
-@Mapper
-public interface IndexEvaluateSystemDao extends BaseDao<IndexEvaluateSystemEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdCurrentPerformanceDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdCurrentPerformanceDao.java
deleted file mode 100644
index 0ee778c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdCurrentPerformanceDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.PrdCurrentPerformanceEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Mapper
-public interface PrdCurrentPerformanceDao extends BaseDao<PrdCurrentPerformanceEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdCurrentSaleDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdCurrentSaleDao.java
deleted file mode 100644
index 7d15448..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdCurrentSaleDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.PrdCurrentSaleEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Mapper
-public interface PrdCurrentSaleDao extends BaseDao<PrdCurrentSaleEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdDayDutyDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdDayDutyDao.java
deleted file mode 100644
index 00fac59..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdDayDutyDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.PrdDayDutyEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Mapper
-public interface PrdDayDutyDao extends BaseDao<PrdDayDutyEntity> {
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdDayProdDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdDayProdDao.java
deleted file mode 100644
index 1e64e10..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdDayProdDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.PrdDayProdEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Mapper
-public interface PrdDayProdDao extends BaseDao<PrdDayProdEntity> {
-}
-
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdPlanMonDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdPlanMonDao.java
deleted file mode 100644
index 0530bae..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdPlanMonDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.PrdPlanMonEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Mapper
-public interface PrdPlanMonDao extends BaseDao<PrdPlanMonEntity> {
-}
-
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdPlanYearDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdPlanYearDao.java
deleted file mode 100644
index ff81c36..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdPlanYearDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.PrdPlanYearEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Mapper
-public interface PrdPlanYearDao extends BaseDao<PrdPlanYearEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdTimeDayDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdTimeDayDao.java
deleted file mode 100644
index 2371044..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/PrdTimeDayDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.PrdTimeDayEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Mapper
-public interface PrdTimeDayDao extends BaseDao<PrdTimeDayEntity> {
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/StorageDayDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/StorageDayDao.java
deleted file mode 100644
index f534f6e..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dao/StorageDayDao.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.prod.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.prod.entity.StorageDayEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月01日
- */
-@Mapper
-public interface StorageDayDao extends BaseDao<StorageDayEntity> {
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/IndexEvaluateSystemDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/IndexEvaluateSystemDTO.java
deleted file mode 100644
index a5b69bb..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/IndexEvaluateSystemDTO.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月25日
- */
-@Data
-@Schema(name = "指标权重")
-public class IndexEvaluateSystemDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
- /**
- * 父ID
- */
- private String pid;
- /**
- * 编码
- */
- private String code;
- /**
- * 评价指标
- */
- private String evaluateIndex;
- /**
- * 权重
- */
- private Integer weight;
- /**
- * 创建人
- */
- private String creator;
- /**
- * 创建时间
- */
- private String createDate;
- /**
- * 更新人
- */
- private String updater;
- /**
- * 更新时间
- */
- private String updateDate;
-}
-
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PageCharsDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PageCharsDTO.java
deleted file mode 100644
index ca6f59c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PageCharsDTO.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年5月10日 15:06:00
- */
-@Data
-public class PageCharsDTO {
-
- //图表
- private BarLineDTO barLineDTO;
-
- //图表
- private String length;
-
- //单位
- private String unit;
-
- //当前值
- private BigDecimal currentValue;
-
- //建议
- private String suggest;
-
- //建议时间
- private Date suggestTime;
-
- //平均值
- private String avg;
-
- //最大值
- private String max;
-
- //最小值
- private String min;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdCurrentPerformanceDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdCurrentPerformanceDTO.java
deleted file mode 100644
index fbe503b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdCurrentPerformanceDTO.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Data
-@Schema(name = "当前产量")
-public class PrdCurrentPerformanceDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
- private String rq;
- private BigDecimal xxPerformance;
- private BigDecimal zqPerformance;
- private Date createDate;
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdCurrentSaleDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdCurrentSaleDTO.java
deleted file mode 100644
index 1fe7c84..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdCurrentSaleDTO.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Data
-@Schema(name = "当前销量")
-public class PrdCurrentSaleDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
- private String rq;
- private BigDecimal groundsales;
- private BigDecimal medblock;
- private BigDecimal nubmeasure;
- private BigDecimal gangue;
- private BigDecimal reshipped;
- private BigDecimal trainTon;
- private BigDecimal trainCount;
- private Date createDate;
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdDayDutyDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdDayDutyDTO.java
deleted file mode 100644
index d8f3871..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdDayDutyDTO.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Data
-@Schema(name = "值班情况")
-public class PrdDayDutyDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
-
- private String date;
-
- private String area;
-
- private String banci;
-
- private String banzu;
-
- private Integer number;
-
- private Integer arrive;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdDayProdDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdDayProdDTO.java
deleted file mode 100644
index e8063a2..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdDayProdDTO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Data
-@Schema(name = "日产品产量")
-public class PrdDayProdDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
-
- private String rq;
- private double rawCoal;
- private double mixedCoal;
- private double mediumCoal;
- private double smallCoal;
- private double gangue;
- private Date createDate;
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdPlanMonDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdPlanMonDTO.java
deleted file mode 100644
index dd9acfb..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdPlanMonDTO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Data
-@Schema(name = "月生产计划执行数据")
-public class PrdPlanMonDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
- private String rq;
- private BigDecimal xxPlan;
- private BigDecimal xxPerformance;
- private BigDecimal zqPlan;
- private BigDecimal zqPerformance;
- private Date createDate;
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdPlanYearDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdPlanYearDTO.java
deleted file mode 100644
index 36f8656..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/PrdPlanYearDTO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Data
-@Schema(name = "年生产计划执行数据")
-public class PrdPlanYearDTO implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
- private String rq;
- private BigDecimal xxPlan;
- private BigDecimal xxPerformance;
- private BigDecimal zqPlan;
- private BigDecimal zqPerformance;
- private Date createDate;
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/StorageDayDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/StorageDayDTO.java
deleted file mode 100644
index c619fb1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/dto/StorageDayDTO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.iailab.module.prod.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月01日
- */
-@Data
-@Schema(name = "日仓储")
-public class StorageDayDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String id;
-
- private String date;
-
- private BigDecimal caocang;
-
- private BigDecimal tower1;
-
- private BigDecimal tower2;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/IndexEvaluateSystemEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/IndexEvaluateSystemEntity.java
deleted file mode 100644
index b808186..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/IndexEvaluateSystemEntity.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_evaluate_index")
-public class IndexEvaluateSystemEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 应用id
- */
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- /**
- * 父ID
- */
- private String pid;
- /**
- * 编码
- */
- private String code;
- /**
- * 评价指标
- */
- private String evaluateIndex;
- /**
- * 权重
- */
- private Integer weight;
- /**
- * 创建人
- */
- private String creator;
- /**
- * 创建时间
- */
- private String createDate;
- /**
- * 更新人
- */
- private String updater;
- /**
- * 更新时间
- */
- private String updateDate;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdCurrentPerformanceEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdCurrentPerformanceEntity.java
deleted file mode 100644
index 566dcbd..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdCurrentPerformanceEntity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_prd_current_performance")
-public class PrdCurrentPerformanceEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 应用id
- */
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String rq;
- private BigDecimal xxPerformance;
- private BigDecimal zqPerformance;
- private Date createDate;
- private Date updateDate;
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdCurrentSaleEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdCurrentSaleEntity.java
deleted file mode 100644
index 69eeaf8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdCurrentSaleEntity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_prd_current_sale")
-public class PrdCurrentSaleEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 应用id
- */
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String rq;
- @TableField(exist = false)
- private String date;
- private BigDecimal groundsales;
- private BigDecimal medblock;
- private BigDecimal nubmeasure;
- private BigDecimal gangue;
- private BigDecimal reshipped;
- private BigDecimal trainTon;
- private BigDecimal trainCount;
- private Date createDate;
- private Date updateDate;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdDayDutyEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdDayDutyEntity.java
deleted file mode 100644
index 18ae056..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdDayDutyEntity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_prd_day_duty")
-public class PrdDayDutyEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * id
- */
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
-
- private String date;
-
- private String area;
-
- private String banci;
-
- private String banzu;
-
- private Integer number;
-
- private Integer arrive;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdDayProdEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdDayProdEntity.java
deleted file mode 100644
index 8cc3483..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdDayProdEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_prd_day_prod")
-public class PrdDayProdEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 应用id
- */
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String rq;
- private BigDecimal rawCoal;
- private BigDecimal mixedCoal;
- private BigDecimal mediumCoal;
- private BigDecimal smallCoal;
- private BigDecimal gangue;
- private Date createDate;
- private Date updateDate;
-}
-
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdPlanMonEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdPlanMonEntity.java
deleted file mode 100644
index b8f23d0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdPlanMonEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_prd_plan_mon")
-public class PrdPlanMonEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 应用id
- */
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String rq;
- private BigDecimal xxPlan;
- private BigDecimal xxPerformance;
- private BigDecimal zqPlan;
- private BigDecimal zqPerformance;
- private Date createDate;
- private Date updateDate;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdPlanYearEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdPlanYearEntity.java
deleted file mode 100644
index c72c027..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdPlanYearEntity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 年生产计划执行数据
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_prd_plan_year")
-public class PrdPlanYearEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 应用id
- */
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String rq;
- private BigDecimal xxPlan;
- private BigDecimal xxPerformance;
- private BigDecimal zqPlan;
- private BigDecimal zqPerformance;
- private Date createDate;
- private Date updateDate;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdTimeDayEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdTimeDayEntity.java
deleted file mode 100644
index d2d9fcc..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/PrdTimeDayEntity.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_prd_time_day")
-public class PrdTimeDayEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
-
- private String date;
-
- private String type;
-
- private BigDecimal runMinutes;
-
- private BigDecimal overhaulMinutes;
-
- private BigDecimal affectMinutes;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/StorageDayEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/StorageDayEntity.java
deleted file mode 100644
index 4a2f4b1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/entity/StorageDayEntity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.iailab.module.prod.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月01日
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_prd_storage_day")
-public class StorageDayEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
-
- private String date;
-
- private BigDecimal caocang;
-
- private BigDecimal tower1;
-
- private BigDecimal tower2;
-
- private Date createDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/IndexEvaluateSystemService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/IndexEvaluateSystemService.java
deleted file mode 100644
index 7e0e0ce..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/IndexEvaluateSystemService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.iailab.module.prod.service;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.prod.dto.IndexEvaluateSystemDTO;
-import com.iailab.module.prod.entity.IndexEvaluateSystemEntity;
-
-import java.util.List;
-import java.util.Map;
-
-public interface IndexEvaluateSystemService extends BaseService<IndexEvaluateSystemEntity> {
-
- PageData<IndexEvaluateSystemDTO> page(Map<String, Object> params);
-
- IndexEvaluateSystemDTO get(String id);
-
- void save(IndexEvaluateSystemDTO dto);
-
- void update(IndexEvaluateSystemDTO dto);
-
- void delete(String[] ids);
-
- List<IndexEvaluateSystemEntity> list(String id);
-
- Map<String,String> systemWeightList();
-
- void updataSystemWeight(Map<String, String> params);
-
- BarLineDTO getChart(String pid);
-
- void updataWeight(List<IndexEvaluateSystemEntity> list);
-
- List<Double> getWeight();
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PageCharsService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PageCharsService.java
deleted file mode 100644
index 097c88f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PageCharsService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.iailab.module.prod.service;
-
-import com.iailab.module.prod.dto.PageCharsDTO;
-
-import java.util.List;
-
-public interface PageCharsService {
- List<PageCharsDTO> getData(String page);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdCurrentPerformanceService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdCurrentPerformanceService.java
deleted file mode 100644
index 66a0e3b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdCurrentPerformanceService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iailab.module.prod.service;
-
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.module.prod.dto.PrdCurrentPerformanceDTO;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-@Service
-public interface PrdCurrentPerformanceService {
-
- BarLineDTO barLine(String length);
-
- BigDecimal currentValue();
-
- PageData<PrdCurrentPerformanceDTO> page(Map<String, Object> params);
-
- PrdCurrentPerformanceDTO get(String id);
-
- void save(PrdCurrentPerformanceDTO dto);
-
- void update(PrdCurrentPerformanceDTO dto);
-
- void delete(String[] ids);
-
- void syncData();
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdCurrentSaleService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdCurrentSaleService.java
deleted file mode 100644
index f744d57..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdCurrentSaleService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.iailab.module.prod.service;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.prod.dto.PrdCurrentSaleDTO;
-import com.iailab.module.prod.entity.PrdCurrentSaleEntity;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-public interface PrdCurrentSaleService extends BaseService<PrdCurrentSaleEntity> {
-
- BarLineDTO barLine(String length,String Type);
-
- BigDecimal currentValue(String Type);
-
- PageData<PrdCurrentSaleDTO> page(Map<String, Object> params);
-
- PrdCurrentSaleDTO get(String id);
-
- void save(PrdCurrentSaleDTO dto);
-
- void update(PrdCurrentSaleDTO dto);
-
- void delete(String[] ids);
-
- void syncData();
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdDayDutyService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdDayDutyService.java
deleted file mode 100644
index f57cd04..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdDayDutyService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.prod.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.prod.entity.PrdDayDutyEntity;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-public interface PrdDayDutyService extends BaseService<PrdDayDutyEntity> {
-
- void syncData();
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdDayProdService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdDayProdService.java
deleted file mode 100644
index 4e5b94d..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdDayProdService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package com.iailab.module.prod.service;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.prod.dto.PrdDayProdDTO;
-import com.iailab.module.prod.entity.PrdDayProdEntity;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-public interface PrdDayProdService extends BaseService<PrdDayProdEntity> {
-
- BarLineDTO barLine(String length,String param);
-
- BigDecimal currentValue(String param);
-
- PageData<PrdDayProdDTO> page(Map<String, Object> params);
-
- PrdDayProdDTO get(String id);
-
- void save(PrdDayProdDTO dto);
-
- void update(PrdDayProdDTO dto);
-
- void delete(String[] ids);
-
- void syncData(String paramDate);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdPlanMonService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdPlanMonService.java
deleted file mode 100644
index c027da6..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdPlanMonService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package com.iailab.module.prod.service;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.prod.dto.PrdPlanMonDTO;
-import com.iailab.module.prod.entity.PrdPlanMonEntity;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-public interface PrdPlanMonService extends BaseService<PrdPlanMonEntity> {
-
- BarLineDTO barLine(String length);
-
- BigDecimal currentValue();
-
- PageData<PrdPlanMonDTO> page(Map<String, Object> params);
-
- PrdPlanMonDTO get(String id);
-
- void save(PrdPlanMonDTO dto);
-
- void update(PrdPlanMonDTO dto);
-
- void delete(String[] ids);
-
- void syncData();
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdPlanYearService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdPlanYearService.java
deleted file mode 100644
index 3cb542f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdPlanYearService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package com.iailab.module.prod.service;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.prod.dto.PrdPlanYearDTO;
-import com.iailab.module.prod.entity.PrdPlanYearEntity;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-public interface PrdPlanYearService extends BaseService<PrdPlanYearEntity> {
-
- BarLineDTO barLine(String length);
-
- BigDecimal currentValue();
-
- PageData<PrdPlanYearDTO> page(Map<String, Object> params);
-
- PrdPlanYearDTO get(String id);
-
- void save(PrdPlanYearDTO dto);
-
- void update(PrdPlanYearDTO dto);
-
- void delete(String[] ids);
-
- void syncData();
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdTimeDayService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdTimeDayService.java
deleted file mode 100644
index b7b3a07..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/PrdTimeDayService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.prod.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.prod.entity.PrdTimeDayEntity;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-public interface PrdTimeDayService extends BaseService<PrdTimeDayEntity> {
-
- void syncData(String iRq);
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/StorageDayService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/StorageDayService.java
deleted file mode 100644
index 891edf1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/StorageDayService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.iailab.module.prod.service;
-
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.prod.entity.StorageDayEntity;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月01日
- */
-public interface StorageDayService extends BaseService<StorageDayEntity> {
-
- void syncData();
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/IndexEvaluateSystemServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/IndexEvaluateSystemServiceImpl.java
deleted file mode 100644
index 3d92d37..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/IndexEvaluateSystemServiceImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.iailab.module.prod.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.module.prod.dao.IndexEvaluateSystemDao;
-import com.iailab.module.prod.dto.IndexEvaluateSystemDTO;
-import com.iailab.module.prod.entity.IndexEvaluateSystemEntity;
-import com.iailab.module.prod.service.IndexEvaluateSystemService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-@Service
-public class IndexEvaluateSystemServiceImpl extends BaseServiceImpl<IndexEvaluateSystemDao, IndexEvaluateSystemEntity> implements IndexEvaluateSystemService {
-
- @Override
- public PageData<IndexEvaluateSystemDTO> page(Map<String, Object> params) {
- IPage<IndexEvaluateSystemEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, IndexEvaluateSystemDTO.class);
- }
-
- private QueryWrapper<IndexEvaluateSystemEntity> getWrapper(Map<String, Object> params) {
- String pid = (String) params.get("pid");
-
- QueryWrapper<IndexEvaluateSystemEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank("pid"), "pid", pid);
-
- return wrapper;
- }
-
- @Override
- public IndexEvaluateSystemDTO get(String id) {
- IndexEvaluateSystemEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, IndexEvaluateSystemDTO.class);
- }
-
- @Override
- public void save(IndexEvaluateSystemDTO dto) {
- IndexEvaluateSystemEntity entity = ConvertUtils.sourceToTarget(dto, IndexEvaluateSystemEntity.class);
-
- insert(entity);
- }
-
- @Override
- public void update(IndexEvaluateSystemDTO dto) {
- IndexEvaluateSystemEntity entity = ConvertUtils.sourceToTarget(dto, IndexEvaluateSystemEntity.class);
-
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- public List<IndexEvaluateSystemEntity> list(String pid) {
- List<IndexEvaluateSystemEntity> list = baseDao.selectList(new QueryWrapper<IndexEvaluateSystemEntity>().eq("pid", pid));
- return list;
- }
-
- @Override
- public Map<String, String> systemWeightList() {
- Map map = new HashMap();
- List<IndexEvaluateSystemEntity> list = baseDao.selectList(new QueryWrapper<IndexEvaluateSystemEntity>().eq("pid", 0));
- list.stream().forEach(
- item -> {
- map.put(item.getCode(), item.getWeight());
- }
- );
- return map;
- }
-
- @Override
- public BarLineDTO getChart(String pid) {
- BarLineDTO barLineDTO = new BarLineDTO();
- List<SeriesItem> series = new ArrayList<>();
- List<Object[]> data = new ArrayList<>();
- SeriesItem seriesItem = new SeriesItem();
- List<String> legend = new ArrayList<>();
- List<IndexEvaluateSystemEntity> list = baseDao.selectList(new QueryWrapper<IndexEvaluateSystemEntity>().eq("pid", pid));
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < list.size(); i++) {
- legend.add(list.get(i).getEvaluateIndex());
- Map<String, String> map = new HashMap<>();
- map.put("value", list.get(i).getWeight() == null ? "" : list.get(i).getWeight().toString());
- map.put("name", list.get(i).getEvaluateIndex());
- objects[i] = map;
- }
- data.add(objects);
- seriesItem.setData(data);
- series.add(seriesItem);
- barLineDTO.setSeries(series);
- barLineDTO.setLegend(legend);
- return barLineDTO;
- }
-
- @Override
- public void updataWeight(List<IndexEvaluateSystemEntity> list) {
- list.stream().forEach(
- item -> {
- baseDao.updateById(item);
- }
- );
- }
-
- @Override
- public void updataSystemWeight(Map<String, String> params) {
- String number = params.get("number");
- String quality = params.get("quality");
- String consume = params.get("consume");
- String process = params.get("process");
- String manage = params.get("manage");
-
- IndexEvaluateSystemEntity numberEntity = baseDao.selectOne(new QueryWrapper<IndexEvaluateSystemEntity>().eq("code", "SYS0001"));
- numberEntity.setWeight(Integer.parseInt(number));
-
- IndexEvaluateSystemEntity qualityEntity = baseDao.selectOne(new QueryWrapper<IndexEvaluateSystemEntity>().eq("code", "SYS0002"));
- qualityEntity.setWeight(Integer.parseInt(quality));
-
- IndexEvaluateSystemEntity consumeEntity = baseDao.selectOne(new QueryWrapper<IndexEvaluateSystemEntity>().eq("code", "SYS0003"));
- consumeEntity.setWeight(Integer.parseInt(consume));
-
- IndexEvaluateSystemEntity processEntity = baseDao.selectOne(new QueryWrapper<IndexEvaluateSystemEntity>().eq("code", "SYS0004"));
- processEntity.setWeight(Integer.parseInt(process));
-
- IndexEvaluateSystemEntity manageEntity = baseDao.selectOne(new QueryWrapper<IndexEvaluateSystemEntity>().eq("code", "SYS0005"));
- manageEntity.setWeight(Integer.parseInt(manage));
-
- baseDao.updateById(numberEntity);
- baseDao.updateById(qualityEntity);
- baseDao.updateById(consumeEntity);
- baseDao.updateById(processEntity);
- baseDao.updateById(manageEntity);
- }
-
-
- @Override
- public List<Double> getWeight() {
- BigDecimal val100 = new BigDecimal("100");
- List<Double> result = new ArrayList<>();
- QueryWrapper<IndexEvaluateSystemEntity> wrapper = new QueryWrapper<>();
- wrapper.orderByAsc("sort");
- List<IndexEvaluateSystemEntity> list = baseDao.selectList(wrapper);
- if (CollectionUtils.isEmpty(list)) {
- return result;
- }
- list.forEach(item -> {
- result.add(new BigDecimal(item.getWeight()).divide(val100, 3, BigDecimal.ROUND_HALF_UP).doubleValue());
- });
- return result;
- }
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PageCharsServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PageCharsServiceImpl.java
deleted file mode 100644
index eed4f42..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PageCharsServiceImpl.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package com.iailab.module.prod.service.impl;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.common.enums.CdbmEnum;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignQueryPointDTO;
-import com.iailab.module.data.dto.ApiDataDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.param.service.PageParmService;
-import com.iailab.module.prod.dto.PageCharsDTO;
-import com.iailab.module.quality.service.QualityQualityTrendDayService;
-import com.iailab.module.prod.service.*;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-@Service
-public class PageCharsServiceImpl implements PageCharsService {
-
- @Resource
- private IFeignDataApi iFeignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Resource
- private PageParmService pageParmService;
-
- @Resource
- private PrdCurrentPerformanceService prdCurrentPerformanceService;
-
- @Resource
- private PrdCurrentSaleService prdCurrentSaleService;
-
- @Resource
- private PrdDayProdService prdDayProdService;
-
- @Resource
- private PrdPlanMonService prdPlanMonService;
-
- @Resource
- private PrdPlanYearService prdPlanYearService;
-
- @Resource
- private QualityQualityTrendDayService qualityQualityTrendDayService;
-
- @Override
- public List<PageCharsDTO> getData(String page) {
-
- String chars = pageParmService.selectValue(page, "chars");
- String length = pageParmService.selectValue(page, "length");
- String pointLength = pageParmService.selectValue(page, "point_length");
- String coal = pageParmService.selectValue(page, "coal");
- String point = pageParmService.selectValue(page, "point")==null?"":pageParmService.selectValue(page, "point");
- List<String> coalList = Arrays.asList(coal.split(";"));
- List<String> pointList = Arrays.asList(point.split(";"));
- List<String> charsCodeList = Arrays.asList(chars.split(";"));
- List<PageCharsDTO> list = new ArrayList<>();
- charsCodeList.stream().forEach(
- item -> {
- //如果数据源为报表，类型为煤质或产量，传一个煤种参数
- if(CdbmEnum.HF.getCode().equals(item)||CdbmEnum.LF.getCode().equals(item)||CdbmEnum.SF.getCode().equals(item)||CdbmEnum.RZ.getCode().equals(item)||CdbmEnum.CL.getCode().equals(item)) {
- coalList.stream().forEach(
- coalItem->{
- list.add(getPageChars(item, length,coalItem));
- }
- );
- }else if(item.equals("point")){
- //如果数据源为point，传一个测点参数
- pointList.stream().forEach(
- pointItem->{
- list.add(getPageChars(item,pointLength,pointItem));
- }
- );
- }else {
- list.add(getPageChars(item, length,""));
- }
- }
- );
-
- return list;
- }
-
- public PageCharsDTO getPageChars(String charsCode, String length,String param) {
- PageCharsDTO dto = new PageCharsDTO();
- BarLineDTO barLine;
-
- try {
- switch (charsCode) {
- case "plan":
- //计划
- barLine = prdPlanMonService.barLine(length);
- dto.setCurrentValue(prdPlanMonService.currentValue()==null?new BigDecimal(0):prdPlanMonService.currentValue());
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("plan").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "cl":
- //产量
- barLine = prdDayProdService.barLine(length,param);
- dto.setCurrentValue(prdDayProdService.currentValue(param)==null?new BigDecimal(0):prdDayProdService.currentValue(param));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("cl").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "groundsales":
- //地销混煤
- barLine = prdCurrentSaleService.barLine(length,"groundsales");
- dto.setCurrentValue(prdCurrentSaleService.currentValue("groundsales")==null?new BigDecimal(0):prdCurrentSaleService.currentValue("groundsales"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("groundsales").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "medblock":
- //洗中块外运
- barLine = prdCurrentSaleService.barLine(length,"medblock");
- dto.setCurrentValue(prdCurrentSaleService.currentValue("medblock")==null?new BigDecimal(0):prdCurrentSaleService.currentValue("medblock"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("medblock").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "nubmeasure":
- //洗小块外运
- barLine = prdCurrentSaleService.barLine(length,"nubmeasure");
- dto.setCurrentValue(prdCurrentSaleService.currentValue("nubmeasure")==null?new BigDecimal(0):prdCurrentSaleService.currentValue("nubmeasure"));
- dto.setBarLineDTO(barLine);
- dto.setLength(length);
- dto.setUnit(CdbmEnum.getEumByCode("nubmeasure").getUnit());
- //调用模型方法
- this.run(dto);
- break;
- case "gangue":
- //矸石外运
- barLine = prdCurrentSaleService.barLine(length,"gangue");
- dto.setCurrentValue(prdCurrentSaleService.currentValue("gangue")==null?new BigDecimal(0):prdCurrentSaleService.currentValue("gangue"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("gangue").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "reshipped":
- //小块转载
- barLine = prdCurrentSaleService.barLine(length,"reshipped");
- dto.setCurrentValue(prdCurrentSaleService.currentValue("reshipped")==null?new BigDecimal(0):prdCurrentSaleService.currentValue("reshipped"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("reshipped").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "trainTon":
- //火车外运吨数
- barLine = prdCurrentSaleService.barLine(length,"trainTon");
- dto.setCurrentValue(prdCurrentSaleService.currentValue("trainTon")==null?new BigDecimal(0):prdCurrentSaleService.currentValue("trainTon"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("trainTon").getUnit());
- //调用模型方法
- this.run(dto);
- break;
- case "trainCount":
- //火车外运列数
- barLine = prdCurrentSaleService.barLine(length,"trainCount");
- dto.setCurrentValue(prdCurrentSaleService.currentValue("trainCount")==null?new BigDecimal(0):prdCurrentSaleService.currentValue("trainCount"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("trainCount").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "dbl":
- //达标率
- dto.setUnit(CdbmEnum.getEumByCode("dbl").getUnit());
- barLine = prdDayProdService.barLine(length,"dbl");
- dto.setCurrentValue(prdDayProdService.currentValue("dbl")==null?new BigDecimal(0):prdDayProdService.currentValue("dbl"));
- dto.setBarLineDTO(barLine);
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "hf":
- //灰分
- barLine = qualityQualityTrendDayService.barLine(length,"hf",param);
- dto.setCurrentValue(qualityQualityTrendDayService.currentValue(param,"hf")==null?new BigDecimal(0):qualityQualityTrendDayService.currentValue(param,"hf"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("hf").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "lf":
- //硫分
- barLine = qualityQualityTrendDayService.barLine(length,"lf",param);
- dto.setCurrentValue(qualityQualityTrendDayService.currentValue(param,"lf")==null?new BigDecimal(0):qualityQualityTrendDayService.currentValue(param,"lf"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("lf").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "sf":
- //水分
- barLine = qualityQualityTrendDayService.barLine(length,"sf",param);
- dto.setCurrentValue(qualityQualityTrendDayService.currentValue(param,"sf")==null?new BigDecimal(0):qualityQualityTrendDayService.currentValue(param,"sf"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("sf").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "rz":
- //热值
- barLine = qualityQualityTrendDayService.barLine(length,"rz",param);
- dto.setCurrentValue(qualityQualityTrendDayService.currentValue(param,"rz")==null?new BigDecimal(0):qualityQualityTrendDayService.currentValue(param,"rz"));
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByCode("rz").getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- case "point":
- //测点
- barLine = this.pointBarline(param,length);
-
- dto.setBarLineDTO(barLine);
- dto.setUnit(CdbmEnum.getEumByName(param).getUnit());
- dto.setLength(length);
- //调用模型方法
- this.run(dto);
- break;
- default:
- break;
- }
- }catch (Exception e){
- e.printStackTrace();
- System.out.println(charsCode+"查图表渲染异常" + e.getMessage());
- }
- return dto;
- }
-
- private BarLineDTO pointBarline(String param,String length) {
-
- FeignQueryPointDTO dto = new FeignQueryPointDTO();
- dto.setEndTime(new Date());
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(length));
- dto.setStartTime(calendar.getTime());
- dto.setPointCode(CdbmEnum.getEumByName(param).getCode());
- dto.setType("float");
- List<ApiDataDTO> list = iFeignDataApi.queryPointValues(dto);
-
- //封装echarsDto
- BarLineDTO barLineDTO = new BarLineDTO();
- List<String> legend = new ArrayList<>();
- List<String> categories = new ArrayList<>();
- List<SeriesItem> series = new ArrayList<>();
- SeriesItem seriesItem = new SeriesItem();
- seriesItem.setName(CdbmEnum.getEumByName(param).getDesc());
- List<Object[]> seriesData = new ArrayList<>();
- for (ApiDataDTO entity : list) {
- // 将数据作为图表数据
- seriesData.add(new Object[]{entity.getTimeStamp(), entity.getDataValue()});
- }
- seriesItem.setData(seriesData);
- series.add(seriesItem);
- barLineDTO.setLegend(legend);
- barLineDTO.setSeries(series);
- barLineDTO.setValueName(CdbmEnum.getEumByName(param).getDesc());
-
- return barLineDTO;
-
- }
-
-
- private PageCharsDTO run(PageCharsDTO dto){
- dto.setSuggest("暂无建议");
- dto.setSuggestTime(new Date());
- dto.setAvg("");
- dto.setMax("");
- dto.setMin("");
- return dto;
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdCurrentPerformanceServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdCurrentPerformanceServiceImpl.java
deleted file mode 100644
index 5e29730..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdCurrentPerformanceServiceImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.iailab.module.prod.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.CommonUtils;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.prod.dao.PrdCurrentPerformanceDao;
-import com.iailab.module.prod.dto.PrdCurrentPerformanceDTO;
-import com.iailab.module.prod.entity.PrdCurrentPerformanceEntity;
-import com.iailab.module.prod.service.PrdCurrentPerformanceService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Slf4j
-@Service
-public class PrdCurrentPerformanceServiceImpl extends BaseServiceImpl<PrdCurrentPerformanceDao, PrdCurrentPerformanceEntity> implements PrdCurrentPerformanceService {
-
- private String HTTP_API_CODE = "Prd.CurrentPerformance";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Override
- public PageData<PrdCurrentPerformanceDTO> page(Map<String, Object> params) {
- IPage<PrdCurrentPerformanceEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, PrdCurrentPerformanceDTO.class);
- }
-
- private QueryWrapper<PrdCurrentPerformanceEntity> getWrapper(Map<String, Object> params){
- String rq = (String)params.get("rq");
-
- QueryWrapper<PrdCurrentPerformanceEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq)
- .orderByAsc("rq");
-
- return wrapper;
- }
-
- @Override
- public PrdCurrentPerformanceDTO get(String id) {
- PrdCurrentPerformanceEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, PrdCurrentPerformanceDTO.class);
- }
-
- @Override
- public void save(PrdCurrentPerformanceDTO dto) {
- PrdCurrentPerformanceEntity entity = ConvertUtils.sourceToTarget(dto, PrdCurrentPerformanceEntity.class);
-
- insert(entity);
- }
-
- @Override
- public void update(PrdCurrentPerformanceDTO dto) {
- PrdCurrentPerformanceEntity entity = ConvertUtils.sourceToTarget(dto, PrdCurrentPerformanceEntity.class);
-
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- public BarLineDTO barLine(String length) {
- return null;
- }
-
- @Override
- public BigDecimal currentValue() {
- return null;
- }
-
- public List<String> getLastMonthDates() {
- List<String> dateList = new ArrayList<>();
- LocalDate currentDate = LocalDate.now();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- for (int i = 29; i >= 0; i--) {
- dateList.add(currentDate.minusDays(i).format(formatter));
- }
-
- return dateList;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl(), params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONObject res = responseObj.getJSONObject(CommonConstant.ZX_RES);
- JSONObject yesterday = res.getJSONObject("yesterday");
- if (yesterday == null) {
- return;
- }
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- String rq = DateUtils.format(calendar.getTime());
- this.deleteByRq(rq);
- PrdCurrentPerformanceEntity entity = new PrdCurrentPerformanceEntity();
- entity.setId(UUID.randomUUID().toString());
- entity.setRq(rq);
- entity.setXxPerformance(CommonUtils.getJSONValue(yesterday.get("xxPerformance")));
- entity.setZqPerformance(CommonUtils.getJSONValue(yesterday.get("zqPerformance")));
- entity.setCreateDate(new Date());
- entity.setUpdateDate(new Date());
- insert(entity);
-
- }
-
- private void deleteByRq(String rq) {
- QueryWrapper<PrdCurrentPerformanceEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq);
- baseDao.delete(wrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdCurrentSaleServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdCurrentSaleServiceImpl.java
deleted file mode 100644
index 1a9b66e..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdCurrentSaleServiceImpl.java
+++ /dev/null
@@ -1,342 +0,0 @@
-
-package com.iailab.module.prod.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.prod.dao.PrdCurrentSaleDao;
-import com.iailab.module.prod.dto.PrdCurrentSaleDTO;
-import com.iailab.module.prod.entity.PrdCurrentSaleEntity;
-import com.iailab.module.prod.service.PrdCurrentSaleService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Slf4j
-@Service
-public class PrdCurrentSaleServiceImpl extends BaseServiceImpl<PrdCurrentSaleDao, PrdCurrentSaleEntity> implements PrdCurrentSaleService {
-
- private String HTTP_API_CODE = "Prd.SaleTrendDay";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Resource
- private PrdCurrentSaleDao prdCurrentSaleDao;
-
- @Override
- public PageData<PrdCurrentSaleDTO> page(Map<String, Object> params) {
- IPage<PrdCurrentSaleEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, PrdCurrentSaleDTO.class);
- }
-
- private QueryWrapper<PrdCurrentSaleEntity> getWrapper(Map<String, Object> params){
- String rq = (String)params.get("rq");
-
- QueryWrapper<PrdCurrentSaleEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq)
- .orderByAsc("rq");
-
- return wrapper;
- }
-
- @Override
- public PrdCurrentSaleDTO get(String id) {
- PrdCurrentSaleEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, PrdCurrentSaleDTO.class);
- }
-
- @Override
- public void save(PrdCurrentSaleDTO dto) {
- PrdCurrentSaleEntity entity = ConvertUtils.sourceToTarget(dto, PrdCurrentSaleEntity.class);
-
- insert(entity);
- }
-
- @Override
- public void update(PrdCurrentSaleDTO dto) {
- PrdCurrentSaleEntity entity = ConvertUtils.sourceToTarget(dto, PrdCurrentSaleEntity.class);
-
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- public BarLineDTO barLine(String length,String type) {
-
- BarLineDTO barLineDTO = new BarLineDTO();
- List<SeriesItem> seriesItemList = new ArrayList<>();
- List<Object[]> data = new ArrayList();
-
- switch (type) {
- case "groundsales":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getGroundsales();
- if(item.getGroundsales()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("地销混煤");
- }
- );
- break;
- case "medblock":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getMedblock();
- if(item.getMedblock()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("洗中块外运");
- }
- );
- break;
- case "nubmeasure":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getNubmeasure();
- if(item.getNubmeasure()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("洗小块外运");
- }
- );
- break;
- case "gangue":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getGangue();
- if(item.getGangue()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("矸石外运");
- }
- );
- break;
- case "reshipped":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getReshipped();
- if(item.getReshipped()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("小块转载");
- }
- );
- break;
- case "trainTon":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getTrainTon();
- if(item.getGangue()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("火车外运吨数");
- }
- );
- break;
- case "trainCount":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getTrainCount();
- if(item.getGangue()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("火车外运列数");
- }
- );
- break;
- default:
- break;
- }
-
- SeriesItem seriesItem = new SeriesItem();
- seriesItem.setData(data);
- seriesItemList.add(seriesItem);
- //barLineDTO.setLegend(this.getLastMonthDates(Integer.parseInt(length)));
- barLineDTO.setSeries(seriesItemList);
- return barLineDTO;
- }
-
- @Override
- public BigDecimal currentValue(String type) {
- switch (type) {
- case "groundsales":
- //地销混煤
- return baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getGroundsales();
- case "medblock":
- //洗中块外运
- return baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getMedblock();
- case "nubmeasure":
- //洗小块外运
- return baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getNubmeasure();
- case "gangue":
- //矸石外运
- return baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getGangue();
- case "reshipped":
- //小块转载
- return baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getReshipped();
- case "trainTon":
- //火车外运吨数
- return baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getTrainTon();
- case "trainCount":
- //火车外运列数
- return baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getTrainCount();
-
- default:
- break;
- }
- return null;
- }
- public List<String> getLastMonthDates(int length) {
- List<String> dateList = new ArrayList<>();
- LocalDate currentDate = LocalDate.now();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- for (int i = length-1; i >= 0; i--) {
- dateList.add(currentDate.minusDays(i).format(formatter));
- }
-
- return dateList;
- }
-
- public List<PrdCurrentSaleEntity> list(){
- List<PrdCurrentSaleEntity> prdCurrentSaleList = baseDao.selectList(
- new QueryWrapper<PrdCurrentSaleEntity>()
- .le("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
- .ge("rq",LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
- .orderByAsc("rq")
- );
- return prdCurrentSaleList;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DAY_OF_YEAR, -30);
- String startDate = DateUtils.format(calendar.getTime());
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl() + "&startDate=" + startDate, params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONArray dataArray = responseObj.getJSONArray(CommonConstant.ZX_RES);
- if (CollectionUtils.isEmpty(dataArray)) {
- return;
- }
- List<PrdCurrentSaleEntity> entities = dataArray.toJavaList(PrdCurrentSaleEntity.class);
-
- entities.forEach(entity -> {
- deleteByRq(entity.getDate());
- entity.setRq(entity.getDate());
- entity.setId(UUID.randomUUID().toString());
- entity.setCreateDate(new Date());
- entity.setUpdateDate(new Date());
- insert(entity);
- });
- }
-
- private void deleteByRq(String rq) {
- QueryWrapper<PrdCurrentSaleEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq);
- baseDao.delete(wrapper);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdDayDutyServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdDayDutyServiceImpl.java
deleted file mode 100644
index 811728a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdDayDutyServiceImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.iailab.module.prod.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.prod.dao.PrdDayDutyDao;
-import com.iailab.module.prod.entity.PrdDayDutyEntity;
-import com.iailab.module.prod.service.PrdDayDutyService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月26日
- */
-@Slf4j
-@Service
-public class PrdDayDutyServiceImpl extends BaseServiceImpl<PrdDayDutyDao, PrdDayDutyEntity> implements PrdDayDutyService {
-
- private String HTTP_API_CODE = "Prd.DayDuty";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- Calendar calendar = Calendar.getInstance();
- String endDate = DateUtils.format(calendar.getTime());
- calendar.add(Calendar.DAY_OF_YEAR, -5);
- String startDate = DateUtils.format(calendar.getTime());
-
-
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl() + "&startDate=" + startDate + "&endDate=" + endDate, params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONArray dataArray = responseObj.getJSONArray(CommonConstant.ZX_RES);
- if (CollectionUtils.isEmpty(dataArray)) {
- return;
- }
- this.deleteByDate(startDate, endDate);
- List<PrdDayDutyEntity> dataList = dataArray.toJavaList(PrdDayDutyEntity.class);
- dataList.forEach(entity -> {
- if (StringUtils.isNotBlank(entity.getBanci())) {
- entity.setId(UUID.randomUUID().toString());
- if (entity.getArrive() == null) {
- entity.setArrive(entity.getNumber());
- }
- insert(entity);
- }
- });
- }
-
- private void deleteByDate(String start, String end) {
- QueryWrapper<PrdDayDutyEntity> wrapper = new QueryWrapper<>();
- wrapper.ge("date", start).le("date", end);
- baseDao.delete(wrapper);
- }
-
-
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdDayProdServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdDayProdServiceImpl.java
deleted file mode 100644
index 738f4b7..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdDayProdServiceImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-
-package com.iailab.module.prod.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.prod.dao.PrdDayProdDao;
-import com.iailab.module.prod.dao.PrdPlanMonDao;
-import com.iailab.module.prod.dto.PrdDayProdDTO;
-import com.iailab.module.prod.entity.PrdDayProdEntity;
-import com.iailab.module.prod.entity.PrdPlanMonEntity;
-import com.iailab.module.prod.service.PrdDayProdService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Slf4j
-@Service
-public class PrdDayProdServiceImpl extends BaseServiceImpl<PrdDayProdDao, PrdDayProdEntity> implements PrdDayProdService {
-
- @Resource
- private PrdPlanMonDao prdPlanMonDao;
-
- private String HTTP_API_CODE = "Prd.DayProd";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Override
- public PageData<PrdDayProdDTO> page(Map<String, Object> params) {
- IPage<PrdDayProdEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, PrdDayProdDTO.class);
- }
-
- private QueryWrapper<PrdDayProdEntity> getWrapper(Map<String, Object> params){
- String rq = (String)params.get("rq");
-
- QueryWrapper<PrdDayProdEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq)
- .orderByAsc("rq");
-
- return wrapper;
- }
-
- @Override
- public PrdDayProdDTO get(String id) {
- PrdDayProdEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, PrdDayProdDTO.class);
- }
-
- @Override
- public void save(PrdDayProdDTO dto) {
- PrdDayProdEntity entity = ConvertUtils.sourceToTarget(dto, PrdDayProdEntity.class);
-
- insert(entity);
- }
-
- @Override
- public void update(PrdDayProdDTO dto) {
- PrdDayProdEntity entity = ConvertUtils.sourceToTarget(dto, PrdDayProdEntity.class);
-
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- public BarLineDTO barLine(String length,String type) {
-
- BarLineDTO barLineDTO = new BarLineDTO();
- List<SeriesItem> seriesItemList = new ArrayList<>();
- List<Object[]> data = new ArrayList();
- //获取当前月份天数
- int lengthOfMonth = LocalDate.now().lengthOfMonth();
-
- //获取月计划
- PrdPlanMonEntity planMonEntity = prdPlanMonDao.selectOne(new QueryWrapper<PrdPlanMonEntity>()
- .eq("rq", new SimpleDateFormat("MM").format(new Date()))
- );
- BigDecimal planDay = planMonEntity==null?new BigDecimal(0):planMonEntity.getXxPlan().divide(new BigDecimal(lengthOfMonth),2,BigDecimal.ROUND_HALF_UP);
-
- switch (type) {
- case "混煤":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getMixedCoal();
- if(item.getMixedCoal()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("混煤产量");
- }
- );
- break;
- case "原煤":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getRawCoal();
- if(item.getRawCoal()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("原煤入洗量");
- }
- );
- break;
- case "洗中块":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getMediumCoal();
- if(item.getMediumCoal()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("洗中块产量");
- }
- );
- break;
- case "洗小块":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getSmallCoal();
- if(item.getSmallCoal()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("洗小块产量");
- }
- );
- break;
- case "矸石":
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getGangue();
- if(item.getGangue()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName("矸石产量");
- }
- );
- break;
- default:
- break;
- }
-
- SeriesItem seriesItem = new SeriesItem();
- seriesItem.setData(data);
- seriesItemList.add(seriesItem);
- //barLineDTO.setLegend(this.getLastMonthDates(Integer.parseInt(length)));
- barLineDTO.setSeries(seriesItemList);
- return barLineDTO;
- }
-
- @Override
- public BigDecimal currentValue(String type) {
- switch (type) {
- case "混煤":
- //混煤
- return baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getMixedCoal();
- case "原煤":
- //入洗量
- return baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getRawCoal();
- case "洗中块":
- return baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getMediumCoal();
- case "洗小块":
- return baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getSmallCoal();
- case "矸石":
- return baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date())))==null
- ?new BigDecimal(0)
- :baseDao.selectOne(
- new QueryWrapper<PrdDayProdEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))).getGangue();
- default:
- break;
- }
- return null;
- }
- public List<String> getLastMonthDates(int length) {
- List<String> dateList = new ArrayList<>();
- LocalDate currentDate = LocalDate.now();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- for (int i = length-1; i >= 0; i--) {
- dateList.add(currentDate.minusDays(i).format(formatter));
- }
-
- return dateList;
- }
-
- public List<PrdDayProdEntity> list(){
- List<PrdDayProdEntity> prdDayProdList = baseDao.selectList(
- new QueryWrapper<PrdDayProdEntity>()
- .le("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
- .ge("rq",LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
- .orderByAsc("rq")
- );
- return prdDayProdList;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData(String paramDate) {
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.HOUR_OF_DAY, -12);
- String rq = StringUtils.isNotBlank(paramDate) ? paramDate : DateUtils.format(calendar.getTime());
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl() + "&date=" + rq, params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONObject dataObj = responseObj.getJSONObject(CommonConstant.ZX_RES);
- if (dataObj == null) {
- return;
- }
- this.deleteByDate(rq);
- PrdDayProdEntity entity = dataObj.toJavaObject(PrdDayProdEntity.class);
- entity.setId(UUID.randomUUID().toString());
- entity.setRq(rq);
- entity.setCreateDate(new Date());
- entity.setUpdateDate(new Date());
- insert(entity);
- }
-
- private void deleteByDate(String date) {
- QueryWrapper<PrdDayProdEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(date), "rq", date);
- baseDao.delete(wrapper);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdPlanMonServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdPlanMonServiceImpl.java
deleted file mode 100644
index 5bd026b..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdPlanMonServiceImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-
-package com.iailab.module.prod.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.CommonUtils;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.prod.dao.PrdPlanMonDao;
-import com.iailab.module.prod.dto.PrdPlanMonDTO;
-import com.iailab.module.prod.entity.PrdPlanMonEntity;
-import com.iailab.module.prod.service.PrdPlanMonService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Slf4j
-@Service
-public class PrdPlanMonServiceImpl extends BaseServiceImpl<PrdPlanMonDao, PrdPlanMonEntity> implements PrdPlanMonService {
-
- private String HTTP_API_CODE = "Prd.YearPEI";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Override
- public PageData<PrdPlanMonDTO> page(Map<String, Object> params) {
- IPage<PrdPlanMonEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, PrdPlanMonDTO.class);
- }
-
- private QueryWrapper<PrdPlanMonEntity> getWrapper(Map<String, Object> params){
- String rq = (String)params.get("rq");
-
- QueryWrapper<PrdPlanMonEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq)
- .orderByAsc("rq");
-
- return wrapper;
- }
-
- @Override
- public PrdPlanMonDTO get(String id) {
- PrdPlanMonEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, PrdPlanMonDTO.class);
- }
-
- @Override
- public void save(PrdPlanMonDTO dto) {
- PrdPlanMonEntity entity = ConvertUtils.sourceToTarget(dto, PrdPlanMonEntity.class);
-
- insert(entity);
- }
-
- @Override
- public void update(PrdPlanMonDTO dto) {
- PrdPlanMonEntity entity = ConvertUtils.sourceToTarget(dto, PrdPlanMonEntity.class);
-
- updateById(entity);
- }
-
- public List<PrdPlanMonEntity> list(){
- List<PrdPlanMonEntity> prdPlanMonList = baseDao.selectList(
- new QueryWrapper<PrdPlanMonEntity>()
- .ge("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
- .le("rq",new SimpleDateFormat("yyyy-MM-dd").format(LocalDate.now().minusDays(29)))
- );
- return prdPlanMonList;
- }
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- public BarLineDTO barLine(String length) {
-
- BarLineDTO barLineDTO = new BarLineDTO();
- List<SeriesItem> seriesItemList = new ArrayList<>();
- List<Object[]> data = new ArrayList();
- this.list().stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getXxPlan();
- data.add(dataItem);
- }
- );
-
-
- SeriesItem seriesItem = new SeriesItem();
- seriesItem.setData(data);
- barLineDTO.setValueName("月计划");
- List categoriesList = new ArrayList();
- categoriesList.add("");
- categoriesList.add("");
- barLineDTO.setCategories(categoriesList);
- //barLineDTO.setLegend(this.getLastMonthDates());
- barLineDTO.setSeries(seriesItemList);
- return barLineDTO;
- }
-
- @Override
- public BigDecimal currentValue() {
- return new BigDecimal(1000);
- }
- public List<String> getLastMonthDates() {
- List<String> dateList = new ArrayList<>();
- LocalDate currentDate = LocalDate.now();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- for (int i = 29; i >= 0; i--) {
- dateList.add(currentDate.minusDays(i).format(formatter));
- }
-
- return dateList;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl(), params, "utf-8", "");
-
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONObject res = responseObj.getJSONObject(CommonConstant.ZX_RES);
- JSONObject yearData = res.getJSONObject("yearData");
- String year = yearData.get("year").toString();
- JSONArray monthData = res.getJSONArray("monthData");
- for (int i = 0; i < monthData.size(); i++) {
- JSONObject item = monthData.getJSONObject(i);
- String rq = year + "-" + (Integer.parseInt(item.getString("month")) < 10 ? "0" + item.getString("month") : item.getString("month") );
- this.deleteByRq(rq);
- PrdPlanMonEntity entity = new PrdPlanMonEntity();
- entity.setId(UUID.randomUUID().toString());
- entity.setRq(rq);
- entity.setXxPlan(CommonUtils.getJSONValue(item.get("xxPlan")));
- entity.setXxPerformance(CommonUtils.getJSONValue(item.get("xxPerformance")));
- entity.setZqPlan(CommonUtils.getJSONValue(item.get("zqPlan")));
- entity.setZqPerformance(CommonUtils.getJSONValue(item.get("zqPerformance")));
- entity.setCreateDate(new Date());
- entity.setUpdateDate(new Date());
- insert(entity);
- }
- }
-
- private void deleteByRq(String rq) {
- QueryWrapper<PrdPlanMonEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq);
- baseDao.delete(wrapper);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdPlanYearServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdPlanYearServiceImpl.java
deleted file mode 100644
index 9b46e3c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdPlanYearServiceImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package com.iailab.module.prod.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.CommonUtils;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.prod.dao.PrdPlanYearDao;
-import com.iailab.module.prod.dto.PrdPlanYearDTO;
-import com.iailab.module.prod.entity.PrdPlanYearEntity;
-import com.iailab.module.prod.service.PrdPlanYearService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年05月14日
- */
-@Slf4j
-@Service
-public class PrdPlanYearServiceImpl extends BaseServiceImpl<PrdPlanYearDao, PrdPlanYearEntity> implements PrdPlanYearService {
-
- private String HTTP_API_CODE = "Prd.YearPEI";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Override
- public PageData<PrdPlanYearDTO> page(Map<String, Object> params) {
- IPage<PrdPlanYearEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, PrdPlanYearDTO.class);
- }
-
- private QueryWrapper<PrdPlanYearEntity> getWrapper(Map<String, Object> params){
- String rq = (String)params.get("rq");
-
- QueryWrapper<PrdPlanYearEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq)
- .orderByAsc("rq");
-
- return wrapper;
- }
-
- @Override
- public PrdPlanYearDTO get(String id) {
- PrdPlanYearEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, PrdPlanYearDTO.class);
- }
-
- @Override
- public void save(PrdPlanYearDTO dto) {
- PrdPlanYearEntity entity = ConvertUtils.sourceToTarget(dto, PrdPlanYearEntity.class);
-
- insert(entity);
- }
-
- @Override
- public void update(PrdPlanYearDTO dto) {
- PrdPlanYearEntity entity = ConvertUtils.sourceToTarget(dto, PrdPlanYearEntity.class);
-
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- public BarLineDTO barLine(String length) {
- return null;
- }
-
- @Override
- public BigDecimal currentValue() {
- return null;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl(), params, "utf-8", "");
-
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONObject res = responseObj.getJSONObject(CommonConstant.ZX_RES);
- JSONObject yearData = res.getJSONObject("yearData");
- this.deleteByYear(yearData.get("year").toString());
- PrdPlanYearEntity entity = new PrdPlanYearEntity();
- entity.setId(UUID.randomUUID().toString());
- entity.setRq(yearData.get("year").toString());
- entity.setXxPlan(CommonUtils.getJSONValue(yearData.get("xxPlan")));
- entity.setXxPerformance(CommonUtils.getJSONValue(yearData.get("xxPerformance")));
- entity.setZqPlan(CommonUtils.getJSONValue(yearData.get("zqPlan")));
- entity.setZqPerformance(CommonUtils.getJSONValue(yearData.get("zqPerformance")));
- entity.setCreateDate(new Date());
- entity.setUpdateDate(new Date());
- insert(entity);
-
- }
-
- private void deleteByYear(String rq) {
- QueryWrapper<PrdPlanYearEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq);
- baseDao.delete(wrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdTimeDayServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdTimeDayServiceImpl.java
deleted file mode 100644
index ba58da4..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/PrdTimeDayServiceImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.iailab.module.prod.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.CommonUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.prod.dao.PrdTimeDayDao;
-import com.iailab.module.prod.entity.PrdTimeDayEntity;
-import com.iailab.module.prod.service.PrdTimeDayService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月16日
- */
-@Slf4j
-@Service
-public class PrdTimeDayServiceImpl extends BaseServiceImpl<PrdTimeDayDao, PrdTimeDayEntity> implements PrdTimeDayService {
-
- private String HTTP_API_CODE = "Prd.PrdTimeDistByDate";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData(String iRq) {
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.HOUR_OF_DAY, -12);
- String rq = StringUtils.isNotBlank(iRq) ? iRq : DateUtils.format(calendar.getTime());
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl() + "&startDate=" + rq + "&endDate=" + rq, params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONObject dataObj = responseObj.getJSONObject(CommonConstant.ZX_RES);
- if (dataObj == null) {
- return;
- }
- deleteByDate(rq);
- JSONObject xxData = dataObj.getJSONObject("xx");
- PrdTimeDayEntity entity = new PrdTimeDayEntity();
- entity.setId(UUID.randomUUID().toString());
- entity.setCreateDate(new Date());
- entity.setDate(rq);
- entity.setType("xx");
- entity.setRunMinutes(CommonUtils.getJSONValue(xxData.get("runMinutes")));
- entity.setOverhaulMinutes(CommonUtils.getJSONValue(xxData.get("overhaulMinutes")));
- entity.setAffectMinutes(CommonUtils.getJSONValue(xxData.get("affectMinutes")));
- insert(entity);
- }
-
- private void deleteByDate(String date) {
- QueryWrapper<PrdTimeDayEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(date), "date", date);
- baseDao.delete(wrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/StorageDayServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/StorageDayServiceImpl.java
deleted file mode 100644
index 2a8c1bf..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/prod/service/impl/StorageDayServiceImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.iailab.module.prod.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.prod.dao.StorageDayDao;
-import com.iailab.module.prod.entity.StorageDayEntity;
-import com.iailab.module.prod.service.StorageDayService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月01日
- */
-@Slf4j
-@Service
-public class StorageDayServiceImpl extends BaseServiceImpl<StorageDayDao, StorageDayEntity> implements StorageDayService {
-
- private String HTTP_API_CODE = "Prd.StorageDay";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- String endDate = DateUtils.format(calendar.getTime());
- calendar.add(Calendar.DAY_OF_YEAR, -5);
- String startDate = DateUtils.format(calendar.getTime());
-
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl() + "&startDate=" + startDate + "&endDate=" + endDate, params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONArray dataArray = responseObj.getJSONArray(CommonConstant.ZX_RES);
- if (CollectionUtils.isEmpty(dataArray)) {
- return;
- }
- List<StorageDayEntity> entities = dataArray.toJavaList(StorageDayEntity.class);
- entities.forEach(entity -> {
- deleteByDate(entity.getDate());
- entity.setId(UUID.randomUUID().toString());
- entity.setCreateDate(new Date());
- insert(entity);
- });
- }
-
- private void deleteByDate(String date) {
- QueryWrapper<StorageDayEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(date), "date", date);
- baseDao.delete(wrapper);
- }
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/dao/QualityQualityTrendDayDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/dao/QualityQualityTrendDayDao.java
deleted file mode 100644
index 6aa4eb4..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/dao/QualityQualityTrendDayDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-
-package com.iailab.module.quality.dao;
-
-import com.iailab.framework.common.dao.BaseDao;
-import com.iailab.module.quality.entity.QualityQualityTrendDayEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月20日
- */
-@Mapper
-public interface QualityQualityTrendDayDao extends BaseDao<QualityQualityTrendDayEntity> {
-}
-
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/dto/QualityQualityTrendDayDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/dto/QualityQualityTrendDayDTO.java
deleted file mode 100644
index 5852c66..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/dto/QualityQualityTrendDayDTO.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.iailab.module.quality.dto;
-
-import com.iailab.framework.common.validation.group.AddGroup;
-import com.iailab.framework.common.validation.group.UpdateGroup;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月20日
- */
-@Data
-@Schema(name = "应用注册")
-public class QualityQualityTrendDayDTO implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Schema(name = "id")
- @Null(message="{id.null}", groups = AddGroup.class)
- @NotNull(message="{id.require}", groups = UpdateGroup.class)
- private String id;
-
- private String rq;
- private String coal;
- private BigDecimal Mt;
- private BigDecimal Ad;
- private BigDecimal St;
- private BigDecimal Qnet;
- private Date createDate;
- private Date updateDate;
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/entity/QualityQualityTrendDayEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/entity/QualityQualityTrendDayEntity.java
deleted file mode 100644
index 60f260f..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/entity/QualityQualityTrendDayEntity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.iailab.module.quality.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月20日
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("t_quality_quality_trend_day")
-public class QualityQualityTrendDayEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @TableId(type = IdType.ASSIGN_UUID)
- private String id;
- private String rq;
- private String coal;
- private BigDecimal Mt;
- private BigDecimal Ad;
- private BigDecimal St;
- private BigDecimal Qnet;
- private Date createDate;
- private Date updateDate;
-}
-
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/service/QualityQualityTrendDayService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/service/QualityQualityTrendDayService.java
deleted file mode 100644
index e08bc96..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/service/QualityQualityTrendDayService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.iailab.module.quality.service;
-
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.BaseService;
-import com.iailab.module.quality.dto.QualityQualityTrendDayDTO;
-import com.iailab.module.quality.entity.QualityQualityTrendDayEntity;
-
-import java.math.BigDecimal;
-import java.util.Map;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月20日
- */
-public interface QualityQualityTrendDayService extends BaseService<QualityQualityTrendDayEntity> {
- BarLineDTO barLine(String length, String type,String coal);
-
- BigDecimal currentValue(String coal,String type);
-
- PageData<QualityQualityTrendDayDTO> page(Map<String, Object> params);
-
- QualityQualityTrendDayDTO get(String id);
-
- void save(QualityQualityTrendDayDTO dto);
-
- void update(QualityQualityTrendDayDTO dto);
-
- void delete(String[] ids);
-
- void syncData();
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/service/impl/QualityQualityTrendDayServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/service/impl/QualityQualityTrendDayServiceImpl.java
deleted file mode 100644
index 865e087..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/quality/service/impl/QualityQualityTrendDayServiceImpl.java
+++ /dev/null
@@ -1,291 +0,0 @@
-
-package com.iailab.module.quality.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.constant.Constant;
-import com.iailab.common.dto.echarts.BarLineDTO;
-import com.iailab.common.dto.echarts.SeriesItem;
-import com.iailab.common.enums.CommonConstant;
-import com.iailab.framework.common.page.PageData;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
-import com.iailab.framework.common.util.object.ConvertUtils;
-import com.iailab.common.utils.DateUtils;
-import com.iailab.common.utils.HttpsRequest;
-import com.iailab.module.data.dto.FeignHttpApiDTO;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.quality.dao.QualityQualityTrendDayDao;
-import com.iailab.module.quality.dto.QualityQualityTrendDayDTO;
-import com.iailab.module.quality.entity.QualityQualityTrendDayEntity;
-import com.iailab.module.quality.service.QualityQualityTrendDayService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * @author DongYukun
- * @Description
- * @createTime 2024年05月20日
- */
-@Slf4j
-@Service
-public class QualityQualityTrendDayServiceImpl extends BaseServiceImpl<QualityQualityTrendDayDao, QualityQualityTrendDayEntity> implements QualityQualityTrendDayService {
-
- private String HTTP_API_CODE = "Quality.QualityTrendDay";
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- @Resource
- private HttpsRequest httpsRequest;
-
- @Override
- public PageData<QualityQualityTrendDayDTO> page(Map<String, Object> params) {
- IPage<QualityQualityTrendDayEntity> page = baseDao.selectPage(
- getPage(params, Constant.CREATE_DATE, false),
- getWrapper(params)
- );
- return getPageData(page, QualityQualityTrendDayDTO.class);
- }
-
- private QueryWrapper<QualityQualityTrendDayEntity> getWrapper(Map<String, Object> params){
- String rq = (String)params.get("rq");
-
- QueryWrapper<QualityQualityTrendDayEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(rq), "rq", rq)
- .orderByAsc("rq");
-
- return wrapper;
- }
-
- @Override
- public QualityQualityTrendDayDTO get(String id) {
- QualityQualityTrendDayEntity entity = baseDao.selectById(id);
-
- return ConvertUtils.sourceToTarget(entity, QualityQualityTrendDayDTO.class);
- }
-
- @Override
- public void save(QualityQualityTrendDayDTO dto) {
- QualityQualityTrendDayEntity entity = ConvertUtils.sourceToTarget(dto, QualityQualityTrendDayEntity.class);
-
- insert(entity);
- }
-
- @Override
- public void update(QualityQualityTrendDayDTO dto) {
- QualityQualityTrendDayEntity entity = ConvertUtils.sourceToTarget(dto, QualityQualityTrendDayEntity.class);
-
- updateById(entity);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void delete(String[] ids) {
- baseDao.deleteBatchIds(Arrays.asList(ids));
- }
-
- @Override
- public BarLineDTO barLine(String length,String type,String coal) {
-
- BarLineDTO barLineDTO = new BarLineDTO();
- List<SeriesItem> seriesItemList = new ArrayList<>();
- List<Object[]> data = new ArrayList();
- switch (type) {
- case "sf":
- //水分
- this.list(coal).stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getMt();
- if(item.getMt()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName(coal+"水分");
- }
- );
- break;
- case "hf":
- //灰分
- this.list(coal).stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getAd();
- if(item.getAd()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName(coal+"灰分");
- }
- );
- break;
- case "lf":
- //硫分
- this.list(coal).stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getSt();
- if(item.getSt()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName(coal+"硫分");
- }
- );
- break;
- case "rz":
- //热值
- this.list(coal).stream().forEach(
- item->{
- Object[] dataItem = new Object[2];
- dataItem[0] = item.getRq();
- dataItem[1] = item.getQnet();
- if(item.getQnet()!=null){
- data.add(dataItem);
- }
- barLineDTO.setValueName(coal+"热值");
- }
- );
- break;
- default:
- break;
- }
-
- SeriesItem seriesItem = new SeriesItem();
- seriesItem.setData(data);
- seriesItemList.add(seriesItem);
- barLineDTO.setCategories(this.getLastMonthDates(Integer.parseInt(length)));
- barLineDTO.setSeries(seriesItemList);
- return barLineDTO;
- }
-
- @Override
- public BigDecimal currentValue(String coal,String type) {
- switch (type) {
- case "sf":
- //水分
- QualityQualityTrendDayEntity sf = baseDao.selectOne(
- new QueryWrapper<QualityQualityTrendDayEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
- .eq("coal",coal)
- );
- if(sf != null){
- return sf.getMt();
- }
- return null;
- case "hf":
- //灰分
- QualityQualityTrendDayEntity hf = baseDao.selectOne(
- new QueryWrapper<QualityQualityTrendDayEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
- .eq("coal",coal)
- );
- if(hf != null){
- return hf.getAd();
- }
- return null;
- case "lf":
- //硫分
- QualityQualityTrendDayEntity lf = baseDao.selectOne(
- new QueryWrapper<QualityQualityTrendDayEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
- .eq("coal",coal)
- );
- if(lf != null){
- return lf.getSt();
- }
- return null;
- case "rz":
- //热值
- QualityQualityTrendDayEntity rz = baseDao.selectOne(
- new QueryWrapper<QualityQualityTrendDayEntity>()
- .eq("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
- .eq("coal",coal)
- );
- if(rz != null){
- return rz.getQnet();
- }
- return null;
- default:
- break;
- }
- return null;
- }
-
- public List<String> getLastMonthDates(int length) {
- List<String> dateList = new ArrayList<>();
- LocalDate currentDate = LocalDate.now();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- for (int i = length-1; i >= 0; i--) {
- dateList.add(currentDate.minusDays(i).format(formatter));
- }
-
- return dateList;
- }
-
- public List<QualityQualityTrendDayEntity> list(String coal){
- List<QualityQualityTrendDayEntity> prdDayProdList = baseDao.selectList(
- new QueryWrapper<QualityQualityTrendDayEntity>()
- .le("rq",new SimpleDateFormat("yyyy-MM-dd").format(new Date()))
- .ge("rq",LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
- .eq("coal",coal)
- .orderByAsc("rq")
- );
- return prdDayProdList;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void syncData() {
- Calendar calendar = Calendar.getInstance();
- calendar.add(Calendar.DAY_OF_YEAR, -1);
- String endDate = DateUtils.format(calendar.getTime());
- calendar.add(Calendar.DAY_OF_YEAR, -10);
- String startDate = DateUtils.format(calendar.getTime());
-
- FeignHttpApiDTO apiDTO = feignDataApi.getHttpApi(HTTP_API_CODE);
- Map<String, String> params = new HashMap<>();
- String responseStr = httpsRequest.doGet(apiDTO.getUrl() + "&startDate=" + startDate + "&endDate=" + endDate, params, "utf-8", "");
- JSONObject responseObj = JSON.parseObject(responseStr);
- if (!CommonConstant.STA_TRUE.equals(responseObj.get("sta").toString())) {
- log.info("接口异常");
- }
- JSONArray dataArray = responseObj.getJSONArray(CommonConstant.ZX_RES);
- if (CollectionUtils.isEmpty(dataArray)) {
- return;
- }
- for (int i = 0; i < dataArray.size(); i++) {
- JSONObject dataItem = dataArray.getJSONObject(i);
- String date = dataItem.getString("date");
- JSONArray coalList = dataItem.getJSONArray("coalList");
- this.deleteByDate(date);
- List<QualityQualityTrendDayEntity> entities = coalList.toJavaList(QualityQualityTrendDayEntity.class);
- entities.forEach(entity -> {
- entity.setId(UUID.randomUUID().toString());
- entity.setRq(date);
- entity.setCreateDate(new Date());
- entity.setUpdateDate(new Date());
- insert(entity);
- });
- }
- }
-
- private void deleteByDate(String date) {
- QueryWrapper<QualityQualityTrendDayEntity> wrapper = new QueryWrapper<>();
- wrapper.eq(StringUtils.isNotBlank(date), "rq", date);
- baseDao.delete(wrapper);
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/watch/WatchConstant.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/watch/WatchConstant.java
deleted file mode 100644
index f44f721..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/watch/WatchConstant.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.iailab.module.watch;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月05日
- */
-public interface WatchConstant {
-
- /**
- * 通信正常
- */
- Integer TX_STS_NORMAL = 1;
-
- /**
- * 通信中断
- */
- Integer TX_STS_STOP = 0;
-
- /**
- * 主洗1心跳读取
- */
- String ZX1_HEART = "M0000101001";
-
- /**
- * 主洗1心跳下发
- */
- String ZX1_HEART_SET = "M0000101003";
-
- /**
- * 主洗1通信状态
- */
- String ZX1_STATUS = "F0000100113";
-
-
- /**
- * 主洗2心跳读取
- */
- String ZX2_HEART = "M0000101002";
-
- /**
- * 主洗2心跳下发
- */
- String ZX2_HEART_SET = "M0000101004";
-
- /**
- * 主洗2通信状态
- */
- String ZX2_STATUS = "F0000100121";
-
-
- /**
- * 控制器停止（手动）
- */
- String CONTROLLER_OFF = "false";
-
- /**
- * 控制器启动（自动）
- */
- String CONTROLLER_ON = "true";
-
- /**
- * 浅槽分选投入智能化状态
- */
- String CONTROLLER_USE_1 = "M0000102003";
-
- /**
- * 浅槽分选智能化运行状态反馈
- */
- String CONTROLLER_ONSTS_1 = "M0000102004";
-
- /**
- * 浅槽分选智能化运行状态反馈
- */
- String CONTROLLER_ALM_1 = "M0000102005";
-
- /**
- * 旋流分选投入智能化状态
- */
- String CONTROLLER_USE_2 = "M0000102006";
-
- /**
- * 旋流分选智能化运行状态反馈
- */
- String CONTROLLER_ONSTS_2 = "M0000102007";
-
- /**
- * 旋流分选故障需切换手动
- */
- String CONTROLLER_ALM_2 = "M0000102008";
-
- /**
- * 旋流浓缩投入智能化状态
- */
- String CONTROLLER_USE_3 = "M0000102012";
-
- /**
- *旋流浓缩智能化运行状态反馈
- */
- String CONTROLLER_ONSTS_3 = "M0000102013";
-
- /**
- * 旋流浓缩故障需切换手动
- */
- String CONTROLLER_ALM_3 = "M0000102014";
-
- /**
- * 旋流压滤投入智能化状态
- */
- String CONTROLLER_USE_4 = "M0000102015";
-
- /**
- * 旋流压滤智能化运行状态反馈
- */
- String CONTROLLER_ONSTS_4 = "M0000102016";
-
- /**
- * 旋流压滤故障需切换手动
- */
- String CONTROLLER_ALM_4 = "M0000102017";
-
- /**
- * 浅槽浓缩投入智能化状态
- */
- String CONTROLLER_USE_5 = "M0000102009";
-
- /**
- * 浅槽浓缩智能化运行状态反馈
- */
- String CONTROLLER_ONSTS_5 = "M0000102010";
-
- /**
- * 浅槽浓缩故障需切换手动
- */
- String CONTROLLER_ALM_5 = "M0000102011";
-
- /**
- * 智能压风投入智能化状态
- */
- String CONTROLLER_USE_6 = "M0000102018";
-
- /**
- * 智能压风智能化运行状态反馈
- */
- String CONTROLLER_ONSTS_6 = "M0000102019";
-
- /**
- * 智能压风故障需切换手动
- */
- String CONTROLLER_ALM_6 = "M0000102020";
-
- /**
- * 智能配仓投入智能化状态
- */
- String CONTROLLER_USE_7 = "M0000102021";
-
- /**
- * 智能配仓智能化运行状态反馈
- */
- String CONTROLLER_ONSTS_7 = "M0000102022";
-
- /**
- * 智能配仓故障需切换手动
- */
- String CONTROLLER_ALM_7 = "M0000102023";
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/watch/WatchDog.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/watch/WatchDog.java
deleted file mode 100644
index 1a75aea..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/watch/WatchDog.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.iailab.module.watch;
-
-import com.iailab.common.utils.DateUtils;
-import com.iailab.module.data.api.IFeignDataApi;
-import com.iailab.module.data.dto.FeignResultDTO;
-import com.iailab.module.data.dto.FeignWritePointValueDTO;
-import lombok.extern.slf4j.Slf4j;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2024年06月05日
- */
-@Slf4j
-@Component
-public class WatchDog {
-
- private long failure_time = 1000 * 10;
-
- @Resource
- private IFeignDataApi feignDataApi;
-
- public int writeWatchDogTime(String writePoint, String readPoint, String statusPoint, int lastHeat) {
- try {
- FeignWritePointValueDTO writeHeart = new FeignWritePointValueDTO();
- writeHeart.setPointCode(writePoint);
- writeHeart.setPointValue(DateUtils.format(new Date(), DateUtils.TIME2_PATTERN));
- FeignResultDTO writeHeartResult = feignDataApi.setPointValue(writeHeart);
- if (writeHeartResult.getCode() != 0) {
- log.info("写入心跳值失败");
- setStsStop(statusPoint);
- return lastHeat;
- }
- List<String> pointNos = new ArrayList<>();
- pointNos.add(readPoint);
- Map<String, Object> readHeatValue = feignDataApi.getCurrentValue(pointNos);
- Integer heartValue = new BigDecimal(readHeatValue.get(readPoint).toString()).intValue();
- log.info("heartValue=" + heartValue);
- if (lastHeat == heartValue) {
- log.info("心跳值无变化");
- setStsStop(statusPoint);
- return lastHeat;
- }
- lastHeat = heartValue;
- setStsNormal(statusPoint);
- } catch (Exception ex) {
- log.error("异常：控制器不能下发随机数；message：" + ex.getMessage());
- ex.printStackTrace();
- setStsStop(statusPoint);
-
- }
- return lastHeat;
- }
-
- public boolean isConnect(String pointNo) {
- List<String> pointNos = new ArrayList<>();
- pointNos.add(pointNo);
- Map<String, Object> pointValue = feignDataApi.getCurrentValue(pointNos);
- Integer value = new BigDecimal(pointValue.get(pointNo).toString()).intValue();
- return WatchConstant.TX_STS_NORMAL.equals(value);
- }
-
- public boolean isUse(String pointNo) {
- List<String> pointNos = new ArrayList<>();
- pointNos.add(pointNo);
- Map<String, Object> pointValue = feignDataApi.getCurrentValue(pointNos);
- log.info("isUse=" + pointValue.get(pointNo).toString());
- return WatchConstant.CONTROLLER_ON.equals(pointValue.get(pointNo).toString());
- }
-
- public void stopControllerSts(String controllerCode) {
- FeignWritePointValueDTO writeSts = new FeignWritePointValueDTO();
- writeSts.setPointCode(controllerCode);
- writeSts.setPointValue(WatchConstant.CONTROLLER_OFF);
- feignDataApi.setPointValue(writeSts);
- }
-
- public void startControllerSts(String controllerCode) {
- FeignWritePointValueDTO writeSts = new FeignWritePointValueDTO();
- writeSts.setPointCode(controllerCode);
- writeSts.setPointValue(WatchConstant.CONTROLLER_ON);
- feignDataApi.setPointValue(writeSts);
- }
-
- private void setStsStop(String statusPoint) {
- FeignWritePointValueDTO writeSts = new FeignWritePointValueDTO();
- writeSts.setPointCode(statusPoint);
- writeSts.setPointValue(WatchConstant.TX_STS_STOP);
- feignDataApi.setPointValue(writeSts);
- }
-
- private void setStsNormal(String statusPoint) {
- FeignWritePointValueDTO writeSts = new FeignWritePointValueDTO();
- writeSts.setPointCode(statusPoint);
- writeSts.setPointValue(WatchConstant.TX_STS_NORMAL);
- feignDataApi.setPointValue(writeSts);
- }
-
-}
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/api/dto/ApiMsgDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/api/dto/ApiMsgDTO.java
deleted file mode 100644
index 78ef0ad..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/api/dto/ApiMsgDTO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.iailab.module.websocket.api.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @author PanZhibao
- * @Description
- * @createTime 2023年03月28日 00:06:00
- */
-@Data
-@Schema(name = "消息表")
-public class ApiMsgDTO {
-
- @Schema(name = "id")
- private String id = Long.toString(System.currentTimeMillis());
-
- @Schema(name = "消息类型")
- private String msgType;
-
- @Schema(name = "消息标题")
- @NotNull(message="消息标题不能为空")
- private String title;
-
- @Schema(name = "消息内容")
- @NotNull(message="消息内容不能为空")
- private String content;
-
- @Schema(name = "接收人")
- @NotNull(message="接收人不能为空")
- private List<String> receivers;
-
- @Schema(name = "发送人")
- private String senderName;
-
- @Schema(name = "appKey")
- @NotNull(message="appKey不能为空")
- private String appKey;
-
- @Schema(name = "授权用户token")
- @NotNull(message="授权用户token不能为空")
- private String token;
-
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/config/ServerEncoder.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/config/ServerEncoder.java
deleted file mode 100644
index 27685b0..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/config/ServerEncoder.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.iailab.module.websocket.config;
-
-import com.alibaba.fastjson.JSONObject;
-import com.iailab.module.websocket.api.dto.ApiMsgDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.websocket.EncodeException;
-import javax.websocket.Encoder;
-import javax.websocket.EndpointConfig;
-
-/**
- * @desc: WebSocket编码器
- * @author: lirm
- * @createTime 2023.11.23
- */
-public class ServerEncoder implements Encoder.Text<ApiMsgDTO> {
- private static final Logger log = LoggerFactory.getLogger(ServerEncoder.class);
-
- /**
- * 这里的参数 hashMap 要和 Encoder.Text<T>保持一致
- * @param hashMap
- * @return
- * @throws EncodeException
- */
- @Override
- public String encode(ApiMsgDTO hashMap) throws EncodeException {
- /*
- * 这里是重点，只需要返回Object序列化后的json字符串就行
- * 你也可以使用gosn，fastJson来序列化。
- * 这里我使用fastjson
- */
- try {
- return JSONObject.toJSONString(hashMap);
- }catch (Exception e){
- log.error("",e);
- }
- return null;
- }
-
- @Override
- public void init(EndpointConfig endpointConfig) {
- //可忽略
- }
-
- @Override
- public void destroy() {
- //可忽略
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/config/WebSocketConfig.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/config/WebSocketConfig.java
deleted file mode 100644
index 73b7370..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/config/WebSocketConfig.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.iailab.module.websocket.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-/**
- * @author lirm
- * @Description
- * @createTime 2023.11.23
- */
-@Configuration
-public class WebSocketConfig {
- @Bean
- public ServerEndpointExporter serverEndpointExporter(){
- return new ServerEndpointExporter();
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/server/WebSocketServer.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/server/WebSocketServer.java
deleted file mode 100644
index b2c63fb..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/websocket/server/WebSocketServer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.iailab.module.websocket.server;
-
-import com.iailab.module.websocket.config.ServerEncoder;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author lirm
- * @Description
- * @createTime 2023.11.23
- */
-@Slf4j
-@Component
-@ServerEndpoint(encoders={ServerEncoder.class},value = "/socket/{username}")
-public class WebSocketServer {
-
- /**
- * 储存当前对象
- */
- private static Map<String, Session> sessionMap = new ConcurrentHashMap<>();
-
- @OnOpen
- public void onOpen(Session session, @PathParam("username") String username) {
- sessionMap.put(username, session);
- }
-
- @OnClose
- public void onClose(@PathParam("username") String username) {
- if (sessionMap.containsKey(username)) {
- sessionMap.remove(username);
- }
- }
-
- @OnMessage
- public void onMessage(String message) {
- broadcastAllUser(message);
- }
-
- @OnError
- public void onError(Session session, Throwable error) {
- error.printStackTrace();
- }
- public void broadcastUsers(List<String> users, Object message) {
- try {
- Set<String> strings = sessionMap.keySet();
- for (String name : users) {
- if (strings.contains(name)) {
- sessionMap.get(name).getBasicRemote().sendObject(message);
- }
- }
- } catch (Exception ex) {
- log.error("广播消息出现异常");
- ex.printStackTrace();
- }
- }
-
- public void broadcastAllUser(String message) {
- try {
- Set<String> strings = sessionMap.keySet();
- for (String name : strings) {
- sessionMap.get(name).getBasicRemote().sendText(message);
- }
- } catch (Exception ex) {
- log.error("广播消息出现异常");
- ex.printStackTrace();
- }
- }
-}
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAbnormalHistoryDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAbnormalHistoryDao.xml
deleted file mode 100644
index e4d4946..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAbnormalHistoryDao.xml
+++ /dev/null
@@ -1,12 +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.iailab.module.device.dao.DeviceAbnormalHistoryDao">
- <insert id="insertHistory" parameterType="map">
- insert into `t_device_abnormal_history` (`total_count`, `abnormal_count`, `create_date`)
- VALUES (#{total_count}, #{abnormal_count}, SYSDATE())
- </insert>
- <select id="getlist" resultType="com.iailab.module.device.dto.DeviceAbnormalHistoryDTO">
- select * from t_device_abnormal_history where create_date between #{startDate} and #{endDate}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAccountDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAccountDao.xml
deleted file mode 100644
index c408928..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAccountDao.xml
+++ /dev/null
@@ -1,19 +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.iailab.module.device.dao.DeviceAccountDao">
- <update id="updateMonitorState">
- update t_device_account set monitor_state = 0
- </update>
- <delete id="delete">
- delete from t_device_account where 1=1
- </delete>
- <select id="getByDeviceId" resultType="com.iailab.module.device.entity.DeviceAccountEntity">
- select * from t_device_account where device_id = #{id}
- </select>
- <select id="getDeviceIdList" resultType="java.lang.String">
- select device_id from t_device_account
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAccountHistoryDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAccountHistoryDao.xml
deleted file mode 100644
index 99243ab..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceAccountHistoryDao.xml
+++ /dev/null
@@ -1,19 +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.iailab.module.device.dao.DeviceAccountHistoryDao">
-
- <resultMap type="com.iailab.module.device.entity.DeviceFaultHistoryEntity" id="deviceAccountHistoryMap">
- <result property="id" column="id"/>
- <result property="faultDevice" column="fault_device"/>
- <result property="faultParts" column="fault_parts"/>
- <result property="faultType" column="fault_type"/>
- <result property="faultCause" column="fault_cause"/>
- <result property="solution" column="solution"/>
- <result property="state" column="state"/>
- <result property="affectHour" column="affect_hour"/>
- <result property="creatorDate" column="creator_date"/>
- </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceFaultDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceFaultDao.xml
deleted file mode 100644
index 50d6d0a..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceFaultDao.xml
+++ /dev/null
@@ -1,6 +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.iailab.module.device.dao.DeviceFaultDao">
-
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceHealthAlarmDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceHealthAlarmDao.xml
deleted file mode 100644
index b2eb258..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceHealthAlarmDao.xml
+++ /dev/null
@@ -1,36 +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.iailab.module.device.dao.DeviceHealthAlarmDao">
-
- <resultMap id="alarmCommonResult" type="com.iailab.module.device.dto.DeviceHealthAlarmDTO">
- <result column="dev_name" property="devName"/>
- <result column="fault_time" property="faultTime"/>
- <collection property="deviceFaults" ofType="com.iailab.module.device.dto.DeviceFaultDTO">
- <result column="index_type" property="indexType"/>
- <result column="class_name" property="className"/>
- <result column="fault_name" property="faultName"/>
- <result column="solution" property="solution"/>
- </collection>
-
- </resultMap>
-
- <select id="getInfo" resultMap="alarmCommonResult"
- parameterType="java.lang.String">
- SELECT
- t1.dev_name,
- t1.fault_time,
- t2.fault_name,
- t3.class_name,
- t3.index_type,
- t3.solution
- FROM
- t_device_health_alarm t1,
- t_device_health_alarm_detail t2,
- t_device_fault t3
- WHERE
- t1.id = t2.alarm_id
- AND t2.fault_code = t3.fault_code
- AND t1.id = #{id}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceHealthStateDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceHealthStateDao.xml
deleted file mode 100644
index eeb5aa1..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceHealthStateDao.xml
+++ /dev/null
@@ -1,34 +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.iailab.module.device.dao.DeviceHealthStateDao">
-
- <resultMap type="com.iailab.module.device.entity.DeviceHealthStateEntity" id="deviceHealthStateMap">
- <result property="id" column="id"/>
- <result property="totalCount" column="total_count"/>
- <result property="normal" column="normal"/>
- <result property="common" column="common"/>
- <result property="heavy" column="heavy"/>
- <result property="serious" column="serious"/>
- <result property="espserious" column="espSerious"/>
- <result property="creatorDate" column="creator_date"/>
- </resultMap>
- <insert id="insertHealthState" parameterType="map">
- insert into `t_device_health_state` (`total_count`, `normal`, `common`, `heavy`, `serious`, `espserious`, `creator_date`)
- VALUES (#{total_count}, #{normal}, #{common}, #{heavy}, #{serious}, #{espSerious}, SYSDATE())
- </insert>
- <update id="updateHealthState" parameterType="map">
- update t_device_health_state
- set total_count = #{total_count},
- normal = #{normal},
- common = #{common},
- heavy = #{heavy},
- serious = #{serious},
- espserious = #{espSerious},
- creator_date = SYSDATE()
- where id = #{id}
- </update>
- <select id="getId" resultType="java.lang.Integer">
- select IF(count(1),id,0) from t_device_health_state group by id
- </select>
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceInfoDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceInfoDao.xml
deleted file mode 100644
index e64e354..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceInfoDao.xml
+++ /dev/null
@@ -1,34 +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.iailab.module.device.dao.DeviceInfoDao">
- <select id="getchildrenList" resultType="com.iailab.module.device.dto.DeviceInfoDTO">
- select id, name, workshop
- from t_device_info
- where pid = #{id}
- </select>
- <select id="getPageList" resultType="com.iailab.module.device.dto.DeviceInfoDTO">
- select a.*,b.health_score healthScore,b.health_evaluate healthEvaluate,b.is_health isHealth,b.evaluate_date
- evaluateDate,
- IFNULL((select device_id from t_device_account where device_name = a.name),0) deviceId
- from t_device_info a,
- t_device_health_evaluate b
- where a.id = b.device_id
- <if test="params.no != null and params.no != ''">
- and a.no like concat('%',#{params.no},'%')
- </if>
- <if test="params.name != null and params.name != ''">
- and a.name like concat('%',#{params.name},'%')
- </if>
- <if test="params.isMain != null and params.isMain != ''">
- and a.is_main = #{params.isMain}
- </if>
- <if test="params.isMain != null and params.isMain != ''">
- and a.is_main = #{params.isMain}
- </if>
-
-
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceRunStateDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceRunStateDao.xml
deleted file mode 100644
index 417414c..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceRunStateDao.xml
+++ /dev/null
@@ -1,33 +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.iailab.module.device.dao.DeviceRunStateDao">
-
- <resultMap type="com.iailab.module.device.entity.DeviceRunStateEntity" id="deviceRunStateMap">
- <result property="id" column="id"/>
- <result property="totalCount" column="total_count"/>
- <result property="runCount" column="run_count"/>
- <result property="haltCount" column="halt_count"/>
- <result property="offlineCount" column="offline_count"/>
- <result property="creatorDate" column="creator_date"/>
- </resultMap>
- <insert id="insertRunState" parameterType="map">
- insert into `t_device_run_state` (`total_count`, `run_count`, `halt_count`, `offline_count`, `creator_date`)
- VALUES (#{total_count}, #{run_count}, #{halt_count}, #{offline_count}, SYSDATE())
- </insert>
- <update id="updateRunState" parameterType="map">
- update t_device_run_state
- set total_count = #{total_count},
- run_count = #{run_count},
- halt_count = #{halt_count},
- offline_count = #{offline_count},
- creator_date = SYSDATE()
- where id = #{id}
- </update>
- <select id="getId" resultType="java.lang.Integer">
- select IF(count(1), id, 0)
- from t_device_run_state group by id
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatCountDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatCountDao.xml
deleted file mode 100644
index ff67dc6..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatCountDao.xml
+++ /dev/null
@@ -1,6 +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.iailab.module.device.dao.DeviceStatCountDao">
-
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatNewnessDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatNewnessDao.xml
deleted file mode 100644
index 7751fed..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatNewnessDao.xml
+++ /dev/null
@@ -1,24 +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.iailab.module.device.dao.DeviceStatNewnessDao">
-
- <select id="getLatDateList" resultType="com.iailab.module.device.dto.DeviceStatNewnessDTO">
- SELECT
- t1.*
- FROM
- t_device_stat_newness AS t1,
- (
- SELECT
- dev_no,
- max(date) as date
- FROM
- t_device_stat_newness
- GROUP BY
- dev_no
- ) AS t2
- WHERE
- t1.date = t2.date
- AND t1.dev_no = t2.dev_no
- </select>
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatUsageDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatUsageDao.xml
deleted file mode 100644
index 6eb8ba4..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/device/DeviceStatUsageDao.xml
+++ /dev/null
@@ -1,13 +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.iailab.module.device.dao.DeviceStatUsageDao">
-
-
- <insert id="batchInsert">
- insert into t_device_stat_usage values
- <foreach collection="list" item="item" open="(" close=")" separator=",">
- #{item.id},#{item.devNo},#{item.devName},#{item.date},#{item.planTime},#{item.runTime},#{item.usageRate},#{item.createDate}
- </foreach>
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/knowledge/KnowledgePathDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/knowledge/KnowledgePathDao.xml
deleted file mode 100644
index 3d9bc10..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/knowledge/KnowledgePathDao.xml
+++ /dev/null
@@ -1,29 +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.iailab.module.knowledge.dao.KnowledgePathDao">
-
- <!-- 查询所有树形图节点 -->
- <select id="selectPathList" resultType="com.iailab.module.knowledge.dto.KnowledgePathDTO">
- select *
- from (
- select t1.id,
- t1.id as value,
- t1.label,
- t1.parent_id
- from t_knowledge_path t1
- inner join t_knowledge_path t2 on
- t1.parent_id = t2.id
- union
- select id,
- id as value,
- label,
- parent_id
- from t_knowledge_path
- where parent_id = '0000000000'
- ) t
- order by parent_id asc,
- id asc
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelDao.xml
deleted file mode 100644
index 6e251d2..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelDao.xml
+++ /dev/null
@@ -1,6 +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.iailab.module.mcs.dao.StModelDao">
-
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelResultDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelResultDao.xml
index 692743b..b093fcc 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelResultDao.xml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelResultDao.xml
@@ -3,140 +3,68 @@
<mapper namespace="com.iailab.module.mcs.dao.StModelResultDao">
- <resultMap id="StModelResultEntity" type="com.iailab.module.mcs.entity.StModelResultEntity">
- <result property="modelId" column="model_id"/>
- <result property="resultKey" column="result_key"/>
- <result property="resultValue" column="result_value"/>
- <result property="resultTime" column="result_time"/>
- </resultMap>
+ <resultMap id="StModelResultEntity" type="com.iailab.module.mcs.entity.StModelResultEntity">
+ <result property="modelId" column="model_id"/>
+ <result property="resultKey" column="result_key"/>
+ <result property="resultValue" column="result_value"/>
+ <result property="resultTime" column="result_time"/>
+ </resultMap>
- <resultMap id="StoreDependableAnalysisDTO" type="com.iailab.module.any.dto.AnyStoreReliabilityDTO">
- <result property="dateTime" column="dateTime"/>
- <result property="grade" column="grade"/>
- <result property="state" column="state"/>
- <result property="analysis" column="analysis"/>
- </resultMap>
+ <resultMap id="StoreDependableAnalysisDTO" type="com.iailab.module.any.dto.AnyStoreReliabilityDTO">
+ <result property="dateTime" column="dateTime"/>
+ <result property="grade" column="grade"/>
+ <result property="state" column="state"/>
+ <result property="analysis" column="analysis"/>
+ </resultMap>
- <select id="getLastResultByCode" parameterType="map" resultType="com.iailab.module.mcs.dto.StModelResultDTO">
- select t2.result_key resultKey, t2.result_value resultValue, t2.result_time resultTime
- from t_st_model t1
- inner join t_st_model_result t2 on t2.model_id = t1.id and t2.result_time = t1.run_time
- where t1.model_code = #{modelCode}
- </select>
- <select id="getResultByCodeDate" parameterType="map" resultType="com.iailab.module.mcs.dto.StModelResultDTO">
- select t2.result_key resultKey, t2.result_value resultValue, t2.result_time resultTime
- from t_st_model t1
- inner join t_st_model_result t2 on t2.model_id = t1.id
- where t1.model_code = #{modelCode} and DATE_FORMAT(t2.result_time, '%Y-%m-%d') = #{resultTime}
- </select>
+ <select id="getLastResultByCode" parameterType="map" resultType="com.iailab.module.mcs.dto.StModelResultDTO">
+ select t2.result_key resultKey, t2.result_value resultValue, t2.result_time resultTime
+ from t_st_model t1
+ inner join t_st_model_result t2 on t2.model_id = t1.id and t2.result_time = t1.run_time
+ where t1.model_code = #{modelCode}
+ </select>
+ <select id="getResultByCodeDate" parameterType="map" resultType="com.iailab.module.mcs.dto.StModelResultDTO">
+ select t2.result_key resultKey, t2.result_value resultValue, t2.result_time resultTime
+ from t_st_model t1
+ inner join t_st_model_result t2 on t2.model_id = t1.id
+ where t1.model_code = #{modelCode}
+ and DATE_FORMAT(t2.result_time, '%Y-%m-%d') = #{resultTime}
+ </select>
- <select id="getResultList" parameterType="map" resultMap="StModelResultEntity">
- SELECT
- b.model_id,
- b.result_key,
- b.result_value,
- b.result_time
- FROM
- t_st_model_result b
- left JOIN t_st_model a ON a.id = b.model_id
- WHERE
- b.result_key not in ('status', 'tips')
- <if test="modelId != null and modelId != ''">
- AND b.model_id = #{modelId}
- </if>
- <if test="modelCode != null and modelCode != ''">
- AND a.model_code = #{modelCode}
- </if>
- AND result_time BETWEEN #{startDate} AND #{endDate}
- ORDER BY
- b.result_time ${sortType}
- </select>
- <select id="getModelResultList" resultType="com.iailab.common.dto.IndexStatisticDTO">
- SELECT
- b.result_time dateTime,b.result_value data
- FROM
- t_st_model a,
- t_st_model_result b
- WHERE a.id = b.model_id
- AND b.line_index = '0'
- AND b.result_key = #{key}
- AND result_time BETWEEN #{startDate} AND #{endDate}
- ORDER BY
- b.result_time
- </select>
+ <select id="getResultList" parameterType="map" resultMap="StModelResultEntity">
+ SELECT
+ b.model_id,
+ b.result_key,
+ b.result_value,
+ b.result_time
+ FROM
+ t_st_model_result b
+ left JOIN t_st_model a ON a.id = b.model_id
+ WHERE
+ b.result_key not in ('status', 'tips')
+ <if test="modelId != null and modelId != ''">
+ AND b.model_id = #{modelId}
+ </if>
+ <if test="modelCode != null and modelCode != ''">
+ AND a.model_code = #{modelCode}
+ </if>
+ AND result_time BETWEEN #{startDate} AND #{endDate}
+ ORDER BY
+ b.result_time ${sortType}
+ </select>
- <delete id="cleanModelResult" parameterType="map">
- delete from t_st_model_result
+ <delete id="cleanModelResult" parameterType="map">
+ delete
+ from t_st_model_result
where result_time between #{startdate} and #{enddate}
</delete>
- <insert id="insertList" parameterType="list">
- INSERT INTO `t_st_model_result` (id, `model_id`, `line_index`, `result_key`, `result_value`, `result_time`)
- VALUES
- <foreach item="item" collection="list" separator=",">
- (#{item.id},#{item.modelId},#{item.lineIndex},#{item.resultKey},#{item.resultValue},#{item.resultTime})
- </foreach>
- </insert>
- <insert id="migrationModelResult"
- parameterType="java.util.List">
- INSERT INTO `t_st_model_result` (id, `model_id`, `line_index`, `result_key`, `result_value`, `result_time`)
- VALUES
- <foreach item="item" collection="list" separator=",">
- (#{item.id},#{item.modelId},#{item.lineIndex},#{item.resultKey},#{item.resultValue},#{item.resultTime})
- </foreach>
- </insert>
-
- <select id="getStorePageList" resultType="com.iailab.module.any.dto.AnyStoreReliabilityDTO">
- select t.* from (
- SELECT result_time as 'dateTime',
- MAX(CASE WHEN result_key = 'score' THEN result_value END) AS 'score',
- MAX(CASE WHEN result_key = 'analysis' THEN result_value END) AS 'analysis',
- MAX(CASE WHEN result_key = 'judgement' THEN result_value END) AS 'judgement'
- FROM `t_st_model_result`
- <where>
- model_id = #{params.modelId}
- <if test="params.startTime != null and params.startTime != ''">
- and result_time >= #{params.startTime}
- </if>
- <if test="params.endTime != null and params.endTime != ''">
- and result_time <= #{params.endTime}
- </if>
- </where>
- GROUP BY result_time
- ) as t
- <where>
- <if test="params.judgement != null and params.judgement != ''">
- t.judgement like concat('%',#{params.judgement},'%')
- </if>
- </where>
- </select>
- <select id="getEvaluationPageList" resultType="com.iailab.module.any.dto.AnyAllEvaluationDTO">
- select * from (
- SELECT result_time as 'dateTime',
- MAX(CASE WHEN result_key = 'first_level' THEN result_value END) AS 'first_level',
- MAX(CASE WHEN result_key = 'zong_level' THEN result_value END) AS 'zong_level',
- MAX(CASE WHEN result_key = 'shu_liang_fen' THEN result_value END) AS 'shu_liang_fen',
- MAX(CASE WHEN result_key = 'zhi_liang_fen' THEN result_value END) AS 'zhi_liang_fen',
- MAX(CASE WHEN result_key = 'sheng_chan_fen' THEN result_value END) AS 'sheng_chan_fen',
- MAX(CASE WHEN result_key = 'guo_cheng_fen' THEN result_value END) AS 'guo_cheng_fen',
- MAX(CASE WHEN result_key = 'guan_li_fen' THEN result_value END) AS 'guan_li_fen'
- FROM `t_st_model_result`
- <where>
- model_id = #{params.modelId}
- <if test="params.startDate != null and params.startDate != ''">
- and result_time >= #{params.startDate}
- </if>
- <if test="params.endDate != null and params.endDate != ''">
- and result_time <= #{params.endDate}
- </if>
- </where>
- GROUP BY result_time
- ) as t
- <where>
- <if test="params.state != null and params.state != ''">
- state like concat('%',#{params.state},'%')
- </if>
- </where>
- </select>
+ <insert id="insertList" parameterType="list">
+ INSERT INTO `t_st_model_result` (id, `model_id`, `line_index`, `result_key`, `result_value`, `result_time`)
+ VALUES
+ <foreach item="item" collection="list" separator=",">
+ (#{item.id},#{item.modelId},#{item.lineIndex},#{item.resultKey},#{item.resultValue},#{item.resultTime})
+ </foreach>
+ </insert>
</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelRunlogDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelRunlogDao.xml
index 9669542..3e88ad7 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelRunlogDao.xml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StModelRunlogDao.xml
@@ -2,29 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.iailab.module.mcs.dao.StModelRunlogDao">
- <insert id="migrationModelRunlog"
- parameterType="java.util.List">
- INSERT INTO `t_st_model_runlog` (id, `modelid`, `run_time`, `run_type`, `run_result`)
- VALUES
- <foreach item="item" collection="list" separator=",">
- (#{item.id},#{item.modelid},#{item.runTime},#{item.runType},#{item.runCommonResult})
- </foreach>
- </insert>
-
- <select id="getLastFxLog" resultType="com.iailab.module.mcs.dto.StModelRunlogDTO">
- select *
- from t_st_model_runlog
- where run_type in ('separation_control','DensityPredict')
- order by run_time desc
- limit 10
- </select>
- <select id="getLastJyLog" resultType="com.iailab.module.mcs.dto.StModelRunlogDTO">
- select *
- from t_st_model_runlog
- where run_type in ('dosing_control','Dosingsystempre')
- order by run_time desc
- limit 10
- </select>
<select id="getLastLog" parameterType="map" resultType="com.iailab.module.mcs.dto.StModelRunlogDTO">
select *
from t_st_model_runlog
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/AnyProcReportDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/AnyProcReportDao.xml
deleted file mode 100644
index 4371648..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/AnyProcReportDao.xml
+++ /dev/null
@@ -1,12 +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.iailab.module.any.dao.AnyProcReportDao">
- <insert id="migrationProcReport"
- parameterType="java.util.List">
- INSERT INTO `t_any_proc_report` (id, `proc_code`, `proc_name`, `report_name`, `report_date`, `content`, `create_date`)
- VALUES
- <foreach item="item" collection="list" separator=",">
- (#{item.id},#{item.procCode},#{item.procName},#{item.reportName},#{item.reportDate},#{item.content},#{item.createDate})
- </foreach>
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/AnyProcReportDetDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/AnyProcReportDetDao.xml
deleted file mode 100644
index 6af22c8..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/AnyProcReportDetDao.xml
+++ /dev/null
@@ -1,12 +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.iailab.module.any.dao.AnyProcReportDetDao">
- <insert id="migration"
- parameterType="java.util.List">
- INSERT INTO `t_any_proc_report_det` (id, `report_id`, `sort`, `content_type`, `content`, `remark`, `create_date`)
- VALUES
- <foreach item="item" collection="list" separator=",">
- (#{item.id},#{item.reportId},#{item.sort},#{item.contentType},#{item.content},#{item.remark},#{item.createDate})
- </foreach>
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/DeviceHealthReportDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/DeviceHealthReportDao.xml
deleted file mode 100644
index 1464e79..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/DeviceHealthReportDao.xml
+++ /dev/null
@@ -1,12 +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.iailab.module.device.dao.DeviceHealthReportDao">
- <insert id="migration"
- parameterType="java.util.List">
- INSERT INTO `t_device_health_report` (id, `dev_no`, `dev_name`, `class_no`, `class_name`, `workshop`, `model`, `report_no`, `report_name`, `report_date`, `health_level`, `health_score`, `abnormal_count`, `data_length`, `run_time`, `content`, `model_code`, `create_date`)
- VALUES
- <foreach item="item" collection="list" separator=",">
- (#{item.id},#{item.devNo},#{item.devName},#{item.classNo},#{item.className},#{item.workshop},#{item.model},#{item.reportNo},#{item.reportName},#{item.reportDate},#{item.healthLevel},#{item.healthScore},#{item.abnormalCount},#{item.dataLength},#{item.runTime},#{item.content},#{item.modelCode},#{item.createDate})
- </foreach>
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/DeviceHealthReportDataDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/DeviceHealthReportDataDao.xml
deleted file mode 100644
index 4b33a52..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/report/DeviceHealthReportDataDao.xml
+++ /dev/null
@@ -1,12 +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.iailab.module.device.dao.DeviceHealthReportDataDao">
- <insert id="migration"
- parameterType="java.util.List">
- INSERT INTO `t_device_health_report_data` (id, `report_id`, `sort`, `data_name`, `data_value`, `data_max`, `data_min`, `data_avg`, `grade_code`, `grade_name`, `solution`, `remark`, `create_date`, `fault_code`)
- VALUES
- <foreach item="item" collection="list" separator=",">
- (#{item.id},#{item.reportId},#{item.sort},#{item.dataName},#{item.dataValue},#{item.dataMax},#{item.dataMin},#{item.dataAvg},#{item.gradeCode},#{item.gradeName},#{item.solution},#{item.remark},#{item.createDate},#{item.faultCode})
- </foreach>
- </insert>
-</mapper>
\ No newline at end of file
--
Gitblit v1.9.3