[万利达MES]反馈2020120508 补充调整，数据字典界面，允许批量更新列显示异常处理

src/com/uas/mes/common/model/DataColumn.java

@@ -22,6 +22,7 @@ public class DataColumn implements Serializable {
 	private String data_default;
 	private Integer data_precision;
 	private String comments;
+	private Integer allowbatchupdate_;
 
 	public String getDdd_defaultvalue() {
 		return ddd_defaultvalue;
@@ -140,4 +141,12 @@ public class DataColumn implements Serializable {
 		return "(" + table_name + "," + column_name + "," + ddd_tablename + "," + ddd_fieldname + ")";
 	}
 
+	public Integer getAllowbatchupdate_() {
+		return allowbatchupdate_;
+	}
+
+	public void setAllowbatchupdate_(Integer allowbatchupdate_) {
+		this.allowbatchupdate_ = allowbatchupdate_;
+	}
+
 }

src/com/uas/mes/ma/controller/MADataDictionaryController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.uas.mes.common.entity.DataDictionary;
@@ -55,6 +56,21 @@ public class MADataDictionaryController {
 		return modelMap;
 	}
 
+
+	/**
+	 * 获取表关联关系
+	 * */
+	@RequestMapping(value="/ma/getDatarelations.action",method= RequestMethod.GET)
+	@ResponseBody
+	public Map<String,Object> getRelations(String tablename){
+		Map<String,Object> map=new HashMap<String, Object>();
+		map.put("relations", maDataDictionaryService.getDataRelations(tablename));
+		map.put("relations_col_comments",maDataDictionaryService.getRelation_Col_Comments(tablename));
+		map.put("relations_tab_comments",maDataDictionaryService.getRelation_Tab_Comments(tablename));
+		map.put("success",true);
+		return map;
+	}
+
 	/**
 	 * 查找数据字典
 	 * 

src/com/uas/mes/ma/service/MADataDictionaryService.java

@@ -1,13 +1,13 @@
 package com.uas.mes.ma.service;
 
-import java.util.List;
-
 import com.uas.mes.common.entity.DataDictionary;
 import com.uas.mes.common.entity.DataDictionaryDetail;
+import com.uas.mes.common.entity.DataRelation;
 import com.uas.mes.core.model.Page;
-
 import net.sf.json.JSONObject;
 
+import java.util.List;
+
 
 public interface MADataDictionaryService {
 
@@ -17,6 +17,8 @@ public interface MADataDictionaryService {
 
 	List<DataDictionary> getDataDictionaries(String tables);
 
+	List<DataRelation> getDataRelations(String tablename);
+
 	Page<DataDictionary> getPageDataDictionary(String query, int page, int start, int limit);
 
 	void alter(String col_update, String col_create, String col_remove, String ind_update, String ind_create, String ind_remove, String formStore,String gridStore);

src/com/uas/mes/ma/service/impl/MADataDictionaryServiceImpl.java

@@ -1,17 +1,10 @@
 package com.uas.mes.ma.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.stereotype.Service;
-
 import com.uas.mes.common.dao.DataDictionaryDao;
 import com.uas.mes.common.data.BaseDao;
 import com.uas.mes.common.entity.DataDictionary;
 import com.uas.mes.common.entity.DataDictionaryDetail;
+import com.uas.mes.common.entity.DataRelation;
 import com.uas.mes.common.support.SystemSession;
 import com.uas.mes.common.util.BaseUtil;
 import com.uas.mes.core.data.SqlRowList;
@@ -19,9 +12,16 @@ import com.uas.mes.core.exception.SystemException;
 import com.uas.mes.core.model.Page;
 import com.uas.mes.core.util.FlexJsonUtil;
 import com.uas.mes.ma.service.MADataDictionaryService;
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class MADataDictionaryServiceImpl implements MADataDictionaryService {
@@ -54,6 +54,22 @@ public class MADataDictionaryServiceImpl implements MADataDictionaryService {
 		return dictionaries;
 	}
 
+	@Override
+	public List<DataRelation> getDataRelations(String tablename) {
+		try{
+			return baseDao.getJdbcTemplate().query(
+					"select * from DataRelation where table_name_x=? ",
+					new BeanPropertyRowMapper<DataRelation>(DataRelation.class),tablename);
+		} catch (EmptyResultDataAccessException e){
+			e.printStackTrace();
+			return null;
+		} catch (Exception e){
+			e.printStackTrace();
+			return null;
+		}
+
+	}
+
 	@Override
 	public Page<DataDictionary> getPageDataDictionary(final String query, final int page, final int start, final int limit) {
 		final String condition = "table_name like '%" + query.toUpperCase() + "%' or comments like '%" + query + "%'";