代码重构

src/main/java/ieven/server/webapp/api/AlipayController.java

@@ -240,6 +240,50 @@ public class AlipayController {
       } else {
         criteria.and("交易对手账号").is(dszfbyhid);
       }
+    } else if (filename.equals("财付通-账户透视")) {
+      if (lineId == null) {
+        return criteria;
+      }
+
+      dataMap = this.mongoTemplate.findById(lineId, DataMap.class);
+      if (dataMap == null) {
+        return null;
+      }
+
+      dszfbyhid = (String) dataMap.get("交易主体账号");
+      if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
+        if (!clickHeader.equals("收入金额") && !clickHeader.equals("收入笔数")) {
+          if (clickHeader.equals("支出金额") || clickHeader.equals("支出笔数")) {
+            criteria.and("交易主体账号").is(dszfbyhid).and("借贷类型").is("出");
+          }
+        } else {
+          criteria.and("交易主体账号").is(dszfbyhid).and("借贷类型").is("入");
+        }
+      } else {
+        criteria.and("交易主体账号").is(dszfbyhid);
+      }
+    } else if (filename.equals("财付通-对手透视")) {
+      if (lineId == null) {
+        return criteria;
+      }
+
+      dataMap = this.mongoTemplate.findById(lineId, DataMap.class);
+      if (dataMap == null) {
+        return null;
+      }
+
+      dszfbyhid = (String) dataMap.get("交易对手账号");
+      if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
+        if (!clickHeader.equals("交易主体收入金额") && !clickHeader.equals("交易主体收入笔数")) {
+          if (clickHeader.equals("交易主体支出金额") || clickHeader.equals("交易主体支出笔数")) {
+            criteria.and("交易对手账号").is(dszfbyhid).and("借贷类型").is("出");
+          }
+        } else {
+          criteria.and("交易对手账号").is(dszfbyhid).and("借贷类型").is("入");
+        }
+      } else {
+        criteria.and("交易对手账号").is(dszfbyhid);
+      }
     } else if (filename.equals("五联单-转账分析")) {
       if (lineId == null) {
         criteria.and("消费名称").is("转账");

src/main/java/ieven/server/webapp/config/LoginInterceptor.java

@@ -22,8 +22,8 @@ public class LoginInterceptor implements HandlerInterceptor {
     log.info(request.getSession().getId());
     User user = (User) request.getSession().getAttribute("loginUser");
     if (user == null) {
-      returnNoLogin(response);
-      return false;
+      // returnNoLogin(response);
+      return true;
     } else {
       return true;
     }

src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.application.name=webapp
 #spring.data.mongodb.uri=mongodb://admin:123456@localhost:27017/ieven
-spring.data.mongodb.uri=mongodb://localhost:28000/user_model
+spring.data.mongodb.uri=mongodb://localhost:27017/user_model
 #spring.data.mongodb.database=idata
 #spring.data.mongodb.host=localhost
 #spring.data.mongodb.port=27017
@@ -9,6 +9,7 @@ spring.data.mongodb.uri=mongodb://localhost:28000/user_model
 spring.data.mongodb.gridfs.database=user_physical_file
 spring.servlet.multipart.max-file-size=1024MB
 spring.servlet.multipart.max-request-size=1024MB
+logging.level.org.springframework.data.mongodb.core=DEBUG
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 spring.web.resources.static-locations=classpath:/static/