~chenluhua/Bond2.git

			@@ -220,7 +220,6 @@

			for (const auto& dev : devs) {
			DeviceRecipe dr;
			dr.strPPID = info.strPPID;
			try {
			dr.nDeviceID = std::stoi(dev[0]);
			dr.strDeviceName = dev[1];
			@@ -235,6 +234,29 @@
			recipes.push_back(info);
			}

			return recipes;
			}

			std::vector<RecipeInfo> RecipeManager::getRecipesByKeyword(const std::string& keyword) {
			std::vector<RecipeInfo> recipes;
			if (!m_pDB \|\| keyword.empty()) {
			return recipes;
			}

			std::ostringstream query;
			query << "SELECT ppid, description, create_time FROM recipes "
			<< "WHERE ppid LIKE '%" << keyword << "%' OR description LIKE '%" << keyword << "%';";

			auto rows = m_pDB->fetchResults(query.str());
			for (const auto& row : rows) {
			if (row.size() >= 3) {
			RecipeInfo info;
			info.strPPID = row[0];
			info.strDescription = row[1];
			info.strCreateTime = row[2];
			recipes.push_back(info);
			}
			}
			return recipes;
			}

			@@ -271,7 +293,6 @@
			auto devs = m_pDB->fetchResults("SELECT device_id, device_name, recipe_id FROM recipe_devices WHERE ppid = '" + ppid + "';");
			for (const auto& dev : devs) {
			DeviceRecipe dr;
			dr.strPPID = ppid;
			try {
			dr.nDeviceID = std::stoi(dev[0]);
			dr.strDeviceName = dev[1];
			@@ -425,8 +446,8 @@
			recipe.strDescription = "Main Board Burn-in";

			recipe.vecDeviceList = {
			{1, 101, "P1001","Burner A"},
			{2, 102, "P1001", "Burner B"}
			{1, 101, "Burner A"},
			{2, 102, "Burner B"}
			};

			addRecipe(recipe);
			@@ -463,7 +484,6 @@
			std::getline(ss, description, ',');
			std::getline(ss, createTime, ',');

			dev.strPPID = ppid;
			auto& recipe = recipeMap[ppid];
			recipe.strPPID = ppid;
			recipe.strDescription = description;