1

common/src/main/java/com/jpsoft/excellent/modules/base/dao/WorkStationDAO.java

@@ -15,4 +15,5 @@ public interface WorkStationDAO {
 	int delete(String id);
 	List<WorkStation> list();
 	List<WorkStation> search(Map<String,Object> searchParams,List<Sort> sortList);
+	List<WorkStation> listByName(String name);
 }

common/src/main/java/com/jpsoft/excellent/modules/base/dao/WorkWindowDAO.java

@@ -15,4 +15,5 @@ public interface WorkWindowDAO {
 	int delete(String id);
 	List<WorkWindow> list();
 	List<WorkWindow> search(Map<String,Object> searchParams,List<Sort> sortList);
+	List<WorkWindow> listByName(String name);
 }

common/src/main/java/com/jpsoft/excellent/modules/base/service/WorkStationService.java

@@ -14,4 +14,5 @@ public interface WorkStationService {
 	int delete(String id);
 	List<WorkStation> list();
 	Page<WorkStation> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+	List<WorkStation> listByName(String name);
 }

common/src/main/java/com/jpsoft/excellent/modules/base/service/WorkWindowService.java

@@ -14,4 +14,5 @@ public interface WorkWindowService {
 	int delete(String id);
 	List<WorkWindow> list();
 	Page<WorkWindow> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+	List<WorkWindow> listByName(String name);
 }

common/src/main/java/com/jpsoft/excellent/modules/base/service/impl/WorkStationServiceImpl.java

@@ -67,4 +67,10 @@ public class WorkStationServiceImpl implements WorkStationService {
         
         return page;
 	}
+
+	@Override
+	public List<WorkStation> listByName(String name) {
+		// TODO Auto-generated method stub
+		return workStationDAO.listByName(name);
+	}
 }

common/src/main/java/com/jpsoft/excellent/modules/base/service/impl/WorkWindowServiceImpl.java

@@ -67,4 +67,10 @@ public class WorkWindowServiceImpl implements WorkWindowService {
         
         return page;
 	}
+
+	@Override
+	public List<WorkWindow> listByName(String name) {
+		// TODO Auto-generated method stub
+		return workWindowDAO.listByName(name);
+	}
 }

common/src/main/resources/mapper/base/WorkStation.xml

@@ -100,4 +100,9 @@ id_,area_id,station_name,del_flag,create_time,create_by,update_time,update_by		f
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="listByName" resultMap="WorkStationMap">
+		select * from base_work_station
+		where del_flag=0
+		and station_name={0}
+	</select>
 </mapper>

common/src/main/resources/mapper/base/WorkWindow.xml

@@ -104,4 +104,8 @@
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="listByName" resultMap="WorkWindowMap">
+		select * from base_work_window
+		where window_name={0}
+	</select>
 </mapper>

web/src/main/java/com/jpsoft/excellent/modules/base/controller/WorkStationController.java

@@ -319,7 +319,13 @@ public class WorkStationController {
                         continue;
                     }
 
-                    workStationService.insert(workStation);
+                    List<WorkStation> workStationExtant = workStationService.listByName(strStationName);
+                    if(workStationExtant.size() == 0) {
+                        workStationService.insert(workStation);
+                    }
+                    else{
+                        workStation = workStationExtant.get(0);
+                    }
 
                     if(StringUtils.isNotEmpty(strWindowName)) {
                         String[] names = strWindowName.split(",");