|
@@ -686,6 +686,51 @@ func CheckDeviceMapStatus(ctx context.Context, c *app.RequestContext) {
|
|
|
c.JSON(consts.StatusOK, entity.Response{Status: true, Code: "1000", Message: "记录存在,符合地图更新条件"})
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+func CheckUpdateMapStatus(ctx context.Context, c *app.RequestContext) {
|
|
|
+ deviceNo := c.Query("deviceNo")
|
|
|
+ fmt.Println("deviceNo", deviceNo)
|
|
|
+ mapId := c.Query("mapId")
|
|
|
+ fmt.Println("mapId", mapId)
|
|
|
+ updateTime := c.Query("updateTime")
|
|
|
+ fmt.Println("updateTime", updateTime)
|
|
|
+
|
|
|
+
|
|
|
+ device, err := mysql.QueryDeviceByDeviceNo(ctx, deviceNo)
|
|
|
+ if err != nil {
|
|
|
+ c.JSON(consts.StatusOK, entity.Response{Status: false, Code: "", Message: "查询设备记录失败"})
|
|
|
+ return
|
|
|
+ }
|
|
|
+ fmt.Println("device", device)
|
|
|
+
|
|
|
+
|
|
|
+ records, err := mysql.QueryValidDeviceMapByMapIdAndDeviceNo(ctx, mapId, deviceNo)
|
|
|
+ if err != nil {
|
|
|
+ c.JSON(consts.StatusOK, entity.Response{Status: false, Code: "", Message: "查询设备地图失败"})
|
|
|
+ return
|
|
|
+ }
|
|
|
+ fmt.Println("records", records)
|
|
|
+
|
|
|
+ if len(records) == 0 {
|
|
|
+
|
|
|
+ c.JSON(consts.StatusOK, entity.Response{Status: false, Code: "1--001", Message: "地图已重采/删除, 不符合地图上传条件"})
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ record := records[0]
|
|
|
+ versionTimeVal, _ := strconv.Atoi(record.MapVersion)
|
|
|
+ fmt.Println("versionTimeVal", versionTimeVal)
|
|
|
+ updateTimeVal, _ := strconv.Atoi(updateTime)
|
|
|
+ fmt.Println("updateTimeVal", updateTimeVal)
|
|
|
+ if versionTimeVal > updateTimeVal {
|
|
|
+ c.JSON(consts.StatusOK, entity.Response{Status: false, Code: "1003", Message: "数据采集后地图已更新版本, 不符合地图上传条件"})
|
|
|
+ return
|
|
|
+ }
|
|
|
+ c.JSON(consts.StatusOK, entity.Response{Status: true, Code: "1000", Message: "记录存在,符合地图上传条件"})
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
|
|
|
func UpdateDeviceMap(ctx context.Context, c *app.RequestContext) {
|
|
@@ -1203,7 +1248,7 @@ func UploadPjiMapAndNotify(ctx context.Context, c *app.RequestContext) {
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
func AddMapRescanNotifyWithHttp(ctx context.Context, c *app.RequestContext) {
|
|
|
|
|
@@ -1277,7 +1322,7 @@ func AddMapRescanNotifyWithHttp(ctx context.Context, c *app.RequestContext) {
|
|
|
c.JSON(consts.StatusOK, entity.Response{Status: true, Code: "", Message: "更新地图续扫提醒成功"})
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
func AddMapRescanNotifyWithoutHttp(ctx context.Context) bool {
|
|
|
|
|
|
mapInfoList, err := getMapInfoList()
|
|
@@ -1351,6 +1396,54 @@ func AddMapRescanNotifyWithoutHttp(ctx context.Context) bool {
|
|
|
return true
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+func UpdateMapDeployStatusWithoutHttp(ctx context.Context) bool {
|
|
|
+
|
|
|
+ mapUpdates, err := mysql.QueryMapUpdateRecordsByUpdateFlag(ctx, config.UPDATE_MAP_UPLOAD_FLAG)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println("获取更新地图列表失败")
|
|
|
+ return false
|
|
|
+ }
|
|
|
+
|
|
|
+ for _, mapUpdate := range mapUpdates {
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ mapDeployRes, err := checkMapDeployStatus(mapUpdate.MapID, *mapUpdate.UploadVersion)
|
|
|
+ if err != nil {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ fmt.Println("mapDeployRes", mapDeployRes)
|
|
|
+ changeFlag := false
|
|
|
+ if mapDeployRes.Code == 500 {
|
|
|
+ mapUpdate.UpdateFlag = config.UPDATE_MAP_NOT_VALID_FLAG
|
|
|
+ changeFlag = true
|
|
|
+ } else if mapDeployRes.Code == 200 {
|
|
|
+ if mapDeployRes.Data.Status == 1 {
|
|
|
+ mapUpdate.UpdateFlag = config.UPDATE_MAP_DEPLOY_FLAG
|
|
|
+ changeFlag = true
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if changeFlag {
|
|
|
+ _, err := mysql.UpdateMapUpdateOneRecord(ctx, *mapUpdate)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println("修改更新地图状态失败")
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ time.Sleep(2 * time.Second)
|
|
|
+ }
|
|
|
+ return true
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
|
|
|
func QueryMapRescanNotifyList(ctx context.Context, c *app.RequestContext) {
|
|
@@ -1370,7 +1463,6 @@ func QueryMapRescanNotifyList(ctx context.Context, c *app.RequestContext) {
|
|
|
|
|
|
records, count, err := mysql.QueryMapRescanList(ctx, &record, pageFlag, page, pageSize)
|
|
|
if err != nil {
|
|
|
- c.JSON(consts.StatusOK, entity.Response{Status: false, Code: "", Message: "地图续扫提醒记录查询失败", Total: 0})
|
|
|
c.JSON(consts.StatusOK, entity.Response{Status: false, Code: "", Message: "地图续扫提醒记录查询失败", Total: 0})
|
|
|
return
|
|
|
}
|
|
@@ -1441,6 +1533,31 @@ func getMapInfoList() ([]model.MapInfo, error) {
|
|
|
return mapRes.Data, nil
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+func checkMapDeployStatus(mapId string, version string) (model.MapDeployRes, error) {
|
|
|
+ paramMap := make(map[string]interface{})
|
|
|
+ paramMap["mapId"] = mapId
|
|
|
+ paramMap["version"] = version
|
|
|
+ fmt.Println("paramMap", paramMap)
|
|
|
+ resp, err := pji_client.ApiClient.GetRequestWithForm(c_pji.PjiApiBaseUrl+"getMapVersionStatus?mapId="+mapId+"&version="+version, paramMap, pji_client.MapSecretId)
|
|
|
+ if err != nil {
|
|
|
+ return model.MapDeployRes{}, err
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ body := resp.Body()
|
|
|
+
|
|
|
+
|
|
|
+ var mapRes model.MapDeployRes
|
|
|
+ err = json.Unmarshal([]byte(body), &mapRes)
|
|
|
+ fmt.Println("mapRes", mapRes)
|
|
|
+ if err != nil {
|
|
|
+ return mapRes, err
|
|
|
+ }
|
|
|
+
|
|
|
+ return mapRes, nil
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
func checkMapIdExist(mapId string, mapInfoList []model.MapInfo) (bool, model.MapInfo) {
|
|
|
|