diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 995dd54..9274ac3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,12 @@
-
-
-
-
-
+
+
+
@@ -107,7 +105,7 @@
-
+
@@ -119,7 +117,7 @@
-
+
@@ -130,14 +128,14 @@
-
+
-
+
@@ -150,38 +148,43 @@
-
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -189,11 +192,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -213,7 +265,6 @@
- email
home
ini
时间
@@ -237,12 +288,13 @@
验证
邮件
exit
- 初始化
通知
SECOND_MINEPANE
NOTICEPANE
消息
GetNewN
+ 初始化
+ 详细信息
@@ -687,7 +739,6 @@
-
@@ -695,14 +746,15 @@
-
-
-
+
+
+
+
@@ -718,7 +770,7 @@
-
+
@@ -802,15 +854,6 @@
-
-
-
-
-
-
-
-
-
@@ -828,7 +871,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -848,7 +902,7 @@
-
+
@@ -1007,18 +1061,18 @@
-
+
-
+
-
+
@@ -1027,7 +1081,7 @@
-
+
@@ -1188,13 +1242,6 @@
-
-
-
-
-
-
-
@@ -1329,16 +1376,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1353,16 +1390,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1373,23 +1400,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1418,10 +1428,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -1437,8 +1459,8 @@
-
-
+
+
@@ -1446,28 +1468,73 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ndn/pib.db b/ndn/pib.db
index 75e565a..c66b63a 100644
Binary files a/ndn/pib.db and b/ndn/pib.db differ
diff --git a/out/production/classes/cn/minoa/MainApp$1.class b/out/production/classes/cn/minoa/MainApp$1.class
index 92d43ba..c6852f2 100644
Binary files a/out/production/classes/cn/minoa/MainApp$1.class and b/out/production/classes/cn/minoa/MainApp$1.class differ
diff --git a/out/production/classes/cn/minoa/MainApp.class b/out/production/classes/cn/minoa/MainApp.class
index 2d09b02..97ec2c5 100644
Binary files a/out/production/classes/cn/minoa/MainApp.class and b/out/production/classes/cn/minoa/MainApp.class differ
diff --git a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$3.class b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$3.class
index 7e2ba31..d5ac33e 100644
Binary files a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$3.class and b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$3.class differ
diff --git a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$4.class b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$4.class
index 66cb245..4840b64 100644
Binary files a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$4.class and b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$4.class differ
diff --git a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$5.class b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$5.class
index b4e5a0d..fb48eeb 100644
Binary files a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$5.class and b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$5.class differ
diff --git a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$6.class b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$6.class
index b3f4708..0474a6f 100644
Binary files a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$6.class and b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$6.class differ
diff --git a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$7.class b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$7.class
index 49bc4d5..57ccb51 100644
Binary files a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$7.class and b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$7.class differ
diff --git a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$8.class b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$8.class
index 1fbdb64..68669b8 100644
Binary files a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$8.class and b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI$8.class differ
diff --git a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI.class b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI.class
index 14065ee..d9876ef 100644
Binary files a/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI.class and b/out/production/classes/cn/minoa/dataRequestInterface/MinoaDataAPI.class differ
diff --git a/out/production/classes/cn/minoa/view/home/ReimbursementApplyController.class b/out/production/classes/cn/minoa/view/home/ReimbursementApplyController.class
index 772c51c..b5aa3ff 100644
Binary files a/out/production/classes/cn/minoa/view/home/ReimbursementApplyController.class and b/out/production/classes/cn/minoa/view/home/ReimbursementApplyController.class differ
diff --git a/out/production/classes/cn/minoa/view/home/ReimbursementDealController.class b/out/production/classes/cn/minoa/view/home/ReimbursementDealController.class
index af845ea..13a3759 100644
Binary files a/out/production/classes/cn/minoa/view/home/ReimbursementDealController.class and b/out/production/classes/cn/minoa/view/home/ReimbursementDealController.class differ
diff --git a/out/production/classes/cn/minoa/view/mine/EmailListItem.class b/out/production/classes/cn/minoa/view/mine/EmailListItem.class
index 3edf44f..098bd59 100644
Binary files a/out/production/classes/cn/minoa/view/mine/EmailListItem.class and b/out/production/classes/cn/minoa/view/mine/EmailListItem.class differ
diff --git a/out/production/classes/cn/minoa/view/mine/MyEmailController.class b/out/production/classes/cn/minoa/view/mine/MyEmailController.class
index ab2f478..82abc62 100644
Binary files a/out/production/classes/cn/minoa/view/mine/MyEmailController.class and b/out/production/classes/cn/minoa/view/mine/MyEmailController.class differ
diff --git a/src/main/java/cn/minoa/MainApp.java b/src/main/java/cn/minoa/MainApp.java
index c665d7a..68e5da4 100644
--- a/src/main/java/cn/minoa/MainApp.java
+++ b/src/main/java/cn/minoa/MainApp.java
@@ -273,6 +273,56 @@ public class MainApp extends Application {
}
+ // 开启监听之后接收到需要自己报销审批消息时的处理=>被minoaDataAPI调用
+ public void handleGetNewReimToSelf(){
+ // 非FX线程调用FX的UI组件
+ Platform.runLater(() -> {
+ //重载报销【发给自己的】
+ if ((currentSecondPane.equals(SECOND_HOMEPANE))
+ && (currentMainPane.equals(MAIN_REIMPANE))
+ &&(currentReimPane.equals(MAIN_REIMPANE_REC))){
+ try {
+ this.reloadReimbursementOverview("R");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }if ((currentSecondPane.equals(SECOND_HOMEPANE))
+ && (currentMainPane.equals(MAIN_REIMPANE))
+ &&(currentReimPane.equals(MAIN_REIMPANE_SEND))){
+ try {
+ this.reloadReimbursementOverview("S");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }else if ((currentSecondPane.equals(SECOND_HOMEPANE))
+ && (currentMainPane.equals(MAIN_REIMDEALPANE))){
+ //重载报销待审核【发给自己的】
+ try {
+ this.reloadReimbursementDealOverview();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+
+ // 开启监听之后接收到发送给自己的邮件时的处理=>被minoaDataAPI调用
+ public void handleGetNewEmailToSelf(){
+ // 非FX线程调用FX的UI组件
+ Platform.runLater(() -> {
+ //重载邮件收件箱
+ if ((currentSecondPane.equals(SECOND_MINEPANE))
+ && (currentMainPane.equals(MAIN_EMAILPANE))
+ &&(currentEmailPane.equals(MAIN_EMAILPANE_REC))){
+ try {
+ this.reloadEmailOverview("R");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+
// 开启监听之后接收到新通知消息时的处理=>被minoaDataAPI调用
public void handleGetNewNotice(SingleNotice singleNotice) {
//先将该通知加入前端数据;
diff --git a/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java b/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java
index f4afe9e..012157c 100644
--- a/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java
+++ b/src/main/java/cn/minoa/dataRequestInterface/MinoaDataAPI.java
@@ -135,6 +135,7 @@ public class MinoaDataAPI {
try {
dataString = jsonObject.getString("data");
if (!dataString.equals("")) {
+// System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
JSONArray dataJsonArray = new JSONArray(dataString);
String newsCacheString;
JSONObject newsCacheJsonObject;
@@ -151,12 +152,16 @@ public class MinoaDataAPI {
handleNewSingleMessage(contentString);
} else if (typeCodeInteger == 1) {
// 处理新通知
- System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
+// System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
handleNewSingleNotice(contentString);
} else if (typeCodeInteger == 2) {
// 处理新审批[报销审批、邮件]
+ System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
+ handleNewSingleApproval(contentString);
}
}
+ }else{
+// System.out.println("getNews-responseData: "+responseData.getResponseJsonDataString());
}
} catch (JSONException e) {
// TODO Auto-generated catch block
@@ -165,6 +170,25 @@ public class MinoaDataAPI {
}
}
+ //接收到一个新的审批[邮件/报销审批等,除掉通知]
+ private void handleNewSingleApproval(String singleApprovalString){
+ try{
+ JSONObject singleApprovalJsonObject=new JSONObject(singleApprovalString);
+ //拿到审批类型
+ Integer typeCodeInteger =singleApprovalJsonObject.getInt("typeCode");
+ if(typeCodeInteger==2){
+ System.out.println("接收到一条新的报销审批【我是审核人】");
+ mainApp.handleGetNewReimToSelf();
+ }else if(typeCodeInteger==3){
+ System.out.println("接收到一条新的邮件【我是接收方】");
+ mainApp.handleGetNewEmailToSelf();
+ }
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+ }
+
+ //接收到一个新的通知
private void handleNewSingleNotice(String singleNoticeString){
String singleNoticeCacheString=singleNoticeString;
JSONObject singleNoticeCacheJsonObject;
@@ -244,7 +268,7 @@ public class MinoaDataAPI {
return jsonObject.toString();
}
- // 处理一条接收到的新消息
+ // 处理一条接收到的新聊天消息
private void handleNewSingleMessage(String singleMessageString) {
try {
JSONObject singleMessageJsonObject = new JSONObject(singleMessageString);
diff --git a/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java b/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java
index 718aa22..133dec6 100644
--- a/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java
+++ b/src/main/java/cn/minoa/view/home/ReimbursementApplyController.java
@@ -121,7 +121,7 @@ public class ReimbursementApplyController {
Reimbursement reimbursement = new Reimbursement();
for (int i = 0; i < reimbursementInfoList.size(); i++) {
reimbursement = reimbursementInfoList.get(i);
- if (reimbursement.getId() == paneId) {
+ if (reimbursement.getId().equals(paneId)) {
break;
}
}
diff --git a/src/main/java/cn/minoa/view/home/ReimbursementDealController.java b/src/main/java/cn/minoa/view/home/ReimbursementDealController.java
index 6f0f322..788c823 100644
--- a/src/main/java/cn/minoa/view/home/ReimbursementDealController.java
+++ b/src/main/java/cn/minoa/view/home/ReimbursementDealController.java
@@ -39,7 +39,7 @@ public class ReimbursementDealController {
Reimbursement reimbursement = new Reimbursement();
for (int i = 0; i < reimbursementInfoList.size(); i++) {
reimbursement = reimbursementInfoList.get(i);
- if (reimbursement.getId() == paneId) {
+ if (reimbursement.getId().equals(paneId)) {
break;
}
}
diff --git a/src/main/java/cn/minoa/view/mine/MyEmailController.java b/src/main/java/cn/minoa/view/mine/MyEmailController.java
index dd41966..98fbaef 100644
--- a/src/main/java/cn/minoa/view/mine/MyEmailController.java
+++ b/src/main/java/cn/minoa/view/mine/MyEmailController.java
@@ -117,16 +117,26 @@ public class MyEmailController {
// 展示邮件的详细信息的弹窗
private void showEmailDetails(Integer emailId) {
+// printEmailIdList();
+// System.out.println("current emailId: "+emailId);
// 在当前数据结构中找到这个emailId对应的邮件
- Email email = new Email();
+// Email email = new Email();
for (int i = 0; i < emailInfoList.size(); i++) {
- email = emailInfoList.get(i);
- if (email.getId() == emailId) {
+// System.out.println("current emailInfoList emailId: "+emailInfoList.get(i).getId());
+ if (emailInfoList.get(i).getId() .equals(emailId)) {
+ mainApp.showEmailDetailsDialog(emailInfoList.get(i));
break;
}
}
// 传递给主函数
- mainApp.showEmailDetailsDialog(email);
+// mainApp.showEmailDetailsDialog(email);
+ }
+
+ //打印测试
+ private void printEmailIdList(){
+ for (int i = 0; i < emailInfoList.size(); i++) {
+ System.out.println(i+"[emailId]: "+emailInfoList.get(i).getId());
+ }
}
// 写信弹窗