From 9e29441646434d9f54a2c3e855a724633885d8a4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 13 八月 2019 19:43:49 +0800
Subject: [PATCH] 缓存开发测试完成
---
WebService/src/main/java/com/java110/web/controller/HomeController.java | 87 ++++++-------------------------------------
1 files changed, 13 insertions(+), 74 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/controller/HomeController.java b/WebService/src/main/java/com/java110/web/controller/HomeController.java
index ac3c53b..5122339 100644
--- a/WebService/src/main/java/com/java110/web/controller/HomeController.java
+++ b/WebService/src/main/java/com/java110/web/controller/HomeController.java
@@ -1,13 +1,9 @@
package com.java110.web.controller;
-import com.alibaba.fastjson.JSONObject;
-import com.java110.common.exception.NoAuthorityException;
-import com.java110.common.exception.SMOException;
-import com.java110.common.util.Assert;
-import com.java110.common.util.StringUtil;
-import com.java110.web.smo.IConsoleServiceSMO;
+import com.java110.common.constant.CommonConstant;
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.IFlowServiceSMO;
import com.java110.core.base.controller.BaseController;
-import com.java110.entity.service.PageData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,85 +24,28 @@
@Autowired
- private IConsoleServiceSMO consoleServiceSMOImpl;
+ private IFlowServiceSMO flowServiceSMOImpl;
@RequestMapping(path = "/")
public String index(Model model, HttpServletRequest request) {
String template = "index";
- return template;
- }
+ IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
- /**
- * 鏌ヨ鏁版嵁
- * @param model
- * @param request
- * @return
- */
- @RequestMapping(path = "/console/list")
- public String listData(Model model, HttpServletRequest request){
- String template = "";
- try {
-
- //1.0 鑾峰彇瀵硅薄
- PageData pd = this.getPageData(request);
-
- Assert.hasLength(pd.getParam().getString("templateCode"),"璇锋眰鍙傛暟templateCode 涓嶈兘涓虹┖锛�");
- // 鍒ゆ柇鐢ㄦ埛鏄惁鐧诲綍
- checkLogin(pd);
- //2.0 鏌ヨ妯℃澘淇℃伅
- checkTemplate(pd,model);
- //3.0 鏌ヨ鑿滃崟淇℃伅
- getMenus(model,pd,consoleServiceSMOImpl.getMenuItemsByManageId(pd.getUserId()));
- //3.0 鏌ヨ鍚勪釜绯荤粺璋冪敤閲�
-
- template = pd.getData().getJSONObject("template").containsKey("htmlName")
- && !StringUtil.isNullOrNone( pd.getData().getJSONObject("template").getString("htmlName")) ?
- pd.getData().getJSONObject("template").getString("htmlName"):
- "list_template";
-
- }catch (NoAuthorityException e){
- //璺宠浆鍒扮櫥褰曢〉闈�
- template = "redirect:/login";
- }catch (IllegalArgumentException e){
- template = "redirect:/system/error";
- }catch (SMOException e){
- template = "redirect:/system/error";
- }catch (Exception e){
- logger.error("绯荤粺寮傚父锛�",e);
- template = "redirect:/system/error";
- }finally {
- return template;
+ if(!flowServiceSMOImpl.hasStoreInfos(pd)){
+ //鍒濆鍖� 鍟嗘埛淇℃伅
+ template = "init_company";
}
+ return template;
}
- /**
- * 妯℃澘鏍￠獙骞跺皢妯℃澘鍐欏叆鍒� model 瀵硅薄涓� 鍓嶅彴椤甸潰灞曠ず鐢�
- * @param pd
- * @param model
- */
- private void checkTemplate(PageData pd,Model model) throws IllegalArgumentException{
- try {
- consoleServiceSMOImpl.getTemplate(pd);
- JSONObject template = pd.getData().getJSONObject("template");
- model.addAttribute("templateCode",template.getString("templateCode"));
- model.addAttribute("templateName",template.getString("templateName"));
- }catch (Exception e){
- logger.error("鏌ヨ寮傚父",e);
- throw new IllegalArgumentException("閰嶇疆閿欒锛屾病鏈夊綋鍓嶆ā鏉裤��"+pd.getParam().getString("templateCode")+"銆�");
- }
-
+ public IFlowServiceSMO getFlowServiceSMOImpl() {
+ return flowServiceSMOImpl;
}
-
-
- public IConsoleServiceSMO getConsoleServiceSMOImpl() {
- return consoleServiceSMOImpl;
- }
-
- public void setConsoleServiceSMOImpl(IConsoleServiceSMO consoleServiceSMOImpl) {
- this.consoleServiceSMOImpl = consoleServiceSMOImpl;
+ public void setFlowServiceSMOImpl(IFlowServiceSMO flowServiceSMOImpl) {
+ this.flowServiceSMOImpl = flowServiceSMOImpl;
}
}
--
Gitblit v1.8.0