版本回退

kanban-console/src/main/java/com/uas/kanban/controller/KanbanController.java

@@ -44,19 +44,6 @@ public class KanbanController extends BaseController<Kanban> {
     public List<Kanban> getByPanelCode(@PathVariable("panelCode") String panelCode, HttpServletRequest request) {
         return kanbanService.getByPanelCode(panelCode);
     }
-    
-    /**
-     * 获取指定面板的已启用的看板
-     *
-     * @param panelCode 所指定的面板 code
-     * @param request   request
-     * @return 已启用的看板
-     */
-    @RequestMapping("/getEnableKanbans/byPanel/{panelCode}")
-    @ResponseBody
-    public List<Kanban> getEnableKanbansByPanelCode(@PathVariable("panelCode") String panelCode, HttpServletRequest request) {
-    	return kanbanService.getEnableKanbansByPanelCode(panelCode);
-    }
 
     /**
      * 校验 sql

kanban-console/src/main/java/com/uas/kanban/controller/PanelViewController.java

@@ -1,58 +0,0 @@
-package com.uas.kanban.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.uas.kanban.base.BaseController;
-import com.uas.kanban.exception.OperationException;
-import com.uas.kanban.model.PanelView;
-import com.uas.kanban.service.PanelViewService;
-
-/**
- * 
- * @author zhuth
- * @since 2018/5/24/ 9:53
- */
-@Controller
-@RequestMapping("/panelView")
-public class PanelViewController extends BaseController<PanelView> {
-	
-	@Autowired
-	PanelViewService panelViewService;
-	
-	/**
-     * 获取指定面板的多画面配置
-     *
-     * @param panelCode 所指定的面板 code
-     * @param request   request
-     * @return  多画面配置
-	 * @throws OperationException 
-     */
-    @RequestMapping("/get/byPanel/{panelCode}")
-    @ResponseBody
-    public PanelView getByPanelCode(@PathVariable("panelCode") String panelCode, HttpServletRequest request) throws OperationException {
-        return panelViewService.getByPanelCode(panelCode);
-    }
-    
-    /**
-     * 获取指定面板的多画面配置
-     *
-     * @param panelCode 所指定的面板 code
-     * @param request   request
-     * @return  多画面配置
-	 * @throws OperationException 
-     */
-    @RequestMapping("/parseData/{code}")
-    @ResponseBody
-    public Map<String, Object> parseData(@PathVariable("code") String code, Integer index, String kanbanCode, HttpServletRequest request) throws OperationException  {
-    	return panelViewService.parseData(code, index, kanbanCode);
-    }
-}

kanban-console/src/main/java/com/uas/kanban/controller/ParameterController.java

@@ -44,19 +44,6 @@ public class ParameterController extends BaseController<Parameter> {
     public List<Parameter> getByPanelCode(@PathVariable("panelCode") String panelCode, HttpServletRequest request) {
         return parameterService.getByPanelCode(panelCode);
     }
-    
-    /**
-     * 获取指定面板解析了下拉项的参数
-     *
-     * @param panelCode 所指定的面板 code
-     * @param request   request
-     * @return 参数
-     */
-    @RequestMapping("/getParseSQLData/byPanel/{panelCode}")
-    @ResponseBody
-    public List<Parameter> getParseDataByPanelCode(@PathVariable("panelCode") String panelCode, HttpServletRequest request) {
-        return parameterService.getParseDataByPanelCode(panelCode);
-    }
 
     /**
      * 校验 sql

kanban-console/src/main/java/com/uas/kanban/dao/KanbanDao.java

@@ -51,17 +51,4 @@ public class KanbanDao extends BaseDao<Kanban> {
         return findField(code, "panelCode", String.class);
     }
 
-
-	/**
-	 * 获取指定面板已启用的看板
-	 * @param panelCode  面板code
-	 * @return  已启用的看板
-	 */
-	public List<Kanban> findEnableKanbanByPanelCode(String panelCode) {
-		Query<Kanban> query = createQuery();
-        query.filter("panelCode", panelCode);
-        query.filter("enabled", true);
-        return find(query);
-	}
-
 }

kanban-console/src/main/java/com/uas/kanban/dao/PanelViewDao.java

@@ -1,47 +0,0 @@
-package com.uas.kanban.dao;
-
-import com.uas.kanban.annotation.NotEmpty;
-import com.uas.kanban.base.BaseDao;
-import com.uas.kanban.model.PanelView;
-import com.uas.kanban.model.User;
-import com.uas.kanban.support.SystemSession;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.stereotype.Component;
-
-/**
- * 面板画面
- *
- * @author zhuth
- * @since 2018/5/24 9:54
- */
-@Component
-public class PanelViewDao extends BaseDao<PanelView> {
-
-	@Override
-    protected Map<String, Object> globalFilter() {
-        User user = SystemSession.checkUser();
-        Map<String, Object> filters = new HashMap<>();
-        // 所有用户只能操作自己的画面
-        filters.put("userCode", user.codeNotEmpty());
-        return filters;
-    }
-	
-	@Override
-	public PanelView parse(String json) {
-		// TODO Auto-generated method stub
-		return super.parse(json);
-	}
-	
-	/**
-     * 获取指定面板的画面
-     *
-     * @param panelCode 所指定的面板 code
-     * @return 面板画面
-     */
-    public PanelView findByPanelCode(@NotEmpty("panelCode") String panelCode) {
-        return findOneBy("panelCode", panelCode);
-    }
-}

kanban-console/src/main/java/com/uas/kanban/model/Logo.java

@@ -2,6 +2,7 @@ package com.uas.kanban.model;
 
 import org.mongodb.morphia.annotations.Entity;
 import com.uas.kanban.annotation.CollectionProperty;
+import com.uas.kanban.annotation.FieldProperty;
 import com.uas.kanban.base.BaseEntity;
 
 /**

kanban-console/src/main/java/com/uas/kanban/model/PanelView.java

@@ -1,144 +0,0 @@
-package com.uas.kanban.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.mongodb.morphia.annotations.Entity;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.kanban.annotation.CollectionProperty;
-import com.uas.kanban.annotation.FieldProperty;
-import com.uas.kanban.base.BaseEntity;
-
-/**
- * 
- * @author zhuth
- * @since 2018/5/24 9:54
- */
-@Entity
-@CollectionProperty(simpleName = "分屏画面")
-public class PanelView extends BaseEntity {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-     * 所属面板
-     */
-	@FieldProperty(nullable = false)
-    private String panelCode;
-    
-    /**
-     * 面板的版本号
-     */
-    @FieldProperty(nullable = false)
-    private Long panelVersion;
-    
-    /**
-     * 关联用户
-     */
-    @FieldProperty(nullable = false)
-    private String userCode;
-    
-    /**
-     * 展示类型
-     */
-    private String viewType;
-    
-    /**
-     * 分屏展示数量
-     */
-    private int areaCount;
-    
-    /**
-     * 多画面行数
-     */
-    private int areaRows;
-    
-    /**
-     * 多画面列数
-     */
-    private int areaCols;
-    
-    /**
-     * 多画面配置
-     */
-    private List<ViewConfig> areaConfig;
-    
-    public String getPanelCode() {
-		return panelCode;
-	}
-	public void setPanelCode(String panelCode) {
-		this.panelCode = panelCode;
-	}
-	public Long getPanelVersion() {
-		return panelVersion;
-	}
-	public void setPanelVersion(Long panelVersion) {
-		this.panelVersion = panelVersion;
-	}
-	public String getUserCode() {
-		return userCode;
-	}
-	public void setUserCode(String userCode) {
-		this.userCode = userCode;
-	}
-	public String getViewType() {
-		return viewType;
-	}
-	public void setViewType(String viewType) {
-		this.viewType = viewType;
-	}
-	public int getAreaCount() {
-		return areaCount;
-	}
-	public void setAreaCount(int areaCount) {
-		this.areaCount = areaCount;
-	}
-	public int getAreaRows() {
-		return areaRows;
-	}
-	public void setAreaRows(int areaRows) {
-		this.areaRows = areaRows;
-	}
-	public int getAreaCols() {
-		return areaCols;
-	}
-	public void setAreaCols(int areaCols) {
-		this.areaCols = areaCols;
-	}
-	public List<ViewConfig> getAreaConfig() {
-		return areaConfig;
-	}
-	public void setAreaConfig(List<ViewConfig> areaConfig) {
-		this.areaConfig = areaConfig;
-	}
-	
-	@Override
-	public String toString() {
-		return "PanelView{"
-				+ "panelCode=" + panelCode
-				+ "panelVersion=" + panelVersion
-				+ "userCode=" + userCode
-				+ "viewType=" + viewType
-				+ "areaCount=" + areaCount
-				+ "areaRows=" + areaRows
-				+ "areaCols=" + areaCols
-				+ "areaConfig=" + areaConfig
-				+ "}" + super.toString();
-	}
-	
-    public List<JSONObject> getParameters() {
-    	List<ViewConfig> viewConfigs = this.areaConfig;
-    	List<JSONObject> parameterList = new ArrayList<JSONObject>();
-    	for(ViewConfig vc : viewConfigs) {
-    		String viewParameters = vc.getViewParameters();
-    		JSONObject obj = JSON.parseObject(viewParameters);
-    		parameterList.add(obj);
-    	}
-    	return parameterList;
-    }
-	
-}

kanban-console/src/main/java/com/uas/kanban/model/ViewConfig.java

@@ -1,65 +0,0 @@
-package com.uas.kanban.model;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 
- * @author zhuth
- * @since 2018/5/28/ 2:53
- */
-public class ViewConfig implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 画面顺序
-	 */
-	private int viewIndex;
-	
-	/**
-	 * 画面参数
-	 */
-	private String viewParameters;
-	
-	/**
-	 * 画面看板
-	 */
-	private List<String> viewKanbans;
-
-	public int getViewIndex() {
-		return viewIndex;
-	}
-
-	public void setViewIndex(int viewIndex) {
-		this.viewIndex = viewIndex;
-	}
-
-	public String getViewParameters() {
-		return viewParameters;
-	}
-
-	public void setViewParameters(String viewParameters) {
-		this.viewParameters = viewParameters;
-	}
-
-	public List<String> getViewKanbans() {
-		return viewKanbans;
-	}
-
-	public void setViewKanbans(List<String> viewKanbans) {
-		this.viewKanbans = viewKanbans;
-	}
-	
-	@Override
-	public String toString() {
-		return "ViewConfig{"
-				+ "viewIndex=" + viewIndex
-				+ "viewParameters=" + viewParameters
-				+ "viewKanbans=" + viewKanbans
-				+ "}";
-	}
-}

kanban-console/src/main/java/com/uas/kanban/service/KanbanService.java

@@ -31,11 +31,4 @@ public interface KanbanService {
      */
     List<Kanban> getByPanelCode(@NotEmpty("panelCode") String panelCode);
 
-	/**
-	 * 获取指定面板已启用的看板
-	 * @param panelCode
-	 * @return 已启用的看板
-	 */
-	List<Kanban> getEnableKanbansByPanelCode(@NotEmpty("panelCode") String panelCode);
-
 }

kanban-console/src/main/java/com/uas/kanban/service/LogoService.java

@@ -3,6 +3,9 @@
  */
 package com.uas.kanban.service;
 
+import java.util.List;
+
+import com.uas.kanban.annotation.NotEmpty;
 import com.uas.kanban.exception.OperationException;
 import com.uas.kanban.model.Logo;
 

kanban-console/src/main/java/com/uas/kanban/service/PanelViewService.java

@@ -1,33 +0,0 @@
-package com.uas.kanban.service;
-
-import java.util.Map;
-
-import com.uas.kanban.annotation.NotEmpty;
-import com.uas.kanban.exception.OperationException;
-import com.uas.kanban.model.PanelView;
-
-/**
- * 面板画面
- *
- * @author zhuth
- * @since 2018/5/24 13:59
- */
-public interface PanelViewService {
-	
-	/**
-     * 根据指定的面板画面code和顺序号，解析生成json数据传给前台
-     *
-     * @param index 画面index，可为空，为空时解析第一个画面数据
-     * @param code  画面 code， 可为空，为空时解析画面配置的第一个看板
-     * @return 解析生成的json
-     */
-	public Map<String, Object> parseData(@NotEmpty("code") String code, Integer index, String kanbanCode) throws OperationException;
-	
-	/**
-     * 获取指定面板的画面
-     *
-     * @param panelCode 所指定的面板 code
-     * @return 面板画面
-     */
-    PanelView getByPanelCode(@NotEmpty("panelCode") String panelCode) throws OperationException;
-}

kanban-console/src/main/java/com/uas/kanban/service/ParameterService.java

@@ -21,12 +21,4 @@ public interface ParameterService {
      */
     List<Parameter> getByPanelCode(@NotEmpty("panelCode") String panelCode);
 
-	/**
-	 * 获取指定面板解析后的的参数
-	 * @param panelCode 所指定的面板 code
-	 * @return 解析后的参数
-	 */
-	List<Parameter> getParseDataByPanelCode(@NotEmpty("panelCode") String panelCode);
-
-    
 }

kanban-console/src/main/java/com/uas/kanban/service/impl/KanbanServiceImpl.java

@@ -125,10 +125,4 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
         return kanbanDao.findByPanelCode(panelCode);
     }
 
-	@Override
-	public List<Kanban> getEnableKanbansByPanelCode(String panelCode) {
-		panelDao.checkExist(panelCode);
-        return kanbanDao.findEnableKanbanByPanelCode(panelCode);
-	}
-
 }

kanban-console/src/main/java/com/uas/kanban/service/impl/PanelViewServiceImpl.java

@@ -1,242 +0,0 @@
-package com.uas.kanban.service.impl;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.xml.transform.TransformerException;
-
-import org.dom4j.DocumentException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.kanban.annotation.NotEmpty;
-import com.uas.kanban.base.BaseDao;
-import com.uas.kanban.base.BaseService;
-import com.uas.kanban.dao.KanbanDao;
-import com.uas.kanban.dao.PanelDao;
-import com.uas.kanban.dao.PanelViewDao;
-import com.uas.kanban.exception.OperationException;
-import com.uas.kanban.model.Kanban;
-import com.uas.kanban.model.Panel;
-import com.uas.kanban.model.PanelView;
-import com.uas.kanban.model.Parameter;
-import com.uas.kanban.model.ViewConfig;
-import com.uas.kanban.service.PanelViewService;
-import com.uas.kanban.service.ParameterService;
-import com.uas.kanban.support.DataSourceManager;
-import com.uas.kanban.support.KanbanParser;
-import com.uas.kanban.support.SystemSession;
-import com.uas.kanban.util.CollectionUtils;
-import com.uas.kanban.util.ObjectUtils;
-import com.uas.kanban.util.StringUtils;
-
-import me.chyxion.jdbc.NewbieJdbcSupport;
-
-/**
- * 面板画面
- *
- * @author zhuth
- * @since 2018/5/24 14:04
- */
-@Service
-public class PanelViewServiceImpl extends BaseService<PanelView> implements PanelViewService {
-
-    @Autowired
-    private PanelViewDao panelViewDao;
-    
-    @Autowired
-    private PanelDao panelDao;
-    
-    @Autowired
-    private KanbanDao kanbanDao;
-    
-    @Autowired
-    private ParameterService parameterService;
-    
-    @Autowired
-    private DataSourceManager dataSourceManager;
-    
-    @Autowired
-    private KanbanParser kanbanParser;
-
-	@Override
-	public PanelView save(@NotEmpty("json") String json) {
-		PanelView panelView = panelViewDao.parse(json);
-		Panel panel = panelDao.checkExist(panelView.getPanelCode());
-		panelView.setPanelVersion(panel.getVersion());
-		return panelViewDao.save(panelView);
-	}
-
-	@Override
-	public int update(@NotEmpty("json") String json) throws IllegalArgumentException, OperationException {
-		PanelView newPanelView = panelViewDao.parse(json);
-		PanelView oldPanelView = panelViewDao.checkExist(newPanelView.getCode());
-		if(ObjectUtils.equals(newPanelView, oldPanelView)) {
-			return 0;
-		}
-		return panelViewDao.update(newPanelView);
-	}
-
-	@Override
-	public Map<String, Object> parseData(@NotEmpty("code") String code, Integer index, String kanbanCode) throws OperationException {
-		index = index == null ? 0 : index;
-		PanelView panelView = panelViewDao.checkExist(code);
-		BaseDao.checkFields(panelView);
-		Panel panel = panelDao.checkExist(panelView.getPanelCode());
-		List<ViewConfig> areaConfigs = panelView.getAreaConfig();
-		ViewConfig viewConfig = areaConfigs.get(index);
-		List<String> viewKanbans = viewConfig.getViewKanbans();
-		if(CollectionUtils.isEmpty(viewKanbans)) {
-			throw new IllegalStateException("该画面未配置可展示看板");
-		}
-		if (!StringUtils.isEmpty(kanbanCode)) {
-            if (!viewKanbans.contains(kanbanCode)) {
-                throw new IllegalArgumentException("看板不存在或未启用：" + kanbanCode);
-            }
-        } else {
-            kanbanCode = viewKanbans.get(0);
-        }
-		Kanban kanban = kanbanDao.checkExist(kanbanCode);
-        BaseDao.checkFields(kanban);
-        String content = kanban.getContent();
-        String title = kanban.getTitle();
-        if (StringUtils.isEmpty(content)) {
-            throw new IllegalStateException("看板内容为空：" + kanbanCode);
-        }
-        List<Parameter> parameters = parameterService.getParseDataByPanelCode(panel.getCode());
-        List<JSONObject> pvalues = panelView.getParameters();
-        JSONObject values = pvalues.get(index); 
-        for(Parameter parameter : parameters) {
-        	String value = values.getString(parameter.getCode());
-        	parameter.setValue(value);
-        }
-        // 解析看板
-        String kanbanContent;
-        try {
-            NewbieJdbcSupport jdbc = dataSourceManager.getJdbc(panel.getDataSourceCode());
-            kanbanContent = kanbanParser.parseXml(content, title, parameters, jdbc);
-        } catch (DocumentException e) {
-            throw new IllegalStateException("xml 解析出错", e);
-        } catch (TransformerException e) {
-            throw new IllegalStateException("xml 映射出错", e);
-        } catch (IOException e) {
-            throw new IllegalStateException("xml 转换出错", e);
-        } catch (SQLException e) {
-            throw new IllegalStateException("SQL 查询错误", e);
-        }
-        Map<String, Object> result = new HashMap<>();
-        Map<String, Object> instance = new HashMap<>();
-        instance.put("parameters", parameters);
-        instance.put("enabledKanbanCodes", viewKanbans);
-        instance.put("display", panel.getDisplay());
-        instance.put("switchFrequency", values.get("refreshFrequency"));
-        instance.put("refreshFrequency", values.get("refreshFrequency"));
-        result.put("instance", instance);
-        List<JSONObject> data = new ArrayList<>();
-        data.add(JSONObject.parseObject(kanbanContent));
-        result.put("data", data);
-        return result;
-	}
-
-	@Override
-	public PanelView getByPanelCode(String panelCode) throws OperationException {
-		PanelView panelView = panelViewDao.findByPanelCode(panelCode);
-		Panel panel = panelDao.checkExist(panelCode);
-		if(panelView == null || panel.getVersion() > panelView.getPanelVersion()) {
-			if(panelView != null) {
-				panelView = updatePanelView(panelCode, panelView);
-			} else {
-				panelView = generatePanelView(panelCode);
-			}
-		}
-        return panelView;
-	}
-
-	/**
-     * 更新面板多画面配置
-     *
-     * @param panelCode        面板 code
-     * @param oldPanelView 旧的画面配置
-     * @return 新的画面配置
-	 * @throws OperationException 
-	 * @throws IllegalArgumentException 
-     */
-	private PanelView updatePanelView(@NotEmpty("panelCode") String panelCode, @NotEmpty("oldPanelView") PanelView oldPanelView) throws IllegalArgumentException, OperationException {
-		Panel panel = panelDao.checkExist(panelCode);
-		PanelView panelView;
-		try{
-			panelView = ObjectUtils.clone(oldPanelView);
-		} catch (IOException | ClassNotFoundException e) {
-			throw new IllegalStateException("更新画面配置时，旧画面克隆失败", e);
-		}
-		panelView.setPanelVersion(panel.getVersion());
-		List<ViewConfig> viewConfigs = panelView.getAreaConfig();
-		List<Parameter> newParameter = parameterService.getParseDataByPanelCode(panel.getCode());
-		Iterator<Parameter> i = newParameter.iterator();
-		while(i.hasNext()) {
-			Parameter p = i.next();
-			for(ViewConfig viewConfig : viewConfigs) {
-				if(viewConfig.getViewParameters() == null) {
-					break;
-				}
-				JSONObject jsonObj = JSON.parseObject(viewConfig.getViewParameters());
-				// TODO 这里只取了String类型的值
-				if(jsonObj.getString(p.getCode()) != null) {
-					String value = jsonObj.getString(p.getCode());
-					List<Object> optionalValues = p.getOptionalValues();
-					List<String> values = new ArrayList<String>();
-					for(Object obj : optionalValues) {
-						values.add(obj.toString());
-					}
-					if(values.contains(value)) {
-						// 使用原值
-					} else {
-						// 使用新值
-						jsonObj.put(p.getCode(), values.get(0));
-					}
-				}
-				viewConfig.setViewParameters(JSON.toJSONString(jsonObj));
-			}
-		}
-		panelView.setAreaConfig(viewConfigs);
-		panelViewDao.update(panelView);
-		return panelView;
-	}
-	
-	/**
-     * 初始化面板多画面配置
-     *
-     * @param panelCode        面板 code
-     * @return 画面配置
-     */
-	private PanelView generatePanelView(@NotEmpty("panelCode") String panelCode) {
-		Panel panel = panelDao.checkExist(panelCode);
-		PanelView panelView = new PanelView();
-		panelView.setViewType("single");
-		panelView.setPanelCode(panel.getCode());
-		panelView.setPanelVersion(panel.getVersion());
-		panelView.setAreaRows(1);
-		panelView.setAreaCols(1);
-		panelView.setUserCode(SystemSession.getUser().codeNotEmpty());
-		List<ViewConfig> areaConfig = new ArrayList<ViewConfig>();
-		ViewConfig v = new ViewConfig();
-		v.setViewIndex(0);
-		v.setViewKanbans(new ArrayList<String>());
-		List<Parameter> parameters = parameterService.getParseDataByPanelCode(panelCode);
-		String parametersStr = "{";
-		for(Parameter p: parameters) {
-			parametersStr += ("\"" + p.getCode() + "\":\"" + p.getValue() + "\",");
-		}
-		parametersStr += "\"refreshFrequency\":5}";
-		v.setViewParameters(parametersStr);
-		areaConfig.add(v);
-		panelView.setAreaConfig(areaConfig);
-		return panelView;
-	}
-}

kanban-console/src/main/java/com/uas/kanban/service/impl/ParameterServiceImpl.java

@@ -5,27 +5,14 @@ import com.uas.kanban.base.BaseService;
 import com.uas.kanban.dao.PanelDao;
 import com.uas.kanban.dao.ParameterDao;
 import com.uas.kanban.exception.OperationException;
-import com.uas.kanban.model.Panel;
 import com.uas.kanban.model.Parameter;
-import com.uas.kanban.model.Type;
 import com.uas.kanban.service.ParameterService;
-import com.uas.kanban.support.DataSourceManager;
-import com.uas.kanban.support.KanbanParser;
 import com.uas.kanban.util.CollectionUtils;
-
-import me.chyxion.jdbc.NewbieJdbcSupport;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 参数
@@ -41,14 +28,6 @@ public class ParameterServiceImpl extends BaseService<Parameter> implements Para
 
     @Autowired
     private PanelDao panelDao;
-    
-    @Autowired
-    private KanbanParser kanbanParser;
-    
-    @Autowired
-    private DataSourceManager dataSourceManager;
-    
-    private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Override
     public Parameter save(@NotEmpty("json") String json) {
@@ -140,74 +119,4 @@ public class ParameterServiceImpl extends BaseService<Parameter> implements Para
         return parameterDao.findByPanelCode(panelCode);
     }
 
-	@Override
-	public List<Parameter> getParseDataByPanelCode(String panelCode) {
-		Panel panel = panelDao.checkExist(panelCode);
-		List<Parameter> parameters = parameterDao.findByPanelCode(panelCode);
-		
-		try {
-			NewbieJdbcSupport jdbc = dataSourceManager.getJdbc(panel.getDataSourceCode());
-			parseSQLParameters(parameters, jdbc);
-		} catch (SQLException e) {
-			throw new IllegalStateException("参数解析错误", e);
-		}
-		return parameters;
-	}
-	
-	/**
-     * 解析 SQL 类型的参数
-     *
-     * @param parameters 参数
-     * @param jdbc       jdbc
-     */
-    private void parseSQLParameters(List<Parameter> parameters, NewbieJdbcSupport jdbc) {
-        if (CollectionUtils.isEmpty(parameters)) {
-            return;
-        }
-        for (Parameter parameter : parameters) {
-            parameter.mayInitValue();
-            // 如果是 SQL 类型，需要解析参数
-            if (parameter.getType() == Type.SQL) {
-                // 需要解析 optionalValues 里可选择的值
-                List<Object> optionalValues = parameter.getOptionalValues();
-                if (!CollectionUtils.isEmpty(optionalValues)) {
-                    if (optionalValues.size() > 1) {
-                        throw new IllegalArgumentException("SQL 类型的参数多于一个");
-                    }
-                    Object optionValue = optionalValues.get(0);
-                    optionalValues = getValue(jdbc, String.valueOf(optionValue));
-                    parameter.setOptionalValues(optionalValues);
-                    if (CollectionUtils.isEmpty(optionalValues)) {
-                        parameter.setValue(null);
-                        continue;
-                    }
-                    // 如果之前没有值，或者之前的值不是可选值的一项，取第一个可选值
-                    if (parameter.getValue() == null || !optionalValues.contains(parameter.getValue())) {
-                        parameter.setValue(CollectionUtils.isEmpty(optionalValues) ? null : optionalValues.get(0));
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * 获取 sql 执行结果
-     *
-     * @param jdbc jdbc
-     * @param sql  sql 查询语句
-     * @return 执行结果
-     */
-    private List<Object> getValue(@NotEmpty("jdbc") NewbieJdbcSupport jdbc, @NotEmpty("sql") String sql) {
-        List<Map<String, Object>> listMap = jdbc.listMap(kanbanParser.removeLastSemicolon(sql));
-        Map<String, List<Object>> map = kanbanParser.convert(listMap);
-        Set<String> keySet = map.keySet();
-        if (CollectionUtils.isEmpty(map)) {
-            return new ArrayList<>();
-        }
-        if (keySet.size() > 1) {
-            logger.error("参数解析结果不止一列：" + map);
-        }
-        return map.get(keySet.iterator().next());
-    }
-
 }

kanban-console/src/main/webapp/resources/app/controller/desktop.js

@@ -2,7 +2,7 @@ Ext.QuickTips.init();
 Ext.define('erp.controller.desktop', {
     extend: 'Ext.app.Controller',
     views:['desktop.Desktop', 'desktop.BoardManageLeftPanel', 'desktop.BoardManageMainPanel', 'desktop.BoardManageRightPanel','user.UserSetting',
-    'core.trigger.TextTrigger', 'desktop.DataSourceWin', 'desktop.AreaView'],
+    'core.trigger.TextTrigger', 'desktop.DataSourceWin'],
     stores:['desktopboard','user'],
     init:function(){
     	var me = this;

kanban-console/src/main/webapp/resources/app/store/desktopboard.js

@@ -1,6 +1,6 @@
 Ext.define('erp.store.desktopboard', {
 	extend: 'Ext.data.Store',
-    fields:['name', 'code', 'display', 'switchFrequency', 'iconCls','type', 'dataSourceCode', 'version'],
+    fields:['name', 'code', 'display', 'switchFrequency', 'iconCls','type', 'dataSourceCode'],
     proxy:{
     	type:'ajax',
     	url:'panel/get/all/',

kanban-console/src/main/webapp/resources/app/view/desktop/AreaView.js

@@ -1,169 +0,0 @@
-Ext.define('erp.view.desktop.AreaView', {
-	extend: 'Ext.panel.Panel',
-	alias: 'widget.areaview',
-	id: 'areaView',
-	layout: 'column',
-	arearows: 1,
-	areacols: 1,
-	selectedCls: 'x-areaview-selected',
-	areaConfig: [],
-	initComponent: function() {
-		var me = this;
-		
-		Ext.apply(me, {
-			items: []
-		});
-		me.callParent(arguments);
-	},
-	listeners: {
-		layoutHeight: function(areaview) {
-			var panels = areaview.items.items;
-			Ext.Array.each(panels, function(panel) {
-				panel.fireEvent('layoutHeight', panel);
-			});
-		}
-	},
-	createArea: function(values) {
-		var me = this, panels = [], num = 1,
-			viewtype = values.viewtype,
-			areacount = values.areacount,
-			rows = values.arearows, 
-			cols = values.areacols;
-		
-		if(viewtype == 'more') {
-			rows = 1;
-			cols = areacount;
-		}
-		
-		var viewHeight = Ext.getCmp('areaView').getHeight(),
-			panelHeight = viewHeight / rows;
-		for(var i = 0; i < rows; i++) {
-			for(var j = 0; j < cols; j++) {
-				panels.push({
-					xtype: 'panel',
-					height: panelHeight,
-					columnWidth: 1/cols,
-					bodyCls: 'x-area-view',
-					areaConfig: me.oldAreaConfig[num-1] || {
-						viewIndex: num-1,
-						viewParameters: Ext.getCmp('paramForm').getDefaultValues(),
-						viewKanbans: []
-					},
-					index: num-1,
-					html: num++,
-					listeners: {
-						afterlayout: function(panel) {
-							if(me.layoutHeighted) {
-								return;
-							}
-							var viewHeight = Ext.getCmp('areaView').getHeight(),
-								panelHeight = viewHeight / rows;
-							me.layoutHeighted = true;
-							panel.setHeight(panelHeight);
-							setTimeout(function() {
-								me.layoutHeighted = false;
-							}, 50);
-						},
-						layoutHeight: function(panel) {
-							var viewHeight = Ext.getCmp('areaView').getHeight(),
-								panelHeight = viewHeight / rows;
-							panel.setHeight(panelHeight);
-						},
-						click: {
-							element: 'el',
-							fn: function(e,dom,el){
-								var panelEl = this, panel = Ext.getCmp(panelEl.id);
-								// 选中样式
-								me.clearSelected();
-								me.setSelected(panel.index);
-							}
-						},
-						mouseenter: {
-							element: 'el',
-							fn: function(e,dom,el){
-								var panelEl = this, panel = Ext.getCmp(panelEl.id);
-								/*debugger;*/
-							}
-						}
-					}
-				});
-			}
-		}
-		
-		me.clearSelected();
-		me.removeAll();
-		me.add(panels);
-		me.doLayout();
-		
-		me.setAreaConfig();
-		me.setSelected(me.currentSelectedIndex);
-	},
-	setAreaConfig: function() {
-		var me = this;
-		me.areaConfig = me.items.items.map(function(p, i) {
-			return p.areaConfig;
-		});
-	},
-	getAreaConfig: function() {
-		var me = this;
-		return me.areaConfig;
-	},
-	clearSelected: function() {
-		var me = this, areaPanels = me.items.items;
-		Ext.Array.each(areaPanels, function(areaPanel) {
-			areaPanel.removeCls(me.selectedCls);
-		});
-		var paramForm = Ext.getCmp('paramForm');
-		var template = Ext.getCmp('template');
-		template.addParamCombo(paramForm, []);
-	},
-	setSelected: function(index) {
-		var me = this;
-		if(index == undefined || index < 0) {
-			index = 0;
-		}
-		if((index+1 > me.items.items.length)) {
-			index = 0;
-		}
-		var panel = me.items.items[index];
-		panel.addCls(me.selectedCls);
-		me.currentSelectedIndex = index;
-		var areaConfig = me.areaConfig[index];
-		// 获得配置的参数数据以及勾选的看板
-		var paramForm = Ext.getCmp('paramForm');
-		var template = Ext.getCmp('template');
-		template.addParamCombo(paramForm, template.parameterItems, index+1);
-		// 赋值
-		if(areaConfig) {
-			if(areaConfig.viewParameters) {
-				var p = {
-					data: areaConfig.viewParameters,
-					getData: function() {
-						return this.data;
-					}
-				}
-				paramForm.loadRecord(p);
-			}
-			if(areaConfig.viewKanbans) {
-				// 勾选看板
-				var grid = Ext.getCmp('modelGrid');
-				grid.selectModels(areaConfig.viewKanbans);
-			}
-		}else {
-			Ext.getCmp('refreshFrequency').setValue(0);
-			Ext.getCmp('refreshFrequency').setValue(5);
-		}
-	},
-	setViewParameters: function(viewParameters) {
-		var me = this, index = me.currentSelectedIndex; me.areaConfig[index] = me.areaConfig[index] || {
-			viewIndex: index
-		};
-		me.areaConfig[index].viewParameters = viewParameters || me.areaConfig[index].viewParameters;
-	},
-	setViewModel: function(codes) {
-		codes = codes || [];
-		var me = this, index = me.currentSelectedIndex, panel = me.items.items[index];
-		panel.areaConfig.viewKanbans = codes;
-		me.areaConfig[index].viewKanbans = codes;
-	}
-});

kanban-console/src/main/webapp/resources/app/view/desktop/BoardWindow.js

@@ -1,6 +1,7 @@
 Ext.define('erp.view.desktop.BoardWindow',{
 	extend:'Ext.window.Window',
 	alias:'widget.boardwindow',
+	instanceCode:null,
 	width:'100%',
 	height:'100%',
 	modal:true,
@@ -11,9 +12,8 @@ Ext.define('erp.view.desktop.BoardWindow',{
 	bodyBorder:false,
 	style:'border:none!important',
 	maximized:true,
-	id:'boardwin',
+	id:'win',
 	fullscreen:false,
-	layout: 'column',
 	listeners:{
 		resize:function( win, width, height, eOpts ){
 			Ext.Array.each(win.dockedItems.items,function(item){
@@ -23,9 +23,6 @@ Ext.define('erp.view.desktop.BoardWindow',{
 					item.show();
 				}
 			});
-			Ext.Array.each(win.items.items, function(item) {
-				item.fireEvent('viewresize', item, win.body.getHeight());
-			});
 		}
 	},
 	buttonAlign:'center',

kanban-console/src/main/webapp/resources/app/view/user/UserInfo.js

@@ -10,7 +10,7 @@ Ext.apply(Ext.form.VTypes, {
             return false;
         }
     },
-    confirmPwdText: '两次输入的密码不一致！'
+    confirmPwdText: '两次输入的密码不一致！',
 });
 Ext.define('erp.view.user.UserInfo',{
 	extend:'Ext.window.Window',
@@ -58,7 +58,7 @@ Ext.define('erp.view.user.UserInfo',{
                 blankText: '请输入新密码',
                 fieldLabel: '新密码',
                 regex: /^[\s\S]{0,16}$/,
-                regexText: '密码长度不能超过16个字符'
+                regexText: '密码长度不能超过16个字符',
             }, {  
                 xtype: 'textfield',
                 name: 'newpassword2',

kanban-console/src/main/webapp/resources/css/desktop.css

@@ -420,49 +420,6 @@ div.ux-taskbar div.x-toolbar {
     border-color:#c1bfc1
 }
 
-/*----------------------------------------------------
-    boardParamWin
-*/
-.x-area-view > span > div {
-	vertical-align: middle !important;
-	text-align: center;
-}
-.x-areaview-selected > div {
-	background-color: #4bc1c7;
-}
-#areaview-body + div +div {
-	top: 0 !important;
-	left: 0 !important;
-}
-#template-body .x-panel-header-default-horizontal .x-tool-after-title {
-	margin-left: 0 !important;
-}
-#template-body .x-panel-header-default-vertical {
-	padding: 5px 3px 5px 2px;
-}
-#template-body .x-panel-header-default-vertical .x-tool-before-title {
-	margin-left: 0 !important;
-}
-#template-body .x-tool-expand-right, .x-tool-collapse-right {
-	background-position-x: 0 !important;
-	background-position-y: -176px !important;
-	width: 16px !important;
-	height: 16px !important;
-}
-
-#template-body .x-tool-collapse-left {
-	background-position-x: 0 !important;
-	background-position-y: -192px !important;
-	width: 16px !important;
-	height: 16px !important;
-}
-/*----------------------------------------------------
-    boardview
-*/
-.x-board-view {
-	border: 0.5px solid black !important;
-}
-
 /*----------------------------------------------------
     boardModel GridSelecter
 */