Fixed: fixed bug scrcpy and shell is disconnect when switch page
This commit is contained in:
parent
9543d4541c
commit
0fe469b5c6
43 changed files with 1378 additions and 1366 deletions
52
server/routers/v2/material.go
Normal file
52
server/routers/v2/material.go
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
package v2
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"recipe-manager/data"
|
||||
modelsV2 "recipe-manager/models/v2"
|
||||
"recipe-manager/services/logger"
|
||||
"strconv"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
type materialRouter struct {
|
||||
data *data.Data
|
||||
taoLogger *logger.TaoLogger
|
||||
}
|
||||
|
||||
func NewMaterialRouter(data *data.Data, taoLogger *logger.TaoLogger) *materialRouter {
|
||||
return &materialRouter{
|
||||
data: data,
|
||||
taoLogger: taoLogger,
|
||||
}
|
||||
}
|
||||
|
||||
func (mr *materialRouter) Route(r chi.Router) {
|
||||
r.Route("/materials", func(r chi.Router) {
|
||||
r.Get("/dashboard", func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
|
||||
countryID := r.URL.Query().Get("country_id")
|
||||
filename := r.URL.Query().Get("filename")
|
||||
|
||||
materials := mr.data.GetMaterialSetting(countryID, filename)
|
||||
|
||||
result := make([]modelsV2.MaterialDashboard, 0, len(materials))
|
||||
for _, material := range materials {
|
||||
|
||||
dashboardMaterial := modelsV2.MaterialDashboard{
|
||||
Lebel: material.MaterialName,
|
||||
Value: strconv.Itoa(int(material.ID)),
|
||||
}
|
||||
|
||||
result = append(result, dashboardMaterial)
|
||||
}
|
||||
|
||||
if err := json.NewEncoder(w).Encode(result); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
69
server/routers/v2/recipe.go
Normal file
69
server/routers/v2/recipe.go
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
package v2
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"recipe-manager/data"
|
||||
modelsV2 "recipe-manager/models/v2"
|
||||
"recipe-manager/services/logger"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
type recipeRouter struct {
|
||||
data *data.Data
|
||||
taoLogger *logger.TaoLogger
|
||||
}
|
||||
|
||||
func NewRecipeRouter(data *data.Data, taoLogger *logger.TaoLogger) *recipeRouter {
|
||||
return &recipeRouter{
|
||||
data: data,
|
||||
taoLogger: taoLogger,
|
||||
}
|
||||
}
|
||||
|
||||
func (rr *recipeRouter) Route(r chi.Router) {
|
||||
r.Route("/recipes", func(r chi.Router) {
|
||||
r.Get("/dashboard", func(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
|
||||
countryID := r.URL.Query().Get("country_id")
|
||||
filename := r.URL.Query().Get("filename")
|
||||
|
||||
recipes := rr.data.GetRecipe(countryID, filename)
|
||||
|
||||
result := make([]modelsV2.DashboardRecipe, 0, len(recipes.Recipe01))
|
||||
for _, recipe := range recipes.Recipe01 {
|
||||
|
||||
dashboardRecipe := modelsV2.DashboardRecipe{
|
||||
ProductCode: recipe.ProductCode,
|
||||
Name: recipe.Name,
|
||||
NameENG: recipe.OtherName,
|
||||
InUse: recipe.IsUse,
|
||||
LastUpdated: recipe.LastChange,
|
||||
Image: "",
|
||||
}
|
||||
|
||||
if recipe.SubMenu != nil && len(recipe.SubMenu) > 0 {
|
||||
dashboardRecipe.SubRecipe = make([]*modelsV2.DashboardRecipe, 0, len(recipe.SubMenu))
|
||||
for _, subMenu := range recipe.SubMenu {
|
||||
dashboardRecipe.SubRecipe = append(dashboardRecipe.SubRecipe, &modelsV2.DashboardRecipe{
|
||||
ProductCode: subMenu.ProductCode,
|
||||
Name: subMenu.Name,
|
||||
NameENG: subMenu.OtherName,
|
||||
InUse: subMenu.IsUse,
|
||||
LastUpdated: recipe.LastChange,
|
||||
Image: "",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
result = append(result, dashboardRecipe)
|
||||
}
|
||||
|
||||
if err := json.NewEncoder(w).Encode(result); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue