Main hhy

server/api/v1/ProblemRecordPkg/enter.go

@@ -0,0 +1,5 @@
+package ProblemRecordPkg
+
+type ApiGroup struct {
+	ProblemRecordApi
+}

server/api/v1/ProblemRecordPkg/problem_record.go

@@ -0,0 +1,206 @@
+package ProblemRecordPkg
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/ProblemRecordPkg"
+	ProblemRecordPkgReq "github.com/flipped-aurora/gin-vue-admin/server/model/ProblemRecordPkg/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/service"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type ProblemRecordApi struct {
+}
+
+var pbRecordService = service.ServiceGroupApp.ProblemRecordPkgServiceGroup.ProblemRecordService
+var nestinfoService = service.ServiceGroupApp.NestInfoServiceGroup.NestInfoService
+
+// CreateProblemRecord 创建ProblemRecord
+// @Tags ProblemRecord
+// @Summary 创建ProblemRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body ProblemRecordPkg.ProblemRecord true "创建ProblemRecord"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Router /pbRecord/createProblemRecord [post]
+func (pbRecordApi *ProblemRecordApi) CreateProblemRecord(c *gin.Context) {
+	var pbRecord ProblemRecordPkg.ProblemRecord
+	err := c.ShouldBindJSON(&pbRecord)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := pbRecordService.CreateProblemRecord(&pbRecord); err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+	} else {
+		response.OkWithMessage("创建成功", c)
+	}
+}
+
+// DeleteProblemRecord 删除ProblemRecord
+// @Tags ProblemRecord
+// @Summary 删除ProblemRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body ProblemRecordPkg.ProblemRecord true "删除ProblemRecord"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Router /pbRecord/deleteProblemRecord [delete]
+func (pbRecordApi *ProblemRecordApi) DeleteProblemRecord(c *gin.Context) {
+	var pbRecord ProblemRecordPkg.ProblemRecord
+	err := c.ShouldBindJSON(&pbRecord)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := pbRecordService.DeleteProblemRecord(pbRecord); err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+	} else {
+		response.OkWithMessage("删除成功", c)
+	}
+}
+
+// DeleteProblemRecordByIds 批量删除ProblemRecord
+// @Tags ProblemRecord
+// @Summary 批量删除ProblemRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.IdsReq true "批量删除ProblemRecord"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"批量删除成功"}"
+// @Router /pbRecord/deleteProblemRecordByIds [delete]
+func (pbRecordApi *ProblemRecordApi) DeleteProblemRecordByIds(c *gin.Context) {
+	var IDS request.IdsReq
+	err := c.ShouldBindJSON(&IDS)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := pbRecordService.DeleteProblemRecordByIds(IDS); err != nil {
+		global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
+		response.FailWithMessage("批量删除失败", c)
+	} else {
+		response.OkWithMessage("批量删除成功", c)
+	}
+}
+
+// UpdateProblemRecord 更新ProblemRecord
+// @Tags ProblemRecord
+// @Summary 更新ProblemRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body ProblemRecordPkg.ProblemRecord true "更新ProblemRecord"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Router /pbRecord/updateProblemRecord [put]
+func (pbRecordApi *ProblemRecordApi) UpdateProblemRecord(c *gin.Context) {
+	var pbRecord ProblemRecordPkg.ProblemRecord
+	err := c.ShouldBindJSON(&pbRecord)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := pbRecordService.UpdateProblemRecord(pbRecord); err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
+		response.FailWithMessage("更新失败", c)
+	} else {
+		response.OkWithMessage("更新成功", c)
+	}
+}
+
+// FindProblemRecord 用id查询ProblemRecord
+// @Tags ProblemRecord
+// @Summary 用id查询ProblemRecord
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query ProblemRecordPkg.ProblemRecord true "用id查询ProblemRecord"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
+// @Router /pbRecord/findProblemRecord [get]
+func (pbRecordApi *ProblemRecordApi) FindProblemRecord(c *gin.Context) {
+	var pbRecord ProblemRecordPkg.ProblemRecord
+	err := c.ShouldBindQuery(&pbRecord)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if repbRecord, err := pbRecordService.GetProblemRecord(pbRecord.ID); err != nil {
+		global.GVA_LOG.Error("查询失败!", zap.Error(err))
+		response.FailWithMessage("查询失败", c)
+	} else {
+		response.OkWithData(gin.H{"repbRecord": repbRecord}, c)
+	}
+}
+
+// GetProblemRecordList 分页获取ProblemRecord列表
+// @Tags ProblemRecord
+// @Summary 分页获取ProblemRecord列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query ProblemRecordPkgReq.ProblemRecordSearch true "分页获取ProblemRecord列表"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Router /pbRecord/getProblemRecordList [get]
+func (pbRecordApi *ProblemRecordApi) GetProblemRecordList(c *gin.Context) {
+	var pageInfo ProblemRecordPkgReq.ProblemRecordSearch
+	err := c.ShouldBindQuery(&pageInfo)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if list, total, err := pbRecordService.GetProblemRecordInfoList(pageInfo); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		response.OkWithDetailed(response.PageResult{
+			List:     list,
+			Total:    total,
+			Page:     pageInfo.Page,
+			PageSize: pageInfo.PageSize,
+		}, "获取成功", c)
+	}
+}
+
+// GetProblemRecordListByUser 根据用户权限分页获取ProblemRecord列表
+// @Tags ProblemRecord
+// @Summary 根据用户权限分页获取ProblemRecord列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query ProblemRecordPkgReq.ProblemRecordSearch true "根据用户权限分页获取ProblemRecord列表"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Router /pbRecord/getProblemRecordList [get]
+func (pbRecordApi *ProblemRecordApi) GetProblemRecordListByUser(c *gin.Context) {
+	var pageInfo ProblemRecordPkgReq.ProblemRecordSearch
+	err := c.ShouldBindQuery(&pageInfo)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if nestList, _, err := nestinfoService.GetNestInfoInfoListWithUser(c); err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		nestIdArr := make([]string, 0, 0)
+		for _, nestInfo := range nestList {
+			nestIdArr = append(nestIdArr, nestInfo.Nestid)
+		}
+		if recordList, total, err := pbRecordService.GetProblemRecordInfoListByUser(pageInfo, nestIdArr); err != nil {
+			global.GVA_LOG.Error("获取失败!", zap.Error(err))
+			response.FailWithMessage("获取失败", c)
+		} else {
+			response.OkWithDetailed(response.PageResult{
+				List:     recordList,
+				Total:    total,
+				Page:     pageInfo.Page,
+				PageSize: pageInfo.PageSize,
+			}, "获取成功", c)
+		}
+	}
+
+}

server/api/v1/enter.go

@@ -7,6 +7,7 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/NestExecRecordPkg"
 	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/NestInfo"
 	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/Nestrolepkg"
+	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/ProblemRecordPkg"
 	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/Theme"
 	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/UserTeemlinkPkg"
 	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/example"
@@ -24,6 +25,7 @@ type ApiGroup struct {
 	UserTeemlinkPkgApiGroup            UserTeemlinkPkg.ApiGroup
 	AerialPhotographyResultPkgApiGroup AerialPhotographyResultPkg.ApiGroup
 	ThemeApiGroup                      Theme.ApiGroup
+	ProblemRecordPkgApiGroup           ProblemRecordPkg.ApiGroup
 }
 
 var ApiGroupApp = new(ApiGroup)

server/initialize/gorm.go

@@ -14,6 +14,7 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/model/NestExecRecordPkg"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/NestInfo"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/Nestrolepkg"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/ProblemRecordPkg"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/Theme"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/UserTeemlinkPkg"
 	"go.uber.org/zap"
@@ -59,7 +60,7 @@ func RegisterTables() {
 		example.ExaFile{},
 		example.ExaCustomer{},
 		example.ExaFileChunk{},
-		example.ExaFileUploadAndDownload{}, NestInfo.NestInfo{}, Nestrolepkg.NestRole{}, NestExecRecordPkg.NestExecRecord{}, FlyResultPkg.FlyResult{}, UserTeemlinkPkg.UserTeemlink{}, NestAirlinePkg.NestAirline{}, AerialPhotographyResultPkg.AerialPhotographyResult{}, Theme.Theme{},
+		example.ExaFileUploadAndDownload{}, NestInfo.NestInfo{}, Nestrolepkg.NestRole{}, NestExecRecordPkg.NestExecRecord{}, FlyResultPkg.FlyResult{}, UserTeemlinkPkg.UserTeemlink{}, NestAirlinePkg.NestAirline{}, AerialPhotographyResultPkg.AerialPhotographyResult{}, Theme.Theme{}, ProblemRecordPkg.ProblemRecord{},
 	)
 	if err != nil {
 		global.GVA_LOG.Error("register table failed", zap.Error(err))

server/initialize/router.go

@@ -100,6 +100,13 @@ func Routers() *gin.Engine {
 		ThemeRouter := router.RouterGroupApp.Theme
 		ThemeRouter.InitThemeRouter(PrivateGroup)
 	}
+	{
+
+	}
+	{
+		ProblemRecordPkgRouter := router.RouterGroupApp.ProblemRecordPkg
+		ProblemRecordPkgRouter.InitProblemRecordRouter(PrivateGroup)
+	}
 
 	global.GVA_LOG.Info("router register success")
 	return Router

server/model/NestAirlinePkg/nest_airline.go

@@ -28,9 +28,10 @@ type NestAirline struct {
 	FixedReturnPoint      string   `json:"fixedReturnPoint" form:"fixedReturnPoint" gorm:"column:fixed_return_point;comment:;"`
 	NestId                string   `json:"nestId" form:"nestId" gorm:"column:nest_id;comment:;"`
 	Remark                string   `json:"remark" form:"remark" gorm:"column:remark;comment:;"`
-	GoHomeHeight          *float64 `json:"goHomeHeight" form:"goHomeHeight" gorm:"column:go_home_height;comment:;"`    //返航高度
-	ExecDistance          *float64 `json:"execDistance" form:"execDistance" gorm:"column:exec_distance;comment:;"`     //预估距离
-	ExecTimeSpend         *float64 `json:"execTimeSpend" form:"execTimeSpend" gorm:"column:exec_time_spend;comment:;"` //预估执行时间
+	GoHomeHeight          *float64 `json:"goHomeHeight" form:"goHomeHeight" gorm:"column:go_home_height;comment:;"`                    //返航高度
+	ExecDistance          *float64 `json:"execDistance" form:"execDistance" gorm:"column:exec_distance;comment:;"`                     //预估距离
+	ExecTimeSpend         *float64 `json:"execTimeSpend" form:"execTimeSpend" gorm:"column:exec_time_spend;comment:;"`                 //预估执行时间
+	UseMultiSpectrum      *int     `json:"useMultispectrum" form:"useMultiSpectrum" gorm:"column:use_multi_spectrum;comment:0-否 1-是;"` //是否多光谱
 	CreatedBy             uint     `gorm:"column:created_by;comment:创建者"`
 	UpdatedBy             uint     `gorm:"column:updated_by;comment:更新者"`
 	DeletedBy             uint     `gorm:"column:deleted_by;comment:删除者"`

server/model/ProblemRecordPkg/problem_record.go

@@ -0,0 +1,30 @@
+// 自动生成模板ProblemRecord
+package ProblemRecordPkg
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"time"
+)
+
+// ProblemRecord 结构体
+type ProblemRecord struct {
+	global.GVA_MODEL
+	OrderNum      *int       `json:"orderNum" form:"orderNum" gorm:"column:order_num;comment:;"`
+	RegisterDate  *time.Time `json:"registerDate" form:"registerDate" gorm:"column:register_date;comment:;"`
+	ProblemName   string     `json:"problemName" form:"problemName" gorm:"column:problem_name;comment:;"`
+	ProblemType   string     `json:"problemType" form:"problemType" gorm:"column:problem_type;comment:;"`
+	ProblemSource string     `json:"problemSource" form:"problemSource" gorm:"column:problem_source;comment:;"`
+	ProblemDesc   string     `json:"problemDesc" form:"problemDesc" gorm:"column:problem_desc;comment:;"`
+	PersonCharge  string     `json:"personCharge" form:"personCharge" gorm:"column:person_charge;comment:;"`
+	ProblemImage  string     `json:"problemImage" form:"problemImage" gorm:"column:problem_image;comment:;"`
+	HandMeasurce  string     `json:"handMeasurce" form:"handMeasurce" gorm:"column:hand_measurce;comment:;"`
+	CurrState     string     `json:"currState" form:"currState" gorm:"column:curr_state;type:enum('已处理','未处理');comment:;"`
+	Lng           *float64   `json:"lng" form:"lng" gorm:"column:lng;comment:;"`
+	Lat           *float64   `json:"lat" form:"lat" gorm:"column:lat;comment:;"`
+	Nestid        string     `json:"nestid" form:"nestid"  gorm:"type:longtext;column:nestid;comment:;"`
+}
+
+// TableName ProblemRecord 表名
+func (ProblemRecord) TableName() string {
+	return "problem_record"
+}

server/model/ProblemRecordPkg/request/problem_record.go

@@ -0,0 +1,14 @@
+package request
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/model/ProblemRecordPkg"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"time"
+)
+
+type ProblemRecordSearch struct {
+	ProblemRecordPkg.ProblemRecord
+	StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
+	EndCreatedAt   *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
+	request.PageInfo
+}

server/router/ProblemRecordPkg/enter.go

@@ -0,0 +1,5 @@
+package ProblemRecordPkg
+
+type RouterGroup struct {
+	ProblemRecordRouter
+}

server/router/ProblemRecordPkg/problem_record.go

@@ -0,0 +1,28 @@
+package ProblemRecordPkg
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/api/v1"
+	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+type ProblemRecordRouter struct {
+}
+
+// InitProblemRecordRouter 初始化 ProblemRecord 路由信息
+func (s *ProblemRecordRouter) InitProblemRecordRouter(Router *gin.RouterGroup) {
+	pbRecordRouter := Router.Group("pbRecord").Use(middleware.OperationRecord())
+	pbRecordRouterWithoutRecord := Router.Group("pbRecord")
+	var pbRecordApi = v1.ApiGroupApp.ProblemRecordPkgApiGroup.ProblemRecordApi
+	{
+		pbRecordRouter.POST("createProblemRecord", pbRecordApi.CreateProblemRecord)             // 新建ProblemRecord
+		pbRecordRouter.DELETE("deleteProblemRecord", pbRecordApi.DeleteProblemRecord)           // 删除ProblemRecord
+		pbRecordRouter.DELETE("deleteProblemRecordByIds", pbRecordApi.DeleteProblemRecordByIds) // 批量删除ProblemRecord
+		pbRecordRouter.PUT("updateProblemRecord", pbRecordApi.UpdateProblemRecord)              // 更新ProblemRecord
+	}
+	{
+		pbRecordRouterWithoutRecord.GET("findProblemRecord", pbRecordApi.FindProblemRecord)                   // 根据ID获取ProblemRecord
+		pbRecordRouterWithoutRecord.GET("getProblemRecordList", pbRecordApi.GetProblemRecordList)             // 获取ProblemRecord列表
+		pbRecordRouterWithoutRecord.GET("getProblemRecordListByUser", pbRecordApi.GetProblemRecordListByUser) // 根据用户权限分页获取ProblemRecord列表
+	}
+}

server/router/enter.go

@@ -8,6 +8,7 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/router/NestExecRecordPkg"
 	"github.com/flipped-aurora/gin-vue-admin/server/router/NestInfo"
 	"github.com/flipped-aurora/gin-vue-admin/server/router/Nestrolepkg"
+	"github.com/flipped-aurora/gin-vue-admin/server/router/ProblemRecordPkg"
 	"github.com/flipped-aurora/gin-vue-admin/server/router/Theme"
 	"github.com/flipped-aurora/gin-vue-admin/server/router/UserTeemlinkPkg"
 	"github.com/flipped-aurora/gin-vue-admin/server/router/example"
@@ -26,6 +27,7 @@ type RouterGroup struct {
 	AerialPhotographyResult    AerialPhotographyResult.RouterGroup
 	AerialPhotographyResultPkg AerialPhotographyResultPkg.RouterGroup
 	Theme                      Theme.RouterGroup
+	ProblemRecordPkg           ProblemRecordPkg.RouterGroup
 }
 
 var RouterGroupApp = new(RouterGroup)

server/service/AerialPhotographyResultPkg/aerial_photography_result.go

@@ -126,7 +126,7 @@ func (ALPhotographyResultService *AerialPhotographyResultService) GetAerialPhoto
 	return ALPhotographyResults, total, err
 }
 
-//QueryAerialPhotographyResult 查询并处理航摄成果数据
+// QueryAerialPhotographyResult 查询并处理航摄成果数据
 func (ALPhotographyResultService *AerialPhotographyResultService) QueryAerialPhotographyResult(c *gin.Context) ([]AerialPhotographyResultPkg.AerialPhotographyResult, []AerialPhotographyResultPkg.AerialPhotographyResult, error) {
 	var dataList []AerialPhotographyResultPkg.AerialPhotographyResult
 	var modelList []AerialPhotographyResultPkg.AerialPhotographyResult
@@ -136,7 +136,7 @@ func (ALPhotographyResultService *AerialPhotographyResultService) QueryAerialPho
 	if err != nil {
 		return modelList, orthoList, err
 	}
-	querySql := "select id,status,name,photography_createtime,type,nest_ids, REPLACE(JSON_EXTRACT(aerial_photography_file, '$[0].url'),'\"','') aerial_photography_file, position, load_or_not from aerial_photography_result where 1 = 1 and status = 2 and load_or_not = 0"
+	querySql := "select id,status,name,photography_createtime,type,nest_ids, REPLACE(JSON_EXTRACT(aerial_photography_file, '$[0].url'),'\"','') aerial_photography_file, position, load_or_not from aerial_photography_result where 1 = 1 and status = 2 and load_or_not = 0 and deleted_by = 0 "
 	db := global.GVA_DB.Model(&AerialPhotographyResultPkg.AerialPhotographyResult{})
 	if len(nestIDList) > 0 {
 		sqlWhere := ""
@@ -247,7 +247,7 @@ func AutoCompressAerialPhotographyFile() {
 	dataHandlerTicker.Stop()
 }
 
-//解压航摄成果压缩包并更新坐标
+// 解压航摄成果压缩包并更新坐标
 func AerialPhotographyFileUnzip(zipFile string, destDir string, alRes AerialPhotographyResultPkg.AerialPhotographyResult, flag bool) ([]string, error) {
 	zipReader, err := zip.OpenReader(zipFile)
 	var paths []string