~suntianyu/webserver.git

parent: f3863b12 | 补丁 | 提交 | ignore whitespace

sunty

2019-06-28 f2d60f4a96b77cf3ae924f9d479bd40dd8fbd13c

修改结构体和相关成员

4个文件已修改

	controllers/fileController.go	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	models/dbtablepersons.go	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	models/dbtables.go	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	router/router.go	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 controllers/fileController.go

@@ -5,16 +5,16 @@
    "encoding/base64"
    "fmt"
    "github.com/gin-gonic/gin"
    "webserver/extend/code"
    "webserver/extend/esutil"
    "webserver/extend/util"
    "webserver/models"
    "github.com/satori/go.uuid"
    "image"
    "image/jpeg"
    "log"
    "mime/multipart"
    "net/http"
    "webserver/extend/code"
    "webserver/extend/esutil"
    "webserver/extend/util"
    "webserver/models"
)

type FileController struct {
@@ -116,15 +116,15 @@
            feat := features[0]["feature"].([]byte)   // linux
        if len(feat) != 2560 {                                // linux
            return field,nil,errors.New("NotFeatureFindError")
        }    */                     // linux
        }    */                       // linux
        feat := []byte("hello world") // windows 测试放开
        dbperson := new(models.Dbtablepersons)
        dbperson.FaceUrl = picIp+field       //  图片路经
        dbperson.TableId = tableId  //
        dbperson.PersonName = filename // 图片名
        dbperson.FaceFeature = picIp + field //  图片路经
        dbperson.TableId = tableId           //
        dbperson.PersonName = filename       // 图片名
        // 演示base64编码
        encodeString := base64.StdEncoding.EncodeToString(feat)
        dbperson.Feature = encodeString // 特征值base64 码
        dbperson.FaceFeature = encodeString // 特征值base64 码
        result := addDbPerson(dbperson)
        return field, result, nil
    } else {
@@ -133,7 +133,6 @@
}

/**上传方法**/


// @Summary 批量添加底库人员
// @Description  依据图片批量添加底库人员
@@ -240,7 +239,7 @@
    //features := gorun.GetSimpleFaceDetect(picIp + "/" + field) // 特征值  只在linux 下
    //feat := []byte("hello world")           // windows 测试放开
    result := make(map[string]interface{}, 0)
    result["uploadImage"] = picIp+field
    result["uploadImage"] = picIp + field
    smUrl := make([]string, 0)
    //for _, feature := range features {         // linux
    // 获取图片

 models/dbtablepersons.go

@@ -1,15 +1,14 @@
package models

type Dbtablepersons   struct {
type Dbtablepersons struct {
    BaseEntity
    TableId string `json:"tableId,omitempty" example:"库表id"`
    Feature string  `json:"feature,omitempty" example:"人脸特征值"`
    FaceUrl string `json:"faceUrl,omitempty" example:"图片路径"`
    PersonName string `json:"personName,omitempty" example:"人员姓名"`
    Age string `json:"age,omitempty"  example:"年龄"`
    Sex string  `json:"sex,omitempty" example:"性别 男 女"`
    Idcard string `json:"idcard,omitempty" example:"身份证"`
    PhoneNum string `json:"phoneNum,omitempty" example:"手机号码"`
    TableId      string `json:"tableId,omitempty" example:"库表id"`
    FaceFeature  string `json:"faceFeature,omitempty" example:"人脸特征值"`
    PersonPicUrl string `json:"personPicUrl,omitempty" example:"图片路径"`
    PersonName   string `json:"personName,omitempty" example:"人员姓名"`
    Age          string `json:"age,omitempty"  example:"年龄"`
    Sex          string `json:"sex,omitempty" example:"性别 男 女"`
    IdCard       string `json:"idCard,omitempty" example:"身份证"`
    PhoneNum     string `json:"phoneNum,omitempty" example:"手机号码"`
    MonitorLevel string `json:"monitorLevel,omitempty" example:"等级"`
}


 models/dbtables.go

@@ -2,15 +2,14 @@

type Dbtables struct {
    BaseEntity
    TableName string  `json:"tableName,omitempty" example:"底库123"`//表名
    TableDesc string  `json:"tableDesc,omitempty" example:"底库描述"`//描述
    TableType string  `json:"tableType,omitempty" example:"person,car"`//人员表"person
    BwType string   `json:"bwType,omitempty" example:"黑名单:1,白名单:0"`  //黑名单：1，白名单：0
    StartTime string  `json:"startTime,omitempty" example:"2019-01-12 12:14:56"` //有效期开始时间
    EndTime string    `json:"endTime,omitempty" example:"2019-10-12 12:14:56"` //有效期结束时间
    UploadFlag string `json:"uploadFlag,omitempty" example:"上传标志"` //
    CmpThreshold string `json:"cmpThreshold,omitempty" example:"45"`// //人脸比对阈值
    SyncType string  `json:"syncType,omitempty" example:"1:同步库，2：本地库"` //是否是同步库(1:同步库，2：本地库)
    Indeviceid string `json:"indeviceid,omitempty" example:"本地库所属的分析设备id，如果是同步库就不需要记录"`// 分析设备id(本地库所属的分析设备id，如果是同步库就不需要记录)
    TableName string `json:"tableName,omitempty" example:"底库123"`               //表名
    TableDesc string `json:"tableDesc,omitempty" example:"底库描述"`                //描述
    TableType string `json:"tableType,omitempty" example:"person,car"`          //人员表"person
    BwType    string `json:"bwType,omitempty" example:"黑名单:1,白名单:0"`            //黑名单：1，白名单：0
    StartTime string `json:"startTime,omitempty" example:"2019-01-12 12:14:56"` //有效期开始时间
    EndTime   string `json:"endTime,omitempty" example:"2019-10-12 12:14:56"`   //有效期结束时间
    //UploadFlag string `json:"uploadFlag,omitempty" example:"上传标志"` //
    //CmpThreshold string `json:"cmpThreshold,omitempty" example:"45"`// //人脸比对阈值
    IsSync        string `json:"isSync,omitempty" example:"1:同步库，2：本地库"`                      //是否是同步库(1:同步库，2：本地库)
    AnalyServerId string `json:"analyServerId,omitempty" example:"本地库所属的分析设备id，如果是同步库就不需要记录"` // 分析设备id(本地库所属的分析设备id，如果是同步库就不需要记录)
}


 router/router.go

@@ -27,16 +27,16 @@
    esSearchController := new(controllers.EsSearchController)
    realTimeController := new(controllers.RealTimeController)
    cameraTimeRuleController := new(controllers.CameraTimeruleController)
    polygonController :=new (controllers.CameraPolygonController)
    cameraTaskController :=new(controllers.CameraTaskController)
    cameraTaskArgsController :=new(controllers.CameraTaskArgsController)
    dicController :=new(controllers.DictionaryController)
    userController :=new(controllers.UserController)
    polygonController := new(controllers.CameraPolygonController)
    cameraTaskController := new(controllers.CameraTaskController)
    cameraTaskArgsController := new(controllers.CameraTaskArgsController)
    dicController := new(controllers.DictionaryController)
    userController := new(controllers.UserController)

    urlPrefix := "/data/api-v" // wp 添加 路径 前缀
    userApi :=r.Group(urlPrefix+"/user")
    userApi := r.Group(urlPrefix + "/user")
    {
        userApi.POST("/login",userController.Login)
        userApi.POST("/login", userController.Login)
    }

    //区域管理
@@ -62,30 +62,30 @@

        camera.GET("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
        camera.POST("/saveTask", cameraController.CameraTaskSave)
        camera.GET("/getRulesByCameraAndTask",cameraTaskArgsController.FindByCameraAndTask)
        camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
    }

    cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
    cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
    {
        cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
        cameraTaskArgsApi.POST("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
        cameraTaskArgsApi.POST("/saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
        cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
        cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
        cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
    }

    cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
    {
        cameraTaskApi.POST("/saveIsDataTrans",cameraTaskController.SaveIsDataTrans)
        cameraTaskApi.POST("/saveAlarmLevelByGroup",cameraTaskController.SaveAlarmLevelByGroup)
        cameraTaskApi.POST("/updateCameraTaskStatus",cameraTaskController.UpdateCameraTaskStatus)
        cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
        cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
        cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
    }

    polygon := r.Group(urlPrefix+"/polygon")
    polygon := r.Group(urlPrefix + "/polygon")
    {
        polygon.POST("/save", polygonController.Save)
        polygon.GET("/findByCameraId", polygonController.FindByCameraId)
        //polygon.GET("/delete", polygonController.Delete)
        polygon.GET("/updateDefenceStateByPolygonId",polygonController.UpdateDefenceStateByPolygonId)
        polygon.GET("/updateDefenceStateByCameraId",polygonController.UpdateDefenceStateByCameraId)
        polygon.GET("/updateDefenceStateByPolygonId", polygonController.UpdateDefenceStateByPolygonId)
        polygon.GET("/updateDefenceStateByCameraId", polygonController.UpdateDefenceStateByCameraId)
    }

    // 任务管理
@@ -153,8 +153,8 @@
    {
        sdkApi.POST("/saveSdk", sdkController.Save)
        sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
        sdkApi.GET("/findByTaskId",sdkController.FindByTaskId)
        sdkApi.GET("/getById",sdkController.GetById)
        sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
        sdkApi.GET("/getById", sdkController.GetById)
    }

    cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
@@ -163,9 +163,9 @@
        cameraTimeApi.GET("/delete", cameraTimeRuleController.Delete)
        cameraTimeApi.GET("/findAll", cameraTimeRuleController.FindAll)
    }
    dicApi :=r.Group(urlPrefix+"/dictionary")
    dicApi := r.Group(urlPrefix + "/dictionary")
    {
        dicApi.GET("/findByType",dicController.FindByType)
        dicApi.GET("/findByType", dicController.FindByType)
    }

    // 文件 上传

			@@ -5,16 +5,16 @@
			"encoding/base64"
			"fmt"
			"github.com/gin-gonic/gin"
			"webserver/extend/code"
			"webserver/extend/esutil"
			"webserver/extend/util"
			"webserver/models"
			"github.com/satori/go.uuid"
			"image"
			"image/jpeg"
			"log"
			"mime/multipart"
			"net/http"
			"webserver/extend/code"
			"webserver/extend/esutil"
			"webserver/extend/util"
			"webserver/models"
			)

			type FileController struct {
			@@ -116,15 +116,15 @@
			feat := features[0]["feature"].([]byte) // linux
			if len(feat) != 2560 { // linux
			return field,nil,errors.New("NotFeatureFindError")
			} */ // linux
			} */ // linux
			feat := []byte("hello world") // windows 测试放开
			dbperson := new(models.Dbtablepersons)
			dbperson.FaceUrl = picIp+field // 图片路经
			dbperson.TableId = tableId //
			dbperson.PersonName = filename // 图片名
			dbperson.FaceFeature = picIp + field // 图片路经
			dbperson.TableId = tableId //
			dbperson.PersonName = filename // 图片名
			// 演示base64编码
			encodeString := base64.StdEncoding.EncodeToString(feat)
			dbperson.Feature = encodeString // 特征值base64 码
			dbperson.FaceFeature = encodeString // 特征值base64 码
			result := addDbPerson(dbperson)
			return field, result, nil
			} else {
			@@ -133,7 +133,6 @@
			}

			/上传方法/


			// @Summary 批量添加底库人员
			// @Description 依据图片批量添加底库人员
			@@ -240,7 +239,7 @@
			//features := gorun.GetSimpleFaceDetect(picIp + "/" + field) // 特征值只在linux 下
			//feat := []byte("hello world") // windows 测试放开
			result := make(map[string]interface{}, 0)
			result["uploadImage"] = picIp+field
			result["uploadImage"] = picIp + field
			smUrl := make([]string, 0)
			//for _, feature := range features { // linux
			// 获取图片

			@@ -1,15 +1,14 @@
			package models

			type Dbtablepersons struct {
			type Dbtablepersons struct {
			BaseEntity
			TableId string `json:"tableId,omitempty" example:"库表id"`
			Feature string `json:"feature,omitempty" example:"人脸特征值"`
			FaceUrl string `json:"faceUrl,omitempty" example:"图片路径"`
			PersonName string `json:"personName,omitempty" example:"人员姓名"`
			Age string `json:"age,omitempty" example:"年龄"`
			Sex string `json:"sex,omitempty" example:"性别男女"`
			Idcard string `json:"idcard,omitempty" example:"身份证"`
			PhoneNum string `json:"phoneNum,omitempty" example:"手机号码"`
			TableId string `json:"tableId,omitempty" example:"库表id"`
			FaceFeature string `json:"faceFeature,omitempty" example:"人脸特征值"`
			PersonPicUrl string `json:"personPicUrl,omitempty" example:"图片路径"`
			PersonName string `json:"personName,omitempty" example:"人员姓名"`
			Age string `json:"age,omitempty" example:"年龄"`
			Sex string `json:"sex,omitempty" example:"性别男女"`
			IdCard string `json:"idCard,omitempty" example:"身份证"`
			PhoneNum string `json:"phoneNum,omitempty" example:"手机号码"`
			MonitorLevel string `json:"monitorLevel,omitempty" example:"等级"`
			}

			@@ -2,15 +2,14 @@

			type Dbtables struct {
			BaseEntity
			TableName string `json:"tableName,omitempty" example:"底库123"`//表名
			TableDesc string `json:"tableDesc,omitempty" example:"底库描述"`//描述
			TableType string `json:"tableType,omitempty" example:"person,car"`//人员表"person
			BwType string `json:"bwType,omitempty" example:"黑名单:1,白名单:0"` //黑名单：1，白名单：0
			StartTime string `json:"startTime,omitempty" example:"2019-01-12 12:14:56"` //有效期开始时间
			EndTime string `json:"endTime,omitempty" example:"2019-10-12 12:14:56"` //有效期结束时间
			UploadFlag string `json:"uploadFlag,omitempty" example:"上传标志"` //
			CmpThreshold string `json:"cmpThreshold,omitempty" example:"45"`// //人脸比对阈值
			SyncType string `json:"syncType,omitempty" example:"1:同步库，2：本地库"` //是否是同步库(1:同步库，2：本地库)
			Indeviceid string `json:"indeviceid,omitempty" example:"本地库所属的分析设备id，如果是同步库就不需要记录"`// 分析设备id(本地库所属的分析设备id，如果是同步库就不需要记录)
			TableName string `json:"tableName,omitempty" example:"底库123"` //表名
			TableDesc string `json:"tableDesc,omitempty" example:"底库描述"` //描述
			TableType string `json:"tableType,omitempty" example:"person,car"` //人员表"person
			BwType string `json:"bwType,omitempty" example:"黑名单:1,白名单:0"` //黑名单：1，白名单：0
			StartTime string `json:"startTime,omitempty" example:"2019-01-12 12:14:56"` //有效期开始时间
			EndTime string `json:"endTime,omitempty" example:"2019-10-12 12:14:56"` //有效期结束时间
			//UploadFlag string `json:"uploadFlag,omitempty" example:"上传标志"` //
			//CmpThreshold string `json:"cmpThreshold,omitempty" example:"45"`// //人脸比对阈值
			IsSync string `json:"isSync,omitempty" example:"1:同步库，2：本地库"` //是否是同步库(1:同步库，2：本地库)
			AnalyServerId string `json:"analyServerId,omitempty" example:"本地库所属的分析设备id，如果是同步库就不需要记录"` // 分析设备id(本地库所属的分析设备id，如果是同步库就不需要记录)
			}

			@@ -27,16 +27,16 @@
			esSearchController := new(controllers.EsSearchController)
			realTimeController := new(controllers.RealTimeController)
			cameraTimeRuleController := new(controllers.CameraTimeruleController)
			polygonController :=new (controllers.CameraPolygonController)
			cameraTaskController :=new(controllers.CameraTaskController)
			cameraTaskArgsController :=new(controllers.CameraTaskArgsController)
			dicController :=new(controllers.DictionaryController)
			userController :=new(controllers.UserController)
			polygonController := new(controllers.CameraPolygonController)
			cameraTaskController := new(controllers.CameraTaskController)
			cameraTaskArgsController := new(controllers.CameraTaskArgsController)
			dicController := new(controllers.DictionaryController)
			userController := new(controllers.UserController)

			urlPrefix := "/data/api-v" // wp 添加路径前缀
			userApi :=r.Group(urlPrefix+"/user")
			userApi := r.Group(urlPrefix + "/user")
			{
			userApi.POST("/login",userController.Login)
			userApi.POST("/login", userController.Login)
			}

			//区域管理
			@@ -62,30 +62,30 @@

			camera.GET("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
			camera.POST("/saveTask", cameraController.CameraTaskSave)
			camera.GET("/getRulesByCameraAndTask",cameraTaskArgsController.FindByCameraAndTask)
			camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
			}

			cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
			cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
			{
			cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
			cameraTaskArgsApi.POST("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
			cameraTaskArgsApi.POST("/saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
			cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
			cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
			cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
			}

			cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
			{
			cameraTaskApi.POST("/saveIsDataTrans",cameraTaskController.SaveIsDataTrans)
			cameraTaskApi.POST("/saveAlarmLevelByGroup",cameraTaskController.SaveAlarmLevelByGroup)
			cameraTaskApi.POST("/updateCameraTaskStatus",cameraTaskController.UpdateCameraTaskStatus)
			cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
			cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
			cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
			}

			polygon := r.Group(urlPrefix+"/polygon")
			polygon := r.Group(urlPrefix + "/polygon")
			{
			polygon.POST("/save", polygonController.Save)
			polygon.GET("/findByCameraId", polygonController.FindByCameraId)
			//polygon.GET("/delete", polygonController.Delete)
			polygon.GET("/updateDefenceStateByPolygonId",polygonController.UpdateDefenceStateByPolygonId)
			polygon.GET("/updateDefenceStateByCameraId",polygonController.UpdateDefenceStateByCameraId)
			polygon.GET("/updateDefenceStateByPolygonId", polygonController.UpdateDefenceStateByPolygonId)
			polygon.GET("/updateDefenceStateByCameraId", polygonController.UpdateDefenceStateByCameraId)
			}

			// 任务管理
			@@ -153,8 +153,8 @@
			{
			sdkApi.POST("/saveSdk", sdkController.Save)
			sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
			sdkApi.GET("/findByTaskId",sdkController.FindByTaskId)
			sdkApi.GET("/getById",sdkController.GetById)
			sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
			sdkApi.GET("/getById", sdkController.GetById)
			}

			cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
			@@ -163,9 +163,9 @@
			cameraTimeApi.GET("/delete", cameraTimeRuleController.Delete)
			cameraTimeApi.GET("/findAll", cameraTimeRuleController.FindAll)
			}
			dicApi :=r.Group(urlPrefix+"/dictionary")
			dicApi := r.Group(urlPrefix + "/dictionary")
			{
			dicApi.GET("/findByType",dicController.FindByType)
			dicApi.GET("/findByType", dicController.FindByType)
			}

			// 文件上传