From 23d35c163bd5308fc4a8e94cda87881d9547a251 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 29 八月 2025 13:31:12 +0800
Subject: [PATCH] 去除与其他系统的对接配置
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java | 143 ---------
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 72 ++--
ruoyi-admin/src/main/resources/application.yml | 9
/dev/null | 142 ---------
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 28 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 6
ruoyi-admin/src/main/resources/application-prod.yml | 27 -
ruoyi-admin/src/main/resources/application-druid.yml | 42 --
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java | 41 --
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 163 +---------
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java | 4
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 101 ------
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java | 68 ----
13 files changed, 82 insertions(+), 764 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQBean.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQBean.java
deleted file mode 100644
index d429673..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQBean.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ruoyi.device.mqtt;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MQBean {
-
- @Bean("mqClient") // 鍚姩WEB鏈嶅姟鍣ㄧ殑鏃跺�欒皟鐢ㄦ鏂规硶鍒濆鍖�
- public MQClient myMQTTClient(){
- MQClient mqClient = new MQClient();
- return mqClient;
- }
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
deleted file mode 100644
index 51fb42a..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.ruoyi.device.mqtt;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.device.service.CollectBridgeService;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-@Component
-@Slf4j
-public class MQCallback<component> implements MqttCallback {
-
- private MQClient mqClient; // MQTT杩炴帴鏁版嵁
-
- private MQConfig mqConfig; // yml閰嶇疆鏁版嵁
-
- private static MQCallback mqCallback;
-
- @Resource
- private CollectBridgeService collectBridgeService;
-
- @PostConstruct
- public void init() {
- mqCallback = this;
- // 鍒濅娇鍖栨椂灏嗗凡闈欐�佸寲鐨刢onfigParam瀹炰緥鍖�
- mqCallback.collectBridgeService = this.collectBridgeService;
- }
-
- public MQCallback(MQClient mqClient, MQConfig mqConfig) {
- this.mqClient = mqClient;
- this.mqConfig = mqConfig;
- }
-
- /** 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩� **/
- @SneakyThrows
- @Override
- public void connectionLost(Throwable cause) {
- /** 杩炴帴涓㈠け鍚庯紝涓�鑸湪杩欓噷闈㈣繘琛岄噸杩� **/
- if (mqClient != null) {
- while (true) {
- try {
- log.info("==============銆嬨�嬨�媅MQTT] 杩炴帴涓㈠け锛屽皾璇曢噸杩�...");
- MQClient mqttPushClient = new MQClient();
- mqttPushClient.connect(mqConfig);
- if (mqClient.getClient().isConnected()) {
- log.info("=============>>閲嶈繛鎴愬姛");
- }
- break;
- } catch (Exception e) {
- log.error("=============>>>[MQTT] 杩炴帴鏂紑锛岄噸杩炲け璐ワ紒<<=============");
- continue;
- }
- }
- }
- log.info(cause.getMessage());
- }
-
- /**
- * MQTT鏈嶅姟鍣ㄥ悜WEB鏈嶅姟鍣ㄥ彂閫佺殑鏁版嵁浼氭墽琛屽埌杩欓噷闈紝瀹樻柟璇濈О涓猴細璁㈤槄鍚庣殑娑堟伅
- * @param topic 涓婚锛氫篃绉颁负搴曞眰缃戝叧鍞竴鏍囪瘑
- * @param message 淇℃伅
- * @throws Exception 鎶ラ敊
- */
- @Override
- public void messageArrived(String topic, MqttMessage message) throws Exception {
- try {
- String parse = new String(message.getPayload());
- JSONObject jsonObject = JSONObject.parseObject(parse);
- // 濉厖閲囬泦鏁版嵁
- mqCallback.collectBridgeService.addBridgeValue(jsonObject);
-
- } catch (Exception e) {
- e.printStackTrace();
- log.info("============銆嬨�嬫帴鏀舵秷鎭富棰樺紓甯� : " + e.getMessage());
- }
- }
-
- /**
- * WEB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂閫佺殑鏁版嵁浼氭墽琛屽埌杩欓噷闈�
- * 瀹樻柟璇濈О涓猴細鍙戝竷鍚庝細鎵ц鍒拌繖閲�
- * @param token 杩炴帴token
- */
- @Override
- public void deliveryComplete(IMqttDeliveryToken token) {
-// log.info("==========鍙戝竷淇℃伅={}==========", token.isComplete());
- }
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQClient.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQClient.java
deleted file mode 100644
index 1c3c548..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQClient.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.ruoyi.device.mqtt;
-
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.MqttClient;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class MQClient {
-
- private static MqttClient client;
- public static MqttClient getClient() {
- return client;
- }
- public static void setClient(MqttClient client) {
- MQClient.client = client;
- }
-
- /**
- * WEB鏈嶅姟鍣ㄨ繛鎺QTT鏈嶅姟鍣ㄧ殑閰嶇疆
- * @param userName 璐﹀彿
- * @param password 瀵嗙爜
- * @param outTime 瓒呮椂鏃堕棿
- * @param KeepAlive 蹇冭烦妫�娴嬫椂闂�
- * @return
- */
- private MqttConnectOptions getOption(String userName, String password, int outTime, int KeepAlive) {
- MqttConnectOptions option = new MqttConnectOptions();
- // 璁剧疆鏄惁娓呯┖session,false琛ㄧず鏈嶅姟鍣ㄤ細淇濈暀瀹㈡埛绔殑杩炴帴璁板綍锛宼rue琛ㄧず姣忔杩炴帴鍒版湇鍔″櫒閮戒互鏂扮殑韬唤杩炴帴
- option.setCleanSession(true);
- // 璁剧疆杩炴帴鐨勭敤鎴峰悕
- option.setUserName(userName);
- // 璁剧疆杩炴帴鐨勫瘑鐮�
- option.setPassword(password.toCharArray());
- // 璁剧疆瓒呮椂鏃堕棿 鍗曚綅涓虹
- option.setConnectionTimeout(outTime);
- // 璁剧疆浼氳瘽蹇冭烦鏃堕棿 鍗曚綅涓虹 鏈嶅姟鍣ㄤ細姣忛殧(1.5*keepTime)绉掔殑鏃堕棿鍚戝鎴风鍙戦�佷釜娑堟伅鍒ゆ柇瀹㈡埛绔槸鍚﹀湪绾匡紝浣嗚繖涓柟娉曞苟娌℃湁閲嶈繛鐨勬満鍒�
- option.setKeepAliveInterval(KeepAlive);
- // setWill鏂规硶锛屽鏋滈」鐩腑闇�瑕佺煡閬撳鎴风鏄惁鎺夌嚎鍙互璋冪敤璇ユ柟娉曘�傝缃渶缁堢鍙ｇ殑閫氱煡娑堟伅
- // option.setWill(topic, "close".getBytes(), 2, true);
- //璁剧疆鏈�澶ч�熷害
- option.setMaxInflight(1000);
- log.info("================>>>MQTT杩炴帴璁よ瘉鎴愬姛<<======================");
- return option;
- }
-
- /**
- * WEB鏈嶅姟鍣ㄨ繛鎺QTT鏈嶅姟鍣ㄥ嚱鏁�
- * @param mqttConfig yml涓璏QTT鐨勯厤缃�
- */
- public void connect(MQConfig mqttConfig) throws MqttException {
- client = new MqttClient(mqttConfig.getUrl(), mqttConfig.getClientId(), new MemoryPersistence());
- MqttConnectOptions options = getOption(mqttConfig.getUsername(), mqttConfig.getPassword(),
- mqttConfig.getTimeout(), mqttConfig.getKeepAlive());
- MQClient.setClient(client);
- //杩炴帴澶辫触璋冪敤鍥炶皟鍑芥暟锛岄噸鏂拌繛鎺�
- client.setCallback(new MQCallback<Object>(this, mqttConfig));
- if (!client.isConnected()) {
- client.connect(options);
- // 璁㈤槄涓婚
- MQSubscribe.subscribe_0(mqttConfig.getSubscribe());
- log.info("================>>>MQTT杩炴帴鎴愬姛<<======================");
- } else {// 杩欓噷鐨勯�昏緫鏄鏋滆繛鎺ヤ笉鎴愬姛灏遍噸鏂拌繛鎺�
- client.disconnect();
- client.connect(options);
- }
- }
-
- /**
- * WEB鏈嶅姟鍣ㄤ笌MQTT鏈嶅姟鍣ㄧ殑鏂嚎閲嶈繛
- * @throws Exception
- */
- public Boolean reConnect() throws Exception {
- Boolean isConnected = false;
- if (null != client) {
- client.connect();
- if (client.isConnected()) {
- isConnected = true;
- }
- }
- return isConnected;
- }
-
- /**
- * 寮傚父鍏抽棴鏈嶅姟锛學EB鏈嶅姟鍣ㄤ笌MQTT鏈嶅姟鍣ㄧ殑鏂紑杩炴帴鍑芥暟
- */
- @SneakyThrows
- public void close(){
- client.close();
- client.disconnect();
- log.info("================>>寮傚父鍏抽棴涓巑qtt鏈嶅姟鍣ㄧ殑杩炴帴<<======================");
- }
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQConfig.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQConfig.java
deleted file mode 100644
index a88b29c..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQConfig.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.ruoyi.device.mqtt;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-@Data
-public class MQConfig {
-
- /**
- * MQTT-鏈嶅姟绔�-IP
- */
- @Value("${mqtt.url}")
- private String url;
-
- /**
- * MQTT-鏈嶅姟绔�-鐢ㄦ埛鍚�
- */
- @Value("${mqtt.username}")
- private String username;
-
- /**
- * MQTT-鏈嶅姟绔�-瀵嗙爜
- */
- @Value("${mqtt.password}")
- private String password;
-
- /**
- * 瓒呮椂鏃堕棿
- */
- @Value("${mqtt.timeout}")
- private int timeout;
-
- /**
- * 蹇冭烦妫�娴嬫椂闂�
- */
- @Value("${mqtt.keepalive}")
- private int keepAlive;
-
- /**
- * 蹇冭烦鍖呯骇鍒�
- */
- @Value("${mqtt.qos}")
- private int qos;
-
- /**
- * 鏈嶅姟绔繛鎺ヨ秴鏃舵椂闂�
- */
- @Value("${mqtt.completion-timeout}")
- private int completionTimeout;
-
- /**
- * clientId
- */
- @Value("${mqtt.clientId}")
- private String clientId;
-
- /**
- * 璁㈤槄涓婚
- */
- @Value("${mqtt.subscribe}")
- private String subscribe;
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQPublic.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQPublic.java
deleted file mode 100644
index 78c26d7..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQPublic.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.ruoyi.device.mqtt;
-
-import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.*;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class MQPublic {
-
- /**
- * 閫氫俊璐ㄩ噺qos涓�0锛氳〃绀篧EB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彧鍙戦�佷竴娆★紝涓嶇MQTT鏈嶅姟鍣ㄦ湁娌℃湁鏀跺埌
- * WEB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂甯冩暟鎹紝姝ゆ柟娉曞皝瑁呬簡publish鍑芥暟
- * @param topic 鍚戝簳灞傜綉鍏冲彂閫佹暟鎹紝瀹樻柟璇濓細绉版涓轰富棰橈紝鍚戦偅涓富棰樺彂閫佹暟鎹� 缃戝叧锛氬嵆涓婚锛岃澶囧敮涓�鏍囪瘑
- * @param pushMessage WEB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂閫佺殑鏁版嵁
- */
- public void publish_0(int qos, String topic, byte[] pushMessage) {
- publish(0, false, topic, pushMessage);
- }
-
- /**
- * 閫氫俊璐ㄩ噺qos涓�1锛氳〃绀篧EB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂閫佹暟鎹紝MQTT鏈嶅姟鍣ㄤ竴瀹氫細鏀跺埌涓�娆℃暟鎹紝濡傛灉MQTT鏈嶅姟鍣ㄦ病鏈夊搷搴斺�滄敹鍒版暟鎹�濓紝閭ｄ箞WEB鏈嶅姟鍣ㄥ氨浼氫竴鐩村彂閫佹暟鎹�
- * WEB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂甯冩暟鎹紝璋冪敤姝ゅ嚱鏁帮紝姝ゆ柟娉曞皝瑁呬簡publish鍑芥暟锛岄�氫俊璐ㄩ噺qos涓�1
- * @param topic 鍚戝簳灞傜綉鍏冲彂閫佹暟鎹紝瀹樻柟璇濓細绉版涓轰富棰橈紝鍚戦偅涓富棰樺彂閫佹暟鎹� 缃戝叧锛氬嵆涓婚锛岃澶囧敮涓�鏍囪瘑
- * @param pushMessage WEB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂閫佺殑鏁版嵁
- */
- public void publish_1(String topic, byte[] pushMessage) {
- publish(1, false, topic, pushMessage);
- }
-
- /**
- *閫氫俊璐ㄩ噺qos涓�2锛氳〃绀篧EB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂閫佹暟鎹紝涓よ�呬細杩涜鑷冲皯涓ゆ璇锋眰/鍝嶅簲娴佺▼锛岄伩鍏嶆暟鎹湪浼犺緭涓殑涓㈠け锛屼絾鏄浉搴旂殑涔熶細娑堣�楄绠楁満涓殑璧勬簮
- * WEB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂甯冩暟鎹紝姝ゆ柟娉曞皝瑁呬簡publish鍑芥暟锛岄�氫俊璐ㄩ噺锛�2
- * @param topic 鍚戝簳灞傜綉鍏冲彂閫佹暟鎹紝瀹樻柟璇濓細绉版涓轰富棰橈紝鍚戦偅涓富棰樺彂閫佹暟鎹� 缃戝叧锛氬嵆涓婚锛岃澶囧敮涓�鏍囪瘑
- * @param pushMessage WEB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂閫佺殑鏁版嵁
- */
- public void publish_2(String topic, byte[] pushMessage) {
- publish(2,false, topic, pushMessage);
- }
-
- /**
- * 鍙戝竷鍑芥暟锛歐EB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂閫佹暟鎹�
- *
- * @param qos 閫氫俊璐ㄩ噺
- * @param retained 榛樿锛歠alse-闈炴寔涔呭寲锛堟槸鎸囦竴鏉℃秷鎭秷璐瑰畬锛屽氨浼氳鍒犻櫎锛涙寔涔呭寲锛屾秷璐瑰畬锛岃繕浼氫繚瀛樺湪鏈嶅姟鍣ㄤ腑锛屽綋鏂扮殑璁㈤槄鑰呭嚭鐜帮紝缁х画缁欐柊璁㈤槄鑰呮秷璐癸級
- * @param topic 鍚戝簳灞傜綉鍏冲彂閫佹暟鎹紝瀹樻柟璇濓細绉版涓轰富棰橈紝鍚戦偅涓富棰樺彂閫佹暟鎹� 缃戝叧锛氬嵆涓婚锛岃澶囧敮涓�鏍囪瘑
- * @param pushMessage WEB鏈嶅姟鍣ㄥ悜MQTT鏈嶅姟鍣ㄥ彂閫佺殑鏁版嵁
- */
- public void publish(int qos, boolean retained, String topic, byte[] pushMessage) {
- MqttMessage message = new MqttMessage();
- message.setQos(qos);
- message.setRetained(retained);
- // 灏哠tring[]鏁扮粍杞崲涓篵yte鏁扮粍鍙戦��
- message.setPayload(pushMessage);
- MqttTopic mTopic = MQClient.getClient().getTopic(topic);
- if (null == mTopic) {
- log.error("===============>>>MQTT {} 涓嶅瓨鍦�<<=======================",topic);
- }
- MqttDeliveryToken token;
- try {
- token = mTopic.publish(message);
- token.waitForCompletion();
- } catch (MqttPersistenceException e) {
- e.printStackTrace();
- } catch (MqttException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQSubscribe.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQSubscribe.java
deleted file mode 100644
index 0541e3f..0000000
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQSubscribe.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.ruoyi.device.mqtt;
-
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MQSubscribe {
-
- /**
- * 璁㈤槄鏌愪釜涓婚锛歁QTT鏈嶅姟鍣ㄥ悜WEB鏈嶅姟鍣ㄥ彂閫佹暟鎹�
- *涓婚锛氫篃绉颁负搴曞眰缃戝叧鍞竴鏍囪瘑
- * @param topic 璁惧缂栧彿锛屼笌搴曞眰浜や簰鐨勫敮涓�鏍囪瘑
- * @param qos MQTT鏈嶅姟鍣ㄥ悜WEB鏈嶅姟鍣ㄥ彂閫佹暟鎹�
- * qos涓�0锛氬彧鍚慦EB鏈嶅姟鍣ㄥ彂閫佷竴娆★紱
- * qos涓�1锛氳嚦灏戝悜WEB鏈嶅姟鍣ㄥ彂閫佷竴娆★紝鎺ユ敹鏂逛細鍝嶅簲涓�涓姤鏂囷紱
- * qos涓�2锛氫袱鑰呬細杩涜鑷冲皯涓ゆ璇锋眰/鍝嶅簲娴佺▼锛岄伩鍏嶆暟鎹湪浼犺緭涓殑涓㈠け
- */
- private static void subscribe(String topic, int qos) {
- try {
- MQClient.getClient().subscribe(topic,qos);
- } catch (MqttException e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 璁㈤槄鏌愪釜涓婚锛岄�氫俊璐ㄩ噺锛歲os榛樿涓�0
- * 涓婚锛氫篃绉颁负搴曞眰缃戝叧鍞竴鏍囪瘑
- * @param topic 璁惧缂栧彿锛屼笌搴曞眰浜や簰鐨勫敮涓�鏍囪瘑
- */
- public static void subscribe_0(String topic) {
- subscribe(topic, 0);
- }
-
- /**
- * 璁㈤槄鏌愪釜涓婚锛岄�氫俊璐ㄩ噺锛歲os榛樿涓�1
- * 涓婚锛氫篃绉颁负搴曞眰缃戝叧鍞竴鏍囪瘑
- * @param topic 璁惧缂栧彿锛屼笌搴曞眰浜や簰鐨勫敮涓�鏍囪瘑
- */
- public void subscribe_1(String topic) {
- subscribe(topic, 1);
- }
-
- /**
- * 璁㈤槄鏌愪釜涓婚锛岄�氫俊璐ㄩ噺锛歲os榛樿涓�2
- * 涓婚锛氫篃绉颁负搴曞眰缃戝叧鍞竴鏍囪瘑
- * @param topic 璁惧缂栧彿锛屼笌搴曞眰浜や簰鐨勫敮涓�鏍囪瘑
- */
- public void subscribe_2(String topic) {
- subscribe(topic, 2);
- }
-
- public void OffSubscribe(String topic) {
- try {
- MQClient.getClient().unsubscribe(topic);
- } catch (MqttException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
index 6a51cca..e7cb46d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.oa.OAProcess;
import com.ruoyi.inspect.dto.PushOADto;
import com.ruoyi.inspect.dto.UnqualifiedHandlerDto;
import com.ruoyi.inspect.pojo.InsUnqualifiedHandlerFile;
@@ -21,7 +20,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
-import java.util.Map;
@RestController
@Api("涓嶅悎鏍煎鐞嗙鐞�")
@@ -36,21 +34,18 @@
private static final String CHECKRESULT = "CHECKRESULT";
-
-
@ApiOperation(value = "鎻愪氦OA")
@PostMapping("/pushOA")
- public Result pushOA(@RequestBody PushOADto pushOADto){
+ public Result pushOA(@RequestBody PushOADto pushOADto) {
return unqualifiedHandlerService.pushOA(pushOADto);
}
@ApiOperation(value = "鏌ヨ")
@GetMapping("/page")
- public Result pageByUnqualified(Page page, UnqualifiedHandlerDto unqualifiedHandlerDto){
+ public Result pageByUnqualified(Page page, UnqualifiedHandlerDto unqualifiedHandlerDto) {
return Result.success(unqualifiedHandlerService.pageList(page, unqualifiedHandlerDto));
}
-
@ApiOperation(value = "闄勪欢涓婁紶")
@@ -63,60 +58,46 @@
@Anonymous
@ApiOperation(value = "涓嶅悎鏍煎鐞哋A鍥炶皟")
@RequestMapping(value = "/callback", produces = "text/plain")
- public String unqualifiedHandlerOACallback(String data){
- String msg = OAProcess.oaReturnMsg(0, "success");
- JSONObject json = JSONObject.parseObject(data);
- log.info("oa鍥炶皟鍙傛暟========>" + json);
- try {
- Long oaWorkId = json.getLong(REQUESTID);
- String checkResult = json.getString(CHECKRESULT);
- Object o = json.get("workflowRequestLogs");
- JSONArray objects = JSONArray.parseArray(JSONObject.toJSONString(o));
- unqualifiedHandlerService.unqualifiedHandlerOACallback(oaWorkId, checkResult,objects);
- } catch (Exception e) {
- log.error("oa鍥炶皟澶辫触: " + e.getMessage());
- msg = OAProcess.oaReturnMsg(1, "oa鍥炶皟澶辫触: " + e.getMessage());
- }
- log.info("oa鍥炶皟杩斿洖缁撴灉========>" + msg);
- return msg;
+ public String unqualifiedHandlerOACallback(String data) {
+ return null;
}
/**
* 涓嬭浇oa闄勪欢
+ *
* @param handlerFileId
* @param response
*/
@GetMapping("/downloadOAFile/{handlerFileId}")
- public void downloadOAFile(@PathVariable("handlerFileId") Long handlerFileId, HttpServletResponse response){
- unqualifiedHandlerFileService.downloadOAFile(handlerFileId,response);
+ public void downloadOAFile(@PathVariable("handlerFileId") Long handlerFileId, HttpServletResponse response) {
+ unqualifiedHandlerFileService.downloadOAFile(handlerFileId, response);
}
@ApiOperation(value = "鏂板涓嶅悎鏍煎鐞�")
@PostMapping("/addUnqualifiedHandler")
- public Result addUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
+ public Result addUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto) {
return Result.success(unqualifiedHandlerService.addUnqualifiedHandler(unqualifiedHandlerDto));
}
@ApiOperation(value = "缂栬緫涓嶅悎鏍煎鐞�")
@PostMapping("/updateUnqualifiedHandler")
- public Result updateUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
+ public Result updateUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto) {
return Result.success(unqualifiedHandlerService.updateUnqualifiedHandler(unqualifiedHandlerDto));
}
@ApiOperation(value = "鏌ョ湅oa娴佺▼")
@GetMapping("/getOaFlow")
- public Result getOaFlow(Integer id){
+ public Result getOaFlow(Integer id) {
return Result.success(unqualifiedHandlerService.getOaFlow(id));
}
-
@ApiOperation(value = "鏌ョ湅涓嶅悎鏍煎鐞嗙晫闈�")
@GetMapping("/getUnqualifiedHandler")
- public Result getUnqualifiedHandler(Integer id){
+ public Result getUnqualifiedHandler(Integer id) {
return Result.success(unqualifiedHandlerService.getUnqualifiedHandler(id));
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
index 357d1c7..4256e3f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/FinishProductSpotCheckServiceImpl.java
@@ -16,7 +16,6 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.utils.DateImageUtil;
-import com.ruoyi.common.utils.api.IfsApiUtils;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.IfsStockQueryDTO;
@@ -57,8 +56,7 @@
@Transactional(rollbackFor = Exception.class)
public class FinishProductSpotCheckServiceImpl implements FinishProductSpotCheckService {
- @Resource
- private IfsApiUtils ifsApiUtils;
+
@Resource
private SpotCheckQuarterMapper spotCheckQuarterMapper;
@Resource
@@ -76,146 +74,9 @@
public Result getIfsStockReport(IfsStockQueryDTO ifsStockQueryDTO) {
- JSONObject jresult = new JSONObject();
- jresult.put("total", 0);
- jresult.put("count", 0);
- jresult.put("data", new JSONArray());
- JSONObject jsonObject = new JSONObject();
- generateIfsStockQueryParams(jsonObject, ifsStockQueryDTO, ifsStockQueryDTO.getPage(), ifsStockQueryDTO.getLimit());
- Result result = ifsApiUtils.getIfsStock(jsonObject.toJSONString());
- if (result.getCode() == 200) {
- JSONObject data = (JSONObject) JSON.toJSON(result.getData());
- JSONArray array = new JSONArray();
- for (int i = 0; i < data.getJSONArray("LIST_INFO").size(); i++) {
- JSONObject listInfo = data.getJSONArray("LIST_INFO").getJSONObject(i);
- array.add(listInfo);
- }
- //鑾峰彇鎬绘暟閲�
- int count = data.getIntValue("TOTAL_RECORD");
- //鑾峰彇椤垫暟
- int total = (int) Math.ceil((double) count / (double) ifsStockQueryDTO.getLimit());
- jresult.put("total", total);
- jresult.put("count", count);
- jresult.put("data", array);
- }
- return Result.success(jresult);
+ return Result.success();
}
- public void generateIfsStockQueryParams(JSONObject result, IfsStockQueryDTO ifsStockQueryDTO, Long pageNo, Long pageSize) {
- result.put("PAGE", pageNo);
- result.put("LIMIT", pageSize);
- result.put("WAREHOUSE", "鎴愬搧浠撳簱");
- result.put("QUANTITY_FLAG", ">0");
- //琛ㄩ噷闈㈢殑OTC琛屽彿
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getCotcOrderNo())) {
- result.put("C_OTC_ORDER_NO", ifsStockQueryDTO.getCotcOrderNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getCotcLineNo())) {
- result.put("C_OTC_LINE_NO", ifsStockQueryDTO.getCotcLineNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getPartNo())) {
- result.put("PART_NO", ifsStockQueryDTO.getPartNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getPartDescription())) {
- result.put("PART_DESC", "%" + ifsStockQueryDTO.getPartDescription() + "%");
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getLocNo())) {
- result.put("LOCATION_NO", ifsStockQueryDTO.getLocNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getLocDesc())) {
- result.put("LOCATION_DESC", ifsStockQueryDTO.getLocDesc());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getLotBatchNo())) {
- result.put("LOT_BATCH_NO", ifsStockQueryDTO.getLotBatchNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getWdrNo())) {
- result.put("WDR_NO", ifsStockQueryDTO.getWdrNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getWarehouse())) {
- result.put("WAREHOUSE", ifsStockQueryDTO.getWarehouse());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getLocationGroup())) {
- result.put("LOCATION_GROUP", ifsStockQueryDTO.getLocationGroup());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getLocationGroupDesc())) {
- result.put("LOCATION_GROUP_DESC", ifsStockQueryDTO.getLocationGroupDesc());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getReelNumber())) {
- result.put("ATTR1", ifsStockQueryDTO.getReelNumber());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getStartMeter())) {
- result.put("ATTR2", ifsStockQueryDTO.getStartMeter());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getEndMeter())) {
- result.put("ATTR3", ifsStockQueryDTO.getEndMeter());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getOuterColor())) {
- result.put("ATTR4", ifsStockQueryDTO.getOuterColor());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getInsulationColor())) {
- result.put("ATTR5", ifsStockQueryDTO.getInsulationColor());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getOtcOrderNo())) {
- result.put("ATTR6", ifsStockQueryDTO.getOtcOrderNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getMpsNo())) {
- result.put("ATTR7", ifsStockQueryDTO.getMpsNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getLetteringInfo())) {
- result.put("ATTR8", ifsStockQueryDTO.getLetteringInfo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getSStockQuantity())) {
- result.put("ATTR9", ifsStockQueryDTO.getSStockQuantity());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getSAvailableStockQuantity())) {
- result.put("ATTR10", ifsStockQueryDTO.getSAvailableStockQuantity());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getSunit())) {
- result.put("ATTR11", ifsStockQueryDTO.getSunit());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getStockSource())) {
- result.put("ATTR12", ifsStockQueryDTO.getStockSource());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getInspInstorageTime())) {
- result.put("ATTR13", ifsStockQueryDTO.getInspInstorageTime());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getTestRemark())) {
- result.put("ATTR14", ifsStockQueryDTO.getTestRemark());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getGrossWeight())) {
- result.put("ATTR15", ifsStockQueryDTO.getGrossWeight());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getNetWeight())) {
- result.put("ATTR16", ifsStockQueryDTO.getNetWeight());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getPackingManner())) {
- result.put("ATTR17", ifsStockQueryDTO.getPackingManner());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getCylinderNumber())) {
- result.put("ATTR18", ifsStockQueryDTO.getCylinderNumber());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getRemark())) {
- result.put("ATTR19", ifsStockQueryDTO.getRemark());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getLengthRequirement())) {
- result.put("ATTR20", ifsStockQueryDTO.getLengthRequirement());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getCustomerName())) {
- result.put("ATTR21", ifsStockQueryDTO.getCustomerName());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getSystemNo())) {
- result.put("ATTR22", ifsStockQueryDTO.getSystemNo());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getInSource())) {
- result.put("ATTR23", ifsStockQueryDTO.getInSource());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getSplitQuality())) {
- result.put("ATTR24", ifsStockQueryDTO.getSplitQuality());
- }
- if (StrUtil.isNotBlank(ifsStockQueryDTO.getReserveQuantity())) {
- result.put("QTY_RESERVED", ifsStockQueryDTO.getReserveQuantity());
- }
- }
/************************************************* 瀛ｅ害鎶芥牱 ***********************************************************/
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 55d6e7f..ed3d251 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
@@ -28,7 +28,6 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.*;
-import com.ruoyi.common.utils.api.IfsApiUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.mapper.*;
@@ -80,7 +79,6 @@
private final NumberGenerator<InsOrder> numberGenerator;
private InsReportMapper insReportMapper;
private InsUnqualifiedRetestProductMapper insUnqualifiedRetestProductMapper;
- private IfsApiUtils ifsApiUtils;
private SpotCheckQuarterItemMapper spotCheckQuarterItemMapper;
private StandardProductListMapper standardProductListMapper;
private StructureItemParameterMapper structureItemParameterMapper;
@@ -548,104 +546,7 @@
*/
@Override
public void getIfsOrder() {
- HashMap<String, Object> map = new HashMap<>();
- map.put("LOCATION_NO","1302");
- map.put("STATE_DB","To be Inspected");
- List<Map<String, Object>> inventory = ifsApiUtils.getInventory(JSONUtil.toJsonStr(map));
- if(inventory.size() == 0) {
- return;
- }
- // 杩涜淇濆瓨
- for (Map<String, Object> map1 : inventory) {
- DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); // 鏃堕棿鏍煎紡鍖�
- IfsInventoryQuantity ifsInventoryQuantity = new IfsInventoryQuantity();
- ifsInventoryQuantity.setContract(map1.get("CONTRACT") == null ? "" : map1.get("CONTRACT").toString()); // 鍩�
- ifsInventoryQuantity.setPartNo(map1.get("PART_NO") == null ? "" : map1.get("PART_NO").toString() ); // 闆朵欢鍙�
- ifsInventoryQuantity.setPartDesc(map1.get("PART_DESC") == null ? "" : map1.get("PART_DESC").toString()); // 闆朵欢鎻忚堪
- ifsInventoryQuantity.setOrderNo(map1.get("ORDER_NO") == null ? "" : map1.get("ORDER_NO").toString()); // 璁㈠崟鍙�
- ifsInventoryQuantity.setLineNo(map1.get("LINE_NO") == null ? "" : map1.get("LINE_NO").toString()); // 琛屽彿
- ifsInventoryQuantity.setReleaseNo(map1.get("RELEASE_NO") == null ? "" : map1.get("RELEASE_NO").toString()); // 涓嬭揪鍙�
- ifsInventoryQuantity.setReceiptNo(Integer.parseInt(map1.get("RECEIPT_NO") == null ? "" : map1.get("RECEIPT_NO").toString())); // 鎺ユ敹鍙�
- ifsInventoryQuantity.setStatus(map1.get("STATE") == null ? "" : map1.get("STATE").toString()); // 鐘舵�佹弿杩�
- ifsInventoryQuantity.setStatusDb(map1.get("STATE_DB") == null ? "" : map1.get("STATE_DB").toString()); // 鐘舵��
- if(map1.get("QTY_ARRIVED") != null) {
- ifsInventoryQuantity.setQtyArrived(new BigDecimal(map1.get("QTY_ARRIVED").toString())); // 鎶佃揪鐨勯噰璐暟閲�
- }
- if(map1.get("QTY_INSPECTED") != null) {
- ifsInventoryQuantity.setQtyInspected(new BigDecimal(map1.get("QTY_INSPECTED").toString())); // 宸叉楠岀殑璐拱鏁伴噺
- }
- if(map1.get("QTY_TO_INSPECT") != null) {
- ifsInventoryQuantity.setQtyToInspect(new BigDecimal(map1.get("QTY_TO_INSPECT").toString())); // 瑕佹楠岀殑閲囪喘鏁伴噺
- }
- if(map1.get("INV_QTY_IN_STORE") != null) {
- ifsInventoryQuantity.setInvQtyInStore(new BigDecimal(map1.get("INV_QTY_IN_STORE").toString())); // 鎶佃揪鐨勫簱瀛樻暟閲�
- }
- if(map1.get("PUR_QTY_IN_STORE") != null) {
- ifsInventoryQuantity.setPurQtyInStore(new BigDecimal( map1.get("PUR_QTY_IN_STORE").toString())); // 鎶佃揪鐨勯噰璐暟閲�
-
- }
- ifsInventoryQuantity.setSupplierId(map1.get("SUPPLIER_ID") == null ? "" : map1.get("SUPPLIER_ID").toString()); // 渚涘簲鍟咺D
- ifsInventoryQuantity.setSupplierName(map1.get("SUPPLIER_NAME") == null ? "" : map1.get("SUPPLIER_NAME").toString()); // 渚涘簲鍟嗗悕绉�
- ifsInventoryQuantity.setConfigurationId(map1.get("CONFIGURATION_ID") == null ? "" : map1.get("CONFIGURATION_ID").toString()); // 閰嶇疆鏍囪瘑
- ifsInventoryQuantity.setLotBatchNo(map1.get("LOT_BATCH_NO") == null ? "" : map1.get("LOT_BATCH_NO").toString()); // 鎵规鍙�
- ifsInventoryQuantity.setUpdateBatchNo(map1.get("LOT_BATCH_NO") == null ? "" : map1.get("LOT_BATCH_NO").toString()); // 鎵规鍙�
- ifsInventoryQuantity.setWaivDevRejNo(map1.get("WAIV_DEV_REJ_NO") == null ? "" : map1.get("WAIV_DEV_REJ_NO").toString()); // WDR鍙�
- ifsInventoryQuantity.setActivitySeq(map1.get("ACTIVITY_SEQ") == null ? null : Integer.parseInt(map1.get("ACTIVITY_SEQ").toString())); // 娲诲姩搴忓垪
- ifsInventoryQuantity.setSerialNo(map1.get("SERIAL_NO") == null ? "" : map1.get("SERIAL_NO").toString()); // 搴忓垪鍙�
- ifsInventoryQuantity.setLocationNo(map1.get("LOCATION_NO") == null ? "" : map1.get("LOCATION_NO").toString()); // 搴撲綅鍙�
- ifsInventoryQuantity.setEngChgLevel(map1.get("ENG_CHG_LEVEL") == null ? "" : map1.get("ENG_CHG_LEVEL").toString()); // 鐗堟湰鍙�
- ifsInventoryQuantity.setReceiver(map1.get("RECEIVER") == null ? "" : map1.get("RECEIVER").toString()); // 鎺ユ敹浜�
- ifsInventoryQuantity.setReceiverName(map1.get("RECEIVER_NAME") == null ? "" : map1.get("RECEIVER_NAME").toString()); // 鎺ユ敹浜哄悕绉�
- ifsInventoryQuantity.setBuyerCode(map1.get("BUYER_CODE") == null ? "" : map1.get("BUYER_CODE").toString()); // 閲囪喘鍛�
- ifsInventoryQuantity.setBuyerName(map1.get("BUYER_NAME") == null ? "" : map1.get("BUYER_NAME").toString()); // 閲囪喘鍛樺悕绉�
-
- if(map1.get("ARRIVE_DATE") != null) {
- ifsInventoryQuantity.setArriveDate(LocalDateTime.parse(map1.get("ARRIVE_DATE").toString(),dateTimeFormatter)); // 瀹為檯鍒拌揣鏃ユ湡
- }
- if(map1.get("DELIVERY_DATE") != null) {
- ifsInventoryQuantity.setDeliveryDate(LocalDateTime.parse(map1.get("DELIVERY_DATE").toString(),dateTimeFormatter)); // 瀹為檯浜よ揣鏃ユ湡
- }
- if(map1.get("PRODUCT_DATE") != null) {
- ifsInventoryQuantity.setProductDate(LocalDateTime.parse(map1.get("PRODUCT_DATE").toString(),dateTimeFormatter)); // 鐢熶骇鏃ユ湡
-
- }
- if(map1.get("INVALID_DATE") != null) {
- ifsInventoryQuantity.setInvalidDate(LocalDateTime.parse(map1.get("INVALID_DATE").toString(),dateTimeFormatter)); // 澶辨晥鏃ユ湡
- }
- if(map1.get("APPROVED_DATE") != null) {
- ifsInventoryQuantity.setApprovedDate(LocalDateTime.parse(map1.get("APPROVED_DATE").toString(),dateTimeFormatter)); // 瀹℃壒鏃ユ湡
- }
- ifsInventoryQuantity.setReqCeater(map1.get("REQ_CEATER") == null ? "" : map1.get("REQ_CEATER").toString()); // 閲囪喘鐢宠鍒涘缓浜�
- ifsInventoryQuantity.setReqCeaterName(map1.get("REQ_CEATER_NAME") == null ? "" : map1.get("REQ_CEATER_NAME").toString()); // 閲囪喘鐢宠鍒涘缓浜哄悕绉�
- ifsInventoryQuantity.setLineRemarks(map1.get("LINE_REMARKS") == null ? "" : map1.get("LINE_REMARKS").toString()); // 閲囪喘璁㈠崟琛屽娉�
- ifsInventoryQuantity.setBuyUnitMeas(map1.get("BUY_UNIT_MEAS") == null ? "" : map1.get("BUY_UNIT_MEAS").toString()); // 閲囪喘鍗曚綅
- ifsInventoryQuantity.setReceiverDate(LocalDateTime.now()); // 鎺ユ敹鏃ユ湡
- ifsInventoryQuantity.setIsSource(1);
- ifsInventoryQuantity.setState(0);
-
- Long count = ifsInventoryQuantityMapper.selectCount(new LambdaQueryWrapper<IfsInventoryQuantity>()
- .eq(IfsInventoryQuantity::getOrderNo, ifsInventoryQuantity.getOrderNo())
- .eq(IfsInventoryQuantity::getLineNo, ifsInventoryQuantity.getLineNo())
- .eq(IfsInventoryQuantity::getReleaseNo, ifsInventoryQuantity.getReleaseNo())
- .eq(IfsInventoryQuantity::getReceiptNo, ifsInventoryQuantity.getReceiptNo())
- .eq(IfsInventoryQuantity::getLocationNo, ifsInventoryQuantity.getLocationNo())
- .eq(IfsInventoryQuantity::getLotBatchNo, ifsInventoryQuantity.getLotBatchNo())
- .eq(IfsInventoryQuantity::getSerialNo, ifsInventoryQuantity.getSerialNo())
- .eq(IfsInventoryQuantity::getEngChgLevel, ifsInventoryQuantity.getEngChgLevel())
- .eq(IfsInventoryQuantity::getWaivDevRejNo, ifsInventoryQuantity.getWaivDevRejNo())
- .eq(IfsInventoryQuantity::getActivitySeq, ifsInventoryQuantity.getActivitySeq())
- );
- if(count == 0) {
- ifsInventoryQuantity.setIsFirst(0);
- // 鏌ヨ浜т笟閾炬娴嬫暟鎹�
- String industryChainAttrFields = IndustryChainUtils.getIndustryChainAttrFields(ifsInventoryQuantity.getOrderNo(),
- ifsInventoryQuantity.getLineNo(),
- ifsInventoryQuantity.getReleaseNo());
- ifsInventoryQuantity.setIndustryChain(industryChainAttrFields);
-
- ifsInventoryQuantityMapper.insert(ifsInventoryQuantity);
- }
- }
+ return;
}
/**
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 568a0ec..bfdf692 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -34,7 +34,6 @@
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.config.WechatProperty;
import com.ruoyi.common.utils.*;
-import com.ruoyi.common.utils.api.IfsApiUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.InsReportExport;
import com.ruoyi.inspect.dto.ReportPageDto;
@@ -108,12 +107,10 @@
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
@Resource
private InsOrderService insOrderService;
- @Resource
- private WechatProperty wechatProperty;
+// @Resource
+// private WechatProperty wechatProperty;
@Resource
private InsUnqualifiedRetestProductMapper insUnqualifiedRetestProductMapper;
- @Resource
- private IfsApiUtils ifsApiUtils;
@Resource
private InsSampleUserMapper insSampleUserMapper;
@@ -836,23 +833,23 @@
.eq(IfsInventoryQuantity::getId, insOrder.getIfsInventoryId()));
}
- threadPoolTaskExecutor.execute(() -> {
- // 浼佷笟寰俊閫氱煡
- String message = "";
- message += "妫�娴嬬粨鏋滄彁浜ら�氱煡";
- message += "\n鎵规鍙�: " + one.getUpdateBatchNo();
- message += "\n闆朵欢鍙�: " + one.getPartNo();
- message += "\n闆朵欢鎻忚堪: " + one.getPartDesc();
- message += "\n渚涘簲鍟嗗悕绉�: " + one.getSupplierName();
- message += "\n鎶佃揪鏁伴噺: " + one.getQtyArrived().stripTrailingZeros().toPlainString() + one.getBuyUnitMeas();
- // 鍙戦�佷紒涓歩nspectStatus淇￠�氱煡
- if (inspectStatus == 1) {
- message += "\n妫�娴嬬粨鏋�: 鍚堟牸";
- } else {
- message += "\n妫�娴嬬粨鏋�: 涓嶅悎鏍�";
- }
- WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
- });
+// threadPoolTaskExecutor.execute(() -> {
+// // 浼佷笟寰俊閫氱煡
+// String message = "";
+// message += "妫�娴嬬粨鏋滄彁浜ら�氱煡";
+// message += "\n鎵规鍙�: " + one.getUpdateBatchNo();
+// message += "\n闆朵欢鍙�: " + one.getPartNo();
+// message += "\n闆朵欢鎻忚堪: " + one.getPartDesc();
+// message += "\n渚涘簲鍟嗗悕绉�: " + one.getSupplierName();
+// message += "\n鎶佃揪鏁伴噺: " + one.getQtyArrived().stripTrailingZeros().toPlainString() + one.getBuyUnitMeas();
+// // 鍙戦�佷紒涓歩nspectStatus淇￠�氱煡
+// if (inspectStatus == 1) {
+// message += "\n妫�娴嬬粨鏋�: 鍚堟牸";
+// } else {
+// message += "\n妫�娴嬬粨鏋�: 涓嶅悎鏍�";
+// }
+// WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
+// });
}
@@ -904,66 +901,7 @@
*/
@Override
public String moveRawMaterial(IfsInventoryQuantity one) {
- String toLocation;
- // 鐧昏閲囪喘妫�楠岀粨鏋淪TD
- if (one.getIsRegister().equals(0)) {
- Map<String, Object> resultMap = new HashMap<>();
- List<Map<String, Object>> resultList = new ArrayList<>();
- Map<String, Object> map = new HashMap<>();
- map.put("ORDER_NO", one.getOrderNo()); // 閲囪喘璁㈠崟鍙�
- map.put("LINE_NO", one.getLineNo()); // 琛屽彿
- map.put("RELEASE_NO", one.getReleaseNo()); // 涓嬭揪鍙�
- map.put("RECEIPT_NO", one.getReceiptNo()); // 鎺ユ敹鍙�
- map.put("PURCH_QTY", one.getQtyToInspect()); // 瑕佹楠岀殑閲囪喘鏁伴噺
- resultList.add(map);
- resultMap.put("RECORD_ID", UUID.randomUUID().toString());
- resultMap.put("SYSCODE", "LIMS");
- resultMap.put("SYSMODEL", "鐧昏閲囪喘妫�楠岀粨鏋�");
- resultMap.put("BATCH_INFO", resultList);
- Result result = ifsApiUtils.getProcurementResults(JSONUtil.toJsonStr(resultMap));
- if (result.getCode() != 200) {
- throw new ErrorException("IFS鐧昏閲囪喘妫�楠岀粨鏋滃け璐�: " + result.getMessage());
- }
- }
- insOrderService.updateIfsInventoryQuantity(one.getId());
- /**
- * TODO 鍚庣画闇�瑕佽皟鐢↖FS鐨勬帴鍙� 绉诲叆鐨勫簱浣嶅彿 toLocation
- */
- // 妫�楠屽悗绉诲簱
- toLocation = "1301";
- Map<String, Object> moveResultMap = new HashMap<>();
- List<Map<String, Object>> moveResultList = new ArrayList<>();
- Map<String, Object> moveMap = new HashMap<>();
- moveMap.put("ORDER_NO", one.getOrderNo()); // 閲囪喘璁㈠崟鍙�
- moveMap.put("LINE_NO", one.getLineNo());
- moveMap.put("RELEASE_NO", one.getReleaseNo());
- moveMap.put("RECEIPT_NO", one.getReceiptNo());
- moveMap.put("PART_NO", one.getPartNo());
- moveMap.put("QTY", one.getQtyArrived());
- moveMap.put("LOCATION_NO", one.getLocationNo());
- moveMap.put("TO_LOCATION_NO", toLocation);
- moveMap.put("LOT_BATCH_NO", one.getLotBatchNo());
- moveMap.put("SERIAL_NO", one.getSerialNo());
- moveMap.put("WAIV_DEV_REJ_NO", one.getWaivDevRejNo());
- moveMap.put("ENG_CHG_LEVEL", one.getEngChgLevel());
- moveMap.put("ACTIVITY_SEQ", one.getActivitySeq());
- moveResultList.add(moveMap);
- moveResultMap.put("RECORD_ID", UUID.randomUUID().toString());
- moveResultMap.put("SYSCODE", "LIMS");
- moveResultMap.put("SYSMODEL", "妫�楠屽悗绉诲簱");
- moveResultMap.put("BATCH_INFO", moveResultList);
-
- Result result1 = ifsApiUtils.moveReceipt(JSONUtil.toJsonStr(moveResultMap));
- // 濡傛灉鏈夊繀椤讳负闆朵欢鎸囧畾鎵瑰彿鎶ラ敊闇�瑕侀噸鏂版彁浜ょЩ搴撲俊鎭幓鎸囧畾鎵瑰彿
- if (result1.getCode() != 200) {
- String message = result1.getMessage();
- if (message.contains("蹇呴』涓洪浂浠�") && message.contains("鎸囧畾鎵瑰彿")) {
- updaeBatch(one, toLocation);
- } else {
- throw new ErrorException("IFS妫�楠屽悗绉诲簱澶辫触: " + result1.getMessage());
- }
- }
- return toLocation;
+ return null;
}
/**
@@ -1045,67 +983,6 @@
* @param toLocation
*/
private void updaeBatch(IfsInventoryQuantity one, String toLocation) {
- if (one.getIsUpdateBatch().equals(0)) {
- // 鍏堜慨鏀规壒娆″彿鍚庤繘琛岀Щ搴�
- Map<String, Object> resultMap = new HashMap<>();
- List<Map<String, Object>> resultList = new ArrayList<>();
- Map<String, Object> map = new HashMap<>();
- map.put("ORDER_NO", one.getOrderNo()); // 閲囪喘璁㈠崟鍙�
- map.put("LINE_NO", one.getLineNo()); // 琛屽彿
- map.put("RELEASE_NO", one.getReleaseNo()); // 涓嬭揪鍙�
- map.put("RECEIPT_NO", one.getReceiptNo()); // 鎺ユ敹鍙�
- map.put("PART_NO", one.getPartNo()); //闆朵欢鍙�
- map.put("CONFIGURATION_ID", one.getConfigurationId()); // 閰嶇疆鏍囪瘑
- map.put("LOCATION_NO", one.getLocationNo()); // 搴撲綅鍙�
- map.put("LOT_BATCH_NO", one.getLotBatchNo());// 鎵规鍙�
- map.put("NEW_LOT_BATCH_NO", one.getUpdateBatchNo()); // 鐩爣鎵规鍙�
- map.put("SERIAL_NO", one.getSerialNo()); // 搴忓垪鍙�
- map.put("ENG_CHG_LEVEL", one.getEngChgLevel()); // 鐗堟湰鍙�
- map.put("WAIV_DEV_REJ_NO", one.getWaivDevRejNo()); // wdr鍙�
- map.put("ACTIVITY_SEQ", one.getActivitySeq()); // 娲诲姩搴忓彿
- map.put("QTY_TO_CHANGE", one.getQtyArrived()); // 鍙樻洿鏁伴噺
- resultList.add(map);
- resultMap.put("RECORD_ID", UUID.randomUUID().toString());
- resultMap.put("SYSCODE", "LIMS");
- resultMap.put("SYSMODEL", "淇敼閲囪喘璁㈠崟鎵规鍙�");
- resultMap.put("BATCH_INFO", resultList);
-
- Result result = ifsApiUtils.updateMoveReceiptLot(JSONUtil.toJsonStr(resultMap));
-
- if (result.getCode() != 200) {
- throw new ErrorException("IFS淇敼鎵规鍙峰け璐�: " + result.getMessage());
- }
- ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
- .set(IfsInventoryQuantity::getIsUpdateBatch, 1)
- .eq(IfsInventoryQuantity::getId, one.getId()));
- }
-
- Map<String, Object> moveResultMap = new HashMap<>();
- List<Map<String, Object>> moveResultList = new ArrayList<>();
- Map<String, Object> moveMap = new HashMap<>();
- moveMap.put("ORDER_NO", one.getOrderNo()); // 閲囪喘璁㈠崟鍙�
- moveMap.put("LINE_NO", one.getLineNo());
- moveMap.put("RELEASE_NO", one.getReleaseNo());
- moveMap.put("RECEIPT_NO", one.getReceiptNo());
- moveMap.put("PART_NO", one.getPartNo());
- moveMap.put("QTY", one.getQtyArrived());
- moveMap.put("LOCATION_NO", one.getLocationNo());
- moveMap.put("TO_LOCATION_NO", toLocation);
- moveMap.put("LOT_BATCH_NO", one.getUpdateBatchNo());
- moveMap.put("SERIAL_NO", one.getSerialNo());
- moveMap.put("WAIV_DEV_REJ_NO", one.getWaivDevRejNo());
- moveMap.put("ENG_CHG_LEVEL", one.getEngChgLevel());
- moveMap.put("ACTIVITY_SEQ", one.getActivitySeq());
- moveResultList.add(moveMap);
- moveResultMap.put("RECORD_ID", UUID.randomUUID().toString());
- moveResultMap.put("SYSCODE", "LIMS");
- moveResultMap.put("SYSMODEL", "妫�楠屽悗绉诲簱");
- moveResultMap.put("BATCH_INFO", moveResultList);
-
- Result result1 = ifsApiUtils.moveReceipt(JSONUtil.toJsonStr(moveResultMap));
- if (result1.getCode() != 200) {
- throw new ErrorException("IFS妫�楠屽悗绉诲簱澶辫触: " + result1.getMessage());
- }
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
index d4c2a25..88b3b5b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
@@ -10,9 +10,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.oa.OAProcess;
-import com.ruoyi.common.oa.OAProperty;
-import com.ruoyi.common.oa.OAResult;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
@@ -54,8 +51,7 @@
@Resource
private CommonOaService commonOaService;
- @Resource
- private OAProperty oaProperty;
+
@Resource
private InsUnqualifiedHandlerFileService insUnqualifiedHandlerFileService;
@Resource
@@ -69,68 +65,6 @@
@Override
public Result pushOA(PushOADto pushOADto) {
- //鑾峰彇涓嶅悎鏍煎鐞嗚褰�
- UnqualifiedHandlerVO vo = baseMapper.findById(pushOADto.getHandlerId());
-
- if (vo.getRequestId() != null) {
- throw new ErrorException("璇ヤ笉鍚堟牸澶勭悊宸叉彁浜よ繃OA");
- }
-
- //鎻愪氦oa鐩稿叧瀛楁璧嬪��
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- Map<String, String> mainFields = new HashMap<>();
- mainFields.put("bh", vo.getNo());//缂栧彿
- mainFields.put("gysmc", vo.getSupplierName());//渚涘簲鍟嗗悕绉�
- mainFields.put("wlmc", vo.getMaterialName());//鐗╂枡鍚嶇О
- mainFields.put("scpc", vo.getProductionBatch());//鐢熶骇鎵规
- mainFields.put("dhsl", vo.getCargoQuantity());//鍒拌揣鏁伴噺
- mainFields.put("ggxh", vo.getSpecsModels());//瑙勬牸鍨嬪彿
- mainFields.put("bjrq", vo.getInspectTime().format(formatter));//鎶ユ鏃ユ湡
- mainFields.put("fkr", SecurityUtils.getUsername());//鍙嶉浜�
- mainFields.put("fkrq", vo.getFeedbackTime().format(formatter));//鍙嶉鏃ユ湡
- mainFields.put("fl", vo.getClassification());//鍒嗙被
- mainFields.put("bhggs", vo.getOffGradeAscription());//涓嶅悎鏍煎綊灞�
- mainFields.put("bhgqkms", vo.getUnqualifiedDesc());//涓嶅悎鏍兼儏鍐垫弿杩�
-
- //鏌ヨ闄勪欢
- List<InsUnqualifiedHandlerFile> handlerFiles = insUnqualifiedHandlerFileService.list(Wrappers.<InsUnqualifiedHandlerFile>lambdaQuery()
- .eq(InsUnqualifiedHandlerFile::getUnqualifiedId, vo.getHandlerId()));
- if (CollectionUtils.isNotEmpty(handlerFiles)) {
- StringBuilder fileUrl = new StringBuilder();
- for (int i = 0; i < handlerFiles.size(); i++) {
- String path = handlerFiles.get(i).getType().equals(1) ? "/lims/img/" : "/lims/word/";
- if (i == handlerFiles.size() - 1) {
- fileUrl.append("<a href='" + oaProperty.getProdIp()).append(path + handlerFiles.get(i).getFileUrl()
- + "'target='_blank'>" + handlerFiles.get(i).getFileName() + "</a>");
- } else {
- fileUrl.append("<a href='" + oaProperty.getProdIp()).append(path + handlerFiles.get(i).getFileUrl()
- + "'target='_blank'>" + handlerFiles.get(i).getFileName() + "</a>").append("<br/>");
- }
- }
- mainFields.put("xlimsfj", fileUrl.toString());
- }
- //娴佺▼鏍囬
- String requestName = vo.getHeadline();
- //鍙戣捣OA
- boolean oa = false;
- try {
- log.info("鍙戣捣涓嶅悎鏍煎鐞哋A瀹℃牳娴佺▼");
- String unqualifiedProcessId = oaProperty.getUnqualifiedProcessId();
- OAResult oaResult = OAProcess.start(mainFields, requestName, unqualifiedProcessId,SecurityUtils.getUsername());
- log.info("涓嶅悎鏍煎鐞哋A瀹℃牳娴佺▼缁撴潫锛岃繑鍥炵粨鏋�->{}" + oaResult);
- oa = oaResult.success();
- if (oa) {
- String addWorkflowResult = oaResult.getAddWorkflowResult();
- baseMapper.update(null, new LambdaUpdateWrapper<InsUnqualifiedHandler>()
- .set(InsUnqualifiedHandler::getRequestId, addWorkflowResult)
- .set(InsUnqualifiedHandler::getOaState, 2)
- .eq(InsUnqualifiedHandler::getId, pushOADto.getHandlerId()));
- } else {
- return Result.fail("鎻愪氦oa澶辫触: " + oaResult.getErrorMsg());
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
return Result.success();
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index ebaac84..95c5e8d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -75,7 +75,7 @@
private InsSampleMapper insSampleMapper;
private final NumberGenerator<InsOrder> numberGenerator;
private InsReportService insReportService;
- private WechatProperty wechatProperty;
+// private WechatProperty wechatProperty;
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
private InsProductMapper insProductMapper;
private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
@@ -151,31 +151,31 @@
.set(IfsInventoryQuantity::getIsInspect, 1)
.set(IfsInventoryQuantity::getDeclareDate, LocalDateTime.now())
);
- threadPoolTaskExecutor.execute(() -> {
- List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
- .in(IfsInventoryQuantity::getId, ids));
- // 浼佷笟寰俊閫氱煡
- String message = "";
- message += "鏂板鎶ユ閫氱煡";
- for (IfsInventoryQuantity inventoryQuantity : quantityList) {
- message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
- message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
- message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
-
- // 鍒ゆ柇鏈夋病鏈夊埌20鍚�. 鎴栬�呰兘鍚﹀厤妫�
- int result = notificationRawOrder(inventoryQuantity.getId());
- switch (result) {
- case 1:
- message += "\n褰撳墠鏍峰搧宸叉楠岃繃, 鍙互鍏嶆";
- break;
- case 2:
- message += "\n褰撳墠鏍峰搧宸茶秴杩�20鍚�";
- break;
- }
- message += "\n";
- }
- WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
- });
+// threadPoolTaskExecutor.execute(() -> {
+// List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
+// .in(IfsInventoryQuantity::getId, ids));
+// // 浼佷笟寰俊閫氱煡
+// String message = "";
+// message += "鏂板鎶ユ閫氱煡";
+// for (IfsInventoryQuantity inventoryQuantity : quantityList) {
+// message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
+// message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
+// message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
+//
+// // 鍒ゆ柇鏈夋病鏈夊埌20鍚�. 鎴栬�呰兘鍚﹀厤妫�
+// int result = notificationRawOrder(inventoryQuantity.getId());
+// switch (result) {
+// case 1:
+// message += "\n褰撳墠鏍峰搧宸叉楠岃繃, 鍙互鍏嶆";
+// break;
+// case 2:
+// message += "\n褰撳墠鏍峰搧宸茶秴杩�20鍚�";
+// break;
+// }
+// message += "\n";
+// }
+// WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
+// });
return 1;
}
@@ -219,16 +219,16 @@
.set(IfsInventoryQuantity::getUpdateBatchNo, ifsInventoryQuantity.getUpdateBatchNo())
);
- threadPoolTaskExecutor.execute(() -> {
- IfsInventoryQuantity inventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryQuantity.getId());
- // 浼佷笟寰俊閫氱煡
- String message = "";
- message += "鏂板鎶ユ閫氱煡";
- message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
- message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
- message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
- WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
- });
+// threadPoolTaskExecutor.execute(() -> {
+// IfsInventoryQuantity inventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryQuantity.getId());
+// // 浼佷笟寰俊閫氱煡
+// String message = "";
+// message += "鏂板鎶ユ閫氱煡";
+// message += "\n鎵规鍙�: " + inventoryQuantity.getUpdateBatchNo();
+// message += "\n闆朵欢鎻忚堪: " + inventoryQuantity.getPartDesc();
+// message += "\n鎶佃揪鏁伴噺: " + inventoryQuantity.getQtyArrived().stripTrailingZeros().toPlainString() + inventoryQuantity.getBuyUnitMeas();
+// WxCpUtils.informWebHook(wechatProperty.getExaminingUrl(), message);
+// });
return 1;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/MqttApplicationRunner.java b/ruoyi-admin/src/main/java/com/ruoyi/web/MqttApplicationRunner.java
deleted file mode 100644
index 854d84a..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/MqttApplicationRunner.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.ruoyi.web;
-
-import com.ruoyi.device.mqtt.MQClient;
-import com.ruoyi.device.mqtt.MQConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class MqttApplicationRunner implements ApplicationRunner {
-
- @Autowired
- private MQConfig mqConfig;
-
- @Value("${mqtt.client}")
- private Boolean client;
-
- @Override
- public void run(ApplicationArguments args) throws Exception {
- if (client) {
- MQClient mqttPushClient = new MQClient();
- mqttPushClient.connect(mqConfig);
- }
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java
deleted file mode 100644
index 3043d93..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonnelHeaderApi.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.ruoyi.web.controller.api;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.log.Log;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.common.config.PersonnelProperties;
-import com.ruoyi.common.core.domain.entity.Custom;
-import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.mapper.UserMapper;
-import com.ruoyi.system.service.CustomService;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-/**
- * 鑾峰彇浜轰簨绯荤粺
- */
-@Component
-public class PersonnelHeaderApi {
-
- @Resource
- private PersonnelProperties personnelProperties;
- @Resource
- private CustomService customService;
- @Resource
- private UserMapper userMapper;
-
- public String fetchNewAccessToken() {
- HttpRequest request = HttpRequest.post(personnelProperties.getCode())
- .header("Content-Type", "application/x-www-form-urlencoded")
- .form("grant_type", "client_credentials")
- .form("client_id", personnelProperties.getAppId())
- .form("client_secret", personnelProperties.getAppSecret());
- HttpResponse response = request.execute();
- ObjectMapper objectMapper = new ObjectMapper();
- JsonNode jsonNode;
- try {
- jsonNode = objectMapper.readTree(response.body());
- String accessToken = jsonNode.get("access_token").asText();
- return accessToken;
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
- }
-
- //鍒ゆ柇鏄惁瀛樺湪
- public String getAccessToken() {
- String accessToken;
- accessToken = fetchNewAccessToken();
- return accessToken;
- }
-
- //璋冪敤
- public List<Company> companyUrl() {
- String accessToken = getAccessToken();
- HttpRequest request = HttpRequest.get(personnelProperties.getCompanies())
- .header("Authorization", "Bearer " + accessToken);
- List<Company> companies;
- try {
- companies = JSON.parseArray(request.execute().body(), Company.class);
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
- return companies.stream().filter(ob -> {
- if (Objects.equals(ob.getStatus(), "enabled")) return true;
- return false;
- }).collect(Collectors.toList());
- }
-
- public List<Person> userUrl(String companyId) {
- String accessToken = getAccessToken();
- HttpRequest request = HttpRequest.get(personnelProperties.getSimple() + companyId)
- .header("Authorization", "Bearer " + accessToken)
- .header("Content-Type", "application/form-data");
- List<Person> person;
- try {
- person = JSON.parseArray(request.execute().body(), Person.class);
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
- List<JSONObject> department = getDepartment(companyId);
- return person.stream().filter(ob -> {
- if (Objects.equals(ob.getStatus(), "enabled")) {
- ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
- ob.setDepartment(getDepartmentStr(department, ob.getDepartmentCode()).replaceFirst("/", ""));
- return true;
- }
- return false;
- }).collect(Collectors.toList());
- }
-
- public String getDepartmentStr(List<JSONObject> department, String code) {
- String str = "";
- Optional<JSONObject> depart = department.stream().filter(a -> code.equals(a.get("departmentCode"))).findFirst();
- str = "/" + depart.get().get("departmentName") + str;
- if (depart.get().get("parentDepartmentCode") != null) {
- str = getDepartmentStr(department, depart.get().get("parentDepartmentCode").toString()) + str;
- }
- return str;
- }
-
- public List<JSONObject> getDepartment(String companyId) {
- String accessToken = getAccessToken();
- HttpRequest request = HttpRequest.get(personnelProperties.getDepartment().replace("companyId", companyId))
- .header("Authorization", "Bearer " + accessToken)
- .header("Content-Type", "application/form-data");
- List<JSONObject> list;
- try {
- list = JSON.parseArray(request.execute().body());
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
- return list.stream().filter(ob -> {
- if (Objects.equals(ob.get("status"), "enabled")) return true;
- return false;
- }).collect(Collectors.toList());
- }
-
- public Person selectPersonUser(String code) {
- String accessToken = getAccessToken();
- HttpRequest request = HttpRequest.get(personnelProperties.getPerson() + code)
- .header("Authorization", "Bearer " + accessToken)
- .header("Content-Type", "application/form-data");
- Person person;
- try {
- person = JSON.parseObject(request.execute().body(), Person.class);
- if (BeanUtil.isEmpty(person)) return null;
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
- List<JSONObject> department = getDepartment(person.getCompanyId());
- person.setDepartment(getDepartmentStr(department, person.getDepartmentCode()).replaceFirst("/", ""));
- person.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, person.getEmployeeID())));
- return person;
- }
-
- /**
- * 灏嗕汉浜嬬郴缁熷嬀閫夌殑鍐呭杞Щ鍒版湰绯荤粺
- * @param personDto
- * @return
- */
- @Transactional(rollbackFor = Exception.class)
- public Object addPersonUser(PersonDto personDto) {
- personDto.getPerson().forEach(person -> {
- User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, person.getEmployeeID()));
- List<Company> company = personDto.getCompany();
- String companyName = "";
- Custom custom = null;
- // 濉厖宸ュ巶淇℃伅
- companyName = company.stream().filter(a -> a.getCompanyId().equals(person.getCompanyId())).findFirst().get().getCompanyName();
- custom = customService.getCustomId(companyName);
-
- if (BeanUtil.isEmpty(user)) {
- user = new User();
- user.setName(person.getName());
- user.setNameEn("not write");
- user.setAccount(person.getEmployeeID());
- user.setPhone(person.getPhoneNumber());
- user.setEmail(person.getCompanyEmail());
- user.setIsCustom(0);
- user.setPassword(SecurityUtils.encryptPassword("zttZTT123!"));
- user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
- userMapper.insert(user);
- } else {
- user.setName(person.getName());
- user.setPhone(person.getPhoneNumber());
- user.setEmail(person.getCompanyEmail());
- user.setIsCustom(0);
- user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
- userMapper.updateById(user);
- }
- });
- return 1;
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CompaniesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CompaniesController.java
deleted file mode 100644
index 0110490..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/CompaniesController.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.ruoyi.web.controller.system;
-
-import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.system.mapper.UserMapper;
-import com.ruoyi.system.service.UserService;
-import com.ruoyi.web.controller.api.Company;
-import com.ruoyi.web.controller.api.PersonDto;
-import com.ruoyi.web.controller.api.PersonnelHeaderApi;
-import com.ruoyi.web.controller.api.Person;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/companies")
-@Api(tags = "鐢ㄦ埛妯″潡")
-public class CompaniesController {
-
- private PersonnelHeaderApi personnelHeaderApi;
-
- private UserService userService;
-
- @PostMapping("/getSampleUser")
- @ApiOperation(value = "鏌ョ湅鎸囧畾閮ㄩ棬鐨勪汉浜嬬郴缁熺粍缁囨灦鏋�")
- public Result<?> getSampleUser() {
- return Result.success();
- }
-
-
- @ApiOperation(value = "鏌ョ湅浜轰簨绯荤粺缁勭粐鏋舵瀯")
- @GetMapping(value = "/selectCompaniesList")
- public Result<List<Company>> selectCompaniesList() {
- return Result.success(personnelHeaderApi.companyUrl());
-
- }
-
- @ApiOperation("鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳")
- @PostMapping(value = "/selectSimpleList")
- public Result<?> selectSimpleList(String companyId) {
- return Result.success(personnelHeaderApi.userUrl(companyId));
- }
-
- @ApiOperation("灏嗕汉浜嬬郴缁熷嬀閫夌殑鍐呭杞Щ鍒版湰绯荤粺")
- @PostMapping(value = "/addPersonUser")
- public Result<?> addPersonUser(@RequestBody PersonDto personDto) {
- return Result.success(personnelHeaderApi.addPersonUser(personDto));
- }
-
- @ApiOperation("閫氳繃鍛樺伐鍙疯幏鍙栧憳宸�")
- @PostMapping(value = "/selectPersonUser")
- public Result<?> selectPersonUser(String code) {
- Person person = personnelHeaderApi.selectPersonUser(code);
- return Result.success(person);
- }
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index d6c0b29..a4e7af3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -4,7 +4,6 @@
import java.util.Set;
import java.util.UUID;
-import com.ruoyi.common.config.SsoBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -41,9 +40,6 @@
@Autowired
private TokenService tokenService;
-
- @Autowired
- private SsoBean ssoBean;
/**
* 鐧诲綍鏂规硶
@@ -110,7 +106,7 @@
@GetMapping("/getSsoAuthUrl")
public AjaxResult getSsoAuthUrl() {
String uuid = UUID.randomUUID().toString();
- return AjaxResult.success("鎿嶄綔鎴愬姛", ssoBean.getUrl() + "/oauth2/auth?response_type=code&scope=openid&client_id=" + ssoBean.getClientId() + "&redirect_uri=" + ssoBean.getCallbackUrl() + "&state=" + uuid);
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
}
/**
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index c88c67b..4db5787 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -71,7 +71,7 @@
# 鏁版嵁搴撶储寮�
database: 0
# # 瀵嗙爜
- # password: root2022!
+ password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -127,47 +127,11 @@
wordUrl: D:\椤圭洰鏂囦欢瀛樺偍\word
-#oa:
-# oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
-# prodIp: http://192.168.21.53:8081
-# unqualifiedProcessId: 41974
-
-# 浜轰簨绯荤粺
-personnel:
- # 姝ｅ紡鍦板潃
- code: https://ztt-sso.ztt.cn/oauth2/token
- # 瑁呭浜轰簨姝ｅ紡搴�
- appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
- appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03
- companies: https://ztt-connector.ztt.cn/api/org/v1/companies
- simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
- # 浜哄憳瀵嗙爜鑾峰彇
- password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/
- department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments
- person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/
# 浼佷笟寰俊閫氱煡
wechat:
# 璐ㄩ噺鎶ユ閫氱煡
- examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=21993616-9966-4fe4-81b0-68e99a40c964
+ examiningUrl:
-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-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 8830a70..b346727 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -127,32 +127,11 @@
wordUrl: /javaWork/lims-ruoyi/file/word
-#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
+ examiningUrl:
-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-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
deleted file mode 100644
index 95840c7..0000000
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,172 +0,0 @@
-# 瑁呭娴嬭瘯搴撻厤缃�
-
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://127.0.0.1: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
-
-# 鏃ュ織閰嶇疆
-logging:
- file-location: /center-lims/Java
- level:
- com.ruoyi: info
- org.springframework: warn
-
-# 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
-
-#oa:
-# oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
-# prodIp: http://192.168.21.53:8081
-# unqualifiedProcessId: 41974
-
-# 浜轰簨绯荤粺
-personnel:
- # 姝ｅ紡鍦板潃
- code: https://ztt-sso.ztt.cn/oauth2/token
- # 瑁呭浜轰簨姝ｅ紡搴�
- appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
- appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03
- companies: https://ztt-connector.ztt.cn/api/org/v1/companies
- simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
- # 浜哄憳瀵嗙爜鑾峰彇
- password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/
- department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments
- person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/
-
-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-ztzb.yml b/ruoyi-admin/src/main/resources/application-ztzb.yml
deleted file mode 100644
index b018910..0000000
--- a/ruoyi-admin/src/main/resources/application-ztzb.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-# 瑁呭姝ｅ紡搴�
-
-# 鏁版嵁婧愰厤缃�
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 涓诲簱鏁版嵁婧�
- master:
- url: jdbc:mysql://127.0.0.1:3306/center-lims?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: root
- password: zttZTT123!
-# 鍙鐢ㄦ埛鏉冮檺
-# username: readonly
-# password: zttZTT123@@
-
- # 浠庡簱鏁版嵁婧�
- slave:
- # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
- # 鍒濆杩炴帴鏁�
- initialSize: 5
- # 鏈�灏忚繛鎺ユ睜鏁伴噺
- minIdle: 10
- # 鏈�澶ц繛鎺ユ睜鏁伴噺
- maxActive: 200
- # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
- 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
-
-# 鏃ュ織閰嶇疆
-logging:
- file-location: /center-lims/after
- level:
- com.ruoyi: info
- org.springframework: warn
-
-# Swagger閰嶇疆
-swagger:
- # 鏄惁寮�鍚痵wagger
- enabled: false
-
-# minio瀹瑰櫒绠＄悊
-minio:
- endpoint: http://114.132.189.42/
- port: 7019
- secure: false
- accessKey: admin
- secretKey: 12345678
- preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
-
-# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
-file:
- path: /center-lims/after/file/img
- # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
- allowed: png,jpg,jpeg,gif
-# 鎶ュ憡鍦板潃
-wordUrl: /center-lims/after/file/word
-
-# oa娴佺▼
-oa:
- oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
- prodIp: http://192.168.21.53:8001/lims
- unqualifiedProcessId: 41974
-
-# 浼佷笟寰俊鎺ㄩ��
-wechat:
- # 璐ㄩ噺鎶ユ閫氱煡
- examiningUrl: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=6e1d2d18-0c60-4889-a05f-b1b5479c9188
-
-# 浜轰簨绯荤粺
-personnel:
- # 姝ｅ紡鍦板潃
- code: https://ztt-sso.ztt.cn/oauth2/token
- # 瑁呭浜轰簨姝ｅ紡搴�
- appId: 6f5f6a0c-2a01-4ef6-9e75-c8a6f0c2f044
- appSecret: 89b9c4735b1e5ee9d6a8544b9b38bb03
- companies: https://ztt-connector.ztt.cn/api/org/v1/companies
- simple: https://ztt-connector.ztt.cn/api/org/v1/employees/simple?companyId=
- # 浜哄憳瀵嗙爜鑾峰彇
- password: https://ztt-connector.ztt.cn/api/org/v1/employees/original_pwd/
- department: https://ztt-connector.ztt.cn/api/org/v1/companies/companyId/departments
- person: https://ztt-connector.ztt.cn/api/org/v1/employees/simple/
-
-ifs:
- contract: ZTZB
- contract-key-get: x%2bvbGReagnsK%2fDr45xkVcGLOh%2fWWGODQ2inBGeNwbZw%3d
- contract-key-post: x+vbGReagnsK/Dr45xkVcGLOh/WWGODQ2inBGeNwbZw=
- custorder: http://192.168.20.50/PurchService.ashx?
- custorder-port: http://192.168.20.50:8008/PurchService.ashx?
- erp-services: http://192.168.20.50: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: true # 濡傛灉寮�鍙戦渶瑕佸惎鍔ㄦ祴璇曪紝闇�瑕佹敼涓篺alse涓嶇劧浼氫竴鐩存姤閿�
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0575c58..aeadb89 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛
- port: 8001
+ port: 7012
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path:
@@ -88,11 +88,6 @@
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
-#闆嗗洟缁熶竴鐧诲綍
-sso:
- url: https://ztt-sso.ztt.cn
- clientId: 6ca77685-e304-4c0e-9e63-3839e166742f
- clientSecret: 496e2809629ea5beb4118b10c95d702f
- callbackUrl: https://ztzb-lims.ztt.cn/thirdpartylogin
+
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/IfsProperties.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/IfsProperties.java
deleted file mode 100644
index 451f163..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/IfsProperties.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Author zhuo
- * @Date 2024/9/29
- */
-@Configuration
-@ConfigurationProperties(prefix = "ifs")
-@Data
-public class IfsProperties {
-
- /**
- * 鍩�
- */
- private String contract;
-
- /**
- * 绉橀挜-get
- */
- private String contractKeyGet;
-
-
- /**
- * 绉橀挜-post
- */
- private String contractKeyPost;
-
- /**
- * 80
- */
- private String custorder;
-
- /**
- * 8008
- */
- private String custorderPort;
-
- /**
- * 8081
- */
- private String erpServices;
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/PersonnelProperties.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/PersonnelProperties.java
deleted file mode 100644
index aab04a1..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/PersonnelProperties.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.common.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 浜轰簨绯荤粺api
- *
- * @Author zhuo
- * @Date 2025/3/16
- */
-@Configuration
-@ConfigurationProperties(prefix = "personnel")
-@Data
-public class PersonnelProperties {
- /**
- * 姝ｅ紡鍦板潃
- * */
- private String code;
- /**
- * 瑁呭浜轰簨姝ｅ紡搴�
- * */
- private String appId;
- private String appSecret;
-
- private String companies;
-
- private String simple;
-
- /**
- * 浜哄憳瀵嗙爜鑾峰彇
- * */
- private String password;
-
- private String department;
-
- private String person;
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/SsoBean.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/SsoBean.java
deleted file mode 100644
index 5cd4c41..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/SsoBean.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.ruoyi.common.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
-/**
- * zhuo
- */
-
-@Configuration
-@Component
-@ConfigurationProperties(prefix = "sso")
-@Data
-public class SsoBean {
-
- /**
- * 鍗曠偣鐧诲綍搴旂敤id
- */
- private String clientId;
-
- /**
- * 鍗曠偣鐧诲綍搴旂敤绉橀挜
- */
- private String clientSecret;
-
- /**
- * 鍗曠偣鐧诲綍鏈嶅姟鍦板潃
- */
- private String url;
-
- /**
- * 鍗曠偣鐧诲綍鍥炶皟鍦板潃
- */
- private String callbackUrl;
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/AddWorkflow.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/AddWorkflow.java
deleted file mode 100644
index aad7df1..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/AddWorkflow.java
+++ /dev/null
@@ -1,143 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="appKey" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="wri" type="{http://tempuri.org/}OA_WorkflowRequestInfo" minOccurs="0"/>
- * <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="errorMsg" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "appKey",
- "wri",
- "errorCode",
- "errorMsg"
-})
-@XmlRootElement(name = "AddWorkflow")
-public class AddWorkflow {
-
- protected String appKey;
- protected OAWorkflowRequestInfo wri;
- protected String errorCode;
- protected String errorMsg;
-
- /**
- * 鑾峰彇appKey灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAppKey() {
- return appKey;
- }
-
- /**
- * 璁剧疆appKey灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAppKey(String value) {
- this.appKey = value;
- }
-
- /**
- * 鑾峰彇wri灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link OAWorkflowRequestInfo }
- *
- */
- public OAWorkflowRequestInfo getWri() {
- return wri;
- }
-
- /**
- * 璁剧疆wri灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link OAWorkflowRequestInfo }
- *
- */
- public void setWri(OAWorkflowRequestInfo value) {
- this.wri = value;
- }
-
- /**
- * 鑾峰彇errorCode灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getErrorCode() {
- return errorCode;
- }
-
- /**
- * 璁剧疆errorCode灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setErrorCode(String value) {
- this.errorCode = value;
- }
-
- /**
- * 鑾峰彇errorMsg灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getErrorMsg() {
- return errorMsg;
- }
-
- /**
- * 璁剧疆errorMsg灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setErrorMsg(String value) {
- this.errorMsg = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/AddWorkflowResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/AddWorkflowResponse.java
deleted file mode 100644
index 64a0bc5..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/AddWorkflowResponse.java
+++ /dev/null
@@ -1,114 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.*;
-
-
-/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="AddWorkflowResult" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="errorMsg" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "addWorkflowResult",
- "errorCode",
- "errorMsg"
-})
-@XmlRootElement(name = "AddWorkflowResponse")
-public class AddWorkflowResponse {
-
- @XmlElement(name = "AddWorkflowResult")
- protected String addWorkflowResult;
- protected String errorCode;
- protected String errorMsg;
-
- /**
- * 鑾峰彇addWorkflowResult灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAddWorkflowResult() {
- return addWorkflowResult;
- }
-
- /**
- * 璁剧疆addWorkflowResult灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAddWorkflowResult(String value) {
- this.addWorkflowResult = value;
- }
-
- /**
- * 鑾峰彇errorCode灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getErrorCode() {
- return errorCode;
- }
-
- /**
- * 璁剧疆errorCode灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setErrorCode(String value) {
- this.errorCode = value;
- }
-
- /**
- * 鑾峰彇errorMsg灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getErrorMsg() {
- return errorMsg;
- }
-
- /**
- * 璁剧疆errorMsg灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setErrorMsg(String value) {
- this.errorMsg = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowRequestTableField.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowRequestTableField.java
deleted file mode 100644
index 85b40a7..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowRequestTableField.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>ArrayOfOA_WorkflowRequestTableField complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType name="ArrayOfOA_WorkflowRequestTableField">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="OA_WorkflowRequestTableField" type="{http://tempuri.org/}OA_WorkflowRequestTableField" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArrayOfOA_WorkflowRequestTableField", propOrder = {
- "oaWorkflowRequestTableField"
-})
-public class ArrayOfOAWorkflowRequestTableField {
-
- @XmlElement(name = "OA_WorkflowRequestTableField", nillable = true)
- protected List<OAWorkflowRequestTableField> oaWorkflowRequestTableField;
-
- /**
- * Gets the value of the oaWorkflowRequestTableField property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the oaWorkflowRequestTableField property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getOAWorkflowRequestTableField().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link OAWorkflowRequestTableField }
- *
- *
- */
- public List<OAWorkflowRequestTableField> getOAWorkflowRequestTableField() {
- if (oaWorkflowRequestTableField == null) {
- oaWorkflowRequestTableField = new ArrayList<OAWorkflowRequestTableField>();
- }
- return this.oaWorkflowRequestTableField;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowRequestTableRecord.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowRequestTableRecord.java
deleted file mode 100644
index b59406d..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowRequestTableRecord.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>ArrayOfOA_WorkflowRequestTableRecord complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType name="ArrayOfOA_WorkflowRequestTableRecord">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="OA_WorkflowRequestTableRecord" type="{http://tempuri.org/}OA_WorkflowRequestTableRecord" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArrayOfOA_WorkflowRequestTableRecord", propOrder = {
- "oaWorkflowRequestTableRecord"
-})
-public class ArrayOfOAWorkflowRequestTableRecord {
-
- @XmlElement(name = "OA_WorkflowRequestTableRecord", nillable = true)
- protected List<OAWorkflowRequestTableRecord> oaWorkflowRequestTableRecord;
-
- /**
- * Gets the value of the oaWorkflowRequestTableRecord property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the oaWorkflowRequestTableRecord property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getOAWorkflowRequestTableRecord().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link OAWorkflowRequestTableRecord }
- *
- *
- */
- public List<OAWorkflowRequestTableRecord> getOAWorkflowRequestTableRecord() {
- if (oaWorkflowRequestTableRecord == null) {
- oaWorkflowRequestTableRecord = new ArrayList<OAWorkflowRequestTableRecord>();
- }
- return this.oaWorkflowRequestTableRecord;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowTable.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowTable.java
deleted file mode 100644
index 30b8f88..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ArrayOfOAWorkflowTable.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>ArrayOfOA_WorkflowTable complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType name="ArrayOfOA_WorkflowTable">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="OA_WorkflowTable" type="{http://tempuri.org/}OA_WorkflowTable" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ArrayOfOA_WorkflowTable", propOrder = {
- "oaWorkflowTable"
-})
-public class ArrayOfOAWorkflowTable {
-
- @XmlElement(name = "OA_WorkflowTable", nillable = true)
- protected List<OAWorkflowTable> oaWorkflowTable;
-
- /**
- * Gets the value of the oaWorkflowTable property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the oaWorkflowTable property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getOAWorkflowTable().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link OAWorkflowTable }
- *
- *
- */
- public List<OAWorkflowTable> getOAWorkflowTable() {
- if (oaWorkflowTable == null) {
- oaWorkflowTable = new ArrayList<OAWorkflowTable>();
- }
- return this.oaWorkflowTable;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ForwardWorkflowRequest.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/ForwardWorkflowRequest.java
deleted file mode 100644
index a9d7a36..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ForwardWorkflowRequest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="requestid" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * <element name="forwardoperator" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="remark" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="userId" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * <element name="clientip" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "requestid",
- "forwardoperator",
- "remark",
- "userId",
- "clientip"
-})
-@XmlRootElement(name = "forwardWorkflowRequest")
-public class ForwardWorkflowRequest {
-
- protected int requestid;
- protected String forwardoperator;
- protected String remark;
- protected int userId;
- protected String clientip;
-
- /**
- * 鑾峰彇requestid灞炴�х殑鍊笺��
- *
- */
- public int getRequestid() {
- return requestid;
- }
-
- /**
- * 璁剧疆requestid灞炴�х殑鍊笺��
- *
- */
- public void setRequestid(int value) {
- this.requestid = value;
- }
-
- /**
- * 鑾峰彇forwardoperator灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getForwardoperator() {
- return forwardoperator;
- }
-
- /**
- * 璁剧疆forwardoperator灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setForwardoperator(String value) {
- this.forwardoperator = value;
- }
-
- /**
- * 鑾峰彇remark灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getRemark() {
- return remark;
- }
-
- /**
- * 璁剧疆remark灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setRemark(String value) {
- this.remark = value;
- }
-
- /**
- * 鑾峰彇userId灞炴�х殑鍊笺��
- *
- */
- public int getUserId() {
- return userId;
- }
-
- /**
- * 璁剧疆userId灞炴�х殑鍊笺��
- *
- */
- public void setUserId(int value) {
- this.userId = value;
- }
-
- /**
- * 鑾峰彇clientip灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getClientip() {
- return clientip;
- }
-
- /**
- * 璁剧疆clientip灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setClientip(String value) {
- this.clientip = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ForwardWorkflowRequestResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/ForwardWorkflowRequestResponse.java
deleted file mode 100644
index fd5eae8..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ForwardWorkflowRequestResponse.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="forwardWorkflowRequestResult" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "forwardWorkflowRequestResult"
-})
-@XmlRootElement(name = "forwardWorkflowRequestResponse")
-public class ForwardWorkflowRequestResponse {
-
- protected String forwardWorkflowRequestResult;
-
- /**
- * 鑾峰彇forwardWorkflowRequestResult灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getForwardWorkflowRequestResult() {
- return forwardWorkflowRequestResult;
- }
-
- /**
- * 璁剧疆forwardWorkflowRequestResult灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setForwardWorkflowRequestResult(String value) {
- this.forwardWorkflowRequestResult = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProcess.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProcess.java
deleted file mode 100644
index fd90aba..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProcess.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ruoyi.common.oa;
-
-import java.util.List;
-import java.util.Map;
-
-public class OAProcess {
-
- public static String oaReturnMsg(int code, String msg) {
- return "<miap><miap-header><errorcode>" + code + "</errorcode><errormsg>" + msg + "</errormsg></miap-header" + "><miap-Body></miap-Body></miap>";
- }
-
- /**
- * @param mainFields锛氫富琛ㄥ瓧娈垫暟鎹�
- * @param detailFields:瀛愯〃瀛楁鏁版嵁
- * @param requestName:鍒涘缓鐨勬祦绋嬬殑鍚嶇О
- * @param workflowId:OA娴佺▼ID
- * @param createrId:OA璐﹀彿
- * @return OAResult
- * @throws Exception
- */
- public static OAResult start(Map<String, String> mainFields, List<Map<String, String>> detailFields, String requestName, String workflowId, String createrId) throws Exception {
- OAService oaService = new OAService();
- //鍒涘缓娴佺▼涓讳綋
- OAWorkflowRequestInfo wri = new OAWorkflowRequestInfo();
- wri.setWorkflowId(workflowId);
- wri.setCreaterId(createrId);
- wri.setRequestLevel("0");
- wri.setRequestName(requestName);
-
- OAWorkflowTable wmi = oaService.createOAMainWorkflowTable(mainFields);
- // 灏嗕富琛ㄤ俊鎭～鍏呭埌娴佺▼淇℃伅閲�
- wri.setWorkflowMainTable(wmi);
-
- ArrayOfOAWorkflowTable owdts = oaService.createOADetailWorkflowTable(detailFields);
- // 灏嗘槑缁嗚〃淇℃伅濉厖鍒版祦绋嬩俊鎭噷
- wri.setWorkflowDetailTables(owdts);
-
- // 鍙戣捣OA娴佺▼
- OAResult oaResult = oaService.sendWorkFlow(wri);
- return oaResult;
- }
-
-
- public static OAResult start(Map<String, String> mainFields, String requestName, String workflowId, String createrId) throws Exception {
- OAService oaService = new OAService();
- //鍒涘缓娴佺▼涓讳綋
- OAWorkflowRequestInfo wri = new OAWorkflowRequestInfo();
- wri.setWorkflowId(workflowId);
- wri.setCreaterId(createrId);
- wri.setRequestLevel("0");
- wri.setRequestName(requestName);
- //todo: oa鎻愪氦 1: 鐩存帴鍙戦�佹祦绋�, 0:瀛樺叆鑽夌绠�
-// wri.setIsnextflow("1");
- wri.setIsnextflow("0");
- //鍒涘缓涓昏〃
- OAWorkflowTable wmi = oaService.createOAMainWorkflowTable(mainFields);
- // 灏嗕富琛ㄤ俊鎭～鍏呭埌娴佺▼淇℃伅閲�
- wri.setWorkflowMainTable(wmi);
- // 鍙戣捣OA娴佺▼
- OAResult oaResult = oaService.sendWorkFlow(wri);
- return oaResult;
- }
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProperty.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProperty.java
deleted file mode 100644
index 48a07e0..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProperty.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.ruoyi.common.oa;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author ZTT
- */
-@Configuration
-@ConfigurationProperties(prefix = "oa")
-@Data
-public class OAProperty {
-
- /**
- * oa鍦板潃
- */
- private String oaHost;
-
- /**
- * 鏂囦欢鏌ョ湅ip鍦板潃
- */
- private String prodIp;
-
- /**
- * 瑁呭鐢电紗锛氫笉鍚堟牸瀹℃壒oa鐨刬d
- */
- private String unqualifiedProcessId;
-
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAResult.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAResult.java
deleted file mode 100644
index 7febd9b..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAResult.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.ruoyi.common.oa;
-
-import lombok.Data;
-
-/**
- * @author ZTT
- */
-@Data
-public class OAResult {
- private static final String SUCCESS_CODE = "0";
-
- /**
- * 閿欒浠ｇ爜
- */
- private String errorCode;
- /**
- * 閿欒淇℃伅
- */
- private String errorMsg;
- /**
- * 娴佺▼缂栧彿
- */
- private String addWorkflowResult;
-
-
- public boolean success() {
- return SUCCESS_CODE.equals(errorCode);
- }
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAService.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAService.java
deleted file mode 100644
index 4044700..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAService.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.ruoyi.common.oa;
-
-import javax.xml.ws.Holder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author ZTT
- */
-public class OAService {
- /**
- * 鍒涘缓OA娴佺▼涓昏〃
- *
- * @param fields
- * @return
- */
- public OAWorkflowTable createOAMainWorkflowTable(Map<String, String> fields) {
- //------------------涓昏〃鍒楄祴鍊�---------------------------
- List<OAWorkflowRequestTableField> oaWorkflowRequestTableField = new ArrayList<OAWorkflowRequestTableField>();
-
- for (Map.Entry<String, String> field : fields.entrySet()) {
- oaWorkflowRequestTableField.add(createOAWorkflowRequestTableField(field.getKey(), field.getValue().toString()));
- }
-
-// for (OAWorkflowRequestTableField workflowRequestTableField : oaWorkflowRequestTableField) {
-//
-// System.out.println(workflowRequestTableField.fieldName +","+ workflowRequestTableField.fieldValue +"--"+ workflowRequestTableField.fieldType);
-// }
- //鍒涘缓涓昏〃鍒�
- ArrayOfOAWorkflowRequestTableField wrti = new ArrayOfOAWorkflowRequestTableField();
- wrti.oaWorkflowRequestTableField = oaWorkflowRequestTableField;
- // 灏嗕富琛ㄥ垪濉厖鍒颁富琛ㄨ閲�
- OAWorkflowRequestTableRecord oaWorkflowRequestTableRecord = new OAWorkflowRequestTableRecord();
- oaWorkflowRequestTableRecord.setWorkflowRequestTableFields(wrti);
-
- //鍒涘缓涓昏〃琛�
- ArrayOfOAWorkflowRequestTableRecord wrtri = new ArrayOfOAWorkflowRequestTableRecord();
- wrtri.getOAWorkflowRequestTableRecord().add(oaWorkflowRequestTableRecord);
-
- //鍒涘缓涓昏〃
- OAWorkflowTable wmi = new OAWorkflowTable();
- //灏嗕富琛ㄨ濉厖鍒颁富琛ㄩ噷
- wmi.setWorkflowRequestTableRecords(wrtri);
-
- return wmi;
- }
-
- /**
- * 鍒涘缓OA鏄庣粏琛ㄦ祦绋�
- *
- * @param fields
- * @return
- */
- public ArrayOfOAWorkflowTable createOADetailWorkflowTable(List<Map<String, String>> fields) {
- //------------------鏄庣粏琛ㄨ祴鍊�---------------------------
- //鍒涘缓1寮犳槑缁嗚〃
- ArrayOfOAWorkflowTable owdts = new ArrayOfOAWorkflowTable();
- //灏嗘槑缁嗗垪濉厖鍒版槑缁嗚涓�
- //鏄庣粏灞炴��
- ArrayOfOAWorkflowRequestTableRecord owrtr = new ArrayOfOAWorkflowRequestTableRecord();
- for (int i = 0; i < fields.size(); i++) {
- List<OAWorkflowRequestTableField> owrtf_ = new ArrayList<OAWorkflowRequestTableField>();
-
- for (Map.Entry<String, String> field : fields.get(i).entrySet()) {
- owrtf_.add(createOAWorkflowRequestTableField(field.getKey(), field.getValue()));
- }
- ArrayOfOAWorkflowRequestTableField owrti = new ArrayOfOAWorkflowRequestTableField();
- owrti.oaWorkflowRequestTableField = owrtf_;
- OAWorkflowRequestTableRecord owrtis = new OAWorkflowRequestTableRecord();
- owrtis.setWorkflowRequestTableFields(owrti);
- owrtr.getOAWorkflowRequestTableRecord().add(owrtis);
- }
-
-
- // 灏嗘槑缁嗚濉厖鍒版槑缁嗚〃閲�
- OAWorkflowTable owrtrs = new OAWorkflowTable();
- owrtrs.setWorkflowRequestTableRecords(owrtr);
- owdts.getOAWorkflowTable().add(owrtrs);
-
- return owdts;
- }
-
- /**
- * 鍒涘缓OA娴佺▼琛ㄦ牸灞炴��
- *
- * @param fieldName
- * @param fieldValue
- * @param view
- * @param edit
- * @return
- */
- public OAWorkflowRequestTableField createOAWorkflowRequestTableField(String fieldName, String fieldValue, String view, String edit) {
- // 鍒涘缓灞炴��
- OAWorkflowRequestTableField oaWorkflowRequestTableField = new OAWorkflowRequestTableField();
-
- // 瀵瑰睘鎬ц繘琛岃缃�
- oaWorkflowRequestTableField.setFieldName(fieldName);
- oaWorkflowRequestTableField.setFieldValue(fieldValue);
- oaWorkflowRequestTableField.setView(view);
- oaWorkflowRequestTableField.setEdit(edit);
-
- return oaWorkflowRequestTableField;
- }
-
- /**
- * 鍒涘缓OA娴佺▼琛ㄦ牸灞炴��
- *
- * @param fieldName
- * @param fieldValue
- * @return
- */
- public OAWorkflowRequestTableField createOAWorkflowRequestTableField(String fieldName, String fieldValue) {
- // 鍒涘缓灞炴��
- OAWorkflowRequestTableField oaWorkflowRequestTableField = new OAWorkflowRequestTableField();
-
- // 瀵瑰睘鎬ц繘琛岃缃�
- oaWorkflowRequestTableField.setFieldName(fieldName);
- oaWorkflowRequestTableField.setFieldValue(fieldValue);
- oaWorkflowRequestTableField.setView("true");
- oaWorkflowRequestTableField.setEdit("true");
- if (fieldName.equals("sqr") || fieldName.equals("fkr")) {
- oaWorkflowRequestTableField.setFieldType(1);
- }
- return oaWorkflowRequestTableField;
- }
-
- /**
- * 鍙戦�丱A娴佺▼
- *
- * @param wri
- * @return
- */
- public OAResult sendWorkFlow(OAWorkflowRequestInfo wri) {
- Holder<String> errorCode = new Holder<String>();
- Holder<String> errorMsg = new Holder<String>();
- Holder<String> addWorkflowResult = new Holder<String>();
-
- OAWorkFlowRequest owfr = new OAWorkFlowRequest();
- // 璋冪敤OA娴佺▼鏂板鏂规硶锛屽彂璧稯A娴佺▼
- owfr.getOAWorkFlowRequestSoap().addWorkflow("5DEDD10D2E434A139A05953BDB66CC68", wri, errorCode, errorMsg, addWorkflowResult);
-
- // 娴佺▼鍙戦�佺粨鏋�
- OAResult oaResult = new OAResult();
- oaResult.setErrorCode(errorCode.value);
- oaResult.setErrorMsg(errorMsg.value);
- oaResult.setAddWorkflowResult(addWorkflowResult.value);
-
- return oaResult;
- }
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequest.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequest.java
deleted file mode 100644
index 4970814..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-
-
-import com.ruoyi.common.utils.ApplicationContextHolder;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.9-b130926.1035
- * Generated source version: 2.2
- *
- */
-@WebServiceClient(name = "OA_WorkFlowRequest", targetNamespace = "http://tempuri.org/")
-public class OAWorkFlowRequest
- extends Service
-{
-
- private final static URL OAWORKFLOWREQUEST_WSDL_LOCATION;
- private final static WebServiceException OAWORKFLOWREQUEST_EXCEPTION;
- private final static QName OAWORKFLOWREQUEST_QNAME = new QName("http://tempuri.org/", "OA_WorkFlowRequest");
-
- static {
- URL url = null;
- WebServiceException e = null;
- try {
- OAProperty oaProperties = ApplicationContextHolder.getBean(OAProperty.class);
- url = new URL(oaProperties.getOaHost());
- } catch (MalformedURLException ex) {
- e = new WebServiceException(ex);
- }
- OAWORKFLOWREQUEST_WSDL_LOCATION = url;
- OAWORKFLOWREQUEST_EXCEPTION = e;
- }
-
- public OAWorkFlowRequest() {
- super(__getWsdlLocation(), OAWORKFLOWREQUEST_QNAME);
- }
-
- public OAWorkFlowRequest(WebServiceFeature... features) {
- super(__getWsdlLocation(), OAWORKFLOWREQUEST_QNAME, features);
- }
-
- public OAWorkFlowRequest(URL wsdlLocation) {
- super(wsdlLocation, OAWORKFLOWREQUEST_QNAME);
- }
-
- public OAWorkFlowRequest(URL wsdlLocation, WebServiceFeature... features) {
- super(wsdlLocation, OAWORKFLOWREQUEST_QNAME, features);
- }
-
- public OAWorkFlowRequest(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public OAWorkFlowRequest(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
- super(wsdlLocation, serviceName, features);
- }
-
- /**
- *
- * @return
- * returns OAWorkFlowRequestSoap
- */
- @WebEndpoint(name = "OA_WorkFlowRequestSoap")
- public OAWorkFlowRequestSoap getOAWorkFlowRequestSoap() {
- return super.getPort(new QName("http://tempuri.org/", "OA_WorkFlowRequestSoap"), OAWorkFlowRequestSoap.class);
- }
-
- /**
- *
- * @param features
- * A list of {@link WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
- * @return
- * returns OAWorkFlowRequestSoap
- */
- @WebEndpoint(name = "OA_WorkFlowRequestSoap")
- public OAWorkFlowRequestSoap getOAWorkFlowRequestSoap(WebServiceFeature... features) {
- return super.getPort(new QName("http://tempuri.org/", "OA_WorkFlowRequestSoap"), OAWorkFlowRequestSoap.class, features);
- }
-
- /**
- *
- * @return
- * returns OAWorkFlowRequestSoap
- */
- @WebEndpoint(name = "OA_WorkFlowRequestSoap12")
- public OAWorkFlowRequestSoap getOAWorkFlowRequestSoap12() {
- return super.getPort(new QName("http://tempuri.org/", "OA_WorkFlowRequestSoap12"), OAWorkFlowRequestSoap.class);
- }
-
- /**
- *
- * @param features
- * A list of {@link WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
- * @return
- * returns OAWorkFlowRequestSoap
- */
- @WebEndpoint(name = "OA_WorkFlowRequestSoap12")
- public OAWorkFlowRequestSoap getOAWorkFlowRequestSoap12(WebServiceFeature... features) {
- return super.getPort(new QName("http://tempuri.org/", "OA_WorkFlowRequestSoap12"), OAWorkFlowRequestSoap.class, features);
- }
-
- /**
- *
- * @return
- * returns OAWorkFlowRequestHttpGet
- */
- @WebEndpoint(name = "OA_WorkFlowRequestHttpGet")
- public OAWorkFlowRequestHttpGet getOAWorkFlowRequestHttpGet() {
- return super.getPort(new QName("http://tempuri.org/", "OA_WorkFlowRequestHttpGet"), OAWorkFlowRequestHttpGet.class);
- }
-
- /**
- *
- * @param features
- * A list of {@link WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
- * @return
- * returns OAWorkFlowRequestHttpGet
- */
- @WebEndpoint(name = "OA_WorkFlowRequestHttpGet")
- public OAWorkFlowRequestHttpGet getOAWorkFlowRequestHttpGet(WebServiceFeature... features) {
- return super.getPort(new QName("http://tempuri.org/", "OA_WorkFlowRequestHttpGet"), OAWorkFlowRequestHttpGet.class, features);
- }
-
- /**
- *
- * @return
- * returns OAWorkFlowRequestHttpPost
- */
- @WebEndpoint(name = "OA_WorkFlowRequestHttpPost")
- public OAWorkFlowRequestHttpPost getOAWorkFlowRequestHttpPost() {
- return super.getPort(new QName("http://tempuri.org/", "OA_WorkFlowRequestHttpPost"), OAWorkFlowRequestHttpPost.class);
- }
-
- /**
- *
- * @param features
- * A list of {@link WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
- * @return
- * returns OAWorkFlowRequestHttpPost
- */
- @WebEndpoint(name = "OA_WorkFlowRequestHttpPost")
- public OAWorkFlowRequestHttpPost getOAWorkFlowRequestHttpPost(WebServiceFeature... features) {
- return super.getPort(new QName("http://tempuri.org/", "OA_WorkFlowRequestHttpPost"), OAWorkFlowRequestHttpPost.class, features);
- }
-
- private static URL __getWsdlLocation() {
- if (OAWORKFLOWREQUEST_EXCEPTION!= null) {
- throw OAWORKFLOWREQUEST_EXCEPTION;
- }
- return OAWORKFLOWREQUEST_WSDL_LOCATION;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestHttpGet.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestHttpGet.java
deleted file mode 100644
index 55c98ce..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestHttpGet.java
+++ /dev/null
@@ -1,50 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.9-b130926.1035
- * Generated source version: 2.2
- *
- */
-@WebService(name = "OA_WorkFlowRequestHttpGet", targetNamespace = "http://tempuri.org/")
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
- ObjectFactory.class
-})
-public interface OAWorkFlowRequestHttpGet {
-
-
- /**
- *
- * @param requestid
- * @param clientip
- * @param remark
- * @param forwardoperator
- * @param userId
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(name = "string", targetNamespace = "http://tempuri.org/", partName = "Body")
- public String forwardWorkflowRequest(
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "requestid")
- String requestid,
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "forwardoperator")
- String forwardoperator,
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "remark")
- String remark,
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "userId")
- String userId,
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "clientip")
- String clientip);
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestHttpPost.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestHttpPost.java
deleted file mode 100644
index bd5a4e2..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestHttpPost.java
+++ /dev/null
@@ -1,50 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.9-b130926.1035
- * Generated source version: 2.2
- *
- */
-@WebService(name = "OA_WorkFlowRequestHttpPost", targetNamespace = "http://tempuri.org/")
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
- ObjectFactory.class
-})
-public interface OAWorkFlowRequestHttpPost {
-
-
- /**
- *
- * @param requestid
- * @param clientip
- * @param remark
- * @param forwardoperator
- * @param userId
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(name = "string", targetNamespace = "http://tempuri.org/", partName = "Body")
- public String forwardWorkflowRequest(
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "requestid")
- String requestid,
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "forwardoperator")
- String forwardoperator,
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "remark")
- String remark,
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "userId")
- String userId,
- @WebParam(name = "string", targetNamespace = "http://www.w3.org/2001/XMLSchema", partName = "clientip")
- String clientip);
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestSoap.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestSoap.java
deleted file mode 100644
index 5122cdc..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkFlowRequestSoap.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.9-b130926.1035
- * Generated source version: 2.2
- *
- */
-@WebService(name = "OA_WorkFlowRequestSoap", targetNamespace = "http://tempuri.org/")
-@XmlSeeAlso({
- ObjectFactory.class
-})
-public interface OAWorkFlowRequestSoap {
-
-
- /**
- *
- * @param requestid
- * @param clientip
- * @param remark
- * @param forwardoperator
- * @param userId
- * @return
- * returns java.lang.String
- */
- @WebMethod(action = "http://tempuri.org/forwardWorkflowRequest")
- @WebResult(name = "forwardWorkflowRequestResult", targetNamespace = "http://tempuri.org/")
- @RequestWrapper(localName = "forwardWorkflowRequest", targetNamespace = "http://tempuri.org/", className = "com.chinaztt.mes.common.oa.ForwardWorkflowRequest")
- @ResponseWrapper(localName = "forwardWorkflowRequestResponse", targetNamespace = "http://tempuri.org/", className = "com.chinaztt.mes.common.oa.ForwardWorkflowRequestResponse")
- public String forwardWorkflowRequest(
- @WebParam(name = "requestid", targetNamespace = "http://tempuri.org/")
- int requestid,
- @WebParam(name = "forwardoperator", targetNamespace = "http://tempuri.org/")
- String forwardoperator,
- @WebParam(name = "remark", targetNamespace = "http://tempuri.org/")
- String remark,
- @WebParam(name = "userId", targetNamespace = "http://tempuri.org/")
- int userId,
- @WebParam(name = "clientip", targetNamespace = "http://tempuri.org/")
- String clientip);
-
- /**
- *
- * @param addWorkflowResult
- * @param errorCode
- * @param appKey
- * @param wri
- * @param errorMsg
- */
- @WebMethod(operationName = "AddWorkflow", action = "http://tempuri.org/AddWorkflow")
- @RequestWrapper(localName = "AddWorkflow", targetNamespace = "http://tempuri.org/", className = "com.chinaztt.mes.common.oa.AddWorkflow")
- @ResponseWrapper(localName = "AddWorkflowResponse", targetNamespace = "http://tempuri.org/", className = "com.chinaztt.mes.common.oa.AddWorkflowResponse")
- public void addWorkflow(
- @WebParam(name = "appKey", targetNamespace = "http://tempuri.org/")
- String appKey,
- @WebParam(name = "wri", targetNamespace = "http://tempuri.org/")
- OAWorkflowRequestInfo wri,
- @WebParam(name = "errorCode", targetNamespace = "http://tempuri.org/", mode = WebParam.Mode.INOUT)
- Holder<String> errorCode,
- @WebParam(name = "errorMsg", targetNamespace = "http://tempuri.org/", mode = WebParam.Mode.INOUT)
- Holder<String> errorMsg,
- @WebParam(name = "AddWorkflowResult", targetNamespace = "http://tempuri.org/", mode = WebParam.Mode.OUT)
- Holder<String> addWorkflowResult);
-
- /**
- *
- * @param errorCode
- * @param appKey
- * @param updateAndSubmitWorkflowResult
- * @param wri
- * @param errorMsg
- */
- @WebMethod(operationName = "UpdateAndSubmitWorkflow", action = "http://tempuri.org/UpdateAndSubmitWorkflow")
- @RequestWrapper(localName = "UpdateAndSubmitWorkflow", targetNamespace = "http://tempuri.org/", className = "com.chinaztt.mes.common.oa.UpdateAndSubmitWorkflow")
- @ResponseWrapper(localName = "UpdateAndSubmitWorkflowResponse", targetNamespace = "http://tempuri.org/", className = "com.chinaztt.mes.common.oa.UpdateAndSubmitWorkflowResponse")
- public void updateAndSubmitWorkflow(
- @WebParam(name = "appKey", targetNamespace = "http://tempuri.org/")
- String appKey,
- @WebParam(name = "wri", targetNamespace = "http://tempuri.org/")
- OAWorkflowRequestInfo wri,
- @WebParam(name = "errorCode", targetNamespace = "http://tempuri.org/", mode = WebParam.Mode.INOUT)
- Holder<String> errorCode,
- @WebParam(name = "errorMsg", targetNamespace = "http://tempuri.org/", mode = WebParam.Mode.INOUT)
- Holder<String> errorMsg,
- @WebParam(name = "UpdateAndSubmitWorkflowResult", targetNamespace = "http://tempuri.org/", mode = WebParam.Mode.OUT)
- Holder<String> updateAndSubmitWorkflowResult);
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestInfo.java
deleted file mode 100644
index f7c585e..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestInfo.java
+++ /dev/null
@@ -1,254 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import lombok.Data;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>OA_WorkflowRequestInfo complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType name="OA_WorkflowRequestInfo">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="WorkflowId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="RequestId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="MainId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="CreaterId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="RequestLevel" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="RequestName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Remark" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="WorkflowMainTable" type="{http://tempuri.org/}OA_WorkflowTable" minOccurs="0"/>
- * <element name="WorkflowDetailTables" type="{http://tempuri.org/}ArrayOfOA_WorkflowTable" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OA_WorkflowRequestInfo", propOrder = {
- "workflowId",
- "requestId",
- "mainId",
- "createrId",
- "requestLevel",
- "requestName",
- "remark",
- "isnextflow",
- "workflowMainTable",
- "workflowDetailTables"
-})
-@Data
-public class OAWorkflowRequestInfo {
-
- @XmlElement(name = "WorkflowId")
- protected String workflowId;
- @XmlElement(name = "RequestId")
- protected String requestId;
- @XmlElement(name = "MainId")
- protected String mainId;
- @XmlElement(name = "CreaterId")
- protected String createrId;
- @XmlElement(name = "RequestLevel")
- protected String requestLevel;
- @XmlElement(name = "RequestName")
- protected String requestName;
- @XmlElement(name = "Remark")
- protected String remark;
- @XmlElement(name = "isnextflow")
- protected String isnextflow;
- @XmlElement(name = "WorkflowMainTable")
- protected OAWorkflowTable workflowMainTable;
- @XmlElement(name = "WorkflowDetailTables")
- protected ArrayOfOAWorkflowTable workflowDetailTables;
-
- /**
- * 鑾峰彇workflowId灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link String }
- */
- public String getWorkflowId() {
- return workflowId;
- }
-
- /**
- * 璁剧疆workflowId灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link String }
- */
- public void setWorkflowId(String value) {
- this.workflowId = value;
- }
-
- /**
- * 鑾峰彇requestId灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link String }
- */
- public String getRequestId() {
- return requestId;
- }
-
- /**
- * 璁剧疆requestId灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link String }
- */
- public void setRequestId(String value) {
- this.requestId = value;
- }
-
- /**
- * 鑾峰彇mainId灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link String }
- */
- public String getMainId() {
- return mainId;
- }
-
- /**
- * 璁剧疆mainId灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link String }
- */
- public void setMainId(String value) {
- this.mainId = value;
- }
-
- /**
- * 鑾峰彇createrId灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link String }
- */
- public String getCreaterId() {
- return createrId;
- }
-
- /**
- * 璁剧疆createrId灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link String }
- */
- public void setCreaterId(String value) {
- this.createrId = value;
- }
-
- /**
- * 鑾峰彇requestLevel灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link String }
- */
- public String getRequestLevel() {
- return requestLevel;
- }
-
- /**
- * 璁剧疆requestLevel灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link String }
- */
- public void setRequestLevel(String value) {
- this.requestLevel = value;
- }
-
- /**
- * 鑾峰彇requestName灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link String }
- */
- public String getRequestName() {
- return requestName;
- }
-
- /**
- * 璁剧疆requestName灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link String }
- */
- public void setRequestName(String value) {
- this.requestName = value;
- }
-
- /**
- * 鑾峰彇remark灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link String }
- */
- public String getRemark() {
- return remark;
- }
-
- /**
- * 璁剧疆remark灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link String }
- */
- public void setRemark(String value) {
- this.remark = value;
- }
-
- /**
- * 鑾峰彇workflowMainTable灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link OAWorkflowTable }
- */
- public OAWorkflowTable getWorkflowMainTable() {
- return workflowMainTable;
- }
-
- /**
- * 璁剧疆workflowMainTable灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link OAWorkflowTable }
- */
- public void setWorkflowMainTable(OAWorkflowTable value) {
- this.workflowMainTable = value;
- }
-
- /**
- * 鑾峰彇workflowDetailTables灞炴�х殑鍊笺��
- *
- * @return possible object is
- * {@link ArrayOfOAWorkflowTable }
- */
- public ArrayOfOAWorkflowTable getWorkflowDetailTables() {
- return workflowDetailTables;
- }
-
- /**
- * 璁剧疆workflowDetailTables灞炴�х殑鍊笺��
- *
- * @param value allowed object is
- * {@link ArrayOfOAWorkflowTable }
- */
- public void setWorkflowDetailTables(ArrayOfOAWorkflowTable value) {
- this.workflowDetailTables = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestTableField.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestTableField.java
deleted file mode 100644
index 6571bed..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestTableField.java
+++ /dev/null
@@ -1,368 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import lombok.Data;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.Objects;
-
-
-/**
- * <p>OA_WorkflowRequestTableField complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType name="OA_WorkflowRequestTableField">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="FieldName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="FieldValue" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="View" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="Edit" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="FieldType" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * <element name="SysName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="ValueType1" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="ValueType2" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="ValueType3" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="ValueKey" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="ValueTableName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OA_WorkflowRequestTableField", propOrder = {
- "fieldName",
- "fieldValue",
- "view",
- "edit",
- "fieldType",
- "sysName",
- "valueType1",
- "valueType2",
- "valueType3",
- "valueKey",
- "valueTableName"
-})
-@Data
-public class OAWorkflowRequestTableField {
-
- @XmlElement(name = "FieldName")
- protected String fieldName;
- @XmlElement(name = "FieldValue")
- protected String fieldValue;
- @XmlElement(name = "View")
- protected String view;
- @XmlElement(name = "Edit")
- protected String edit;
- @XmlElement(name = "FieldType")
- protected int fieldType;
- @XmlElement(name = "SysName")
- protected String sysName;
- @XmlElement(name = "ValueType1")
- protected String valueType1;
- @XmlElement(name = "ValueType2")
- protected String valueType2;
- @XmlElement(name = "ValueType3")
- protected String valueType3;
- @XmlElement(name = "ValueKey")
- protected String valueKey;
- @XmlElement(name = "ValueTableName")
- protected String valueTableName;
-
- /**
- * 鑾峰彇fieldName灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFieldName() {
- return fieldName;
- }
-
- /**
- * 璁剧疆fieldName灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFieldName(String value) {
- this.fieldName = value;
- }
-
- /**
- * 鑾峰彇fieldValue灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFieldValue() {
- return fieldValue;
- }
-
- /**
- * 璁剧疆fieldValue灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFieldValue(String value) {
- this.fieldValue = value;
- }
-
- /**
- * 鑾峰彇view灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getView() {
- return view;
- }
-
- /**
- * 璁剧疆view灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setView(String value) {
- this.view = value;
- }
-
- /**
- * 鑾峰彇edit灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getEdit() {
- return edit;
- }
-
- /**
- * 璁剧疆edit灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setEdit(String value) {
- this.edit = value;
- }
-
- /**
- * 鑾峰彇fieldType灞炴�х殑鍊笺��
- *
- */
- public int getFieldType() {
- return fieldType;
- }
-
- /**
- * 璁剧疆fieldType灞炴�х殑鍊笺��
- *
- */
- public void setFieldType(int value) {
- this.fieldType = value;
- }
-
- /**
- * 鑾峰彇sysName灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSysName() {
- return sysName;
- }
-
- /**
- * 璁剧疆sysName灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSysName(String value) {
- this.sysName = value;
- }
-
- /**
- * 鑾峰彇valueType1灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValueType1() {
- return valueType1;
- }
-
- /**
- * 璁剧疆valueType1灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValueType1(String value) {
- this.valueType1 = value;
- }
-
- /**
- * 鑾峰彇valueType2灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValueType2() {
- return valueType2;
- }
-
- /**
- * 璁剧疆valueType2灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValueType2(String value) {
- this.valueType2 = value;
- }
-
- /**
- * 鑾峰彇valueType3灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValueType3() {
- return valueType3;
- }
-
- /**
- * 璁剧疆valueType3灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValueType3(String value) {
- this.valueType3 = value;
- }
-
- /**
- * 鑾峰彇valueKey灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValueKey() {
- return valueKey;
- }
-
- /**
- * 璁剧疆valueKey灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValueKey(String value) {
- this.valueKey = value;
- }
-
- /**
- * 鑾峰彇valueTableName灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValueTableName() {
- return valueTableName;
- }
-
- /**
- * 璁剧疆valueTableName灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValueTableName(String value) {
- this.valueTableName = value;
- }
-
- @Override
- public String toString() {
- return "OAWorkflowRequestTableField{" +
- "fieldName='" + fieldName + '\'' +
- ", fieldValue='" + fieldValue + '\'' +
- ", view='" + view + '\'' +
- ", edit='" + edit + '\'' +
- ", fieldType=" + fieldType +
- ", sysName='" + sysName + '\'' +
- ", valueType1='" + valueType1 + '\'' +
- ", valueType2='" + valueType2 + '\'' +
- ", valueType3='" + valueType3 + '\'' +
- ", valueKey='" + valueKey + '\'' +
- ", valueTableName='" + valueTableName + '\'' +
- '}';
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- OAWorkflowRequestTableField that = (OAWorkflowRequestTableField) o;
- return fieldType == that.fieldType && Objects.equals(fieldName, that.fieldName) && Objects.equals(fieldValue, that.fieldValue) && Objects.equals(view, that.view) && Objects.equals(edit, that.edit) && Objects.equals(sysName, that.sysName) && Objects.equals(valueType1, that.valueType1) && Objects.equals(valueType2, that.valueType2) && Objects.equals(valueType3, that.valueType3) && Objects.equals(valueKey, that.valueKey) && Objects.equals(valueTableName, that.valueTableName);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(fieldName, fieldValue, view, edit, fieldType, sysName, valueType1, valueType2, valueType3, valueKey, valueTableName);
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestTableRecord.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestTableRecord.java
deleted file mode 100644
index 3c28fd8..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowRequestTableRecord.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>OA_WorkflowRequestTableRecord complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType name="OA_WorkflowRequestTableRecord">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="WorkflowRequestTableFields" type="{http://tempuri.org/}ArrayOfOA_WorkflowRequestTableField" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OA_WorkflowRequestTableRecord", propOrder = {
- "workflowRequestTableFields"
-})
-public class OAWorkflowRequestTableRecord {
-
- @XmlElement(name = "WorkflowRequestTableFields")
- protected ArrayOfOAWorkflowRequestTableField workflowRequestTableFields;
-
- /**
- * 鑾峰彇workflowRequestTableFields灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link ArrayOfOAWorkflowRequestTableField }
- *
- */
- public ArrayOfOAWorkflowRequestTableField getWorkflowRequestTableFields() {
- return workflowRequestTableFields;
- }
-
- /**
- * 璁剧疆workflowRequestTableFields灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link ArrayOfOAWorkflowRequestTableField }
- *
- */
- public void setWorkflowRequestTableFields(ArrayOfOAWorkflowRequestTableField value) {
- this.workflowRequestTableFields = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowTable.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowTable.java
deleted file mode 100644
index 11b4add..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAWorkflowTable.java
+++ /dev/null
@@ -1,90 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>OA_WorkflowTable complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType name="OA_WorkflowTable">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="TableName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="WorkflowRequestTableRecords" type="{http://tempuri.org/}ArrayOfOA_WorkflowRequestTableRecord" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OA_WorkflowTable", propOrder = {
- "tableName",
- "workflowRequestTableRecords"
-})
-public class OAWorkflowTable {
-
- @XmlElement(name = "TableName")
- protected String tableName;
- @XmlElement(name = "WorkflowRequestTableRecords")
- protected ArrayOfOAWorkflowRequestTableRecord workflowRequestTableRecords;
-
- /**
- * 鑾峰彇tableName灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getTableName() {
- return tableName;
- }
-
- /**
- * 璁剧疆tableName灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setTableName(String value) {
- this.tableName = value;
- }
-
- /**
- * 鑾峰彇workflowRequestTableRecords灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link ArrayOfOAWorkflowRequestTableRecord }
- *
- */
- public ArrayOfOAWorkflowRequestTableRecord getWorkflowRequestTableRecords() {
- return workflowRequestTableRecords;
- }
-
- /**
- * 璁剧疆workflowRequestTableRecords灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link ArrayOfOAWorkflowRequestTableRecord }
- *
- */
- public void setWorkflowRequestTableRecords(ArrayOfOAWorkflowRequestTableRecord value) {
- this.workflowRequestTableRecords = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ObjectFactory.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/ObjectFactory.java
deleted file mode 100644
index d19d18a..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/ObjectFactory.java
+++ /dev/null
@@ -1,149 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the com.chinaztt.mes.common.oa package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
- private final static QName _String_QNAME = new QName("http://tempuri.org/", "string");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.chinaztt.mes.common.oa
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link AddWorkflowResponse }
- *
- */
- public AddWorkflowResponse createAddWorkflowResponse() {
- return new AddWorkflowResponse();
- }
-
- /**
- * Create an instance of {@link AddWorkflow }
- *
- */
- public AddWorkflow createAddWorkflow() {
- return new AddWorkflow();
- }
-
- /**
- * Create an instance of {@link OAWorkflowRequestInfo }
- *
- */
- public OAWorkflowRequestInfo createOAWorkflowRequestInfo() {
- return new OAWorkflowRequestInfo();
- }
-
- /**
- * Create an instance of {@link UpdateAndSubmitWorkflow }
- *
- */
- public UpdateAndSubmitWorkflow createUpdateAndSubmitWorkflow() {
- return new UpdateAndSubmitWorkflow();
- }
-
- /**
- * Create an instance of {@link UpdateAndSubmitWorkflowResponse }
- *
- */
- public UpdateAndSubmitWorkflowResponse createUpdateAndSubmitWorkflowResponse() {
- return new UpdateAndSubmitWorkflowResponse();
- }
-
- /**
- * Create an instance of {@link ForwardWorkflowRequestResponse }
- *
- */
- public ForwardWorkflowRequestResponse createForwardWorkflowRequestResponse() {
- return new ForwardWorkflowRequestResponse();
- }
-
- /**
- * Create an instance of {@link ForwardWorkflowRequest }
- *
- */
- public ForwardWorkflowRequest createForwardWorkflowRequest() {
- return new ForwardWorkflowRequest();
- }
-
- /**
- * Create an instance of {@link OAWorkflowTable }
- *
- */
- public OAWorkflowTable createOAWorkflowTable() {
- return new OAWorkflowTable();
- }
-
- /**
- * Create an instance of {@link OAWorkflowRequestTableRecord }
- *
- */
- public OAWorkflowRequestTableRecord createOAWorkflowRequestTableRecord() {
- return new OAWorkflowRequestTableRecord();
- }
-
- /**
- * Create an instance of {@link ArrayOfOAWorkflowTable }
- *
- */
- public ArrayOfOAWorkflowTable createArrayOfOAWorkflowTable() {
- return new ArrayOfOAWorkflowTable();
- }
-
- /**
- * Create an instance of {@link ArrayOfOAWorkflowRequestTableRecord }
- *
- */
- public ArrayOfOAWorkflowRequestTableRecord createArrayOfOAWorkflowRequestTableRecord() {
- return new ArrayOfOAWorkflowRequestTableRecord();
- }
-
- /**
- * Create an instance of {@link OAWorkflowRequestTableField }
- *
- */
- public OAWorkflowRequestTableField createOAWorkflowRequestTableField() {
- return new OAWorkflowRequestTableField();
- }
-
- /**
- * Create an instance of {@link ArrayOfOAWorkflowRequestTableField }
- *
- */
- public ArrayOfOAWorkflowRequestTableField createArrayOfOAWorkflowRequestTableField() {
- return new ArrayOfOAWorkflowRequestTableField();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://tempuri.org/", name = "string")
- public JAXBElement<String> createString(String value) {
- return new JAXBElement<String>(_String_QNAME, String.class, null, value);
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/UpdateAndSubmitWorkflow.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/UpdateAndSubmitWorkflow.java
deleted file mode 100644
index 7f82b54..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/UpdateAndSubmitWorkflow.java
+++ /dev/null
@@ -1,143 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="appKey" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="wri" type="{http://tempuri.org/}OA_WorkflowRequestInfo" minOccurs="0"/>
- * <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="errorMsg" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "appKey",
- "wri",
- "errorCode",
- "errorMsg"
-})
-@XmlRootElement(name = "UpdateAndSubmitWorkflow")
-public class UpdateAndSubmitWorkflow {
-
- protected String appKey;
- protected OAWorkflowRequestInfo wri;
- protected String errorCode;
- protected String errorMsg;
-
- /**
- * 鑾峰彇appKey灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAppKey() {
- return appKey;
- }
-
- /**
- * 璁剧疆appKey灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAppKey(String value) {
- this.appKey = value;
- }
-
- /**
- * 鑾峰彇wri灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link OAWorkflowRequestInfo }
- *
- */
- public OAWorkflowRequestInfo getWri() {
- return wri;
- }
-
- /**
- * 璁剧疆wri灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link OAWorkflowRequestInfo }
- *
- */
- public void setWri(OAWorkflowRequestInfo value) {
- this.wri = value;
- }
-
- /**
- * 鑾峰彇errorCode灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getErrorCode() {
- return errorCode;
- }
-
- /**
- * 璁剧疆errorCode灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setErrorCode(String value) {
- this.errorCode = value;
- }
-
- /**
- * 鑾峰彇errorMsg灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getErrorMsg() {
- return errorMsg;
- }
-
- /**
- * 璁剧疆errorMsg灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setErrorMsg(String value) {
- this.errorMsg = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/UpdateAndSubmitWorkflowResponse.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/UpdateAndSubmitWorkflowResponse.java
deleted file mode 100644
index 37153bc..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/UpdateAndSubmitWorkflowResponse.java
+++ /dev/null
@@ -1,114 +0,0 @@
-
-package com.ruoyi.common.oa;
-
-import javax.xml.bind.annotation.*;
-
-
-/**
- * <p>anonymous complex type鐨� Java 绫汇��
- *
- * <p>浠ヤ笅妯″紡鐗囨鎸囧畾鍖呭惈鍦ㄦ绫讳腑鐨勯鏈熷唴瀹广��
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="UpdateAndSubmitWorkflowResult" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="errorMsg" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "updateAndSubmitWorkflowResult",
- "errorCode",
- "errorMsg"
-})
-@XmlRootElement(name = "UpdateAndSubmitWorkflowResponse")
-public class UpdateAndSubmitWorkflowResponse {
-
- @XmlElement(name = "UpdateAndSubmitWorkflowResult")
- protected String updateAndSubmitWorkflowResult;
- protected String errorCode;
- protected String errorMsg;
-
- /**
- * 鑾峰彇updateAndSubmitWorkflowResult灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getUpdateAndSubmitWorkflowResult() {
- return updateAndSubmitWorkflowResult;
- }
-
- /**
- * 璁剧疆updateAndSubmitWorkflowResult灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setUpdateAndSubmitWorkflowResult(String value) {
- this.updateAndSubmitWorkflowResult = value;
- }
-
- /**
- * 鑾峰彇errorCode灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getErrorCode() {
- return errorCode;
- }
-
- /**
- * 璁剧疆errorCode灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setErrorCode(String value) {
- this.errorCode = value;
- }
-
- /**
- * 鑾峰彇errorMsg灞炴�х殑鍊笺��
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getErrorMsg() {
- return errorMsg;
- }
-
- /**
- * 璁剧疆errorMsg灞炴�х殑鍊笺��
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setErrorMsg(String value) {
- this.errorMsg = value;
- }
-
-}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/package-info.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/package-info.java
deleted file mode 100644
index cd30acf..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://tempuri.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package com.ruoyi.common.oa;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java
deleted file mode 100644
index ca4d3a9..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/IfsApiUtils.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.ruoyi.common.utils.api;
-
-import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.config.IfsProperties;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author zhuo
- * @Date 2024/9/29
- */
-@Slf4j
-@AllArgsConstructor
-@Component
-public class IfsApiUtils {
-
- private IfsProperties ifsProperties;
-
-
- /**
- * 鏌ヨ閲囪喘璁㈠崟鏈楠�
- */
- public List<Map<String, Object>> getInventory(String inAttr) {
- String procedureName = "QUERY_POL_RECEIPT_STD";
- JSONObject stockMap = getJsonObject(procedureName, inAttr);
- String body = HttpRequest.post(ifsProperties.getCustorderPort()).form(stockMap).execute().body();
- ObjectMapper objectMapper = new ObjectMapper();
- try {
- Map map = objectMapper.readValue(body, Map.class);
- List<Map<String, Object>> maps = objectMapper.readValue(JSONUtil.toJsonStr(map.get("LIST_INFO")), new TypeReference<List<Map<String, Object>>>() {
- });
- log.info("鑾峰彇閲囪喘璁㈠崟-->>" + maps);
- return maps;
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
- }
-
-
-
- /**
- * 鐧昏閲囪喘妫�楠岀粨鏋淪TD
- */
- public Result getProcurementResults(String inAttr) {
- return getResult("REGIST_INSPECTION_RESULTS_STD", inAttr, ifsProperties.getCustorder(), "鐧昏閲囪喘妫�楠岀粨鏋�-->");
- }
-
-
- /**
- * 鍘熸潗鏂欐楠�-妫�楠屽悗绉诲簱
- *
- * @param inAttr
- * @return
- */
- public Result moveReceipt(String inAttr) {
- return getResult("MOVE_RECEIPT_STD", inAttr, ifsProperties.getCustorder(), "妫�楠屽悗绉诲簱-->");
- }
-
-
- /**
- * 鍘熸潗鏂欐楠�-閲囪喘鎺ユ敹鏇存敼鎵瑰彿
- *
- * @param inAttr
- * @return
- */
- public Result updateMoveReceiptLot(String inAttr) {
- return getResult("MODIFY_PURCH_RECEIPT_LOT_STD", inAttr, ifsProperties.getCustorder(), "淇敼閲囪喘璁㈠崟鎵规鍙�-->");
- }
-
-
-
- /**
- * 鏌ヨ搴撳瓨鏁版嵁
- *
- * @param inAttr
- * @return
- */
- public Result getIfsStock(String inAttr) {
- return getResult("QUERY_INVENTORY_INFO_STD", inAttr, ifsProperties.getCustorderPort(), "鏌ヨ搴撳瓨淇℃伅-->");
- }
-
-
- /**
- * 閫氱敤鎺ュ彛
- * @param procedureName 鏂规硶鍚�
- * @param inAttr 浼犲弬
- * @param url 鍦板潃
- * @param image 娑堟伅
- * @return
- */
- private Result<?> getResult(String procedureName, String inAttr, String url, String image) {
- JSONObject stockMap = new JSONObject();
- stockMap.put("procedureName", procedureName);
- stockMap.put("contract", ifsProperties.getContract());
- stockMap.put("contractKey", ifsProperties.getContractKeyPost());
- stockMap.put("userId", "lims_user");
- stockMap.put("inAttr", inAttr);
- String body = HttpRequest.post(url).form(stockMap).execute().body();
- log.info(image + body);
- ObjectMapper objectMapper = new ObjectMapper();
- try {
- Map map = objectMapper.readValue(body, Map.class);
- String successFlag = map.get("SuccessFlag").toString();
- if (Integer.valueOf(successFlag) == 1) {
- return Result.success(map);
- } else {
- return Result.fail(map.get("ErrorMsg").toString());
- }
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- return Result.fail(e.getMessage());
- }
- }
-
- /**
- * 鑾峰彇娣诲姞璇锋眰淇℃伅
- * @param procedureName 缁撴瀯鍚嶇О
- * @param inAttr 璇锋眰鍙傛暟
- * @return
- */
- private JSONObject getJsonObject(String procedureName, String inAttr) {
- JSONObject stockMap = new JSONObject();
- stockMap.put("procedureName", procedureName);
- stockMap.put("contract", ifsProperties.getContract());
- stockMap.put("contractKey", ifsProperties.getContractKeyPost());
- stockMap.put("userId", "lims_user");
- stockMap.put("inAttr", inAttr);
- return stockMap;
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
index 8cf04a9..e8c96fa 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -5,7 +5,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.ruoyi.common.config.SsoBean;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
@@ -35,8 +34,6 @@
private TokenService tokenService;
@Autowired
private RedisTemplate redisTemplate;
- @Autowired
- private SsoBean ssoBean;
/**
* 閫�鍑哄鐞�
@@ -58,7 +55,6 @@
// 娓呴櫎鍗曠偣鐧诲綍淇℃伅
Object idToken = redisTemplate.opsForValue().get("ssoOauthToken:idToken:" + userName);
if (idToken != null) {
- loginOutUrl = ssoBean.getUrl() + "/oauth2/sessions/logout?id_token_hint=" + idToken;
redisTemplate.delete("ssoOauthToken:idToken:" + userName);
AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.sso.logout.success")));
} else {
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index bc666cb..385d707 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -4,7 +4,6 @@
import javax.net.ssl.SSLContext;
import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.config.SsoBean;
import com.ruoyi.framework.model.SsoOauthTokenModel;
import com.ruoyi.framework.model.SsoUserInfoModel;
import com.ruoyi.framework.web.ssoAuth.SsoCodeAuthenticationToken;
@@ -85,9 +84,6 @@
@Autowired
private ISysConfigService configService;
-
- @Autowired
- private SsoBean ssoBean;
@Autowired
private RedisTemplate redisTemplate;
@@ -296,21 +292,7 @@
* @return
*/
public SsoOauthTokenModel getSsoAccessToken(String code) {
- List<NameValuePair> list = new LinkedList<>();
- list.add(new BasicNameValuePair("grant_type", "authorization_code"));
- list.add(new BasicNameValuePair("code", code));
- list.add(new BasicNameValuePair("client_id", ssoBean.getClientId()));
- list.add(new BasicNameValuePair("client_secret", ssoBean.getClientSecret()));
- list.add(new BasicNameValuePair("redirect_uri", ssoBean.getCallbackUrl()));
-
- Map<String, String> headers = new HashMap<>();
- headers.put("Content-Type", "application/x-www-form-urlencoded");
- headers.put("Accept", "application/json");
- String result = doPost(ssoBean.getUrl() + "/oauth2/token", headers, list);
- if (org.apache.commons.lang3.StringUtils.isBlank(result)) {
- return null;
- }
- return JSON.parseObject(result, SsoOauthTokenModel.class);
+ return null;
}
/**
@@ -319,13 +301,7 @@
* @return
*/
public SsoUserInfoModel getSsoUserInfo(String accessToken) {
- Map<String, String> headers = new HashMap<>();
- headers.put("Authorization", "Bearer " + accessToken);
- String result = doPost(ssoBean.getUrl() + "/userinfo", headers, null);
- if (org.apache.commons.lang3.StringUtils.isBlank(result)) {
- return null;
- }
- return JSON.parseObject(result, SsoUserInfoModel.class);
+ return null;
}
public static String doPost(String url, Map<String, String> headers, List<NameValuePair> params) {
--
Gitblit v1.9.3