From e39c7ba23d87c222960526f6ee90b38b2f73c2b1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 27 八月 2026 15:40:10 +0800
Subject: [PATCH] feat: 移除1.MQTT对接 2.外部人事系统 3.MES 推送 4.OA提交参数
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 6
inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml | 23 -
inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerFileService.java | 3
cnas-device/pom.xml | 32 +-
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java | 18 -
inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java | 22
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 2
/dev/null | 63 ----
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 200 ---------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 33 --
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java | 59 ----
ruoyi-admin/src/main/resources/i18n/messages.properties | 3
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java | 22 -
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 7
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerFileServiceImpl.java | 35 --
ruoyi-admin/src/main/resources/logback.xml | 2
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java | 9
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 24 -
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java | 154 -----------
ruoyi-common/src/main/java/com/ruoyi/common/config/WechatProperty.java | 1
inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java | 13 -
21 files changed, 37 insertions(+), 694 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 96beb37..ae8c4d5 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -90,7 +90,7 @@
</sql>
<select id="selectStandardTreeList" resultMap="FactoryDto">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample,
@@ -156,7 +156,7 @@
</select>
<select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample
@@ -237,7 +237,7 @@
where name = #{name}
</select>
<select id="selectStandardTreeListByPartNo" resultMap="FactoryDto">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample,
diff --git a/cnas-device/pom.xml b/cnas-device/pom.xml
index 74dbc21..6a8a3d5 100644
--- a/cnas-device/pom.xml
+++ b/cnas-device/pom.xml
@@ -19,22 +19,22 @@
<artifactId>inspect-server</artifactId>
</dependency>
- <!--mqtt jar鍖�-->
- <!-- https://mvnrepository.com/artifact/org.springframework.integration/spring-integration-mqtt -->
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-mqtt</artifactId>
- </dependency>
- <!--mqtt闇�瑕佺殑jar鍖�-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-integration</artifactId>
- </dependency>
- <!--mqtt闇�瑕佺殑jar鍖�-->
- <dependency>
- <groupId>org.springframework.integration</groupId>
- <artifactId>spring-integration-stream</artifactId>
- </dependency>
+<!-- <!–mqtt jar鍖�–>-->
+<!-- <!– https://mvnrepository.com/artifact/org.springframework.integration/spring-integration-mqtt –>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.integration</groupId>-->
+<!-- <artifactId>spring-integration-mqtt</artifactId>-->
+<!-- </dependency>-->
+<!-- <!–mqtt闇�瑕佺殑jar鍖�–>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.boot</groupId>-->
+<!-- <artifactId>spring-boot-starter-integration</artifactId>-->
+<!-- </dependency>-->
+<!-- <!–mqtt闇�瑕佺殑jar鍖�–>-->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.integration</groupId>-->
+<!-- <artifactId>spring-integration-stream</artifactId>-->
+<!-- </dependency>-->
</dependencies>
<properties>
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/aspect/MoveLocationAfterPushMesStockAspect.java b/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java
deleted file mode 100644
index a1b7a3e..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.ruoyi.inspect.aspect;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.basic.pojo.IfsInventoryQuantity;
-import com.ruoyi.common.numgen.NumberGenerator;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.api.MesApiUtils;
-import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
-import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-/**
- * 鎵цifs绉诲簱鎿嶄綔鍚庯紝鍚屾鎺ㄩ�乵es瀹炴椂搴撳瓨
- */
-@Aspect
-@Slf4j
-@Component
-public class MoveLocationAfterPushMesStockAspect {
-
- @Autowired
- private IfsSplitOrderRecordService ifsSplitOrderRecordService;
-
- @Autowired
- private MesApiUtils mesApiUtils;
-
- public final static String LOCATION_NO = "WG-02-001";//mes澶栬喘鍚堟牸搴撲綅
-
- @Autowired
- private NumberGenerator<IfsSplitOrderRecord> splitOrderRecordNumberGenerator;
-
- @Before(value = "execution(* com.ruoyi.inspect.service.impl.InsOrderServiceImpl.moveRawMaterial(..))")
- @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
- public void doAfterReturning(JoinPoint joinPoint) {
- Object[] args = joinPoint.getArgs();
- if(Objects.nonNull(args) && args.length>0) {
- IfsInventoryQuantity ifsInventoryQuantity = BeanUtil.toBean(args[0], IfsInventoryQuantity.class);
- if(Objects.nonNull(ifsInventoryQuantity) && ifsInventoryQuantity.getIsSplitOrder()==1){
- //鏌ヨ瀵瑰簲鎵瑰彿鐨勬媶鍒嗚褰�
- IfsSplitOrderRecord one = ifsSplitOrderRecordService.getOne(Wrappers.<IfsSplitOrderRecord>lambdaQuery()
- .eq(IfsSplitOrderRecord::getPartNo, ifsInventoryQuantity.getPartNo())
- .eq(IfsSplitOrderRecord::getLotBatchNo, ifsInventoryQuantity.getUpdateBatchNo())
- .eq(IfsSplitOrderRecord::getLineNo, ifsInventoryQuantity.getLineNo())
- .eq(IfsSplitOrderRecord::getReleaseNo, ifsInventoryQuantity.getReleaseNo())
- .eq(IfsSplitOrderRecord::getReceiptNo, ifsInventoryQuantity.getReceiptNo())
- .eq(IfsSplitOrderRecord::getOrderNo, ifsInventoryQuantity.getOrderNo())
- .last("limit 1")
- );
- if(Objects.nonNull(one)){
- //鏌ヨ瀵瑰簲璁板綍鐩稿悓鎵瑰彿鍜岄浂浠朵笖宸插悓姝ョ殑璁㈠崟璁板綍
- List<IfsSplitOrderRecord> quantityList = ifsSplitOrderRecordService.list(Wrappers.<IfsSplitOrderRecord>lambdaQuery()
- .eq(IfsSplitOrderRecord::getPartNo,one.getPartNo())
- .eq(IfsSplitOrderRecord::getLotBatchNo,one.getLotBatchNo())
- .ne(IfsSplitOrderRecord::getId,one.getId())
- .eq(IfsSplitOrderRecord::getSyncStatus,1)
- );
- if(!quantityList.isEmpty()){
- //浣跨敤鐩稿悓鐨勭郴缁熺紪鍙�
- one.setSystemNo(quantityList.get(0).getSystemNo());
- }
- if(StringUtils.isBlank(one.getSystemNo())){
- one.setSystemNo(splitOrderRecordNumberGenerator.generateNumberWithPrefix(IfsSplitOrderRecord.DIGIT,IfsSplitOrderRecord.PREFIX,IfsSplitOrderRecord::getSystemNo));
- }
- //鍚屾MES瀹炴椂搴撳瓨
- Map<String, Object> requestMap = new HashMap<>();
- requestMap.put("partNo", one.getPartNo()); // 闆朵欢缂栧彿
- requestMap.put("systemNo", one.getSystemNo()); // 绯荤粺缂栧彿
- requestMap.put("newSystemNo", one.getSystemNo()); // 鏂扮郴缁熺紪鍙�
- requestMap.put("spec", one.getSpec()); // 瑙勬牸
- requestMap.put("partBatchNo", one.getLotBatchNo()); // 闆朵欢鎵瑰彿
- requestMap.put("newPartBatchNo", one.getLotBatchNo()); // 鏂伴浂浠舵壒鍙�
- requestMap.put("stockQuantity", one.getLength()); // 搴撳瓨鏁伴噺1
- requestMap.put("qty", one.getQtyStock()); // 搴撳瓨鏁伴噺2
- requestMap.put("insulationColor", one.getInsulationColor()); // 缁濈紭棰滆壊
- requestMap.put("outerColor", one.getOuterColor()); // 澶栨姢棰滆壊
- requestMap.put("letteringInfo", one.getLetteringInfo()); // 鍗板瓧淇℃伅
- requestMap.put("reelNumber", one.getDrumNo()); // 鐩樺彿
- requestMap.put("locationNo", LOCATION_NO); // 搴撲綅缂栧彿
- requestMap.put("customerOrderNo", one.getOrderNo()); // 閿�鍞鍗曞彿
- requestMap.put("stockSource", one.getStockSource()); // 搴撳瓨鏉ユ簮
- requestMap.put("remark", one.getRemark()); // 澶囨敞
-
- String jsonStr = JSONUtil.toJsonStr(Collections.singletonList(requestMap));
- log.info("鍚屾MES瀹炴椂搴撳瓨璇锋眰鍙傛暟-->{}",jsonStr);
- boolean b = mesApiUtils.batchAddStock(jsonStr);
- //鍚屾鎴愬姛锛屾洿鏂板悓姝ョ姸鎬�
- if(b){
- ifsSplitOrderRecordService.update(null,Wrappers.<IfsSplitOrderRecord>lambdaUpdate()
- .set(IfsSplitOrderRecord::getSyncStatus,1)
- .set(IfsSplitOrderRecord::getSystemNo,one.getSystemNo())
- .eq(IfsSplitOrderRecord::getId,one.getId()));
- }
- }
- }
- }
- }
-
-}
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..18497ab 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
@@ -1,13 +1,8 @@
package com.ruoyi.inspect.controller;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
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;
import com.ruoyi.inspect.service.InsUnqualifiedHandlerFileService;
@@ -19,9 +14,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
-import java.util.Map;
@RestController
@Api("涓嶅悎鏍煎鐞嗙鐞�")
@@ -32,19 +25,6 @@
private final InsUnqualifiedHandlerService unqualifiedHandlerService;
private final InsUnqualifiedHandlerFileService unqualifiedHandlerFileService;
- private static final String REQUESTID = "requestId";
- private static final String CHECKRESULT = "CHECKRESULT";
-
-
-
-
- @ApiOperation(value = "鎻愪氦OA")
- @PostMapping("/pushOA")
- public Result pushOA(@RequestBody PushOADto pushOADto){
- return unqualifiedHandlerService.pushOA(pushOADto);
- }
-
-
@ApiOperation(value = "鏌ヨ")
@GetMapping("/page")
public Result pageByUnqualified(Page page, UnqualifiedHandlerDto unqualifiedHandlerDto){
@@ -60,38 +40,6 @@
}
- @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;
- }
-
- /**
- * 涓嬭浇oa闄勪欢
- * @param handlerFileId
- * @param response
- */
- @GetMapping("/downloadOAFile/{handlerFileId}")
- public void downloadOAFile(@PathVariable("handlerFileId") Long handlerFileId, HttpServletResponse response){
- unqualifiedHandlerFileService.downloadOAFile(handlerFileId,response);
- }
-
-
@ApiOperation(value = "鏂板涓嶅悎鏍煎鐞�")
@PostMapping("/addUnqualifiedHandler")
public Result addUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
@@ -103,13 +51,6 @@
@PostMapping("/updateUnqualifiedHandler")
public Result updateUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
return Result.success(unqualifiedHandlerService.updateUnqualifiedHandler(unqualifiedHandlerDto));
- }
-
-
- @ApiOperation(value = "鏌ョ湅oa娴佺▼")
- @GetMapping("/getOaFlow")
- public Result getOaFlow(Integer id){
- return Result.success(unqualifiedHandlerService.getOaFlow(id));
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java
index c48c862..1fc6312 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java
@@ -13,37 +13,37 @@
public class CostStatisticsDto{
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","ZTT/QR-30-01-01","鏃ユ湡"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鏃ユ湡"})
private LocalDateTime createTime;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","ZTT/QR-30-01-01","妫�楠岀紪鍙�"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","妫�楠岀紪鍙�"})
private String entrustCode;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鏍峰搧鍚嶇О"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鏍峰搧鍚嶇О"})
private String sample;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","瑙勬牸鍨嬪彿"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","瑙勬牸鍨嬪彿"})
private String model;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鏍峰搧鏁伴噺"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鏍峰搧鏁伴噺"})
private Integer num;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鎬讳环"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鎬讳环"})
private BigDecimal price;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","璇曢獙椤圭洰"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","璇曢獙椤圭洰"})
private String inspectionItem;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","濮旀墭鍗曚綅"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","濮旀墭鍗曚綅"})
private String company;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","濮旀墭浜�"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","濮旀墭浜�"})
private String name;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鐢熶骇鍗曚綅"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鐢熶骇鍗曚綅"})
private String production;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","宸ョ▼鍚嶇О"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","宸ョ▼鍚嶇О"})
private String engineering;
@ExcelIgnore
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/PushOADto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/PushOADto.java
deleted file mode 100644
index 3fabfcd..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/PushOADto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.ruoyi.inspect.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 鎻愪氦oa鏁版嵁浼犺緭瀵硅薄
- */
-@Data
-public class PushOADto {
-
- /**
- * 涓嶅悎鏍煎鐞嗕富閿甶d
- */
- @ApiModelProperty(value = "涓嶅悎鏍煎鐞嗕富閿甶d")
- private Long handlerId;
-
- /**
- * 闄勪欢url
- */
- @ApiModelProperty(value = "闄勪欢url")
- private String fileUrl;
-
-}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/CommonOaMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/CommonOaMapper.java
deleted file mode 100644
index 41725f2..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/CommonOaMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.inspect.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.inspect.pojo.CommonOa;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @author 27233
-* @description 閽堝琛ㄣ�恈ommon_oa(oa瀹℃牳娴佺▼淇℃伅璁板綍琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-08-01 15:54:11
-* @Entity com.yuanchu.mom.pojo.CommonOa
-*/
-@Mapper
-public interface CommonOaMapper extends BaseMapper<CommonOa> {
-
-}
-
-
-
-
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java
index 171980b..21b6a65 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsUnqualifiedHandlerMapper.java
@@ -4,13 +4,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.inspect.dto.UnqualifiedHandlerDto;
-import com.ruoyi.inspect.pojo.CommonOa;
import com.ruoyi.inspect.pojo.InsUnqualifiedHandler;
import com.ruoyi.inspect.vo.UnqualifiedHandlerVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
/**
* @author 27233
@@ -25,12 +22,6 @@
UnqualifiedHandlerVO findById(@Param("id") Long id);
- /**
- * 鏌ョ湅oa娴佺▼
- * @param id
- * @return
- */
- List<CommonOa> getOaFlow(@Param("id") Integer id);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/CommonOa.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/CommonOa.java
deleted file mode 100644
index 3d8abb5..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/CommonOa.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.ruoyi.inspect.pojo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * oa瀹℃牳娴佺▼淇℃伅璁板綍琛�
- * @TableName common_oa
- */
-@TableName(value ="common_oa")
-@Data
-public class CommonOa implements Serializable {
- /**
- * 涓婚敭id
- */
- @TableId(type = IdType.AUTO)
- private Long id;
-
- /**
- * 鑺傜偣鍚嶇О
- */
- private String nodeName;
-
- /**
- * 鎿嶄綔
- */
- private String operation;
-
- /**
- * 瀹℃壒浜�
- */
- private String approver;
-
- /**
- * 瀹℃壒鏃ユ湡
- */
- private String approvalDate;
-
- /**
- * 瀹℃壒鏃堕棿
- */
- private String approvalTime;
-
- /**
- * 瀹℃壒鎰忚
- */
- private String approvalOpinion;
-
- /**
- * 娴佺▼id
- */
- private Long workflowId;
-
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
-}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java
index 7004dce..f62663b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsUnqualifiedHandler.java
@@ -110,22 +110,4 @@
@ApiModelProperty(value = "璁㈠崟id")
private Integer insOrderId;
- /**
- * oa宸ヤ綔娴乮d
- */
- @ApiModelProperty(value = "oa宸ヤ綔娴乮d")
- private Integer requestId;
-
- /**
- * oa瀹℃牳鐘舵��(1:寰呭鏍� 2:瀹℃牳涓� 3:閫氳繃 4:椹冲洖)
- */
- @ApiModelProperty(value = "oa瀹℃牳鐘舵��")
- private Integer oaState;
-
- /**
- * oa闄勪欢url鍦板潃
- */
- @ApiModelProperty("oa闄勪欢url鍦板潃")
- private String fileUrl;
-
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/CommonOaService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/CommonOaService.java
deleted file mode 100644
index 63f6a51..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/CommonOaService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ruoyi.inspect.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.inspect.pojo.CommonOa;
-
-/**
-* @author 27233
-* @description 閽堝琛ㄣ�恈ommon_oa(oa瀹℃牳娴佺▼淇℃伅璁板綍琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-08-01 15:54:11
-*/
-public interface CommonOaService extends IService<CommonOa> {
-
-}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerFileService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerFileService.java
index 3f3825b..bd7d1e1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerFileService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerFileService.java
@@ -4,8 +4,6 @@
import com.ruoyi.inspect.pojo.InsUnqualifiedHandlerFile;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author 27233
* @description 閽堝琛ㄣ�恑ns_unqualified_handler_file(涓嶅悎鏍煎鐞嗛檮浠惰褰曡〃)銆戠殑鏁版嵁搴撴搷浣淪ervice
@@ -15,5 +13,4 @@
InsUnqualifiedHandlerFile uploadFile(Long handlerId, MultipartFile file);
- void downloadOAFile(Long handlerFileId, HttpServletResponse response);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java
index 038a284..7c38c0e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsUnqualifiedHandlerService.java
@@ -1,18 +1,11 @@
package com.ruoyi.inspect.service;
-import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.inspect.dto.PushOADto;
import com.ruoyi.inspect.dto.UnqualifiedHandlerDto;
-import com.ruoyi.inspect.pojo.CommonOa;
import com.ruoyi.inspect.pojo.InsUnqualifiedHandler;
import com.ruoyi.inspect.vo.UnqualifiedHandlerVO;
-
-import java.util.List;
-import java.util.Map;
/**
* @author 27233
@@ -22,12 +15,6 @@
public interface InsUnqualifiedHandlerService extends IService<InsUnqualifiedHandler> {
IPage<UnqualifiedHandlerVO> pageList(Page page, UnqualifiedHandlerDto unqualifiedHandlerDto);
-
- Result pushOA(PushOADto pushOADto);
-
- void unqualifiedHandlerOACallback(Long oaWorkId, String checkResult, JSONArray objects);
-
- List<CommonOa> getOaFlow(Integer id);
boolean addUnqualifiedHandler(UnqualifiedHandlerDto unqualifiedHandlerDto);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/CommonOaServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/CommonOaServiceImpl.java
deleted file mode 100644
index 0ef57c2..0000000
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/CommonOaServiceImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ruoyi.inspect.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.inspect.mapper.CommonOaMapper;
-import com.ruoyi.inspect.pojo.CommonOa;
-import com.ruoyi.inspect.service.CommonOaService;
-import org.springframework.stereotype.Service;
-
-/**
-* @author 27233
-* @description 閽堝琛ㄣ�恈ommon_oa(oa瀹℃牳娴佺▼淇℃伅璁板綍琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-08-01 15:54:11
-*/
-@Service
-public class CommonOaServiceImpl extends ServiceImpl<CommonOaMapper, CommonOa>
- implements CommonOaService {
-
-}
-
-
-
-
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 fc47c56..1315240 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
@@ -648,13 +648,6 @@
if(isSplitOrder){
ifsInventoryQuantity.setIsSplitOrder(1);
}
- //todo:涓嶆竻妤氱敤閫旓紝鏆傛椂灞忚斀鎺�
- // 鏌ヨ浜т笟閾炬娴嬫暟鎹�
-// String industryChainAttrFields = IndustryChainUtils.getIndustryChainAttrFields(ifsInventoryQuantity.getOrderNo(),
-// ifsInventoryQuantity.getLineNo(),
-// ifsInventoryQuantity.getReleaseNo());
-// ifsInventoryQuantity.setIndustryChain(industryChainAttrFields);
-
ifsInventoryQuantityMapper.insert(ifsInventoryQuantity);
}
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerFileServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerFileServiceImpl.java
index 28236fa..2ee87f4 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerFileServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerFileServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.inspect.service.impl;
-import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.framework.exception.ErrorException;
@@ -12,12 +11,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.io.File;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
/**
* @author 27233
@@ -72,35 +66,6 @@
e.printStackTrace();
log.error("闄勪欢涓婁紶閿欒");
throw new ErrorException(e.getMessage());
- }
- }
-
- @Override
- public void downloadOAFile(Long handlerFileId, HttpServletResponse response) {
- response.reset();
- String fileName;
- try {
- //鏌ヨ涓婁紶闄勪欢璁板綍
- InsUnqualifiedHandlerFile file = baseMapper.selectById(handlerFileId);
- if (file != null){
- fileName = file.getFileName();
- fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
- response.setContentType("application/vnd.ms-excel");
- response.setHeader("Cache-Control", "no-cache");
- response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
- response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
- //鑾峰彇鏂囦欢澶硅矾寰�
- String path = file.getType()==1?imgUrl:wordUrl;
- //鏂囦欢瀹屾暣璺緞
- String fullPath = path + file.getFileUrl();
- //鍒ゆ柇鏂囦欢鏄惁瀛樺湪
- File fullFile = new File(fullPath);
- if(fullFile.exists()){
- IoUtil.copy(Files.newInputStream(fullFile.toPath()),response.getOutputStream());
- }
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
}
}
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..b4ca23f 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
@@ -1,46 +1,28 @@
package com.ruoyi.inspect.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
-import com.ruoyi.inspect.dto.PushOADto;
import com.ruoyi.inspect.dto.UnqualifiedHandlerDto;
import com.ruoyi.inspect.mapper.InsOrderMapper;
import com.ruoyi.inspect.mapper.InsUnqualifiedHandlerMapper;
-import com.ruoyi.inspect.pojo.CommonOa;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsUnqualifiedHandler;
import com.ruoyi.inspect.pojo.InsUnqualifiedHandlerFile;
-import com.ruoyi.inspect.service.CommonOaService;
import com.ruoyi.inspect.service.InsUnqualifiedHandlerFileService;
import com.ruoyi.inspect.service.InsUnqualifiedHandlerService;
import com.ruoyi.inspect.vo.UnqualifiedHandlerVO;
-import com.ruoyi.system.mapper.UserMapper;
-import com.ruoyi.system.service.UserService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* @author 27233
@@ -48,14 +30,8 @@
* @createDate 2024-07-31 13:38:14
*/
@Service
-@Slf4j
public class InsUnqualifiedHandlerServiceImpl extends ServiceImpl<InsUnqualifiedHandlerMapper, InsUnqualifiedHandler>
implements InsUnqualifiedHandlerService {
-
- @Resource
- private CommonOaService commonOaService;
- @Resource
- private OAProperty oaProperty;
@Resource
private InsUnqualifiedHandlerFileService insUnqualifiedHandlerFileService;
@Resource
@@ -67,135 +43,6 @@
return baseMapper.selectPageList(page, QueryWrappers.queryWrappers(unqualifiedHandlerDto));
}
- @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();
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void unqualifiedHandlerOACallback(Long oaWorkId, String checkResult, JSONArray objects) {
- // 娌℃湁杩欎釜灏辩粨鏉�
- Long count1 = baseMapper.selectCount(Wrappers.<InsUnqualifiedHandler>lambdaQuery()
- .eq(InsUnqualifiedHandler::getRequestId, Integer.valueOf(String.valueOf(oaWorkId))));
- if (count1 == 0) {
- return;
- }
-
- //oa鐘舵�侊細3閫氳繃 4椹冲洖
- Integer oaState = "1".equals(checkResult) ? 3 : 4;
- baseMapper.update(null, new LambdaUpdateWrapper<InsUnqualifiedHandler>()
- .set(InsUnqualifiedHandler::getOaState, oaState)
- .ge(InsUnqualifiedHandler::getRequestId, Integer.valueOf(String.valueOf(oaWorkId))));
- //淇濆瓨oa瀹℃壒娴佺▼璁板綍
- List<CommonOa> commonOaList = new ArrayList<>();
- objects.forEach(l -> {
- JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(l));
- CommonOa oa = new CommonOa();
- oa.setApprover(jsonObject.getString("operatorName"));
- oa.setWorkflowId(oaWorkId);
- oa.setOperation(jsonObject.getString("operateType"));
- oa.setApprovalDate(jsonObject.getString("operateDate"));
- oa.setApprovalOpinion(jsonObject.getString("remark"));
- oa.setNodeName(jsonObject.getString("nodeName"));
- oa.setApprovalTime(jsonObject.getString("operateTime"));
-
- //鏌ヨ鍒ゆ柇涔嬪墠鏄惁娣诲姞杩�
- long count = commonOaService.count(Wrappers.<CommonOa>lambdaQuery()
- .eq(CommonOa::getApprover, oa.getApprover())
- .eq(CommonOa::getWorkflowId, oa.getWorkflowId())
- .eq(CommonOa::getOperation, oa.getOperation())
- .eq(CommonOa::getApprovalDate, oa.getApprovalDate())
- .eq(CommonOa::getApprovalOpinion, oa.getApprovalOpinion())
- .eq(CommonOa::getNodeName, oa.getNodeName())
- .eq(CommonOa::getApprovalTime, oa.getApprovalTime())
- );
- // 娌℃湁閲嶅娣诲姞
- if (count == 0) {
- commonOaList.add(oa);
- }
- });
- commonOaService.saveBatch(commonOaList);
-
- }
-
- /**
- * 鏌ョ湅oa娴佺▼
- * @param id
- * @return
- */
- @Override
- public List<CommonOa> getOaFlow(Integer id) {
- return baseMapper.getOaFlow(id);
- }
-
- /**
- * 鏂板涓嶅悎鏍煎鐞�
- * @param unqualifiedHandlerDto
- * @return
- */
@Override
@Transactional(rollbackFor = Exception.class)
public boolean addUnqualifiedHandler(UnqualifiedHandlerDto unqualifiedHandlerDto) {
@@ -278,3 +125,4 @@
+
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 e92cefa..cafe734 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
@@ -653,7 +653,6 @@
throw new ErrorException("涓嶅悎鏍肩殑鍘熸潗鏂欐墠鑳借姝ユ斁琛�");
}
- // todo:闇�瑕佸垽鏂璷a娴佺▼鏄惁鏄姝ユ斁琛�
String toLocation = insOrderService.moveRawMaterial(ifsInventoryQuantity);
ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
@@ -843,7 +842,6 @@
throw new ErrorException("鏈娴嬪畬鎴愭暟鎹墠鑳芥彁鍓嶅叆搴�");
}
- // todo:闇�瑕佸垽鏂璷a娴佺▼鏄惁鏄姝ユ斁琛�
String toLocation = insOrderService.moveRawMaterial(ifsInventoryQuantity);
ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
index c91b2c0..f971b19 100644
--- a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
@@ -27,9 +27,6 @@
iuh.off_grade_ascription,
iuh.unqualified_desc,
iuh.inventory_quantity_id,
- iuh.oa_state,
- iuh.request_id,
- iuh.file_url,
iuh.headline
from
ins_unqualified_handler iuh
@@ -58,10 +55,7 @@
iuh.classification,
iuh.off_grade_ascription,
iuh.unqualified_desc,
- iuh.inventory_quantity_id,
- iuh.request_id,
- iuh.oa_state,
- iuh.file_url
+ iuh.inventory_quantity_id
from
ins_unqualified_handler iuh
inner join
@@ -69,20 +63,5 @@
on
iuh.inventory_quantity_id = iiq.id)tempA
where tempA.handler_id = #{id}
- </select>
- <select id="getOaFlow" resultType="com.ruoyi.inspect.pojo.CommonOa">
- select co.id,
- co.node_name,
- co.operation,
- co.approver,
- co.approval_date,
- co.approval_time,
- co.approval_opinion,
- co.workflow_id
- from common_oa co
- left join ins_unqualified_handler iuh on iuh.request_id = co.workflow_id
- where iuh.id = #{id}
- and operation != '鎶勯��'
- group by co.node_name
</select>
</mapper>
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/Company.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/Company.java
deleted file mode 100644
index 625ba56..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/Company.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.web.controller.api;
-
-import lombok.Data;
-
-/**
- * 鍏徃淇℃伅
- */
-@Data
-public class Company {
-
- private String companyId;
-
- private String companyName;
-
- private String parentCompanyId;
-
- private String description;
-
- private String status;
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/Person.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/Person.java
deleted file mode 100644
index 1565244..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/Person.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.ruoyi.web.controller.api;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 浜哄憳淇℃伅
- */
-@Data
-public class Person {
-
- private String name;
-
- //浜哄憳缂栧彿锛屽叏灞�鍞竴
- private String employeeID;
- //宀椾綅
- private String position;
- //宀椾綅缂栫爜
- private String positionCode;
- //鎵嬫満鍙风爜
- private String phoneNumber;
-
- //鎬у埆 1:鐢� 2:濂�
- private Integer gender;
-
- //缁勭粐鐘舵�� enable:鍦ㄨ亴 disabled:绂昏亴
- private String status;
- //鎵�灞炵粍缁囩紪鐮�
- private String companyId;
- //鍏徃閭(鍙敤浜庨偖绠辩郴缁�)
- private String companyEmail;
- //鍏ヨ亴鍏徃鏃堕棿
- private String dateOfJoiningTheCompany;
- //缁勭粐鍐呯殑閮ㄩ棬缂栫爜
- private String departmentCode;
-
- @ApiModelProperty(">1锛氬瓨鍦� =0锛氫笉瀛樺湪")
- private Long isLive;
-
- private String department;
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java
deleted file mode 100644
index cd5bec1..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/PersonDto.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.ruoyi.web.controller.api;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 浜轰簨淇℃伅
- */
-@Data
-public class PersonDto {
-
- private List<Person> person;
-
- private List<Company> company;
-
-}
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..8dac212 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
@@ -2,9 +2,6 @@
import java.util.List;
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 +38,6 @@
@Autowired
private TokenService tokenService;
-
- @Autowired
- private SsoBean ssoBean;
/**
* 鐧诲綍鏂规硶
@@ -101,31 +95,4 @@
return AjaxResult.success(menuService.buildMenus(menus));
}
- /**
- * 鑾峰彇缁熶竴鐧诲綍骞冲彴鑾峰彇CODE鍦板潃
- *
- * @return
- */
-
- @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);
- }
-
- /**
- * 鍗曠偣鐧诲綍
- *
- * @param code 鐧诲綍淇℃伅
- * @return 缁撴灉
- */
- @PostMapping("/loginBySSO")
- public AjaxResult loginBySSO(String code)
- {
- AjaxResult ajax = AjaxResult.success();
- // 鐢熸垚浠ょ墝
- String token = loginService.loginBySSO(code);
- ajax.put(Constants.TOKEN, token);
- return ajax;
- }
}
diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-admin/src/main/resources/i18n/messages.properties
index b182920..348960e 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages.properties
@@ -4,7 +4,6 @@
user.jcaptcha.expire=\u9A8C\u8BC1\u7801\u5DF2\u5931\u6548
user.not.exists=\u7528\u6237\u4E0D\u5B58\u5728/\u5BC6\u7801\u9519\u8BEF
user.password.not.match=\u7528\u6237\u4E0D\u5B58\u5728/\u5BC6\u7801\u9519\u8BEF
-user.sso.not.match=\u5355\u70B9\u767B\u5F55\u9A8C\u8BC1\u5931\u8D25
user.password.retry.limit.count=\u5BC6\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21
user.password.retry.limit.exceed=\u5BC6\u7801\u8F93\u5165\u9519\u8BEF{0}\u6B21\uFF0C\u5E10\u6237\u9501\u5B9A{1}\u5206\u949F
user.password.delete=\u5BF9\u4E0D\u8D77\uFF0C\u60A8\u7684\u8D26\u53F7\u5DF2\u88AB\u5220\u9664
@@ -12,7 +11,6 @@
role.blocked=\u89D2\u8272\u5DF2\u5C01\u7981\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458
login.blocked=\u5F88\u9057\u61BE\uFF0C\u8BBF\u95EEIP\u5DF2\u88AB\u5217\u5165\u7CFB\u7EDF\u9ED1\u540D\u5355
user.logout.success=\u9000\u51FA\u6210\u529F
-user.sso.logout.success=\u5355\u70B9\u767B\u5F55\u9000\u51FA\u6210\u529F
length.not.valid=\u957F\u5EA6\u5FC5\u987B\u5728{min}\u5230{max}\u4E2A\u5B57\u7B26\u4E4B\u95F4
@@ -22,7 +20,6 @@
user.email.not.valid=\u90AE\u7BB1\u683C\u5F0F\u9519\u8BEF
user.mobile.phone.number.not.valid=\u624B\u673A\u53F7\u683C\u5F0F\u9519\u8BEF
user.login.success=\u767B\u5F55\u6210\u529F
-user.sso.login.success=\u5355\u70B9\u767B\u5F55\u6210\u529F
user.register.success=\u6CE8\u518C\u6210\u529F
user.notfound=\u8BF7\u91CD\u65B0\u767B\u5F55
user.forcelogout=\u7BA1\u7406\u5458\u5F3A\u5236\u9000\u51FA\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index d51e7a3..bd6c905 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 鏃ュ織瀛樻斁璺緞 -->
- <springProperty scope="context" name="logs" source="logging.file-location" default="/ztzb-logs"/>
+ <springProperty scope="context" name="logs" source="logging.file-location" default="/lims-logs"/>
<property name="log.path" value="${logs}"/>
<!-- 鏃ュ織杈撳嚭鏍煎紡 -->
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/config/WechatProperty.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/WechatProperty.java
index f992280..dce58be 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/WechatProperty.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/WechatProperty.java
@@ -5,7 +5,6 @@
import org.springframework.context.annotation.Configuration;
/**
- * @author ZTT
*/
@Configuration
@ConfigurationProperties(prefix = "wechat")
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/IndustryChainUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/IndustryChainUtils.java
deleted file mode 100644
index 1547e9d..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/IndustryChainUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.ruoyi.common.utils;
-
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class IndustryChainUtils {
- private static final String CLOUD_LOGIN = "https://gym.ztt.cn:1443/openApi/v1/user/login";
- private static final String CLOUD_REQUEST = "https://gym.ztt.cn:1443/openApi/codeGenerate/getCodeDetailByOrder";
- //璇锋眰琛ㄥ崟璐﹀彿
- private static final String USERNAME = "ZTKJ-N002096";
- //璇锋眰琛ㄥ崟瀵嗙爜
- private static final String PASSWORD = "Comp&52316167";
- //Base64鏍煎紡缂栫爜
- private static final String PWDBASE64 = Base64.encode(PASSWORD);
-
- //鑾峰彇token
- public static String getToken() {
- HttpRequest request = HttpRequest.post(CLOUD_LOGIN)
- .header("Content-Type", "application/x-www-form-urlencoded")
- .form("username", USERNAME)
- .form("password", PWDBASE64);
- HttpResponse response = request.execute();
- ObjectMapper objectMapper = new ObjectMapper();
- JsonNode jsonNode;
- try {
- jsonNode = objectMapper.readTree(response.body());
- //閫氳繃杩斿洖鏁版嵁鑾峰彇token
- String accessToken = jsonNode.get("data").get("token").asText();
- return accessToken;
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
- }
-
- //杈撳嚭鎵�鏈夋暟鎹�
- public static String getIndustryChainAll(String orderNo, String lineNum, String releaseNum) {
- String token = getToken();
- HttpRequest request = HttpRequest.get(CLOUD_REQUEST)
- .header("Authorization", "Bearer " + token)
- .form("orderNo", orderNo)
- .form("lineNum", lineNum)
- .form("releaseNum", releaseNum);
- HttpResponse response = request.execute();
- ObjectMapper objectMapper = new ObjectMapper();
- JsonNode jsonNode;
- try {
- jsonNode = objectMapper.readTree(response.body());
- return jsonNode.toString();
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
- }
-
- /**
- *
- * @param orderNo 璁㈠崟鍙�
- * @param lineNum 琛屽彿
- * @param releaseNum 涓嬭揪鍙�
- * @return
- */
- public static String getIndustryChainAttrFields(String orderNo, String lineNum, String releaseNum) {
- String token = getToken();
- HttpRequest request = HttpRequest.get(CLOUD_REQUEST)
- .header("Authorization", "Bearer " + token)
- .form("orderNo", orderNo)
- .form("lineNum", lineNum)
- .form("releaseNum", releaseNum);
- HttpResponse response = request.execute();
- ObjectMapper objectMapper = new ObjectMapper();
- JsonNode jsonNode;
- try {
- jsonNode = objectMapper.readTree(response.body());
- // 鍒ゆ柇鏄惁閫氳繃
- if (jsonNode.get("code").asInt() != 200) {
- return null;
- }
- JsonNode data = jsonNode.get("data");
- for (JsonNode dataNode : data) {
- //鑾峰彇attrFields鏁版嵁
- String attrFields = dataNode.get("attrFields").toPrettyString();
- return attrFields;
- }
- } catch (Exception e) {
- throw new RuntimeException(e.getMessage());
- }
- return null;
- }
-
-
-}
-
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/MesApiUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/MesApiUtils.java
deleted file mode 100644
index 98f2f2f..0000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/api/MesApiUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.ruoyi.common.utils.api;
-
-import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-@Slf4j
-@Component
-public class MesApiUtils {
-
- @Value("${mes.ztzb.ip}")
- String ip;
-
- @Value("${mes.ztzb.user}")
- String user;
-
- @Value("${mes.ztzb.password}")
- String password;
-
- /**
- * 鑾峰彇token璇锋眰閾炬帴
- * @return
- */
- private String getAuthTokenUrl() {
- return ip + "/auth/oauth/token?randomStr=blockPuzzle&grant_type=password";
- }
-
- /**
- * 鏂板瀹炴椂搴撳瓨璇锋眰閾炬帴
- * @return
- */
- private String getBatchAddStockUrl(){
- return ip + "/mes/stock/batchAddStock";
- }
-
- /**
- * 鑾峰彇mes绯荤粺token
- * @return 鎺ュ彛鍝嶅簲缁撴灉
- */
- public String getToken(){
- try{
- Map<String,Object> bodyMap = new HashMap<>();
- bodyMap.put("username",user);
- String bodyStr = "username="+user+"&password="+password;
- String response = HttpRequest.post(getAuthTokenUrl())
- .header("Authorization", "Basic cGlnOnBpZw==")
- .header("Content-Type", "application/x-www-form-urlencoded")
- .body(bodyStr,"application/x-www-form-urlencoded").execute().body();
- JSONObject responseObj = JSONUtil.parseObj(response);
- if(Objects.nonNull(responseObj.getStr("access_token"))){
- return "Bearer " + responseObj.getStr("access_token");
- }else{
- throw new RuntimeException(responseObj.getStr("msg"));
- }
- }catch (Exception e){
- e.printStackTrace();
- throw new RuntimeException("鑾峰彇MES绯荤粺token鎺ュ彛寮傚父:"+e.getMessage());
- }
- }
-
- /**
- * mes鏂板瀹炴椂搴撳瓨鎺ュ彛
- * @param requestJsonStr 璇锋眰鍙傛暟json瀛楃涓�
- * @return 鎺ュ彛鍝嶅簲缁撴灉
- */
- public boolean batchAddStock(String requestJsonStr){
- try{
- String response = HttpRequest.post(getBatchAddStockUrl())
- .header("Authorization", getToken())
- .header("Content-Type", "application/json")
- .body(requestJsonStr)
- .execute()
- .body();
- JSONObject entries = JSONUtil.parseObj(response);
- if(entries.getInt("code")==0){
- return true;
- }else{
- throw new RuntimeException("鍚屾鍒癕ES澶辫触锛�"+entries.getStr("msg"));
- }
- }catch (Exception e){
- e.printStackTrace();
- throw new RuntimeException("鍚屾MES瀹炴椂搴撳瓨鎺ュ彛寮傚父:"+e.getMessage());
- }
- }
-
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 13b3568..47cb3fe 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -1,13 +1,11 @@
package com.ruoyi.framework.config;
-import com.ruoyi.framework.web.ssoAuth.SsoCodeAuthenticationProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.ProviderManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
@@ -24,9 +22,6 @@
import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* spring security閰嶇疆
*
@@ -42,13 +37,6 @@
@Autowired
@Qualifier("UserDetailsServiceImpl")
private UserDetailsService userDetailsService;
-
- /**
- * sso鑷畾涔夋牎楠�
- */
- @Autowired
- @Qualifier("UserDetailsByOpenIdServiceImpl")
- private UserDetailsService userDetailsServiceBySSO;
/**
* 璁よ瘉澶辫触澶勭悊绫�
@@ -90,15 +78,7 @@
daoAuthenticationProvider.setUserDetailsService(userDetailsService);
daoAuthenticationProvider.setPasswordEncoder(bCryptPasswordEncoder());
- // sso鐧婚檰閴存潈 Provider
- SsoCodeAuthenticationProvider ssoCodeAuthenticationProvider = new SsoCodeAuthenticationProvider();
- ssoCodeAuthenticationProvider.setUserDetailsService(userDetailsServiceBySSO);
- List<AuthenticationProvider> providers = new ArrayList<>();
-
- providers.add(ssoCodeAuthenticationProvider);
- providers.add(daoAuthenticationProvider);
-
- return new ProviderManager(providers);
+ return new ProviderManager(daoAuthenticationProvider);
}
/**
@@ -134,7 +114,7 @@
.authorizeHttpRequests((requests) -> {
permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- requests.antMatchers("/login", "/register", "/captchaImage", "/getSsoAuthUrl", "/loginBySSO").permitAll()
+ requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/img/**", "/word/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/model/SsoOauthTokenModel.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/model/SsoOauthTokenModel.java
deleted file mode 100644
index f7e69e1..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/model/SsoOauthTokenModel.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.framework.model;
-
-import lombok.Data;
-
-/**
- * zhuo
- */
-@Data
-public class SsoOauthTokenModel {
-
- private String access_token;
-
- private String expires_in;
-
- private String id_token;
-
- private String scope;
-
- private String token_type;
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/model/SsoUserInfoModel.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/model/SsoUserInfoModel.java
deleted file mode 100644
index e5a50f4..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/model/SsoUserInfoModel.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.ruoyi.framework.model;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.Data;
-
-/**
- * zhuo
- */
-@Data
-public class SsoUserInfoModel {
- private String avatar;
-
- @JSONField(name="nick_name")
- private String nickName;
-
- private String openid;
-
- @JSONField(name="org_id")
- private String orgId;
-
- @JSONField(name="org_name")
- private String orgName;
-
- @JSONField(name="org_role")
- private String orgRole;
-
- @JSONField(name="phone_number")
- private String phoneNumber;
-
- private String sid;
-
-
- private String sub;
-
- @JSONField(name="employee_id")
- private String employeeId;
-
- @JSONField(name="department_code")
- private String departmentCode;
-}
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..a36b7f1 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,11 +5,8 @@
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;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
import com.alibaba.fastjson2.JSON;
@@ -33,11 +30,6 @@
{
@Autowired
private TokenService tokenService;
- @Autowired
- private RedisTemplate redisTemplate;
- @Autowired
- private SsoBean ssoBean;
-
/**
* 閫�鍑哄鐞�
*
@@ -48,24 +40,14 @@
throws IOException, ServletException
{
LoginUser loginUser = tokenService.getLoginUser(request);
- String loginOutUrl = null;
if (StringUtils.isNotNull(loginUser))
{
String userName = loginUser.getUsername();
// 鍒犻櫎鐢ㄦ埛缂撳瓨璁板綍
tokenService.delLoginUser(loginUser.getToken());
// 璁板綍鐢ㄦ埛閫�鍑烘棩蹇�
- // 娓呴櫎鍗曠偣鐧诲綍淇℃伅
- 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 {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
- }
-
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
}
- ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.success(MessageUtils.message("user.logout.success"), loginOutUrl)));
+ ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.success(MessageUtils.message("user.logout.success"))));
}
}
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..0c4d179 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
@@ -1,29 +1,8 @@
package com.ruoyi.framework.web.service;
import javax.annotation.Resource;
-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;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpStatus;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.apache.http.ssl.TrustStrategy;
-import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -51,16 +30,6 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
/**
* 鐧诲綍鏍￠獙鏂规硶
@@ -68,7 +37,6 @@
* @author ruoyi
*/
@Component
-@Slf4j
public class SysLoginService
{
@Autowired
@@ -85,12 +53,6 @@
@Autowired
private ISysConfigService configService;
-
- @Autowired
- private SsoBean ssoBean;
-
- @Autowired
- private RedisTemplate redisTemplate;
/**
* 鐧诲綍楠岃瘉
@@ -219,166 +181,4 @@
sysUserService.updateUserProfile(sysUser);
}
- /**
- * 鍗曠偣鐧诲綍
- * @param code
- * @return
- */
- public String loginBySSO(String code) {
-
- // 鑾峰彇鍗曠偣鐧诲綍token
- SsoOauthTokenModel tokenModel = this.getSsoAccessToken(code);
- if (tokenModel == null) {
- throw new RuntimeException("鍗曠偣鐧诲綍楠岃瘉澶辫触");
- }
-
- // 鑾峰彇鍗曠偣鐧诲綍鐢ㄦ埛淇℃伅
- SsoUserInfoModel userInfo = this.getSsoUserInfo(tokenModel.getAccess_token());
- if (userInfo == null) {
- throw new RuntimeException("鍗曠偣鐧诲綍楠岃瘉澶辫触");
- }
-
- // 鏌ヨ鏈湴鐢ㄦ埛淇℃伅
- LoginUser loginUser = this.getSsoLoginToken(userInfo.getEmployeeId());
- recordLoginInfo(loginUser.getUserId());
-
- // 鍒涘缓鐧诲綍淇℃伅
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(userInfo.getEmployeeId(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.sso.login.success")));
- redisTemplate.opsForValue().set("ssoOauthToken:idToken:" + userInfo.getEmployeeId(), tokenModel.getId_token(), 3, TimeUnit.DAYS);
- // 鐢熸垚token
- return tokenService.createToken(loginUser);
- }
-
- /**
- * ***** 鑾峰彇鏈湴鐢ㄦ埛淇℃伅 *****
- * @param username
- * @return
- */
- public LoginUser getSsoLoginToken(String username) {
- // 鐢ㄦ埛楠岃瘉
- Authentication authentication = null;
- SysUser sysUser = sysUserService.selectUserByUserName(username);
- if (sysUser == null) {
- throw new ServiceException("褰撳墠绯荤粺娌℃湁璇ョ敤鎴�");
- }
- try
- {
- // 鏃犻渶瀵嗙爜鑾峰彇鐢ㄦ埛淇℃伅
- authentication = authenticationManager.authenticate(new SsoCodeAuthenticationToken(username));
- }
- catch (Exception e)
- {
- if (e instanceof BadCredentialsException)
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.sso.not.match")));
- throw new UserPasswordNotMatchException();
- }
- else
- {
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
- throw new ServiceException(e.getMessage());
- }
- }
- finally
- {
- AuthenticationContextHolder.clearContext();
- }
- AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.sso.login.success")));
- return (LoginUser) authentication.getPrincipal();
-
- }
-
-
-
- /**
- * **** 鑾峰彇鍗曠偣鐧诲綍token ****
- * @param code
- * @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);
- }
-
- /**
- * ***鑾峰彇鍗曠偣鐧诲綍鐢ㄦ埛淇℃伅***
- * @param accessToken
- * @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);
- }
-
- public static String doPost(String url, Map<String, String> headers, List<NameValuePair> params) {
- CloseableHttpClient client = createSSLClientDefault();
- CloseableHttpResponse response = null;
- try {
- HttpPost method = new HttpPost(url);
- headers.forEach(method::setHeader);
- if (params != null) {
- method.setEntity(new UrlEncodedFormEntity(params, "UTF-8"));
- }
-
- response = client.execute(method);
- if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
- HttpEntity entity = response.getEntity();
- return EntityUtils.toString(entity);
- }
- } catch (Exception e) {
- log.error("缁熶竴鐧诲綍璇锋眰鍑虹幇寮傚父", e.getMessage());
- } finally {
- try {
- if (client != null) {
- client.close();
- }
- if (response != null) {
- response.close();
- }
- } catch (Exception e) {
- log.error("缁熶竴鐧诲綍璇锋眰鍑虹幇寮傚父", e.getMessage());
- }
- }
- return null;
- }
-
-
- private static CloseableHttpClient createSSLClientDefault() {
- try {
- SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
- //淇′换鎵�鏈�
- @Override
- public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
- return true;
- }
- }).build();
- SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext);
- return HttpClients.custom().setSSLSocketFactory(sslsf).build();
- } catch (KeyManagementException e) {
- e.printStackTrace();
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- } catch (KeyStoreException e) {
- e.printStackTrace();
- }
- return HttpClients.createDefault();
- }
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsByOpenIdServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsByOpenIdServiceImpl.java
deleted file mode 100644
index a97d073..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsByOpenIdServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ruoyi.framework.web.service;
-
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-@Service("UserDetailsByOpenIdServiceImpl")
-public class UserDetailsByOpenIdServiceImpl implements UserDetailsService {
-
-
-
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private SysPermissionService permissionService;
-
- @Override
- public UserDetails loadUserByUsername(String openId) throws UsernameNotFoundException {
- SysUser user = userService.selectUserByUserName(openId);
- if (StringUtils.isNull(user)) {
-
- throw new UsernameNotFoundException("鐧诲綍鐢ㄦ埛锛�" + openId + " 涓嶅瓨鍦�");
- } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-
- throw new BaseException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + openId + " 宸茶鍒犻櫎");
- } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-
- throw new BaseException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + openId + " 宸插仠鐢�");
- }
- // 鍜岃嫢渚濈殑鍖哄埆 鏄病鏈夐獙璇佸瘑鐮�
- return createLoginUser(user);
- }
-
- public UserDetails createLoginUser(SysUser user) {
- return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java
deleted file mode 100644
index 689fe16..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.ruoyi.framework.web.ssoAuth;
-
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.AuthenticationException;
-public class SsoCodeAuthenticationProvider implements AuthenticationProvider {
-
- private UserDetailsService userDetailsService;
-
- @Override
- public Authentication authenticate(Authentication authentication) throws AuthenticationException {
- SsoCodeAuthenticationToken authenticationToken = (SsoCodeAuthenticationToken) authentication;
-
- String openId = (String) authenticationToken.getPrincipal();
-
- UserDetails userDetails = userDetailsService.loadUserByUsername(openId);
-
- // 姝ゆ椂閴存潈鎴愬姛鍚庯紝搴斿綋閲嶆柊 new 涓�涓嫢鏈夐壌鏉冪殑 authenticationResult 杩斿洖
- SsoCodeAuthenticationToken authenticationResult = new SsoCodeAuthenticationToken(userDetails, userDetails.getAuthorities());
-
- authenticationResult.setDetails(authenticationToken.getDetails());
-
- return authenticationResult;
- }
-
-
- @Override
- public boolean supports(Class<?> authentication) {
- // 鍒ゆ柇 authentication 鏄笉鏄� SsoCodeAuthenticationToken 鐨勫瓙绫绘垨瀛愭帴鍙�
- return SsoCodeAuthenticationToken.class.isAssignableFrom(authentication);
- }
-
- public UserDetailsService getUserDetailsService() {
- return userDetailsService;
- }
-
- public void setUserDetailsService(UserDetailsService userDetailsService) {
- this.userDetailsService = userDetailsService;
- }
-}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationToken.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationToken.java
deleted file mode 100644
index b783f36..0000000
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/ssoAuth/SsoCodeAuthenticationToken.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ruoyi.framework.web.ssoAuth;
-
-import org.springframework.security.authentication.AbstractAuthenticationToken;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.SpringSecurityCoreVersion;
-
-import java.util.Collection;
-
-public class SsoCodeAuthenticationToken extends AbstractAuthenticationToken {
-
- private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
-
- /**
- * 鍦� UsernamePasswordAuthenticationToken 涓瀛楁浠ｈ〃鐧诲綍鐨勭敤鎴峰悕锛�
- * 鍦ㄨ繖閲屽氨浠ｈ〃鐧诲綍鐨刼penId
- */
- private final Object principal;
-
- /**
- * 鏋勫缓涓�涓病鏈夐壌鏉冪殑 SsoCodeAuthenticationToken
- */
- public SsoCodeAuthenticationToken(Object principal) {
- super(null);
- this.principal = principal;
- setAuthenticated(false);
- }
-
- /**
- * 鏋勫缓鎷ユ湁閴存潈鐨� SsoCodeAuthenticationToken
- */
- public SsoCodeAuthenticationToken(Object principal, Collection<? extends GrantedAuthority> authorities) {
- super(authorities);
- this.principal = principal;
- // must use super, as we override
- super.setAuthenticated(true);
- }
-
- @Override
- public Object getCredentials() {
- return null;
- }
-
- @Override
- public Object getPrincipal() {
- return this.principal;
- }
-
- @Override
- public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
- if (isAuthenticated) {
- throw new IllegalArgumentException(
- "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead");
- }
-
- super.setAuthenticated(false);
- }
-
- @Override
- public void eraseCredentials() {
- super.eraseCredentials();
- }
-
-}
--
Gitblit v1.9.3