From a24095d096e7ab1f83e44aa8054d0f673db05b38 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 07 三月 2025 09:09:40 +0800
Subject: [PATCH] Merge branch 'dev_dz' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java | 33 ++
ruoyi-admin/src/main/resources/application-test.yml | 153 ++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java | 10
ruoyi-admin/pom.xml | 6
pom.xml | 8
ruoyi-admin/src/main/resources/application.yml | 43 --
performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml | 14
cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java | 219 ++++++++++++++
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 4
inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java | 1
inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml | 22 +
cnas-require/src/main/java/com/ruoyi/require/pojo/CollectTemperatureHumidity.java | 66 ++++
performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java | 10
/dev/null | 111 -------
cnas-require/src/main/java/com/ruoyi/require/pojo/CollectLaboratory.java | 41 ++
ruoyi-admin/src/main/resources/application-prod.yml | 42 ++
ruoyi-admin/src/main/resources/application-druid.yml | 42 ++
cnas-require/src/main/java/com/ruoyi/require/mapper/CollectTemperatureHumidityMapper.java | 15 +
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 3
cnas-require/src/main/java/com/ruoyi/require/mapper/CollectLaboratoryMapper.java | 15 +
ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java | 6
performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java | 9
performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java | 13
24 files changed, 715 insertions(+), 174 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/CollectLaboratoryMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/CollectLaboratoryMapper.java
new file mode 100644
index 0000000..9452260
--- /dev/null
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/CollectLaboratoryMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.require.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.require.pojo.CollectLaboratory;
+
+/**
+ * 娓╂箍搴﹂噰闆嗗疄楠屽缁戝畾
+ *
+ * @author zhuo
+ * @since 2024-12-18
+ */
+public interface CollectLaboratoryMapper extends BaseMapper<CollectLaboratory> {
+
+}
+
diff --git a/cnas-require/src/main/java/com/ruoyi/require/mapper/CollectTemperatureHumidityMapper.java b/cnas-require/src/main/java/com/ruoyi/require/mapper/CollectTemperatureHumidityMapper.java
new file mode 100644
index 0000000..957f967
--- /dev/null
+++ b/cnas-require/src/main/java/com/ruoyi/require/mapper/CollectTemperatureHumidityMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.require.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.require.pojo.CollectTemperatureHumidity;
+
+/**
+ * 娓╂箍搴﹂噰闆嗕俊鎭�
+ *
+ * @author zhuo
+ * @since 2024-12-18
+ */
+public interface CollectTemperatureHumidityMapper extends BaseMapper<CollectTemperatureHumidity> {
+
+}
+
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/CollectLaboratory.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/CollectLaboratory.java
new file mode 100644
index 0000000..bb3e525
--- /dev/null
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/CollectLaboratory.java
@@ -0,0 +1,41 @@
+package com.ruoyi.require.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 娓╂箍搴﹂噰闆嗗疄楠屽缁戝畾
+ *
+ * @author zhuo
+ * @since 2024-12-18
+ */
+@Data
+@TableName("collect_laboratory")
+public class CollectLaboratory {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("瀹為獙瀹�")
+ private String laboratory;
+
+ @ApiModelProperty("娓╂箍搴﹁澶囩紪鍙�")
+ private String deviceCode;
+
+ @ApiModelProperty("鏈�楂樻俯搴�")
+ private Double temperatureHighest;
+
+ @ApiModelProperty("鏈�浣庢俯搴�")
+ private Double temperatureLowest;
+
+ @ApiModelProperty("鏈�楂樻箍搴�")
+ private Double humidityHighest;
+
+ @ApiModelProperty("鏈�浣庢箍搴�")
+ private Double humidityLowest;
+
+}
+
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/CollectTemperatureHumidity.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/CollectTemperatureHumidity.java
new file mode 100644
index 0000000..95b2f27
--- /dev/null
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/CollectTemperatureHumidity.java
@@ -0,0 +1,66 @@
+package com.ruoyi.require.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 娓╂箍搴﹂噰闆嗕俊鎭�
+ *
+ * @author zhuo
+ * @since 2024-12-18
+ */
+@Data
+@TableName("collect_temperature_humidity")
+public class CollectTemperatureHumidity {
+
+ @TableId(type = IdType.AUTO)
+ private Integer superviseId;
+ //7801娓╁害
+ private Double code7801Temperature;
+ //7801婀垮害
+ private Double code7801Humidity;
+ //7802娓╁害
+ private Double code7802Temperature;
+ //7802婀垮害
+ private Double code7802Humidity;
+ //7803娓╁害
+ private Double code7803Temperature;
+ //7803婀垮害
+ private Double code7803Humidity;
+ //7804娓╁害
+ private Double code7804Temperature;
+ //7804婀垮害
+ private Double code7804Humidity;
+ //7805娓╁害
+ private Double code7805Temperature;
+ //7805婀垮害
+ private Double code7805Humidity;
+ //7806娓╁害
+ private Double code7806Temperature;
+ //7806婀垮害
+ private Double code7806Humidity;
+ //7807娓╁害
+ private Double code7807Temperature;
+ //7807婀垮害
+ private Double code7807Humidity;
+ //7808娓╁害
+ private Double code7808Temperature;
+ //7808婀垮害
+ private Double code7808Humidity;
+ //7809娓╁害
+ private Double code7809Temperature;
+ //7809婀垮害
+ private Double code7809Humidity;
+ //7810娓╁害
+ private Double code7810Temperature;
+ //7810婀垮害
+ private Double code7810Humidity;
+ //閲囬泦鏃堕棿
+ private Date collectTime;
+
+}
+
diff --git a/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java b/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java
new file mode 100644
index 0000000..5f32fd2
--- /dev/null
+++ b/cnas-require/src/main/java/com/ruoyi/require/task/FeTempHumDateSchedule.java
@@ -0,0 +1,219 @@
+package com.ruoyi.require.task;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.require.mapper.CollectLaboratoryMapper;
+import com.ruoyi.require.mapper.CollectTemperatureHumidityMapper;
+import com.ruoyi.require.mapper.FeTempHumDateMapper;
+import com.ruoyi.require.mapper.FeTempHumRecordMapper;
+import com.ruoyi.require.pojo.CollectLaboratory;
+import com.ruoyi.require.pojo.CollectTemperatureHumidity;
+import com.ruoyi.require.pojo.FeTempHumDate;
+import com.ruoyi.require.pojo.FeTempHumRecord;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * Author: yuan
+ * Date: 2024-12-19 鏄熸湡鍥� 8:33:56
+ * Description:
+ */
+@Component
+public class FeTempHumDateSchedule {
+
+ @Autowired
+ private CollectLaboratoryMapper collectLaboratoryMapper;
+ @Autowired
+ private FeTempHumDateMapper feTempHumDateMapper;
+ @Autowired
+ private CollectTemperatureHumidityMapper collectTemperatureHumidityMapper;
+ @Autowired
+ private FeTempHumRecordMapper feTempHumRecordMapper;
+
+ // 鑾峰彇褰撳墠骞翠唤鍜屾湀浠� 濡傦細2024-11
+ private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ private String formattedDate = sdf.format(Calendar.getInstance().getTime());
+
+ /**
+ * 妫�鏌ュ疄楠屽鏄惁鏈変换鍔�
+ */
+ public synchronized void checkLaboratoriesSchedule() {
+ // 鑾峰彇褰撳墠骞翠唤鍜屾湀浠� 濡傦細2024-11
+ formattedDate = sdf.format(Calendar.getInstance().getTime());
+ // 鏌ヨ鎵�鏈夌殑瀹為獙瀹�
+ List<CollectLaboratory> collectLaboratories = collectLaboratoryMapper.selectList(null);
+ // 閬嶅巻瀹為獙瀹わ紝鍒ゆ柇浠诲姟鍒楄〃涓槸鍚﹀瓨璇ュ疄楠屽鐨勪换鍔�
+ for (CollectLaboratory collectLaboratory : collectLaboratories) {
+ // 鏌ヨ鏁版嵁搴撲腑鏄惁瀛樺湪璇ュ疄楠屽鐨勪换鍔�
+ int count = feTempHumDateMapper.selectFeTempHumDateIncludeFormattedDate(collectLaboratory.getLaboratory(), formattedDate);
+ // 鏌ヨ缁撴灉涓�0锛岃鏄庢暟鎹簱涓笉瀛樺湪璇ュ疄楠屽鐨勪换鍔★紝闇�瑕佹柊澧�
+ if (count == 0) {
+ FeTempHumDate feTempHumDate = new FeTempHumDate();
+ feTempHumDate.setMonthDate(formattedDate);
+ feTempHumDate.setTestAreaName(collectLaboratory.getLaboratory());
+ feTempHumDateMapper.insert(feTempHumDate);
+ }
+ }
+ }
+
+ /**
+ * 姣忓ぉ9鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
+ * 鑾峰彇娓╁害婀垮害
+ */
+// @Scheduled(cron = "0/5 * * * * *")
+ @Scheduled(cron = "0 0 9 * * 1-6") // 姣忓ぉ9鐐规墽琛屼竴娆� 闄や簡鏄熸湡澶�
+ public void task1() {
+ checkLaboratoriesSchedule();
+ // 鏍规嵁鏃堕棿闄嶅簭锛岃幏鍙栧埌鏈�鏂扮殑涓�鏉℃暟鎹�
+ CollectTemperatureHumidity collectTemperatureHumidity = collectTemperatureHumidityMapper.selectOne(Wrappers.<CollectTemperatureHumidity>lambdaQuery()
+ .orderByDesc(CollectTemperatureHumidity::getCollectTime)
+ .last("limit 1"));
+
+ // 鑾峰彇鎵�鏈夌殑瀹為獙瀹�
+ List<CollectLaboratory> collectLaboratories = collectLaboratoryMapper.selectList(null);
+ // 閬嶅巻鑾峰彇瀹為獙瀹ょ紪鍙� 鑾峰彇娓╂箍搴� 淇濆瓨鍦ㄥ搴旂殑
+ for (CollectLaboratory collectLaboratory : collectLaboratories) {
+ // 瀹為獙瀹ょ紪鍙�
+ int labNumber = Integer.parseInt(collectLaboratory.getDeviceCode());
+ // 鏍规嵁瀹為獙瀹ょ紪鍙锋嫾鎺ュ搴旂殑婀垮害鍜屾俯搴﹀瓧娈�
+ String temperatureField = "code" + labNumber + "Temperature";
+ String humidityField = "code" + labNumber + "Humidity";
+ // 鑾峰彇娓╁害
+ Double temperature = getFieldValue(collectTemperatureHumidity, temperatureField) != null ? (Double) getFieldValue(collectTemperatureHumidity, temperatureField) : Double.valueOf(00.0);
+ // 鑾峰彇婀垮害
+ Double humidity = getFieldValue(collectTemperatureHumidity, humidityField) != null ? (Double) getFieldValue(collectTemperatureHumidity, humidityField) : Double.valueOf(00.0);
+ // 鏌ヨ璇曢獙鍖哄煙
+ FeTempHumDate feTempHumDate = feTempHumDateMapper.selectOne(Wrappers.<FeTempHumDate>lambdaQuery()
+ .eq(FeTempHumDate::getMonthDate, formattedDate)
+ .eq(FeTempHumDate::getTestAreaName, collectLaboratory.getLaboratory()));
+ Integer dateId = feTempHumDate.getDateId();
+ // 鍒ゆ柇浠婂ぉ鏄惁鏈夋俯婀垮害璁板綍
+ FeTempHumRecord feTempHumRecord = record(dateId);
+ // 鏌ヨ鍑烘潵灏变唬琛ㄤ粖澶╄褰曡繃浜嗗氨涓嶈褰�
+ if (feTempHumRecord != null) {
+ // 鏈夋俯搴︽箍搴﹁褰曞氨涓嶈褰�
+ continue;
+ }
+
+ // 鍒涘缓浠婂ぉ娓╂箍搴﹁褰曞璞� 璁板綍涓婂崍娓╁害婀垮害
+ FeTempHumRecord newFeTempHumRecord = new FeTempHumRecord();
+ newFeTempHumRecord.setRecordDate(LocalDate.now());
+ newFeTempHumRecord.setMorningTestTime(LocalTime.now());
+ newFeTempHumRecord.setMorningTemp(temperature.toString());
+ newFeTempHumRecord.setMorningHum(humidity.toString());
+ newFeTempHumRecord.setDateId(dateId);
+ feTempHumRecordMapper.insert(newFeTempHumRecord);
+ }
+ }
+
+ /**
+ * 鍒ゆ柇浠婂ぉ鏄惁鏈夋俯婀垮害璁板綍
+ */
+ private FeTempHumRecord record(Integer dateId) {
+ // 鑾峰彇浠婂ぉ鐨勬棩鏈�
+ LocalDate today = LocalDate.now();
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+ // 鑾峰彇浠婂ぉ鐨� 00:00:00 鍜� 23:59:59
+ String start = today.atStartOfDay().format(dateTimeFormatter); // 00:00:00
+ String end = today.atTime(LocalTime.MAX).format(dateTimeFormatter); // 23:59:59
+ // 鏌ヨ浠婂ぉ鏄惁鏈夋俯婀垮害璁板綍
+ return feTempHumRecordMapper.selectOne(Wrappers.<FeTempHumRecord>lambdaQuery()
+ // 鍝釜瀹為獙瀹�
+ .eq(FeTempHumRecord::getDateId, dateId)
+ // 璁板綍鏃堕棿鍦ㄤ粖澶╀箣鍐�
+ .eq(FeTempHumRecord::getRecordDate, today)
+ .between(FeTempHumRecord::getMorningTestTime, start, end));
+ }
+
+ /**
+ * 姣忓ぉ14鐐规墽琛屼竴娆� 闄や簡鏄熸湡鍏拰鏄熸湡澶�
+ * 鑾峰彇娓╁害婀垮害
+ */
+// @Scheduled(cron = "0/5 * * * * *")
+ @Scheduled(cron = "0 0 14 * * 1-5") // 姣忓ぉ14鐐规墽琛屼竴娆� 闄や簡鏄熸湡鍏拰鏄熸湡澶�
+ public void task2() {
+
+ // 妫�鏌ュ疄楠屽鏄惁鏈変换鍔� 濡傛灉娌℃湁鏂板浠诲姟
+ checkLaboratoriesSchedule();
+ // 鏍规嵁鏃堕棿闄嶅簭锛岃幏鍙栧埌鏈�鏂扮殑涓�鏉℃暟鎹�
+ CollectTemperatureHumidity collectTemperatureHumidity = collectTemperatureHumidityMapper.selectOne(Wrappers.<CollectTemperatureHumidity>lambdaQuery()
+ .orderByDesc(CollectTemperatureHumidity::getCollectTime)
+ .last("limit 1"));
+ // 鑾峰彇鎵�鏈夌殑瀹為獙瀹�
+ List<CollectLaboratory> collectLaboratories = collectLaboratoryMapper.selectList(null);
+ // 閬嶅巻鑾峰彇瀹為獙瀹ょ紪鍙� 鑾峰彇娓╂箍搴� 淇濆瓨鍦ㄥ搴旂殑
+ for (CollectLaboratory collectLaboratory : collectLaboratories) {
+ // 瀹為獙瀹ょ紪鍙�
+ int labNumber = Integer.parseInt(collectLaboratory.getDeviceCode());
+ // 鏍规嵁瀹為獙瀹ょ紪鍙锋嫾鎺ュ搴旂殑婀垮害鍜屾俯搴﹀瓧娈�
+ String temperatureField = "code" + labNumber + "Temperature";
+ String humidityField = "code" + labNumber + "Humidity";
+ // 鑾峰彇娓╁害
+ Double temperature = getFieldValue(collectTemperatureHumidity, temperatureField) != null ? (Double) getFieldValue(collectTemperatureHumidity, temperatureField) : Double.valueOf(00.0);
+ // 鑾峰彇婀垮害
+ Double humidity = getFieldValue(collectTemperatureHumidity, humidityField) != null ? (Double) getFieldValue(collectTemperatureHumidity, humidityField) : Double.valueOf(00.0);
+ // 鏌ヨ璇曢獙鍖哄煙
+ FeTempHumDate feTempHumDate = feTempHumDateMapper.selectOne(Wrappers.<FeTempHumDate>lambdaQuery()
+ .eq(FeTempHumDate::getMonthDate, formattedDate)
+ .eq(FeTempHumDate::getTestAreaName, collectLaboratory.getLaboratory()));
+ Integer dateId = feTempHumDate.getDateId();
+ // 鏌ヨ浠婂ぉ鏄惁鏈夋俯婀垮害璁板綍
+ FeTempHumRecord feTempHumRecord = record(dateId);
+ // 濡傛灉娌℃湁鏌ヨ缁撴灉灏辫鏄庝笂鍗堟病鏈夎褰�
+ if (feTempHumRecord == null) {
+ // 鍒涘缓浠婂ぉ娓╂箍搴﹁褰曞璞� 璁板綍涓嬪崍娓╁害婀垮害
+ FeTempHumRecord newFeTempHumRecord = new FeTempHumRecord();
+ newFeTempHumRecord.setAfternoonTime(LocalTime.now());
+ newFeTempHumRecord.setAfternoonTemp(temperature.toString());
+ newFeTempHumRecord.setAfternoonHum(humidity.toString());
+ newFeTempHumRecord.setDateId(dateId);
+ feTempHumRecordMapper.insert(newFeTempHumRecord);
+ continue;
+ }
+
+ // 鏌ヨ鍑烘潵灏变唬琛ㄤ粖澶╄褰曡繃 鍐嶅垽鏂笅鍗堟湁璁板綍杩囨病鏈�
+ // 娓╁害鏄惁璁板綍杩�
+ if (feTempHumRecord.getAfternoonTemp() == null) {
+ // 娌℃湁灏辫嚜鍔ㄨ褰�
+ feTempHumRecord.setAfternoonTemp(temperature.toString());
+ // 淇敼璁板綍鏃堕棿
+ feTempHumRecord.setAfternoonTime(LocalTime.now());
+ }
+ // 婀垮害鏄惁璁板綍杩�
+ if (feTempHumRecord.getAfternoonHum() == null) {
+ // 娌℃湁灏辫嚜鍔ㄨ褰�
+ feTempHumRecord.setAfternoonHum(humidity.toString());
+ // 淇敼璁板綍鏃堕棿
+ feTempHumRecord.setAfternoonTime(LocalTime.now());
+ }
+ feTempHumRecordMapper.updateById(feTempHumRecord);
+
+ }
+ }
+
+ /**
+ * 鏍规嵁瀹為獙瀹ょ紪鍙疯幏鍙栨俯搴︽箍搴�
+ *
+ * @param collectTemperatureHumidity 娓╁害婀垮害鏁版嵁
+ * @param fieldName 瀛楁鍚�
+ * @return 瀛楁鍊�
+ */
+ public static Object getFieldValue(CollectTemperatureHumidity collectTemperatureHumidity, String fieldName) {
+ try {
+ Field field = collectTemperatureHumidity.getClass().getDeclaredField(fieldName);
+ field.setAccessible(true); // 璁剧疆鍙互璁块棶绉佹湁瀛楁
+ return field.get(collectTemperatureHumidity); // 鑾峰彇瀛楁鐨勫��
+ } catch (NoSuchFieldException | IllegalAccessException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 04abec3..21a7226 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -27,6 +27,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletException;
@@ -76,6 +77,7 @@
}
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
+ @PreAuthorize("@ss.hasPermi('add:insOrder')")
@PostMapping("/addInsOrder")
public Result<?> addInsOrder(@RequestBody InsPlaceOrderDto insPlaceOrderDto) {
return Result.success(insOrderService.addInsOrder(insPlaceOrderDto.getSampleList(), insPlaceOrderDto.getInsOrder()));
@@ -216,7 +218,7 @@
public Result<?> delInsOrder(Integer insOrderId) {
// 鏌ヨ璁㈠崟
InsOrder order = insOrderService.getById(insOrderId);
- if (!order.getState().equals(2)) {
+ if (!(order.getState().equals(2) || order.getState().equals(3))) {
throw new ErrorException("鍙湁閫�鍥炶鍗曟墠鑳藉垹闄�");
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
index 4e8624e..46c968f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderPlanController.java
@@ -1,6 +1,7 @@
package com.ruoyi.inspect.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
@@ -14,10 +15,14 @@
import com.ruoyi.inspect.pojo.InsProduct;
import com.ruoyi.inspect.service.InsOrderFileService;
import com.ruoyi.inspect.service.InsOrderPlanService;
+import com.ruoyi.inspect.service.InsOrderRatesService;
import com.ruoyi.inspect.service.InsProductService;
+import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
+import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -35,10 +40,9 @@
public class InsOrderPlanController {
private InsOrderPlanService insOrderPlanService;
-
private InsOrderFileService insOrderFileService;
-
private InsProductService insProductService;
+ private AuxiliaryOutputWorkingHoursTemporaryService auxiliaryOutputWorkingHoursTemporaryService;
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -122,6 +126,7 @@
@ApiOperation(value = "涓婁紶闄勪欢")
+ @PreAuthorize("@ss.hasPermi('upload:order:file')")
@PostMapping("/uploadFile")
public Result<?> taskUploadFile(Integer orderId, MultipartFile file) {
return Result.success(insOrderPlanService.uploadFile(orderId, file));
@@ -129,6 +134,7 @@
@ApiOperation(value = "鍒犻櫎闄勪欢")
+ @PreAuthorize("@ss.hasPermi('del:order:file')")
@DeleteMapping("/delfile")
public Result<?> delfile(Integer id) {
return Result.success(insOrderFileService.removeById(id));
@@ -223,6 +229,7 @@
@ApiOperation(value = "淇敼妫�楠岄」鍐呭")
+ @PreAuthorize("@ss.hasPermi('update:product:onPlan')")
@PostMapping("/updateProductOnPlan")
public Result<?> updateProductOnPlan(@RequestBody InsProduct insProduct) {
insProductService.updateById(insProduct);
@@ -259,4 +266,26 @@
public Result<?> delProductTreeByProductId(Integer productId) {
return Result.success(insProductService.removeBindingProductTree(productId));
}
+
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+ * @return
+ */
+ @ApiOperation(value = "鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏")
+ @PreAuthorize("@ss.hasPermi('get:working:hours:byOrder')")
+ @GetMapping("/getWorkingHoursByOrderId")
+ public Result<IPage<AuxiliaryOutputWorkingHoursTemporary>> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+ return Result.success(auxiliaryOutputWorkingHoursTemporaryService.getWorkingHoursByOrderId(page, workingHoursTemporary));
+ }
+
+ /**
+ * 淇敼宸ユ椂璇︽儏
+ * @return
+ */
+ @ApiOperation(value = "淇敼宸ユ椂璇︽儏")
+ @PreAuthorize("@ss.hasPermi('update:order:workingHours')")
+ @PostMapping("/updateWorkingHours")
+ public Result updateWorkingHours(@RequestBody AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+ return Result.success(auxiliaryOutputWorkingHoursTemporaryService.updateById(workingHoursTemporary));
+ }
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
index 1211049..51c05ea 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -214,6 +214,7 @@
@ApiOperation(value = "鍘熸潗鏂欐姤妫�鏌ヨ鍏ㄩ儴")
+ @PreAuthorize("@ss.hasPermi('get:Ifs:ByAll')")
@GetMapping("/getIfsByAll")
public Result getIfsByAll(Page page, IfsInventoryQuantitySupplierDto ifsInventoryQuantityDto){
return Result.success(rawMaterialOrderService.getIfsByOver(page, ifsInventoryQuantityDto));
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
index 9f7fef2..8464b1c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderRatesMapper.java
@@ -1,7 +1,12 @@
package com.ruoyi.inspect.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.pojo.InsOrderRates;
+import org.apache.ibatis.annotations.Param;
/**
* 璁㈠崟璐圭敤琛�
@@ -11,5 +16,10 @@
*/
public interface InsOrderRatesMapper extends BaseMapper<InsOrderRates> {
+ /**
+ * 鏌ヨ璁㈠崟璐圭敤鍒楄〃
+ * @return
+ */
+ IPage<SampleOrderDto> selectInsOrderRates(Page page, @Param("ew") QueryWrapper<SampleOrderDto> ew);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
index 592f6fb..43178e5 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderRatesServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.inspect.dto.SampleOrderDto;
import com.ruoyi.inspect.mapper.InsOrderRatesMapper;
import com.ruoyi.inspect.pojo.InsOrderRates;
@@ -26,7 +27,7 @@
*/
@Override
public IPage<SampleOrderDto> selectInsOrderRates(Page page, SampleOrderDto sampleOrderDto) {
- return null;
+ return baseMapper.selectInsOrderRates(page, QueryWrappers.queryWrappers(sampleOrderDto));
}
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 28495bc..186e0a1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -442,6 +442,9 @@
if (StringUtils.isBlank(product.getAsk()) || StringUtils.isBlank(product.getTell())) {
throw new ErrorException("鏈夋楠岄」鐨勮姹傚�兼垨瑕佹眰鎻忚堪涓虹┖, 璇峰厛鍘绘爣鍑嗗簱閰嶇疆瑕佹眰鍊兼垨瑕佹眰鎻忚堪");
}
+ if (StringUtils.isBlank(product.getSonLaboratory())) {
+ throw new ErrorException("鏈夋楠岄」鐨勭殑瀛愬疄楠屽涓虹粦瀹�, 璇峰厛缁戝畾瀛愬疄楠屽");
+ }
insProductMapper.insert(product);
}
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
new file mode 100644
index 0000000..82ede85
--- /dev/null
+++ b/inspect-server/src/main/resources/mapper/InsOrderRatesMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.inspect.mapper.InsOrderRatesMapper">
+ <!-- 鏌ヨ璐圭敤鍒楄〃 -->
+ <select id="selectInsOrderRates" resultType="com.ruoyi.inspect.dto.SampleOrderDto">
+ select *
+ from (select io.*,
+ case
+ when
+ io.type_source = 0
+ then io.sample_view
+ else io.sample end sample,
+ GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model
+ from ins_order io
+ LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
+ group by io.id) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
+</mapper>
diff --git a/performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java b/performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java
index 0f9be14..524a730 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.java
@@ -1,7 +1,11 @@
package com.ruoyi.performance.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
+import org.apache.ibatis.annotations.Param;
/**
* 宸ユ椂鏆傚瓨琛�
@@ -11,5 +15,11 @@
*/
public interface AuxiliaryOutputWorkingHoursTemporaryMapper extends BaseMapper<AuxiliaryOutputWorkingHoursTemporary> {
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+ * @param page
+ * @return
+ */
+ IPage<AuxiliaryOutputWorkingHoursTemporary> getWorkingHoursByOrderId(Page page, @Param("ew") QueryWrapper<AuxiliaryOutputWorkingHoursTemporary> ew);
}
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java b/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java
index dd5078e..b86c132 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/AuxiliaryOutputWorkingHoursTemporaryService.java
@@ -1,5 +1,7 @@
package com.ruoyi.performance.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
@@ -11,5 +13,12 @@
*/
public interface AuxiliaryOutputWorkingHoursTemporaryService extends IService<AuxiliaryOutputWorkingHoursTemporary> {
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+ * @param page
+ * @param workingHoursTemporary
+ * @return
+ */
+ IPage<AuxiliaryOutputWorkingHoursTemporary> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary);
}
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
index 09e3154..8ae2353 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryOutputWorkingHoursTemporaryServiceImpl.java
@@ -1,6 +1,9 @@
package com.ruoyi.performance.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursTemporaryMapper;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary;
import com.ruoyi.performance.service.AuxiliaryOutputWorkingHoursTemporaryService;
@@ -15,5 +18,15 @@
@Service
public class AuxiliaryOutputWorkingHoursTemporaryServiceImpl extends ServiceImpl<AuxiliaryOutputWorkingHoursTemporaryMapper, AuxiliaryOutputWorkingHoursTemporary> implements AuxiliaryOutputWorkingHoursTemporaryService {
+ /**
+ * 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏
+ * @param page
+ * @param workingHoursTemporary
+ * @return
+ */
+ @Override
+ public IPage<AuxiliaryOutputWorkingHoursTemporary> getWorkingHoursByOrderId(Page page, AuxiliaryOutputWorkingHoursTemporary workingHoursTemporary) {
+ return baseMapper.getWorkingHoursByOrderId(page, QueryWrappers.queryWrappers(workingHoursTemporary));
+ }
}
diff --git a/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml
new file mode 100644
index 0000000..106206c
--- /dev/null
+++ b/performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursTemporaryMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursTemporaryMapper">
+
+ <!-- 鏍规嵁璁㈠崟鏌ヨ宸ユ椂璇︽儏 -->
+ <select id="getWorkingHoursByOrderId"
+ resultType="com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHoursTemporary">
+ select *
+ from auxiliary_output_working_hours_temporary
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
diff --git a/pom.xml b/pom.xml
index 0dbf825..2a75212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,13 +201,6 @@
<version>${kaptcha.version}</version>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
- <version>${ruoyi.version}</version>
- </dependency>
-
<!-- 閫氱敤宸ュ叿-->
<dependency>
<groupId>com.ruoyi</groupId>
@@ -390,7 +383,6 @@
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
- <module>ruoyi-quartz</module>
<module>ruoyi-common</module>
<module>basic-server</module>
<module>inspect-server</module>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 485e28d..6c8e9a9 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -55,12 +55,6 @@
<artifactId>ruoyi-framework</artifactId>
</dependency>
- <!-- 瀹氭椂浠诲姟-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-quartz</artifactId>
- </dependency>
-
<!--鍩虹妯″潡-->
<dependency>
<groupId>com.ruoyi</groupId>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index f466a7f..dfad74e 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -1,3 +1,5 @@
+# 鏈湴
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -60,6 +62,46 @@
config:
multi-statement-allow: true
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+ host: localhost
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # # 瀵嗙爜
+ # password: root2022!
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+# mybatis-plus閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:mapper/**/*Mapper.xml
+ type-aliases-package: com.ruoyi.**.domain
+ global-config:
+ banner: off
+ db-config:
+ id-type: auto
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
minio:
endpoint: http://114.132.189.42/
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 32be6bd..6f68d66 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -1,3 +1,5 @@
+# 鍏徃娴嬭瘯搴�
+
# 鏁版嵁婧愰厤缃�
spring:
datasource:
@@ -60,6 +62,46 @@
config:
multi-statement-allow: true
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+ host: localhost
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 1
+ # 瀵嗙爜
+ password: root2022!
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+# mybatis-plus閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:mapper/**/*Mapper.xml
+ type-aliases-package: com.ruoyi.**.domain
+ global-config:
+ banner: off
+ db-config:
+ id-type: auto
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
minio:
endpoint: http://114.132.189.42/
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
new file mode 100644
index 0000000..ca51993
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -0,0 +1,153 @@
+# 瑁呭娴嬭瘯搴撻厤缃�
+
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 涓诲簱鏁版嵁婧�
+ master:
+ url: jdbc:mysql://localhost:3306/center-lims-dz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: zttZTT123!
+
+ # 浠庡簱鏁版嵁婧�
+ slave:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: false
+ url:
+ username:
+ password:
+ # 鍒濆杩炴帴鏁�
+ initialSize: 5
+ # 鏈�灏忚繛鎺ユ睜鏁伴噺
+ minIdle: 10
+ # 鏈�澶ц繛鎺ユ睜鏁伴噺
+ maxActive: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ maxWait: 60000
+ # 閰嶇疆杩炴帴瓒呮椂鏃堕棿
+ connectTimeout: 30000
+ # 閰嶇疆缃戠粶瓒呮椂鏃堕棿
+ socketTimeout: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ timeBetweenEvictionRunsMillis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ minEvictableIdleTimeMillis: 300000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ maxEvictableIdleTimeMillis: 900000
+ # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+ allow:
+ url-pattern: /druid/*
+ # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+ login-username: ruoyi
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 鎱QL璁板綍
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+
+ # redis 閰嶇疆
+ redis:
+ # 鍦板潃
+ host: localhost
+ # 绔彛锛岄粯璁や负6379
+ port: 6379
+ # 鏁版嵁搴撶储寮�
+ database: 0
+ # # 瀵嗙爜
+ password: zttZTT123!
+ # 杩炴帴瓒呮椂鏃堕棿
+ timeout: 10s
+ lettuce:
+ pool:
+ # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
+ min-idle: 0
+ # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
+ max-idle: 8
+ # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
+ max-active: 8
+ # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
+ max-wait: -1ms
+
+# mybatis-plus閰嶇疆
+mybatis-plus:
+ mapper-locations: classpath*:mapper/**/*Mapper.xml
+ type-aliases-package: com.ruoyi.**.domain
+ global-config:
+ banner: off
+ db-config:
+ id-type: auto
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
+
+# Swagger閰嶇疆
+swagger:
+ # 鏄惁寮�鍚痵wagger
+ enabled: true
+
+minio:
+ endpoint: http://114.132.189.42/
+ port: 7019
+ secure: false
+ accessKey: admin
+ secretKey: 12345678
+ preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
+
+# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
+file:
+ path: /center-lims/Work/img
+ # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
+ allowed: png,jpg,jpeg,gif
+
+wordUrl: /center-lims/Work/word
+twoCode: /center-lims/Work/two_code
+
+
+#oa:
+# oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
+# prodIp: http://192.168.21.53:8081
+# unqualifiedProcessId: 41974
+
+wechat:
+ # 璐ㄩ噺鎶ユ閫氱煡
+ examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
+
+ifs:
+ contract: ZTZB
+ contract-key-get: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
+ contract-key-post: 4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=
+ custorder: http://192.168.20.47/PurchService.ashx?
+ custorder-port: http://192.168.20.47:8008/PurchService.ashx?
+ erp-services: http://192.168.20.47:8081
+
+# 澶囨敞 18083瀵嗙爜锛歾ttZTT123!@
+mqtt:
+ url: tcp://mqtt-ztt.zttiot.com:1883 # 鏈嶅姟鍣╥p
+ username: forwarder # MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍鍚�
+ password: ZTlink12345 # MQTT-鏈嶅姟绔�-瀵嗙爜锛�,鍚庢湡浼氫慨鏀逛负鐢ㄦ埛鐧诲綍瀵嗙爜
+ timeout: 100 # 瓒呮椂鏃堕棿 锛堝崟浣嶏細绉掞級
+ keepalive: 60 # 蹇冭烦 锛堝崟浣嶏細绉掞級
+ qos: 1 # 蹇冭烦鍖呯骇鍒�
+ completion-timeout: 3000 # 杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶏細绉掞級
+ clientId: javaPublish # clientId
+ subscribe: /ztt/v3/2443521/publish # 璁㈤槄涓婚
+ client: false # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 8a825d3..54fd4cb 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -15,8 +15,8 @@
# 寮�鍙戠幆澧冮厤缃�
server:
- # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 8002
+ # 鏈嶅姟鍣ㄧ殑HTTP绔彛
+ port: 8001
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -70,28 +70,6 @@
# restart:
# # 鐑儴缃插紑鍏�
# enabled: false
- # redis 閰嶇疆
- redis:
- # 鍦板潃
- host: localhost
- # 绔彛锛岄粯璁や负6379
- port: 6379
- # 鏁版嵁搴撶储寮�
- database: 0
-# # 瀵嗙爜
-# password: root2022!
- # 杩炴帴瓒呮椂鏃堕棿
- timeout: 10s
- lettuce:
- pool:
- # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
- min-idle: 0
- # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
- max-idle: 8
- # 杩炴帴姹犵殑鏈�澶ф暟鎹簱杩炴帴鏁�
- max-active: 8
- # #杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
- max-wait: -1ms
# token閰嶇疆
token:
@@ -108,11 +86,6 @@
supportMethodsArguments: true
params: count=countSql
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: true
-
# 闃叉XSS鏀诲嚮
xss:
# 杩囨护寮�鍏�
@@ -122,16 +95,4 @@
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
-# mybatis-plus閰嶇疆
-mybatis-plus:
- mapper-locations: classpath*:mapper/**/*Mapper.xml
- type-aliases-package: com.ruoyi.**.domain
- global-config:
- banner: off
- db-config:
- id-type: auto
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- log-impl: # org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java
index da8cc61..20a9da5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/GZipUtil.java
@@ -28,8 +28,7 @@
return new String(out.toByteArray(), "iso-8859-1");
} catch (Exception e) {
- e.printStackTrace();
- return str;
+ throw new RuntimeException("鏁版嵁鍘嬬缉澶辫触");
}
}
@@ -55,8 +54,7 @@
return new String(out.toByteArray(), "utf-8");
} catch (Exception e) {
- e.printStackTrace();
- return str;
+ throw new RuntimeException("鏁版嵁瑙ｅ帇澶辫触");
}
}
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
deleted file mode 100644
index 0421087..0000000
--- a/ruoyi-quartz/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>ruoyi</artifactId>
- <groupId>com.ruoyi</groupId>
- <version>3.8.9</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>ruoyi-quartz</artifactId>
-
- <description>
- quartz瀹氭椂浠诲姟
- </description>
-
- <dependencies>
-
- <!-- 瀹氭椂浠诲姟 -->
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.mchange</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- 閫氱敤宸ュ叿-->
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
deleted file mode 100644
index d4e065a..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
+++ /dev/null
@@ -1,57 +0,0 @@
-//package com.ruoyi.quartz.config;
-//
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.scheduling.quartz.SchedulerFactoryBean;
-//import javax.sql.DataSource;
-//import java.util.Properties;
-//
-///**
-// * 瀹氭椂浠诲姟閰嶇疆锛堝崟鏈洪儴缃插缓璁垹闄ゆ绫诲拰qrtz鏁版嵁搴撹〃锛岄粯璁よ蛋鍐呭瓨浼氭渶楂樻晥锛�
-// *
-// * @author ruoyi
-// */
-//@Configuration
-//public class ScheduleConfig
-//{
-// @Bean
-// public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
-// {
-// SchedulerFactoryBean factory = new SchedulerFactoryBean();
-// factory.setDataSource(dataSource);
-//
-// // quartz鍙傛暟
-// Properties prop = new Properties();
-// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler");
-// prop.put("org.quartz.scheduler.instanceId", "AUTO");
-// // 绾跨▼姹犻厤缃�
-// prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool");
-// prop.put("org.quartz.threadPool.threadCount", "20");
-// prop.put("org.quartz.threadPool.threadPriority", "5");
-// // JobStore閰嶇疆
-// prop.put("org.quartz.jobStore.class", "org.springframework.scheduling.quartz.LocalDataSourceJobStore");
-// // 闆嗙兢閰嶇疆
-// prop.put("org.quartz.jobStore.isClustered", "true");
-// prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
-// prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "10");
-// prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "true");
-//
-// // sqlserver 鍚敤
-// // prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
-// prop.put("org.quartz.jobStore.misfireThreshold", "12000");
-// prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
-// factory.setQuartzProperties(prop);
-//
-// factory.setSchedulerName("RuoyiScheduler");
-// // 寤舵椂鍚姩
-// factory.setStartupDelay(1);
-// factory.setApplicationContextSchedulerContextKey("applicationContextKey");
-// // 鍙�夛紝QuartzScheduler
-// // 鍚姩鏃舵洿鏂板繁瀛樺湪鐨凧ob锛岃繖鏍峰氨涓嶇敤姣忔淇敼targetObject鍚庡垹闄rtz_job_details琛ㄥ搴旇褰曚簡
-// factory.setOverwriteExistingJobs(true);
-// // 璁剧疆鑷姩鍚姩锛岄粯璁や负true
-// factory.setAutoStartup(true);
-//
-// return factory;
-// }
-//}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
deleted file mode 100644
index 4fd7aab..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.ruoyi.quartz.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.quartz.domain.SysJob;
-import com.ruoyi.quartz.service.ISysJobService;
-import com.ruoyi.quartz.util.CronUtils;
-import com.ruoyi.quartz.util.ScheduleUtils;
-
-/**
- * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/job")
-public class SysJobController extends BaseController
-{
- @Autowired
- private ISysJobService jobService;
-
- /**
- * 鏌ヨ瀹氭椂浠诲姟鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysJob sysJob)
- {
- startPage();
- List<SysJob> list = jobService.selectJobList(sysJob);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭瀹氭椂浠诲姟鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:export')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysJob sysJob)
- {
- List<SysJob> list = jobService.selectJobList(sysJob);
- ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
- util.exportExcel(response, list, "瀹氭椂浠诲姟");
- }
-
- /**
- * 鑾峰彇瀹氭椂浠诲姟璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:query')")
- @GetMapping(value = "/{jobId}")
- public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
- {
- return success(jobService.selectJobById(jobId));
- }
-
- /**
- * 鏂板瀹氭椂浠诲姟
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:add')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
- {
- if (!CronUtils.isValid(job.getCronExpression()))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
- }
- else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
- }
- else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
- }
- job.setCreateBy(getUsername());
- return toAjax(jobService.insertJob(job));
- }
-
- /**
- * 淇敼瀹氭椂浠诲姟
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
- {
- if (!CronUtils.isValid(job.getCronExpression()))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
- }
- else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
- }
- else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
- }
- job.setUpdateBy(getUsername());
- return toAjax(jobService.updateJob(job));
- }
-
- /**
- * 瀹氭椂浠诲姟鐘舵�佷慨鏀�
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
- {
- SysJob newJob = jobService.selectJobById(job.getJobId());
- newJob.setStatus(job.getStatus());
- return toAjax(jobService.changeStatus(newJob));
- }
-
- /**
- * 瀹氭椂浠诲姟绔嬪嵆鎵ц涓�娆�
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- @PutMapping("/run")
- public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
- {
- boolean result = jobService.run(job);
- return result ? success() : error("浠诲姟涓嶅瓨鍦ㄦ垨宸茶繃鏈燂紒");
- }
-
- /**
- * 鍒犻櫎瀹氭椂浠诲姟
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
- @DeleteMapping("/{jobIds}")
- public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
- {
- jobService.deleteJobByIds(jobIds);
- return success();
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
deleted file mode 100644
index 4f6bb63..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.ruoyi.quartz.controller;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.quartz.domain.SysJobLog;
-import com.ruoyi.quartz.service.ISysJobLogService;
-
-/**
- * 璋冨害鏃ュ織鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/jobLog")
-public class SysJobLogController extends BaseController
-{
- @Autowired
- private ISysJobLogService jobLogService;
-
- /**
- * 鏌ヨ瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysJobLog sysJobLog)
- {
- startPage();
- List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:export')")
- @Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysJobLog sysJobLog)
- {
- List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
- ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
- util.exportExcel(response, list, "璋冨害鏃ュ織");
- }
-
- /**
- * 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:query')")
- @GetMapping(value = "/{jobLogId}")
- public AjaxResult getInfo(@PathVariable Long jobLogId)
- {
- return success(jobLogService.selectJobLogById(jobLogId));
- }
-
-
- /**
- * 鍒犻櫎瀹氭椂浠诲姟璋冨害鏃ュ織
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
- @Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
- @DeleteMapping("/{jobLogIds}")
- public AjaxResult remove(@PathVariable Long[] jobLogIds)
- {
- return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
- }
-
- /**
- * 娓呯┖瀹氭椂浠诲姟璋冨害鏃ュ織
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
- @Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
- @DeleteMapping("/clean")
- public AjaxResult clean()
- {
- jobLogService.cleanJobLog();
- return success();
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
deleted file mode 100644
index 1f49695..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.ruoyi.quartz.domain;
-
-import java.util.Date;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.quartz.util.CronUtils;
-
-/**
- * 瀹氭椂浠诲姟璋冨害琛� sys_job
- *
- * @author ruoyi
- */
-public class SysJob extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 浠诲姟ID */
- @Excel(name = "浠诲姟搴忓彿", cellType = ColumnType.NUMERIC)
- private Long jobId;
-
- /** 浠诲姟鍚嶇О */
- @Excel(name = "浠诲姟鍚嶇О")
- private String jobName;
-
- /** 浠诲姟缁勫悕 */
- @Excel(name = "浠诲姟缁勫悕")
- private String jobGroup;
-
- /** 璋冪敤鐩爣瀛楃涓� */
- @Excel(name = "璋冪敤鐩爣瀛楃涓�")
- private String invokeTarget;
-
- /** cron鎵ц琛ㄨ揪寮� */
- @Excel(name = "鎵ц琛ㄨ揪寮� ")
- private String cronExpression;
-
- /** cron璁″垝绛栫暐 */
- @Excel(name = "璁″垝绛栫暐 ", readConverterExp = "0=榛樿,1=绔嬪嵆瑙﹀彂鎵ц,2=瑙﹀彂涓�娆℃墽琛�,3=涓嶈Е鍙戠珛鍗虫墽琛�")
- private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
-
- /** 鏄惁骞跺彂鎵ц锛�0鍏佽 1绂佹锛� */
- @Excel(name = "骞跺彂鎵ц", readConverterExp = "0=鍏佽,1=绂佹")
- private String concurrent;
-
- /** 浠诲姟鐘舵�侊紙0姝ｅ父 1鏆傚仠锛� */
- @Excel(name = "浠诲姟鐘舵��", readConverterExp = "0=姝ｅ父,1=鏆傚仠")
- private String status;
-
- public Long getJobId()
- {
- return jobId;
- }
-
- public void setJobId(Long jobId)
- {
- this.jobId = jobId;
- }
-
- @NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗�")
- public String getJobName()
- {
- return jobName;
- }
-
- public void setJobName(String jobName)
- {
- this.jobName = jobName;
- }
-
- public String getJobGroup()
- {
- return jobGroup;
- }
-
- public void setJobGroup(String jobGroup)
- {
- this.jobGroup = jobGroup;
- }
-
- @NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌�")
- @Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩�500涓瓧绗�")
- public String getInvokeTarget()
- {
- return invokeTarget;
- }
-
- public void setInvokeTarget(String invokeTarget)
- {
- this.invokeTarget = invokeTarget;
- }
-
- @NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�")
- @Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩�255涓瓧绗�")
- public String getCronExpression()
- {
- return cronExpression;
- }
-
- public void setCronExpression(String cronExpression)
- {
- this.cronExpression = cronExpression;
- }
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date getNextValidTime()
- {
- if (StringUtils.isNotEmpty(cronExpression))
- {
- return CronUtils.getNextExecution(cronExpression);
- }
- return null;
- }
-
- public String getMisfirePolicy()
- {
- return misfirePolicy;
- }
-
- public void setMisfirePolicy(String misfirePolicy)
- {
- this.misfirePolicy = misfirePolicy;
- }
-
- public String getConcurrent()
- {
- return concurrent;
- }
-
- public void setConcurrent(String concurrent)
- {
- this.concurrent = concurrent;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("jobId", getJobId())
- .append("jobName", getJobName())
- .append("jobGroup", getJobGroup())
- .append("cronExpression", getCronExpression())
- .append("nextValidTime", getNextValidTime())
- .append("misfirePolicy", getMisfirePolicy())
- .append("concurrent", getConcurrent())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
deleted file mode 100644
index 121c035..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.ruoyi.quartz.domain;
-
-import java.util.Date;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 瀹氭椂浠诲姟璋冨害鏃ュ織琛� sys_job_log
- *
- * @author ruoyi
- */
-public class SysJobLog extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** ID */
- @Excel(name = "鏃ュ織搴忓彿")
- private Long jobLogId;
-
- /** 浠诲姟鍚嶇О */
- @Excel(name = "浠诲姟鍚嶇О")
- private String jobName;
-
- /** 浠诲姟缁勫悕 */
- @Excel(name = "浠诲姟缁勫悕")
- private String jobGroup;
-
- /** 璋冪敤鐩爣瀛楃涓� */
- @Excel(name = "璋冪敤鐩爣瀛楃涓�")
- private String invokeTarget;
-
- /** 鏃ュ織淇℃伅 */
- @Excel(name = "鏃ュ織淇℃伅")
- private String jobMessage;
-
- /** 鎵ц鐘舵�侊紙0姝ｅ父 1澶辫触锛� */
- @Excel(name = "鎵ц鐘舵��", readConverterExp = "0=姝ｅ父,1=澶辫触")
- private String status;
-
- /** 寮傚父淇℃伅 */
- @Excel(name = "寮傚父淇℃伅")
- private String exceptionInfo;
-
- /** 寮�濮嬫椂闂� */
- private Date startTime;
-
- /** 鍋滄鏃堕棿 */
- private Date stopTime;
-
- public Long getJobLogId()
- {
- return jobLogId;
- }
-
- public void setJobLogId(Long jobLogId)
- {
- this.jobLogId = jobLogId;
- }
-
- public String getJobName()
- {
- return jobName;
- }
-
- public void setJobName(String jobName)
- {
- this.jobName = jobName;
- }
-
- public String getJobGroup()
- {
- return jobGroup;
- }
-
- public void setJobGroup(String jobGroup)
- {
- this.jobGroup = jobGroup;
- }
-
- public String getInvokeTarget()
- {
- return invokeTarget;
- }
-
- public void setInvokeTarget(String invokeTarget)
- {
- this.invokeTarget = invokeTarget;
- }
-
- public String getJobMessage()
- {
- return jobMessage;
- }
-
- public void setJobMessage(String jobMessage)
- {
- this.jobMessage = jobMessage;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getExceptionInfo()
- {
- return exceptionInfo;
- }
-
- public void setExceptionInfo(String exceptionInfo)
- {
- this.exceptionInfo = exceptionInfo;
- }
-
- public Date getStartTime()
- {
- return startTime;
- }
-
- public void setStartTime(Date startTime)
- {
- this.startTime = startTime;
- }
-
- public Date getStopTime()
- {
- return stopTime;
- }
-
- public void setStopTime(Date stopTime)
- {
- this.stopTime = stopTime;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("jobLogId", getJobLogId())
- .append("jobName", getJobName())
- .append("jobGroup", getJobGroup())
- .append("jobMessage", getJobMessage())
- .append("status", getStatus())
- .append("exceptionInfo", getExceptionInfo())
- .append("startTime", getStartTime())
- .append("stopTime", getStopTime())
- .toString();
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
deleted file mode 100644
index 727d916..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.ruoyi.quartz.mapper;
-
-import java.util.List;
-import com.ruoyi.quartz.domain.SysJobLog;
-
-/**
- * 璋冨害浠诲姟鏃ュ織淇℃伅 鏁版嵁灞�
- *
- * @author ruoyi
- */
-public interface SysJobLogMapper
-{
- /**
- * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟
- *
- * @param jobLog 璋冨害鏃ュ織淇℃伅
- * @return 璋冨害浠诲姟鏃ュ織闆嗗悎
- */
- public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
-
- /**
- * 鏌ヨ鎵�鏈夎皟搴︿换鍔℃棩蹇�
- *
- * @return 璋冨害浠诲姟鏃ュ織鍒楄〃
- */
- public List<SysJobLog> selectJobLogAll();
-
- /**
- * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅
- *
- * @param jobLogId 璋冨害浠诲姟鏃ュ織ID
- * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅
- */
- public SysJobLog selectJobLogById(Long jobLogId);
-
- /**
- * 鏂板浠诲姟鏃ュ織
- *
- * @param jobLog 璋冨害鏃ュ織淇℃伅
- * @return 缁撴灉
- */
- public int insertJobLog(SysJobLog jobLog);
-
- /**
- * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅
- *
- * @param logIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteJobLogByIds(Long[] logIds);
-
- /**
- * 鍒犻櫎浠诲姟鏃ュ織
- *
- * @param jobId 璋冨害鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteJobLogById(Long jobId);
-
- /**
- * 娓呯┖浠诲姟鏃ュ織
- */
- public void cleanJobLog();
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
deleted file mode 100644
index 20f45db..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.ruoyi.quartz.mapper;
-
-import java.util.List;
-import com.ruoyi.quartz.domain.SysJob;
-
-/**
- * 璋冨害浠诲姟淇℃伅 鏁版嵁灞�
- *
- * @author ruoyi
- */
-public interface SysJobMapper
-{
- /**
- * 鏌ヨ璋冨害浠诲姟鏃ュ織闆嗗悎
- *
- * @param job 璋冨害淇℃伅
- * @return 鎿嶄綔鏃ュ織闆嗗悎
- */
- public List<SysJob> selectJobList(SysJob job);
-
- /**
- * 鏌ヨ鎵�鏈夎皟搴︿换鍔�
- *
- * @return 璋冨害浠诲姟鍒楄〃
- */
- public List<SysJob> selectJobAll();
-
- /**
- * 閫氳繃璋冨害ID鏌ヨ璋冨害浠诲姟淇℃伅
- *
- * @param jobId 璋冨害ID
- * @return 瑙掕壊瀵硅薄淇℃伅
- */
- public SysJob selectJobById(Long jobId);
-
- /**
- * 閫氳繃璋冨害ID鍒犻櫎璋冨害浠诲姟淇℃伅
- *
- * @param jobId 璋冨害ID
- * @return 缁撴灉
- */
- public int deleteJobById(Long jobId);
-
- /**
- * 鎵归噺鍒犻櫎璋冨害浠诲姟淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteJobByIds(Long[] ids);
-
- /**
- * 淇敼璋冨害浠诲姟淇℃伅
- *
- * @param job 璋冨害浠诲姟淇℃伅
- * @return 缁撴灉
- */
- public int updateJob(SysJob job);
-
- /**
- * 鏂板璋冨害浠诲姟淇℃伅
- *
- * @param job 璋冨害浠诲姟淇℃伅
- * @return 缁撴灉
- */
- public int insertJob(SysJob job);
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
deleted file mode 100644
index 8546792..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.ruoyi.quartz.service;
-
-import java.util.List;
-import com.ruoyi.quartz.domain.SysJobLog;
-
-/**
- * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅淇℃伅 鏈嶅姟灞�
- *
- * @author ruoyi
- */
-public interface ISysJobLogService
-{
- /**
- * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟
- *
- * @param jobLog 璋冨害鏃ュ織淇℃伅
- * @return 璋冨害浠诲姟鏃ュ織闆嗗悎
- */
- public List<SysJobLog> selectJobLogList(SysJobLog jobLog);
-
- /**
- * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅
- *
- * @param jobLogId 璋冨害浠诲姟鏃ュ織ID
- * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅
- */
- public SysJobLog selectJobLogById(Long jobLogId);
-
- /**
- * 鏂板浠诲姟鏃ュ織
- *
- * @param jobLog 璋冨害鏃ュ織淇℃伅
- */
- public void addJobLog(SysJobLog jobLog);
-
- /**
- * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅
- *
- * @param logIds 闇�瑕佸垹闄ょ殑鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteJobLogByIds(Long[] logIds);
-
- /**
- * 鍒犻櫎浠诲姟鏃ュ織
- *
- * @param jobId 璋冨害鏃ュ織ID
- * @return 缁撴灉
- */
- public int deleteJobLogById(Long jobId);
-
- /**
- * 娓呯┖浠诲姟鏃ュ織
- */
- public void cleanJobLog();
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
deleted file mode 100644
index 437ade8..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.ruoyi.quartz.service;
-
-import java.util.List;
-import org.quartz.SchedulerException;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.quartz.domain.SysJob;
-
-/**
- * 瀹氭椂浠诲姟璋冨害淇℃伅淇℃伅 鏈嶅姟灞�
- *
- * @author ruoyi
- */
-public interface ISysJobService
-{
- /**
- * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟
- *
- * @param job 璋冨害淇℃伅
- * @return 璋冨害浠诲姟闆嗗悎
- */
- public List<SysJob> selectJobList(SysJob job);
-
- /**
- * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅
- *
- * @param jobId 璋冨害浠诲姟ID
- * @return 璋冨害浠诲姟瀵硅薄淇℃伅
- */
- public SysJob selectJobById(Long jobId);
-
- /**
- * 鏆傚仠浠诲姟
- *
- * @param job 璋冨害淇℃伅
- * @return 缁撴灉
- */
- public int pauseJob(SysJob job) throws SchedulerException;
-
- /**
- * 鎭㈠浠诲姟
- *
- * @param job 璋冨害淇℃伅
- * @return 缁撴灉
- */
- public int resumeJob(SysJob job) throws SchedulerException;
-
- /**
- * 鍒犻櫎浠诲姟鍚庯紝鎵�瀵瑰簲鐨則rigger涔熷皢琚垹闄�
- *
- * @param job 璋冨害淇℃伅
- * @return 缁撴灉
- */
- public int deleteJob(SysJob job) throws SchedulerException;
-
- /**
- * 鎵归噺鍒犻櫎璋冨害淇℃伅
- *
- * @param jobIds 闇�瑕佸垹闄ょ殑浠诲姟ID
- * @return 缁撴灉
- */
- public void deleteJobByIds(Long[] jobIds) throws SchedulerException;
-
- /**
- * 浠诲姟璋冨害鐘舵�佷慨鏀�
- *
- * @param job 璋冨害淇℃伅
- * @return 缁撴灉
- */
- public int changeStatus(SysJob job) throws SchedulerException;
-
- /**
- * 绔嬪嵆杩愯浠诲姟
- *
- * @param job 璋冨害淇℃伅
- * @return 缁撴灉
- */
- public boolean run(SysJob job) throws SchedulerException;
-
- /**
- * 鏂板浠诲姟
- *
- * @param job 璋冨害淇℃伅
- * @return 缁撴灉
- */
- public int insertJob(SysJob job) throws SchedulerException, TaskException;
-
- /**
- * 鏇存柊浠诲姟
- *
- * @param job 璋冨害淇℃伅
- * @return 缁撴灉
- */
- public int updateJob(SysJob job) throws SchedulerException, TaskException;
-
- /**
- * 鏍￠獙cron琛ㄨ揪寮忔槸鍚︽湁鏁�
- *
- * @param cronExpression 琛ㄨ揪寮�
- * @return 缁撴灉
- */
- public boolean checkCronExpressionIsValid(String cronExpression);
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
deleted file mode 100644
index 812eed7..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.ruoyi.quartz.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.quartz.domain.SysJobLog;
-import com.ruoyi.quartz.mapper.SysJobLogMapper;
-import com.ruoyi.quartz.service.ISysJobLogService;
-
-/**
- * 瀹氭椂浠诲姟璋冨害鏃ュ織淇℃伅 鏈嶅姟灞�
- *
- * @author ruoyi
- */
-@Service
-public class SysJobLogServiceImpl implements ISysJobLogService
-{
- @Autowired
- private SysJobLogMapper jobLogMapper;
-
- /**
- * 鑾峰彇quartz璋冨害鍣ㄦ棩蹇楃殑璁″垝浠诲姟
- *
- * @param jobLog 璋冨害鏃ュ織淇℃伅
- * @return 璋冨害浠诲姟鏃ュ織闆嗗悎
- */
- @Override
- public List<SysJobLog> selectJobLogList(SysJobLog jobLog)
- {
- return jobLogMapper.selectJobLogList(jobLog);
- }
-
- /**
- * 閫氳繃璋冨害浠诲姟鏃ュ織ID鏌ヨ璋冨害淇℃伅
- *
- * @param jobLogId 璋冨害浠诲姟鏃ュ織ID
- * @return 璋冨害浠诲姟鏃ュ織瀵硅薄淇℃伅
- */
- @Override
- public SysJobLog selectJobLogById(Long jobLogId)
- {
- return jobLogMapper.selectJobLogById(jobLogId);
- }
-
- /**
- * 鏂板浠诲姟鏃ュ織
- *
- * @param jobLog 璋冨害鏃ュ織淇℃伅
- */
- @Override
- public void addJobLog(SysJobLog jobLog)
- {
- jobLogMapper.insertJobLog(jobLog);
- }
-
- /**
- * 鎵归噺鍒犻櫎璋冨害鏃ュ織淇℃伅
- *
- * @param logIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteJobLogByIds(Long[] logIds)
- {
- return jobLogMapper.deleteJobLogByIds(logIds);
- }
-
- /**
- * 鍒犻櫎浠诲姟鏃ュ織
- *
- * @param jobId 璋冨害鏃ュ織ID
- */
- @Override
- public int deleteJobLogById(Long jobId)
- {
- return jobLogMapper.deleteJobLogById(jobId);
- }
-
- /**
- * 娓呯┖浠诲姟鏃ュ織
- */
- @Override
- public void cleanJobLog()
- {
- jobLogMapper.cleanJobLog();
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
deleted file mode 100644
index 77fdbb5..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package com.ruoyi.quartz.service.impl;
-
-import java.util.List;
-import javax.annotation.PostConstruct;
-import org.quartz.JobDataMap;
-import org.quartz.JobKey;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.quartz.domain.SysJob;
-import com.ruoyi.quartz.mapper.SysJobMapper;
-import com.ruoyi.quartz.service.ISysJobService;
-import com.ruoyi.quartz.util.CronUtils;
-import com.ruoyi.quartz.util.ScheduleUtils;
-
-/**
- * 瀹氭椂浠诲姟璋冨害淇℃伅 鏈嶅姟灞�
- *
- * @author ruoyi
- */
-@Service
-public class SysJobServiceImpl implements ISysJobService
-{
- @Autowired
- private Scheduler scheduler;
-
- @Autowired
- private SysJobMapper jobMapper;
-
- /**
- * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧畾鏃跺櫒 涓昏鏄槻姝㈡墜鍔ㄤ慨鏀规暟鎹簱瀵艰嚧鏈悓姝ュ埌瀹氭椂浠诲姟澶勭悊锛堟敞锛氫笉鑳芥墜鍔ㄤ慨鏀规暟鎹簱ID鍜屼换鍔＄粍鍚嶏紝鍚﹀垯浼氬鑷磋剰鏁版嵁锛�
- */
- @PostConstruct
- public void init() throws SchedulerException, TaskException
- {
- scheduler.clear();
- List<SysJob> jobList = jobMapper.selectJobAll();
- for (SysJob job : jobList)
- {
- ScheduleUtils.createScheduleJob(scheduler, job);
- }
- }
-
- /**
- * 鑾峰彇quartz璋冨害鍣ㄧ殑璁″垝浠诲姟鍒楄〃
- *
- * @param job 璋冨害淇℃伅
- * @return
- */
- @Override
- public List<SysJob> selectJobList(SysJob job)
- {
- return jobMapper.selectJobList(job);
- }
-
- /**
- * 閫氳繃璋冨害浠诲姟ID鏌ヨ璋冨害淇℃伅
- *
- * @param jobId 璋冨害浠诲姟ID
- * @return 璋冨害浠诲姟瀵硅薄淇℃伅
- */
- @Override
- public SysJob selectJobById(Long jobId)
- {
- return jobMapper.selectJobById(jobId);
- }
-
- /**
- * 鏆傚仠浠诲姟
- *
- * @param job 璋冨害淇℃伅
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int pauseJob(SysJob job) throws SchedulerException
- {
- Long jobId = job.getJobId();
- String jobGroup = job.getJobGroup();
- job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
- int rows = jobMapper.updateJob(job);
- if (rows > 0)
- {
- scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
- }
- return rows;
- }
-
- /**
- * 鎭㈠浠诲姟
- *
- * @param job 璋冨害淇℃伅
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int resumeJob(SysJob job) throws SchedulerException
- {
- Long jobId = job.getJobId();
- String jobGroup = job.getJobGroup();
- job.setStatus(ScheduleConstants.Status.NORMAL.getValue());
- int rows = jobMapper.updateJob(job);
- if (rows > 0)
- {
- scheduler.resumeJob(ScheduleUtils.getJobKey(jobId, jobGroup));
- }
- return rows;
- }
-
- /**
- * 鍒犻櫎浠诲姟鍚庯紝鎵�瀵瑰簲鐨則rigger涔熷皢琚垹闄�
- *
- * @param job 璋冨害淇℃伅
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int deleteJob(SysJob job) throws SchedulerException
- {
- Long jobId = job.getJobId();
- String jobGroup = job.getJobGroup();
- int rows = jobMapper.deleteJobById(jobId);
- if (rows > 0)
- {
- scheduler.deleteJob(ScheduleUtils.getJobKey(jobId, jobGroup));
- }
- return rows;
- }
-
- /**
- * 鎵归噺鍒犻櫎璋冨害淇℃伅
- *
- * @param jobIds 闇�瑕佸垹闄ょ殑浠诲姟ID
- * @return 缁撴灉
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void deleteJobByIds(Long[] jobIds) throws SchedulerException
- {
- for (Long jobId : jobIds)
- {
- SysJob job = jobMapper.selectJobById(jobId);
- deleteJob(job);
- }
- }
-
- /**
- * 浠诲姟璋冨害鐘舵�佷慨鏀�
- *
- * @param job 璋冨害淇℃伅
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int changeStatus(SysJob job) throws SchedulerException
- {
- int rows = 0;
- String status = job.getStatus();
- if (ScheduleConstants.Status.NORMAL.getValue().equals(status))
- {
- rows = resumeJob(job);
- }
- else if (ScheduleConstants.Status.PAUSE.getValue().equals(status))
- {
- rows = pauseJob(job);
- }
- return rows;
- }
-
- /**
- * 绔嬪嵆杩愯浠诲姟
- *
- * @param job 璋冨害淇℃伅
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public boolean run(SysJob job) throws SchedulerException
- {
- boolean result = false;
- Long jobId = job.getJobId();
- String jobGroup = job.getJobGroup();
- SysJob properties = selectJobById(job.getJobId());
- // 鍙傛暟
- JobDataMap dataMap = new JobDataMap();
- dataMap.put(ScheduleConstants.TASK_PROPERTIES, properties);
- JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
- if (scheduler.checkExists(jobKey))
- {
- result = true;
- scheduler.triggerJob(jobKey, dataMap);
- }
- return result;
- }
-
- /**
- * 鏂板浠诲姟
- *
- * @param job 璋冨害淇℃伅 璋冨害淇℃伅
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int insertJob(SysJob job) throws SchedulerException, TaskException
- {
- job.setStatus(ScheduleConstants.Status.PAUSE.getValue());
- int rows = jobMapper.insertJob(job);
- if (rows > 0)
- {
- ScheduleUtils.createScheduleJob(scheduler, job);
- }
- return rows;
- }
-
- /**
- * 鏇存柊浠诲姟鐨勬椂闂磋〃杈惧紡
- *
- * @param job 璋冨害淇℃伅
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int updateJob(SysJob job) throws SchedulerException, TaskException
- {
- SysJob properties = selectJobById(job.getJobId());
- int rows = jobMapper.updateJob(job);
- if (rows > 0)
- {
- updateSchedulerJob(job, properties.getJobGroup());
- }
- return rows;
- }
-
- /**
- * 鏇存柊浠诲姟
- *
- * @param job 浠诲姟瀵硅薄
- * @param jobGroup 浠诲姟缁勫悕
- */
- public void updateSchedulerJob(SysJob job, String jobGroup) throws SchedulerException, TaskException
- {
- Long jobId = job.getJobId();
- // 鍒ゆ柇鏄惁瀛樺湪
- JobKey jobKey = ScheduleUtils.getJobKey(jobId, jobGroup);
- if (scheduler.checkExists(jobKey))
- {
- // 闃叉鍒涘缓鏃跺瓨鍦ㄦ暟鎹棶棰� 鍏堢Щ闄わ紝鐒跺悗鍦ㄦ墽琛屽垱寤烘搷浣�
- scheduler.deleteJob(jobKey);
- }
- ScheduleUtils.createScheduleJob(scheduler, job);
- }
-
- /**
- * 鏍￠獙cron琛ㄨ揪寮忔槸鍚︽湁鏁�
- *
- * @param cronExpression 琛ㄨ揪寮�
- * @return 缁撴灉
- */
- @Override
- public boolean checkCronExpressionIsValid(String cronExpression)
- {
- return CronUtils.isValid(cronExpression);
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
deleted file mode 100644
index 853243b..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.ruoyi.quartz.task;
-
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 瀹氭椂浠诲姟璋冨害娴嬭瘯
- *
- * @author ruoyi
- */
-@Component("ryTask")
-public class RyTask
-{
- public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
- {
- System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i));
- }
-
- public void ryParams(String params)
- {
- System.out.println("鎵ц鏈夊弬鏂规硶锛�" + params);
- }
-
- public void ryNoParams()
- {
- System.out.println("鎵ц鏃犲弬鏂规硶");
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
deleted file mode 100644
index 731a5eb..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.ruoyi.quartz.util;
-
-import java.util.Date;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.utils.ExceptionUtil;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.quartz.domain.SysJob;
-import com.ruoyi.quartz.domain.SysJobLog;
-import com.ruoyi.quartz.service.ISysJobLogService;
-
-/**
- * 鎶借薄quartz璋冪敤
- *
- * @author ruoyi
- */
-public abstract class AbstractQuartzJob implements Job
-{
- private static final Logger log = LoggerFactory.getLogger(AbstractQuartzJob.class);
-
- /**
- * 绾跨▼鏈湴鍙橀噺
- */
- private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
-
- @Override
- public void execute(JobExecutionContext context) throws JobExecutionException
- {
- SysJob sysJob = new SysJob();
- BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
- try
- {
- before(context, sysJob);
- if (sysJob != null)
- {
- doExecute(context, sysJob);
- }
- after(context, sysJob, null);
- }
- catch (Exception e)
- {
- log.error("浠诲姟鎵ц寮傚父 - 锛�", e);
- after(context, sysJob, e);
- }
- }
-
- /**
- * 鎵ц鍓�
- *
- * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞�
- * @param sysJob 绯荤粺璁″垝浠诲姟
- */
- protected void before(JobExecutionContext context, SysJob sysJob)
- {
- threadLocal.set(new Date());
- }
-
- /**
- * 鎵ц鍚�
- *
- * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞�
- * @param sysJob 绯荤粺璁″垝浠诲姟
- */
- protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
- {
- Date startTime = threadLocal.get();
- threadLocal.remove();
-
- final SysJobLog sysJobLog = new SysJobLog();
- sysJobLog.setJobName(sysJob.getJobName());
- sysJobLog.setJobGroup(sysJob.getJobGroup());
- sysJobLog.setInvokeTarget(sysJob.getInvokeTarget());
- sysJobLog.setStartTime(startTime);
- sysJobLog.setStopTime(new Date());
- long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
- sysJobLog.setJobMessage(sysJobLog.getJobName() + " 鎬诲叡鑰楁椂锛�" + runMs + "姣");
- if (e != null)
- {
- sysJobLog.setStatus(Constants.FAIL);
- String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
- sysJobLog.setExceptionInfo(errorMsg);
- }
- else
- {
- sysJobLog.setStatus(Constants.SUCCESS);
- }
-
- // 鍐欏叆鏁版嵁搴撳綋涓�
- SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
- }
-
- /**
- * 鎵ц鏂规硶锛岀敱瀛愮被閲嶈浇
- *
- * @param context 宸ヤ綔鎵ц涓婁笅鏂囧璞�
- * @param sysJob 绯荤粺璁″垝浠诲姟
- * @throws Exception 鎵ц杩囩▼涓殑寮傚父
- */
- protected abstract void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception;
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
deleted file mode 100644
index dd53839..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ruoyi.quartz.util;
-
-import java.text.ParseException;
-import java.util.Date;
-import org.quartz.CronExpression;
-
-/**
- * cron琛ㄨ揪寮忓伐鍏风被
- *
- * @author ruoyi
- *
- */
-public class CronUtils
-{
- /**
- * 杩斿洖涓�涓竷灏斿�间唬琛ㄤ竴涓粰瀹氱殑Cron琛ㄨ揪寮忕殑鏈夋晥鎬�
- *
- * @param cronExpression Cron琛ㄨ揪寮�
- * @return boolean 琛ㄨ揪寮忔槸鍚︽湁鏁�
- */
- public static boolean isValid(String cronExpression)
- {
- return CronExpression.isValidExpression(cronExpression);
- }
-
- /**
- * 杩斿洖涓�涓瓧绗︿覆鍊�,琛ㄧず璇ユ秷鎭棤鏁圕ron琛ㄨ揪寮忕粰鍑烘湁鏁堟��
- *
- * @param cronExpression Cron琛ㄨ揪寮�
- * @return String 鏃犳晥鏃惰繑鍥炶〃杈惧紡閿欒鎻忚堪,濡傛灉鏈夋晥杩斿洖null
- */
- public static String getInvalidMessage(String cronExpression)
- {
- try
- {
- new CronExpression(cronExpression);
- return null;
- }
- catch (ParseException pe)
- {
- return pe.getMessage();
- }
- }
-
- /**
- * 杩斿洖涓嬩竴涓墽琛屾椂闂存牴鎹粰瀹氱殑Cron琛ㄨ揪寮�
- *
- * @param cronExpression Cron琛ㄨ揪寮�
- * @return Date 涓嬫Cron琛ㄨ揪寮忔墽琛屾椂闂�
- */
- public static Date getNextExecution(String cronExpression)
- {
- try
- {
- CronExpression cron = new CronExpression(cronExpression);
- return cron.getNextValidTimeAfter(new Date(System.currentTimeMillis()));
- }
- catch (ParseException e)
- {
- throw new IllegalArgumentException(e.getMessage());
- }
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
deleted file mode 100644
index e3dc62c..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.ruoyi.quartz.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.LinkedList;
-import java.util.List;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.quartz.domain.SysJob;
-
-/**
- * 浠诲姟鎵ц宸ュ叿
- *
- * @author ruoyi
- */
-public class JobInvokeUtil
-{
- /**
- * 鎵ц鏂规硶
- *
- * @param sysJob 绯荤粺浠诲姟
- */
- public static void invokeMethod(SysJob sysJob) throws Exception
- {
- String invokeTarget = sysJob.getInvokeTarget();
- String beanName = getBeanName(invokeTarget);
- String methodName = getMethodName(invokeTarget);
- List<Object[]> methodParams = getMethodParams(invokeTarget);
-
- if (!isValidClassName(beanName))
- {
- Object bean = SpringUtils.getBean(beanName);
- invokeMethod(bean, methodName, methodParams);
- }
- else
- {
- Object bean = Class.forName(beanName).getDeclaredConstructor().newInstance();
- invokeMethod(bean, methodName, methodParams);
- }
- }
-
- /**
- * 璋冪敤浠诲姟鏂规硶
- *
- * @param bean 鐩爣瀵硅薄
- * @param methodName 鏂规硶鍚嶇О
- * @param methodParams 鏂规硶鍙傛暟
- */
- private static void invokeMethod(Object bean, String methodName, List<Object[]> methodParams)
- throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException,
- InvocationTargetException
- {
- if (StringUtils.isNotNull(methodParams) && methodParams.size() > 0)
- {
- Method method = bean.getClass().getMethod(methodName, getMethodParamsType(methodParams));
- method.invoke(bean, getMethodParamsValue(methodParams));
- }
- else
- {
- Method method = bean.getClass().getMethod(methodName);
- method.invoke(bean);
- }
- }
-
- /**
- * 鏍￠獙鏄惁涓轰负class鍖呭悕
- *
- * @param invokeTarget 鍚嶇О
- * @return true鏄� false鍚�
- */
- public static boolean isValidClassName(String invokeTarget)
- {
- return StringUtils.countMatches(invokeTarget, ".") > 1;
- }
-
- /**
- * 鑾峰彇bean鍚嶇О
- *
- * @param invokeTarget 鐩爣瀛楃涓�
- * @return bean鍚嶇О
- */
- public static String getBeanName(String invokeTarget)
- {
- String beanName = StringUtils.substringBefore(invokeTarget, "(");
- return StringUtils.substringBeforeLast(beanName, ".");
- }
-
- /**
- * 鑾峰彇bean鏂规硶
- *
- * @param invokeTarget 鐩爣瀛楃涓�
- * @return method鏂规硶
- */
- public static String getMethodName(String invokeTarget)
- {
- String methodName = StringUtils.substringBefore(invokeTarget, "(");
- return StringUtils.substringAfterLast(methodName, ".");
- }
-
- /**
- * 鑾峰彇method鏂规硶鍙傛暟鐩稿叧鍒楄〃
- *
- * @param invokeTarget 鐩爣瀛楃涓�
- * @return method鏂规硶鐩稿叧鍙傛暟鍒楄〃
- */
- public static List<Object[]> getMethodParams(String invokeTarget)
- {
- String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
- if (StringUtils.isEmpty(methodStr))
- {
- return null;
- }
- String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
- List<Object[]> classs = new LinkedList<>();
- for (int i = 0; i < methodParams.length; i++)
- {
- String str = StringUtils.trimToEmpty(methodParams[i]);
- // String瀛楃涓茬被鍨嬶紝浠�'鎴�"寮�澶�
- if (StringUtils.startsWithAny(str, "'", "\""))
- {
- classs.add(new Object[] { StringUtils.substring(str, 1, str.length() - 1), String.class });
- }
- // boolean甯冨皵绫诲瀷锛岀瓑浜巘rue鎴栬�協alse
- else if ("true".equalsIgnoreCase(str) || "false".equalsIgnoreCase(str))
- {
- classs.add(new Object[] { Boolean.valueOf(str), Boolean.class });
- }
- // long闀挎暣褰紝浠缁撳熬
- else if (StringUtils.endsWith(str, "L"))
- {
- classs.add(new Object[] { Long.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Long.class });
- }
- // double娴偣绫诲瀷锛屼互D缁撳熬
- else if (StringUtils.endsWith(str, "D"))
- {
- classs.add(new Object[] { Double.valueOf(StringUtils.substring(str, 0, str.length() - 1)), Double.class });
- }
- // 鍏朵粬绫诲瀷褰掔被涓烘暣褰�
- else
- {
- classs.add(new Object[] { Integer.valueOf(str), Integer.class });
- }
- }
- return classs;
- }
-
- /**
- * 鑾峰彇鍙傛暟绫诲瀷
- *
- * @param methodParams 鍙傛暟鐩稿叧鍒楄〃
- * @return 鍙傛暟绫诲瀷鍒楄〃
- */
- public static Class<?>[] getMethodParamsType(List<Object[]> methodParams)
- {
- Class<?>[] classs = new Class<?>[methodParams.size()];
- int index = 0;
- for (Object[] os : methodParams)
- {
- classs[index] = (Class<?>) os[1];
- index++;
- }
- return classs;
- }
-
- /**
- * 鑾峰彇鍙傛暟鍊�
- *
- * @param methodParams 鍙傛暟鐩稿叧鍒楄〃
- * @return 鍙傛暟鍊煎垪琛�
- */
- public static Object[] getMethodParamsValue(List<Object[]> methodParams)
- {
- Object[] classs = new Object[methodParams.size()];
- int index = 0;
- for (Object[] os : methodParams)
- {
- classs[index] = (Object) os[0];
- index++;
- }
- return classs;
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
deleted file mode 100644
index 5e13558..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.ruoyi.quartz.util;
-
-import org.quartz.DisallowConcurrentExecution;
-import org.quartz.JobExecutionContext;
-import com.ruoyi.quartz.domain.SysJob;
-
-/**
- * 瀹氭椂浠诲姟澶勭悊锛堢姝㈠苟鍙戞墽琛岋級
- *
- * @author ruoyi
- *
- */
-@DisallowConcurrentExecution
-public class QuartzDisallowConcurrentExecution extends AbstractQuartzJob
-{
- @Override
- protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
- {
- JobInvokeUtil.invokeMethod(sysJob);
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
deleted file mode 100644
index e975326..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.quartz.util;
-
-import org.quartz.JobExecutionContext;
-import com.ruoyi.quartz.domain.SysJob;
-
-/**
- * 瀹氭椂浠诲姟澶勭悊锛堝厑璁稿苟鍙戞墽琛岋級
- *
- * @author ruoyi
- *
- */
-public class QuartzJobExecution extends AbstractQuartzJob
-{
- @Override
- protected void doExecute(JobExecutionContext context, SysJob sysJob) throws Exception
- {
- JobInvokeUtil.invokeMethod(sysJob);
- }
-}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
deleted file mode 100644
index 21fedae..0000000
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.ruoyi.quartz.util;
-
-import org.quartz.CronScheduleBuilder;
-import org.quartz.CronTrigger;
-import org.quartz.Job;
-import org.quartz.JobBuilder;
-import org.quartz.JobDetail;
-import org.quartz.JobKey;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
-import org.quartz.TriggerBuilder;
-import org.quartz.TriggerKey;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.constant.ScheduleConstants;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.common.exception.job.TaskException.Code;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.quartz.domain.SysJob;
-
-/**
- * 瀹氭椂浠诲姟宸ュ叿绫�
- *
- * @author ruoyi
- *
- */
-public class ScheduleUtils
-{
- /**
- * 寰楀埌quartz浠诲姟绫�
- *
- * @param sysJob 鎵ц璁″垝
- * @return 鍏蜂綋鎵ц浠诲姟绫�
- */
- private static Class<? extends Job> getQuartzJobClass(SysJob sysJob)
- {
- boolean isConcurrent = "0".equals(sysJob.getConcurrent());
- return isConcurrent ? QuartzJobExecution.class : QuartzDisallowConcurrentExecution.class;
- }
-
- /**
- * 鏋勫缓浠诲姟瑙﹀彂瀵硅薄
- */
- public static TriggerKey getTriggerKey(Long jobId, String jobGroup)
- {
- return TriggerKey.triggerKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
- }
-
- /**
- * 鏋勫缓浠诲姟閿璞�
- */
- public static JobKey getJobKey(Long jobId, String jobGroup)
- {
- return JobKey.jobKey(ScheduleConstants.TASK_CLASS_NAME + jobId, jobGroup);
- }
-
- /**
- * 鍒涘缓瀹氭椂浠诲姟
- */
- public static void createScheduleJob(Scheduler scheduler, SysJob job) throws SchedulerException, TaskException
- {
- Class<? extends Job> jobClass = getQuartzJobClass(job);
- // 鏋勫缓job淇℃伅
- Long jobId = job.getJobId();
- String jobGroup = job.getJobGroup();
- JobDetail jobDetail = JobBuilder.newJob(jobClass).withIdentity(getJobKey(jobId, jobGroup)).build();
-
- // 琛ㄨ揪寮忚皟搴︽瀯寤哄櫒
- CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(job.getCronExpression());
- cronScheduleBuilder = handleCronScheduleMisfirePolicy(job, cronScheduleBuilder);
-
- // 鎸夋柊鐨刢ronExpression琛ㄨ揪寮忔瀯寤轰竴涓柊鐨則rigger
- CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(getTriggerKey(jobId, jobGroup))
- .withSchedule(cronScheduleBuilder).build();
-
- // 鏀惧叆鍙傛暟锛岃繍琛屾椂鐨勬柟娉曞彲浠ヨ幏鍙�
- jobDetail.getJobDataMap().put(ScheduleConstants.TASK_PROPERTIES, job);
-
- // 鍒ゆ柇鏄惁瀛樺湪
- if (scheduler.checkExists(getJobKey(jobId, jobGroup)))
- {
- // 闃叉鍒涘缓鏃跺瓨鍦ㄦ暟鎹棶棰� 鍏堢Щ闄わ紝鐒跺悗鍦ㄦ墽琛屽垱寤烘搷浣�
- scheduler.deleteJob(getJobKey(jobId, jobGroup));
- }
-
- // 鍒ゆ柇浠诲姟鏄惁杩囨湡
- if (StringUtils.isNotNull(CronUtils.getNextExecution(job.getCronExpression())))
- {
- // 鎵ц璋冨害浠诲姟
- scheduler.scheduleJob(jobDetail, trigger);
- }
-
- // 鏆傚仠浠诲姟
- if (job.getStatus().equals(ScheduleConstants.Status.PAUSE.getValue()))
- {
- scheduler.pauseJob(ScheduleUtils.getJobKey(jobId, jobGroup));
- }
- }
-
- /**
- * 璁剧疆瀹氭椂浠诲姟绛栫暐
- */
- public static CronScheduleBuilder handleCronScheduleMisfirePolicy(SysJob job, CronScheduleBuilder cb)
- throws TaskException
- {
- switch (job.getMisfirePolicy())
- {
- case ScheduleConstants.MISFIRE_DEFAULT:
- return cb;
- case ScheduleConstants.MISFIRE_IGNORE_MISFIRES:
- return cb.withMisfireHandlingInstructionIgnoreMisfires();
- case ScheduleConstants.MISFIRE_FIRE_AND_PROCEED:
- return cb.withMisfireHandlingInstructionFireAndProceed();
- case ScheduleConstants.MISFIRE_DO_NOTHING:
- return cb.withMisfireHandlingInstructionDoNothing();
- default:
- throw new TaskException("The task misfire policy '" + job.getMisfirePolicy()
- + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
- }
- }
-
- /**
- * 妫�鏌ュ寘鍚嶆槸鍚︿负鐧藉悕鍗曢厤缃�
- *
- * @param invokeTarget 鐩爣瀛楃涓�
- * @return 缁撴灉
- */
- public static boolean whiteList(String invokeTarget)
- {
- String packageName = StringUtils.substringBefore(invokeTarget, "(");
- int count = StringUtils.countMatches(packageName, ".");
- if (count > 1)
- {
- return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
- }
- Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
- String beanPackageName = obj.getClass().getPackage().getName();
- return StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_WHITELIST_STR)
- && !StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_ERROR_STR);
- }
-}
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
deleted file mode 100644
index ba1b683..0000000
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.quartz.mapper.SysJobLogMapper">
-
- <resultMap type="SysJobLog" id="SysJobLogResult">
- <id property="jobLogId" column="job_log_id" />
- <result property="jobName" column="job_name" />
- <result property="jobGroup" column="job_group" />
- <result property="invokeTarget" column="invoke_target" />
- <result property="jobMessage" column="job_message" />
- <result property="status" column="status" />
- <result property="exceptionInfo" column="exception_info" />
- <result property="createTime" column="create_time" />
- </resultMap>
-
- <sql id="selectJobLogVo">
- select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time
- from sys_job_log
- </sql>
-
- <select id="selectJobLogList" parameterType="SysJobLog" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- <where>
- <if test="jobName != null and jobName != ''">
- AND job_name like concat('%', #{jobName}, '%')
- </if>
- <if test="jobGroup != null and jobGroup != ''">
- AND job_group = #{jobGroup}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="invokeTarget != null and invokeTarget != ''">
- AND invoke_target like concat('%', #{invokeTarget}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%Y%m%d') >= date_format(#{params.beginTime},'%Y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
- </if>
- </where>
- order by create_time desc
- </select>
-
- <select id="selectJobLogAll" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- </select>
-
- <select id="selectJobLogById" parameterType="Long" resultMap="SysJobLogResult">
- <include refid="selectJobLogVo"/>
- where job_log_id = #{jobLogId}
- </select>
-
- <delete id="deleteJobLogById" parameterType="Long">
- delete from sys_job_log where job_log_id = #{jobLogId}
- </delete>
-
- <delete id="deleteJobLogByIds" parameterType="Long">
- delete from sys_job_log where job_log_id in
- <foreach collection="array" item="jobLogId" open="(" separator="," close=")">
- #{jobLogId}
- </foreach>
- </delete>
-
- <update id="cleanJobLog">
- truncate table sys_job_log
- </update>
-
- <insert id="insertJobLog" parameterType="SysJobLog">
- insert into sys_job_log(
- <if test="jobLogId != null and jobLogId != 0">job_log_id,</if>
- <if test="jobName != null and jobName != ''">job_name,</if>
- <if test="jobGroup != null and jobGroup != ''">job_group,</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- <if test="jobMessage != null and jobMessage != ''">job_message,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
- create_time
- )values(
- <if test="jobLogId != null and jobLogId != 0">#{jobLogId},</if>
- <if test="jobName != null and jobName != ''">#{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- <if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
deleted file mode 100644
index 5605c44..0000000
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.quartz.mapper.SysJobMapper">
-
- <resultMap type="SysJob" id="SysJobResult">
- <id property="jobId" column="job_id" />
- <result property="jobName" column="job_name" />
- <result property="jobGroup" column="job_group" />
- <result property="invokeTarget" column="invoke_target" />
- <result property="cronExpression" column="cron_expression" />
- <result property="misfirePolicy" column="misfire_policy" />
- <result property="concurrent" column="concurrent" />
- <result property="status" column="status" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- </resultMap>
-
- <sql id="selectJobVo">
- select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark
- from sys_job
- </sql>
-
- <select id="selectJobList" parameterType="SysJob" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- <where>
- <if test="jobName != null and jobName != ''">
- AND job_name like concat('%', #{jobName}, '%')
- </if>
- <if test="jobGroup != null and jobGroup != ''">
- AND job_group = #{jobGroup}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- <if test="invokeTarget != null and invokeTarget != ''">
- AND invoke_target like concat('%', #{invokeTarget}, '%')
- </if>
- </where>
- </select>
-
- <select id="selectJobAll" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- </select>
-
- <select id="selectJobById" parameterType="Long" resultMap="SysJobResult">
- <include refid="selectJobVo"/>
- where job_id = #{jobId}
- </select>
-
- <delete id="deleteJobById" parameterType="Long">
- delete from sys_job where job_id = #{jobId}
- </delete>
-
- <delete id="deleteJobByIds" parameterType="Long">
- delete from sys_job where job_id in
- <foreach collection="array" item="jobId" open="(" separator="," close=")">
- #{jobId}
- </foreach>
- </delete>
-
- <update id="updateJob" parameterType="SysJob">
- update sys_job
- <set>
- <if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target = #{invokeTarget},</if>
- <if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy = #{misfirePolicy},</if>
- <if test="concurrent != null and concurrent != ''">concurrent = #{concurrent},</if>
- <if test="status !=null">status = #{status},</if>
- <if test="remark != null and remark != ''">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where job_id = #{jobId}
- </update>
-
- <insert id="insertJob" parameterType="SysJob" useGeneratedKeys="true" keyProperty="jobId">
- insert into sys_job(
- <if test="jobId != null and jobId != 0">job_id,</if>
- <if test="jobName != null and jobName != ''">job_name,</if>
- <if test="jobGroup != null and jobGroup != ''">job_group,</if>
- <if test="invokeTarget != null and invokeTarget != ''">invoke_target,</if>
- <if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">misfire_policy,</if>
- <if test="concurrent != null and concurrent != ''">concurrent,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="jobId != null and jobId != 0">#{jobId},</if>
- <if test="jobName != null and jobName != ''">#{jobName},</if>
- <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
- <if test="invokeTarget != null and invokeTarget != ''">#{invokeTarget},</if>
- <if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
- <if test="misfirePolicy != null and misfirePolicy != ''">#{misfirePolicy},</if>
- <if test="concurrent != null and concurrent != ''">#{concurrent},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
-</mapper>
\ No newline at end of file
--
Gitblit v1.9.3