Merge pull request '添加数据保存和通过artID删除的功能接口,修改未查到工位数据的报错提示' (#284) from fix_screw into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/284
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>

models/pdc/pdc.go

@@ -0,0 +1,7 @@
+package pdc
+
+
+type ScrewDownSave struct {
+	ArtId   string      `json:"artId"`
+	ScrewLi []ScrewDown `json:"screwLi"`
+}

services/api/implments/Screw.service.impl.go

@@ -107,11 +107,13 @@ func (impl *ScrewServiceImplement) GetNewestScrew(user *models.Usertab, stn stri
 	model.ScrewGlobalNewest.Lock.RLock()
 	defer model.ScrewGlobalNewest.Lock.RUnlock()
 	if model.ScrewGlobalNewest.Map == nil {
-		return result, grmi.NewBusinessError("未获取到该工位的数据")
+		return result, nil
+		//return result, grmi.NewBusinessError("未获取到该工位的数据")
 	}
 	screwData, exist := model.ScrewGlobalNewest.Map[stn]
 	if !exist {
-		return result, grmi.NewBusinessError("未获取到该工位的数据")
+		return result, nil
+		//return result, grmi.NewBusinessError("未获取到该工位的数据")
 	}
 	if screwData.PicPath == "" {
 		engine := db.Eloquent.Master()
@@ -140,11 +142,13 @@ func (impl *ScrewServiceImplement) GetScrewLi(user *models.Usertab, stn string)
 	model.ScrewGlobalMap.Lock.RLock()
 	defer model.ScrewGlobalMap.Lock.RUnlock()
 	if model.ScrewGlobalMap.Map == nil {
-		return result, grmi.NewBusinessError("未获取到该工位的数据")
+		//return result, grmi.NewBusinessError("未获取到该工位的数据")
+		return result, nil
 	}
 	screwMap, exist := model.ScrewGlobalMap.Map[stn]
 	if !exist {
-		return result, grmi.NewBusinessError("未获取到该工位的数据")
+		//return result, grmi.NewBusinessError("未获取到该工位的数据")
+		return result, nil
 	}
 	var picPath string
 	for _, screwData := range screwMap {

services/pdc/ScrewDown.service.go

@@ -202,6 +202,44 @@ type ScrewDownService interface {
 	 *
 	 ******************************************************************************/
 	Update(*models.Usertab, *[]model.ScrewDown) error
+	/******************************************************************************
+	 *
+	 * @Function Name            : Save
+	 *-----------------------------------------------------------------------------
+	 *
+	 * @Description              : 保存同一个artID多条ScrewDown
+	 *
+	 * @Function Parameters      : 当前访问人员信息
+	 *
+	 * @Function Parameters      : 需要保存的screwData
+	 *
+	 * @Return Value             : 执行时发生的错误
+	 *
+	 * @Author                   : zhangxin
+	 *
+	 * @Date                     : 2021-05-28
+	 *
+	 ******************************************************************************/
+	Save(*models.Usertab, model.ScrewDownSave) error
+	/******************************************************************************
+	 *
+	 * @Function Name            : DeleteByArtId
+	 *-----------------------------------------------------------------------------
+	 *
+	 * @Description              : 通过artId删除多条ScrewDown
+	 *
+	 * @Function Parameters      : 当前访问人员信息
+	 *
+	 * @Function Parameters      : 需要删除的ScrewDown列表
+	 *
+	 * @Return Value             : 执行时发生的错误
+	 *
+	 * @Author                   : zhangxin
+	 *
+	 * @Date                     : 2021-05-28
+	 *
+	 ******************************************************************************/
+	DeleteByArtId(*models.Usertab, string) error
 }
 
 /******************************************************************************

services/pdc/implments/ScrewDown.service.impl.go

@@ -203,6 +203,9 @@ func (impl *ScrewDownServiceImplement) Insert(user *models.Usertab, entities *[]
 		if record != nil {
 			return grmi.NewBusinessError("已经存在相同主键的记录!")
 		}
+		if entity.PicPath == "" {
+			return grmi.NewBusinessError("图片为空")
+		}
 	}
 
 	err := dao.Insert(entities)
@@ -256,6 +259,7 @@ func (impl *ScrewDownServiceImplement) Select(user *models.Usertab, urlParameter
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	grmi.DeleteUrlParametersEmpty(&urlParameters)
 	predicates, err := condition.BuildPredicates(urlParameters)
 	if err != nil {
 		return nil, err
@@ -290,10 +294,12 @@ func (impl *ScrewDownServiceImplement) List(user *models.Usertab, urlParameters
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	grmi.DeleteUrlParametersEmpty(&urlParameters)
 	predicates, err := condition.BuildPredicates(urlParameters)
 	if err != nil {
 		return nil, err
 	}
+
 	predicates = append(predicates, meta.ScrewDown_ScrewPos.NewPredicate(grmi.Equal, -1))
 	dao := dal.NewScrewDownDAO(session, user.Pid, user.Userid)
 	if condition.Fill(urlParameters) {
@@ -341,3 +347,75 @@ func (impl *ScrewDownServiceImplement) Update(user *models.Usertab, entities *[]
 	}
 	return nil
 }
+
+
+/******************************************************************************
+ *
+ * @Reference LAPP_GAAS_GFrame_BACKEND/services/pdc/ScrewDownService.Save
+ *
+ ******************************************************************************/
+func (impl *ScrewDownServiceImplement) Save(user *models.Usertab, screwData model.ScrewDownSave) error {
+
+	grmi.Log(user, "/services/pdc/implments/ScrewDown.service.impl.go", "Save", "插入多个ScrewDown")
+
+	engine := db.Eloquent.Master()
+	session := engine.NewSession()
+	defer session.Close()
+	if err := session.Begin(); err != nil {
+		return err
+	}
+	dao := dal.NewScrewDownDAO(session, user.Pid, user.Userid)
+	artId := screwData.ArtId
+	entities := &screwData.ScrewLi
+	for _, entity := range *entities {
+		//record, err := dao.SelectOne(entity.ArtId, entity.ScrewPos, entity.Result)
+		//if err != nil {
+		//	return err
+		//}
+		//if record != nil {
+		//	return grmi.NewBusinessError("已经存在相同主键的记录!")
+		//}
+		if entity.PicPath == "" {
+			return grmi.NewBusinessError("图片为空")
+		}
+		if entity.ArtId != artId {
+			return grmi.NewBusinessError("artID不符")
+		}
+	}
+	err := dao.DeleteWhere([]grmi.Predicate{meta.ScrewDown_ArtId.NewPredicate(grmi.Equal, artId)})
+	if err != nil {
+		_ = session.Rollback()
+		return err
+	}
+	err = dao.Insert(entities)
+	if err != nil {
+		_ = session.Rollback()
+		return err
+	}
+	_ = session.Commit()
+	return nil
+}
+
+
+
+
+/******************************************************************************
+ *
+ * @Reference LAPP_GAAS_GFrame_BACKEND/services/pdc/ScrewDownService.DeleteByArtId
+ *
+ ******************************************************************************/
+func (impl *ScrewDownServiceImplement) DeleteByArtId(user *models.Usertab, artId string) error {
+
+	grmi.Log(user, "/services/pdc/implments/ScrewDown.service.impl.go", "DeleteScrewDown", "删除多个ScrewDown")
+
+	engine := db.Eloquent.Master()
+	session := engine.NewSession()
+	defer session.Close()
+	dao := dal.NewScrewDownDAO(session, user.Pid, user.Userid)
+	err := dao.DeleteWhere([]grmi.Predicate{meta.ScrewDown_ArtId.NewPredicate(grmi.Equal, artId)})
+
+	if err != nil {
+		return err
+	}
+	return nil
+}

web/controllers/pdc/ScrewDown.rest.go

@@ -382,3 +382,143 @@ func RegisterUpdateScrewDown(party router.Party, path string, method func(*model
 
 	RegisterMultiScrewDown(party, "PUT", path, method)
 }
+
+
+/******************************************************************************
+ *
+ * @Function Name            : RegisterSaveScrewDown
+ *-----------------------------------------------------------------------------
+ *
+ * @Description              : 为一个处理多条ScrewDown的方法注册路由
+ *
+ * @Function Parameters      : 路由分组
+ *
+ * @Function Parameters      : HTTP方法
+ *
+ * @Function Parameters      : 路径
+ *
+ * @Function Parameters      : 实际处理请求的方法
+ *
+ * @Author                   : zhangxin
+ *
+ * @Date                     : 2021-05-28
+ *
+ ******************************************************************************/
+func RegisterSaveScrewDown(party router.Party, httpMethod string, path string, method func(*models.Usertab, model.ScrewDownSave) error) {
+
+	party.Handle(httpMethod, path, func(ctx iris.Context) {
+		user, ok := jwts.ParseToken(ctx)
+		if !ok {
+			supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil)
+			return
+		}
+
+		var saveScrewData model.ScrewDownSave
+		err := ctx.ReadJSON(&saveScrewData)
+		if err != nil {
+			supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
+			return
+		}
+
+		err = method(user, saveScrewData)
+		if err != nil {
+			supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
+			return
+		}
+		supports.Ok(ctx, supports.OptionSuccess, nil)
+	})
+}
+
+
+/******************************************************************************
+ *
+ * @Function Name            : RegisterSaveScrewDownHandler
+ *-----------------------------------------------------------------------------
+ *
+ * @Description              : 为一个save多条ScrewDown的方法注册路由
+ *
+ * @Function Parameters      : 路由分组
+ *
+ * @Function Parameters      : 路径
+ *
+ * @Function Parameters      : 实际处理请求的方法
+ *
+ * @Author                   : zhangxin
+ *
+ * @Date                     : 2021-05-28
+ *
+ ******************************************************************************/
+func RegisterSaveScrewDownHandler(party router.Party, path string, method func(*models.Usertab, model.ScrewDownSave) error) {
+
+	RegisterSaveScrewDown(party, "POST", path, method)
+}
+
+
+/******************************************************************************
+ *
+ * @Function Name            : RegisterDeleteOneScrewDown
+ *-----------------------------------------------------------------------------
+ *
+ * @Description              : 为一个删除单条ScrewDown的方法注册路由
+ *
+ * @Function Parameters      : 路由分组
+ *
+ * @Function Parameters      : 路径
+ *
+ * @Function Parameters      : 实际处理请求的方法
+ *
+ * @Author                   : zhangxin
+ *
+ * @Date                     : 2021-05-28
+ *
+ ******************************************************************************/
+func RegisterDeleteScrewDownByArtIdHandler(party router.Party, path string, method func(*models.Usertab, string) error) {
+
+	RegisterDeleteScrewDownByArtId(party, "DELETE", path+"/{artId:string}", method)
+}
+
+
+/******************************************************************************
+ *
+ * @Function Name            : RegisterDeleteScrewDownByArtId
+ *-----------------------------------------------------------------------------
+ *
+ * @Description              : 通过artId进行删除screw data
+ *
+ * @Function Parameters      : 路由分组
+ *
+ * @Function Parameters      : HTTP方法
+ *
+ * @Function Parameters      : 路径
+ *
+ * @Function Parameters      : 实际处理请求的方法
+ *
+ * @Author                   : zhangxin
+ *
+ * @Date                     : 2021-05-28
+ *
+ ******************************************************************************/
+func RegisterDeleteScrewDownByArtId(party router.Party, httpMethod string, path string, method func(*models.Usertab, string) error) {
+
+	party.Handle(httpMethod, path, func(ctx iris.Context) {
+		user, ok := jwts.ParseToken(ctx)
+		if !ok {
+			supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil)
+			return
+		}
+
+		var err error = nil
+		artId := ctx.Params().GetString("artId")
+		if artId == "" {
+			supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil)
+			return
+		}
+
+		err = method(user, artId)
+		if err != nil {
+			supports.Error(ctx, iris.StatusBadRequest, err.Error(), nil)
+			return
+		}
+		supports.Ok(ctx, supports.OptionSuccess, nil)
+	})
+}

web/controllers/pdc/pdc.go

@@ -29,9 +29,9 @@ func RegisterRoutes() {
 		// ScrewDown的服务实例
 		var serviceOfScrewDown = svr.NewScrewDownService()
 		// ScrewDown插入一条
-		RegisterInsertOneScrewDown(screwdown, "/insertone", serviceOfScrewDown.InsertOne)
+		//RegisterInsertOneScrewDown(screwdown, "/insertone", serviceOfScrewDown.InsertOne)
 		// ScrewDown插入多条
-		RegisterInsertScrewDown(screwdown, "/insert", serviceOfScrewDown.Insert)
+		//RegisterInsertScrewDown(screwdown, "/insert", serviceOfScrewDown.Insert)
 		// ScrewDown删除一条
 		RegisterDeleteOneScrewDown(screwdown, "/deleteone", serviceOfScrewDown.DeleteOne)
 		// ScrewDown删除多条
@@ -41,11 +41,15 @@ func RegisterRoutes() {
 		// ScrewDown展示列表
 		RegisterSelectScrewDown(screwdown, "/list", serviceOfScrewDown.List)
 		// ScrewDown查询一条
-		RegisterSelectOneScrewDown(screwdown, "/get", serviceOfScrewDown.SelectOne)
+		//RegisterSelectOneScrewDown(screwdown, "/get", serviceOfScrewDown.SelectOne)
 		// ScrewDown修改一条
-		RegisterUpdateOneScrewDown(screwdown, "/updateone", serviceOfScrewDown.UpdateOne)
+		//RegisterUpdateOneScrewDown(screwdown, "/updateone", serviceOfScrewDown.UpdateOne)
 		// ScrewDown修改多条
 		// RegisterUpdateScrewDown(screwdown, "/update", serviceOfScrewDown.Update)
+		// ScrewDown修改多条
+		RegisterSaveScrewDownHandler(screwdown, "/save", serviceOfScrewDown.Save)
+		// ScrewDown删除一条
+		RegisterDeleteScrewDownByArtIdHandler(screwdown, "/deletebyartid", serviceOfScrewDown.DeleteByArtId)
 	})
 }