Forráskód Böngészése

新增 数据统计模块

wuweihao 4 éve
szülő
commit
1ca857e7c3
40 módosított fájl, 451 hozzáadás és 1913 törlés
  1. 0 17
      gis_application/src/main/resources/data/images.json
  2. 0 473
      gis_application/src/main/resources/data/scene.js
  3. 0 89
      gis_application/src/main/resources/data/someData.json
  4. 0 1186
      gis_application/src/main/resources/db/army_cms.sql
  5. 20 0
      gis_domain/src/main/java/com/gis/domain/dto/GoodsPageDto.java
  6. 34 0
      gis_domain/src/main/java/com/gis/domain/po/GoodsEntity.java
  7. 39 0
      gis_domain/src/main/java/com/gis/domain/vo/StatsVo.java
  8. 4 0
      gis_mapper/src/main/java/com/gis/mapper/BarrageMapper.java
  9. 5 0
      gis_mapper/src/main/java/com/gis/mapper/CommentMapper.java
  10. 4 0
      gis_mapper/src/main/java/com/gis/mapper/GiftMapper.java
  11. 30 0
      gis_mapper/src/main/java/com/gis/mapper/GoodsMapper.java
  12. 9 0
      gis_mapper/src/main/java/com/gis/mapper/IBaseMapper.java
  13. 7 3
      gis_mapper/src/main/java/com/gis/mapper/SceneMapper.java
  14. 35 0
      gis_mapper/src/main/java/com/gis/mapper/provider/GoodsProvider.java
  15. 0 1
      gis_mapper/src/main/java/com/gis/mapper/provider/UserProvider.java
  16. 3 0
      gis_service/src/main/java/com/gis/service/BarrageService.java
  17. 5 1
      gis_service/src/main/java/com/gis/service/CommentService.java
  18. 3 0
      gis_service/src/main/java/com/gis/service/GiftService.java
  19. 17 0
      gis_service/src/main/java/com/gis/service/GoodsService.java
  20. 6 1
      gis_service/src/main/java/com/gis/service/SceneService.java
  21. 13 0
      gis_service/src/main/java/com/gis/service/StatsService.java
  22. 0 1
      gis_service/src/main/java/com/gis/service/SysUserService.java
  23. 1 1
      gis_web/src/main/java/com/gis/web/aop/WebControllerLog.java
  24. 1 1
      gis_web/src/main/java/com/gis/web/aop/WebLogAspect.java
  25. 6 0
      gis_service/src/main/java/com/gis/service/impl/BarrageServiceImpl.java
  26. 10 2
      gis_service/src/main/java/com/gis/service/impl/CommentServiceImpl.java
  27. 6 0
      gis_service/src/main/java/com/gis/service/impl/GiftServiceImpl.java
  28. 36 0
      gis_service/src/main/java/com/gis/service/impl/GoodsServiceImpl.java
  29. 12 0
      gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java
  30. 86 0
      gis_service/src/main/java/com/gis/service/impl/StatsServiceImpl.java
  31. 1 1
      gis_web/pom.xml
  32. 3 8
      gis_web/src/main/java/com/gis/web/controller/CommentController.java
  33. 1 1
      gis_web/src/main/java/com/gis/web/controller/SceneController.java
  34. 40 0
      gis_web/src/main/java/com/gis/web/controller/StatsController.java
  35. 1 1
      gis_web/src/main/java/com/gis/web/controller/SysUserController.java
  36. 13 18
      gis_web/src/main/java/com/gis/web/controller/WebController.java
  37. 0 1
      gis_web/src/main/resources/data/data2.json
  38. 0 17
      gis_web/src/main/resources/data/images.json
  39. 0 1
      gis_web/src/main/resources/data/smokeing.json
  40. 0 89
      gis_web/src/main/resources/data/someData.json

+ 0 - 17
gis_application/src/main/resources/data/images.json

@@ -1,17 +0,0 @@
-
-{
-"metadata": "{\"camera_mode\":0,\"camera_position\":{\"x\":17.319578170776367,\"y\":0.5689632296562195,\"z\":30.42438507080078},\"camera_quaternion\":{\"x\":-0.0000020361233819675194,\"y\":0.9999978870169733,\"z\":-0.0012442941874225735,\"w\":-0.0016363646960161576},\"ortho_zoom\":-1,\"ss_zoom\":1,\"scan_id\":\"b1498df53a554a0bafec6646639964e6\",\"is_ortho\":false,\"floorVisibility\":[1]}",
-"created": "2019-04-12T01:15:48.811428Z",
-"modified": "2019-04-12T01:15:48.811961Z",
-"sid": "update",
-"name": "04.12.2019_09.15.38",
-"height": 1707,
-"width": 3034,
-"is_hero": true,
-"category": "user",
-"vision_generated_label": "",
-"vision_generated_name": "",
-"vision_image_index": -1,
-"created_by": 4084,
-"rating": null
-}

+ 0 - 473
gis_application/src/main/resources/data/scene.js

@@ -1,473 +0,0 @@
-const Router = require('koa-router');
-const fs = require('fs');
-const path = require('path');
-const url = require('url');
-const request = require('request')
-const router = new Router();
-const sys = require('../config/sys')
-const sceneDir = path.join(__dirname, '../', sys.static_dir, sys.scene_dir)
-const uploadFile = require('../util/upload')
-const copyDir = require('../util/copydir')
-const upqiniu = require('../util/upqiniu')
-
-// 获取一个文件夹所有第一子文件夹
-function getFiles() {
-  return new Promise((resolve, reject) => {
-    fs.readdir(sceneDir, (err, files) => {
-      if (err) {
-        reject(err)
-      } else {
-        resolve(files)
-      }
-    })
-  })
-}
-
-// 删除文件夹所有文件
-function deleteFolder(dir) {
-  var files = [];
-  if (fs.existsSync(dir)) {
-    files = fs.readdirSync(dir);
-    files.forEach(function (file, index) {
-      var curPath = dir + "/" + file;
-      if (fs.statSync(curPath).isDirectory()) { // recurse
-        deleteFolder(curPath);
-      } else {
-        fs.unlinkSync(curPath);
-      }
-    });
-    fs.rmdirSync(dir);
-  }
-}
-
-// 清除一个json复合正则的字段
-function clearRgFileds(obj, rg) {
-  let type = Object.prototype.toString.call(obj)
-  if (type === '[object Object]') {
-    for (let key in obj) filter(obj[key], key)
-  } else if (type === '[object Array]') {
-    for (let i = 0; i < obj.length; i++) filter(obj[i], i)
-  }
-
-  function filter (filed, key) {
-    let filedType = Object.prototype.toString.call(obj[key])
-    if (filedType === '[object Object]' || filedType === '[object Array]') {
-      clearRgFileds(obj[key], rg)
-    } else if (filed && rg.test(filed.toString())) {
-      if (type === '[object Object]') {
-        delete obj[key]
-      } else {
-        obj.splice(key, 1)
-      }
-    }
-  }
-}
-
-
-async function savehots(hots = {}, name) {
-  let dataFile = 'data2.js'
-  let dataPath = path.join(sceneDir, name, dataFile)
-  let infoFile = 'hot/js/data.js'
-  let infoPath = path.join(sceneDir, name, infoFile)
-  let data = JSON.parse(fs.readFileSync(dataPath))
-  let hotJSON = {}
-  let infoJSON = {}
-
-  Object.keys(hots).forEach(hotKey => {
-    hotJSON[hotKey] = {
-      position: hots[hotKey].position,
-      rotation: hots[hotKey].rotation,
-      link: `//www.4dmodel.com/SuperTwo/hot_online/index.html?m=${hotKey}`
-    }
-
-    infoJSON[hotKey] = hots[hotKey].infoAttribute || ({
-      title: '',
-      content: '',
-      iframes: [],
-      modules: [],
-      images: [],
-      videos: []
-    })
-  })
-
-  data.hots = hotJSON
-
-  fs.writeFileSync(dataPath, JSON.stringify(data))
-  fs.writeFileSync(infoPath, JSON.stringify(infoJSON))
-
-  await upqiniu(name, dataFile)
-  await upqiniu(name, infoFile)
-}
-
-async function saveGuide(guides = [], name) {
-  let dataFile = 'data2.js'
-  let someFile = 'someData.json'
-  let dataPath = path.join(sceneDir, name, dataFile)
-  let somDataPath = path.join(sceneDir, name, someFile)
-  let data = JSON.parse(fs.readFileSync(dataPath));
-  let somData = JSON.parse(fs.readFileSync(somDataPath))
-  let audio = {}
-  let images = []
-
-  somData.model.images.forEach(i => i && (i.thumbnail_signed_src || images.push(i)))
-  guides.forEach(i => i.thumbnail_signed_src && images.push(i))
-  
-
-images.forEach(guide => {
-    try {
-      audio[JSON.parse(guide.metadata).scan_id] = {
-        time: 40000
-      }
-    } catch (e) {
-      
-    }
-  })
-
-  somData.model.images = images
-  data.audio = audio
-  fs.writeFileSync(somDataPath, JSON.stringify(somData))
-  fs.writeFileSync(dataPath, JSON.stringify(data))
-
-  await upqiniu(name, dataFile)
-  await upqiniu(name, someFile)
-}
-
-async function saveMusics(musics = {}, name) {
-  let dataFile = 'data2.js'
-  let dataPath = path.join(sceneDir, name, dataFile)
-  let data = JSON.parse(fs.readFileSync(dataPath));
-
-  data.tourAudio = musics
-
-  fs.writeFileSync(dataPath, JSON.stringify(data))
-  
-  await upqiniu(name, dataFile)
-}
-
-async function saveOverlays(overlays,name){
-  let dataFile = 'data2.js'
-  let dataPath = path.join(sceneDir, name, dataFile)
-  let data = JSON.parse(fs.readFileSync(dataPath));
-
-  data.overlays = overlays
-
-  fs.writeFileSync(dataPath, JSON.stringify(data))
-  
-  await upqiniu(name, dataFile)
-}
-
-async function saveInfo(info, name) {
-  let dataFile = 'data2.js'
-  let someFile = 'someData.json'
-  let dataPath = path.join(sceneDir, name, dataFile)
-  let data = JSON.parse(fs.readFileSync(dataPath));
-  let somDataPath = path.join(sceneDir, name, someFile);
-  let somData = JSON.parse(fs.readFileSync(somDataPath));
-
-  
-  somData.model.name = info.name
-  somData.model.summary = info.summary
-  somData.model.camera_start = info.camera_start
-
-  Object.keys(info).forEach(key => {
-    somData[key] = info[key]
-  })
-
-  // somData.backgroundMusic = info.backgroundMusic
-  // somData.hoticon = info.hoticon
-  somData.loadlogo = info.loadlogo === "true" ? true : false
-
-  data.weixinDesc = info.weixinDesc
-
-  fs.writeFileSync(somDataPath, JSON.stringify(somData))
-  fs.writeFileSync(dataPath, JSON.stringify(data))
-
-  await upqiniu(name, dataFile)
-  await upqiniu(name, someFile)
-}
-
-// 添加场景
-router.post('/addscene', async ctx => {
-  let name = ctx.request.body.name
-  let files = await getFiles()
-  let index = files.findIndex(file => file === name)
-
-  if (~index) {
-    return ctx.body = {
-      msg: '该场景已存在,请更改场景名称', 
-      code: 500
-    }
-  }
-
-  await new Promise((resolve, reject) => {
-    fs.mkdir(path.join(sceneDir, name), err => {
-      if (err) {
-        reject(err)
-      } else {
-        resolve()
-      }
-    })
-  })
-  
-  ctx.body = {
-    content: '成功创建场景',
-    code: 200
-  }
-})
-
-// 删除场景
-router.post('/delscene', async ctx => {
-  let dir = path.join(sceneDir, ctx.request.body.name)
-  deleteFolder(dir)
-
-  ctx.body = {
-    code: 200
-  }
-})
-
-// 获取所有场景
-router.get('/list', async ctx => {
-  let files = await getFiles()
-
-  let content = files.map(file => {
-    let name = ''
-    try {
-      let somedata = JSON.parse(fs.readFileSync(path.join(sceneDir, file, 'someData.json')))
-      name = somedata.name || somedata.model.name
-      
-    } catch (e) {
-    }
-
-    return {
-      name: file,
-      title: name,
-      query: url.format({
-        protocol: sys.protocol,
-        host: 'www.4dmodel.com',
-        port: sys.port,
-        pathname: sys.scene_query,
-        query: {m: file}
-      }),
-      edit: url.format({
-        protocol: sys.protocol,
-        host: sys.host,
-        port: sys.port,
-        pathname: sys.scene_edit,
-        query: { m: file }
-      })
-    }
-  })
-  
-  ctx.body = {
-    content,
-    code: 200
-  }
-})
-
-// 转化运行场景需要的参数
-router.post('/transform', async ctx => {
-  let url = ctx.request.body.url
-  let modelDataUrl = path.join(sceneDir, ctx.request.body.name, 'modeldata.js')
-  let someDataUrl = path.join(sceneDir, ctx.request.body.name, 'someData.json')
-  let readFile
-  let transformData
-
-  if (fs.existsSync(someDataUrl)) {
-    readFile = 'someData.json'
-    transformData = fs.readFileSync(someDataUrl)
-  } else if (fs.existsSync(modelDataUrl)) {
-    readFile = 'modeldata.js'
-    transformData = fs.readFileSync(modelDataUrl)
-  } else {
-    transformData = await new Promise((resolve, reject) => {
-      request(url, function(err, res, body) {
-        if (err) {
-          reject(err)
-        } else {
-          resolve(body)
-        }
-      })
-    })
-
-    readFile = url
-  }
-
-  if (!transformData) {
-    return ctx.body = {
-      msg: '该场景缺少核心启动文件!',
-      code: 500
-    }
-  }
-
-  try {
-    transformData = JSON.parse(transformData)
-  } catch (e) {
-    return ctx.body = {
-      code: 500,
-      msg: readFile + '不是有效的json格式文件!'
-    }
-  }
-
-  transformData = transformSomeData(transformData)
-  transformData.model.sid = ctx.request.body.name
-
-  let hotUrl = path.join(sceneDir, ctx.request.body.name, 'hot')
-  if (!fs.existsSync(hotUrl)) {
-    await new Promise((resolve, reject) => {
-      copyDir(path.join(__dirname, '../', sys.static_dir, './hottemp'), hotUrl, resolve)
-    })
-  }
-
-  let dataPath = path.join(sceneDir, ctx.request.body.name, 'data2.js')
-  fs.writeFileSync(dataPath, '{}')
-
-  await upqiniu(ctx.request.body.name, 'data2.js')
-
-  fs.writeFileSync(someDataUrl, JSON.stringify(transformData))
-
-  await upqiniu(ctx.request.body.name, 'someData.json')
-
-  ctx.body = { code: 200 }
-})
-
-
-// 保存配置
-router.post('/savesetting', async ctx => {
-  let { name, hots, guides = [], info, tourAudio = {},overlays=[]  } = ctx.request.body
-
-  if (!guides.length) {
-    let ret = []
-    for (let key in guides) {
-      ret.push(guides[key])
-    }
-    guides = ret
-  }
-
-  await saveGuide(guides, name)
-  await savehots(hots, name)
-  await saveInfo(info, name)
-  await saveMusics(tourAudio, name)
-  await saveOverlays(overlays, name)
-
-  ctx.body = {
-    code: 200, 
-    msg: '修改成功!'
-  }
-})
-
-// 上传文件
-router.post('/uploadFile', async ctx => {
-  let result = await uploadFile(ctx, sceneDir);
-  let file = result.file.substr(('/'+result.name+'/').length);
-  let qiniuLocal = await upqiniu(result.name, file);
-
-  ctx.body = {
-    code: 200,
-    msg: '文件上传成功',
-    content: qiniuLocal
-  }
-})
-
-
-router.get('/getSomeData', async ctx => {
-  let url = ctx.request.query.url
-  let data = await new Promise((resolve, reject) => {
-    request(url, function (err, res, body) {
-      if (err) {
-        reject(err)
-      } else {
-        resolve(body)
-      }
-    })
-  })
-
-  try {
-    transformData = transformSomeData(JSON.parse(data))
-  } catch (e) {
-    return ctx.body = {
-      code: 500,
-      msg: url + '不是有效的json格式文件!'
-    }
-  }
-
-  ctx.body = transformData
-})
-
-
-
-function transformSomeData(transformData) {
-
-  if (!transformData.model) {
-    transformData = {
-      model: transformData
-    }
-    delete transformData.model.icon
-    delete transformData.model.camera_start
-    transformData.model.address = JSON.stringify(transformData.model.address)
-  }
-
-  clearRgFileds(transformData, /\/\//)
-
-  let delFileds = [
-    'enable_social_sharing', 'social_sharing_enabled', 'account_social_sharing_default',
-    'owner', 'address', 'is_vr', 'vision_version', 'created', 'unit_type', 'owner'
-  ]
-  let assigFileds = {
-    files: {
-      templates: ['data/{{number}}/{{filename}}']
-    },
-
-  }
-
-  delFileds.forEach(filed => {
-    delete transformData[filed]
-    delete transformData.model[filed]
-  })
-  Object.keys(assigFileds).forEach(filed => transformData[filed] = assigFileds[filed])
-
-  if (!transformData.model.camera_start) {
-    for (let i = 0; i < transformData.model.images.length; i++) {
-      let metadata = JSON.parse(transformData.model.images[0].metadata)
-
-      if (metadata.scan_id) {
-        transformData.model.camera_start = {
-          camera: {
-            "zoom": -1,
-            "quaternion": [
-              metadata.camera_quaternion.x,
-              metadata.camera_quaternion.y,
-              metadata.camera_quaternion.z,
-              metadata.camera_quaternion.w
-            ]
-          },
-          pano: {
-            "uuid": metadata.scan_id
-          },
-          "mode": 0
-        }
-        break;
-      }
-    }
-
-  }
-
-  let deufaltPlayer = {
-    "presented_by": true,
-    "highlight_reel": true,
-    "floor_plan": true,
-    "tour_buttons": true,
-    "dollhouse": true,
-    "fast_transitions": false,
-    "autoplay": false,
-  }
-
-  transformData.model.player_options = transformData.model.player_options || {};
-  Object.keys(deufaltPlayer).forEach(key => transformData.model.player_options[key] = deufaltPlayer[key])
-
-  transformData.model.images = [transformData.model.images[0]]
-
-  return transformData
-}
-
-
-module.exports = exports = {router};

+ 0 - 89
gis_application/src/main/resources/data/someData.json

@@ -1,89 +0,0 @@
-{
-  "model": {
-    "sid": "zhengzhou",
-    "name": "526190409SZGX",
-    "status": "viewable",
-    "floors": "",
-    "metainfo": { "allowed_methods": ["GET", "OPTIONS", "HEAD"] },
-    "images": [
-      {
-        "metadata": "{\"camera_mode\":0,\"camera_position\":{\"x\":17.319578170776367,\"y\":0.5689632296562195,\"z\":30.42438507080078},\"camera_quaternion\":{\"x\":-0.0000020361233819675194,\"y\":0.9999978870169733,\"z\":-0.0012442941874225735,\"w\":-0.0016363646960161576},\"ortho_zoom\":-1,\"ss_zoom\":1,\"scan_id\":\"b1498df53a554a0bafec6646639964e6\",\"is_ortho\":false,\"floorVisibility\":[1]}",
-        "created": "2019-04-12T01:15:48.811428Z",
-        "modified": "2019-04-12T01:15:48.811961Z",
-        "sid": "3itPh3K83Bq",
-        "name": "04.12.2019_09.15.38",
-        "height": 1707,
-        "width": 3034,
-        "is_hero": true,
-        "category": "user",
-        "vision_generated_label": "",
-        "vision_generated_name": "",
-        "vision_image_index": -1,
-        "created_by": 4084,
-        "rating": null
-      }
-    ],
-    "job": { "uuid": "dacf7dfa24ae47fab8fcebfe4dc41ab9" },
-    "player_options": {
-      "presented_by": true,
-      "highlight_reel": true,
-      "floor_plan": true,
-      "tour_buttons": true,
-      "dollhouse": true,
-      "fast_transitions": false,
-      "autoplay": false,
-      "contact_email": true,
-      "address": true,
-      "contact_name": true,
-      "model_summary": true,
-      "contact_phone": true,
-      "model_name": true,
-      "external_url": true
-    },
-    "modified": "2019-04-12T06:39:16.940410Z",
-    "is_public": true,
-    "summary": "",
-    "presented_by": "",
-    "contact_name": "",
-    "contact_phone": "",
-    "formatted_contact_phone": "",
-    "contact_email": "",
-    "external_url": "",
-    "camera_start": {
-      "camera": {
-        "zoom": "-1",
-        "quaternion": ["0.7013", "-0.7026", "0.0907", "-0.08"]
-      },
-      "pano": { "uuid": "2" },
-      "mode": "0"
-    }
-  },
-  "files": { "templates": ["data/{{number}}/{{filename}}"] },
-  "name": "526190409SZGX",
-  "summary": "",
-  "hoticon": {
-    "default": "images/4dagePoint2.png",
-    "higt": "images/4dagePoint.png"
-  },
-  "camera_start": {
-    "camera": {
-      "zoom": "-1",
-      "quaternion": ["0.7013", "-0.7026", "0.0907", "-0.08"]
-    },
-    "pano": { "uuid": "2" },
-    "mode": "0"
-  },
-  "loadlogo": false,
-  "special": false,
-  "vision_version": false,
-  "hotImageScale": false,
-  "hideFloorMarker": false,
-  "hideMouseMarker": false,
-  "floorMarkerColor": "#4bcdfc",
-  "mouseMarkerColor": "#4bcdfc",
-  "momentTour": "walk",
-  "showHotListSta": false,
-  "hotIconScale": "1",
-  "supportsVR": false,
-  "weixinDesc": ""
-}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 1186
gis_application/src/main/resources/db/army_cms.sql


+ 20 - 0
gis_domain/src/main/java/com/gis/domain/dto/GoodsPageDto.java

@@ -0,0 +1,20 @@
+package com.gis.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Created by owen on 2020/5/9 0009 12:20
+ */
+@Data
+public class GoodsPageDto extends PageDto {
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+
+
+
+}

+ 34 - 0
gis_domain/src/main/java/com/gis/domain/po/GoodsEntity.java

@@ -0,0 +1,34 @@
+package com.gis.domain.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Table;
+
+/**
+ * Created by owen on 2021/4/20 0010 17:39
+ * 文物表
+ */
+@Data
+@Table(name = "tb_goods")
+public class GoodsEntity extends BaseEntity {
+
+    @ApiModelProperty(value = "名称" )
+    private String name;
+
+    @ApiModelProperty(value = "缩略图url")
+    private String thumb;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "是否显示,1:是, 0:否")
+    private Integer display;
+
+    @ApiModelProperty(value = "简介")
+    private String description;
+
+
+
+
+}

+ 39 - 0
gis_domain/src/main/java/com/gis/domain/vo/StatsVo.java

@@ -0,0 +1,39 @@
+package com.gis.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 留言评论
+ */
+@Data
+public class StatsVo implements Serializable {
+
+    private static final long serialVersionUID = -8093446477743493946L;
+
+    @ApiModelProperty(value = "合计")
+    private Integer total;
+
+    @ApiModelProperty(value = "今天")
+    private Integer today;
+
+    @ApiModelProperty(value = "昨天")
+    private Integer yesterday;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+
+
+
+
+
+
+
+
+}

+ 4 - 0
gis_mapper/src/main/java/com/gis/mapper/BarrageMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
 import java.util.List;
 
 
@@ -15,4 +16,7 @@ public interface BarrageMapper extends IBaseMapper<BarrageEntity, Long> {
 
     @Select("select id from tb_barrage where is_delete = 0 AND display = 1 ")
     List<BarrageEntity> getCountDisplay();
+
+    @Select("select COUNT(id) from tb_barrage where is_delete = 0 AND  DATE_FORMAT( create_time, '%Y%m%d' ) = DATE_FORMAT(#{date} , '%Y%m%d' ) ")
+    Integer countFindByDate(LocalDate now);
 }

+ 5 - 0
gis_mapper/src/main/java/com/gis/mapper/CommentMapper.java

@@ -5,9 +5,11 @@ import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.po.CommentEntity;
 import com.gis.mapper.provider.CommentProvider;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Component
@@ -17,4 +19,7 @@ public interface CommentMapper extends IBaseMapper<CommentEntity, Long> {
 
     @SelectProvider(type = CommentProvider.class, method = "search")
     List<CommentEntity> search(PageDateDto param, Integer display);
+
+    @Select("select COUNT(id) from tb_comment where is_delete = 0 AND  DATE_FORMAT( create_time, '%Y%m%d' ) = DATE_FORMAT(#{date} , '%Y%m%d' ) ")
+    Integer countFindByDate(LocalDate now);
 }

+ 4 - 0
gis_mapper/src/main/java/com/gis/mapper/GiftMapper.java

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Component
@@ -24,4 +25,7 @@ public interface GiftMapper extends IBaseMapper<GiftEntity, Long> {
 
     @Select("select id from tb_gift where is_delete = 0 AND display = 1 ")
     List<GiftEntity> getCountDisplay();
+
+    @Select("select COUNT(id) from tb_gift where is_delete = 0 AND  DATE_FORMAT( create_time, '%Y%m%d' ) = DATE_FORMAT(#{date} , '%Y%m%d' ) ")
+    Integer countFindByDate(LocalDate now);
 }

+ 30 - 0
gis_mapper/src/main/java/com/gis/mapper/GoodsMapper.java

@@ -0,0 +1,30 @@
+package com.gis.mapper;
+
+
+import com.gis.domain.dto.GoodsPageDto;
+import com.gis.domain.dto.PageDto;
+import com.gis.domain.po.GoodsEntity;
+import com.gis.domain.po.SceneEntity;
+import com.gis.mapper.provider.GoodsProvider;
+import com.gis.mapper.provider.SceneProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@Mapper
+public interface GoodsMapper extends IBaseMapper<GoodsEntity, Long> {
+
+
+
+    @SelectProvider(type = GoodsProvider.class, method = "search")
+    List<GoodsEntity> search(GoodsPageDto param);
+
+
+
+
+}

+ 9 - 0
gis_mapper/src/main/java/com/gis/mapper/IBaseMapper.java

@@ -1,6 +1,10 @@
 package com.gis.mapper;
 
 import com.gis.domain.po.BaseEntity;
+import com.gis.domain.po.GiftEntity;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import tk.mybatis.mapper.common.BaseMapper;
 import tk.mybatis.mapper.common.ConditionMapper;
 import tk.mybatis.mapper.common.IdsMapper;
@@ -8,6 +12,7 @@ import tk.mybatis.mapper.common.special.InsertListMapper;
 
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * Created by owen on 2020/2/18 0018 11:27
@@ -15,4 +20,8 @@ import java.io.Serializable;
 
 public interface IBaseMapper<T extends BaseEntity, ID extends Serializable> extends BaseMapper<T>,
         ConditionMapper<T>, IdsMapper<T>, InsertListMapper<T> {
+
+
+    @Insert("INSERT INTO tb_scene_visit (scene_id) values (0) ")
+    void addSceneVisit();
 }

+ 7 - 3
gis_mapper/src/main/java/com/gis/mapper/SceneMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Component
@@ -19,9 +20,6 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, Long> {
     @Select("select * from tb_scene where scene_code = #{m}")
     SceneEntity findBySceneCode(String m);
 
-//    @SelectProvider(type = SceneProvider.class, method = "search")
-//    List<SceneEntity> search(ScenePageDto param);
-
     @SelectProvider(type = SceneProvider.class, method = "search")
     List<SceneEntity> search(PageDto param);
 
@@ -35,4 +33,10 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, Long> {
 
     @Update("update tb_scene set display = 0 where is_delete = '0' and display = 1 and type = #{type}")
     void setDisableByType(String type);
+
+    @Select("select COUNT(id) from tb_scene_visit where is_delete = 0 AND  DATE_FORMAT( create_time, '%Y%m%d' ) = DATE_FORMAT(#{date} , '%Y%m%d' ) ")
+    Integer countFindByDate(LocalDate date);
+
+    @Select("select COUNT(id) from tb_scene_visit where is_delete = 0 ")
+    Integer countTotal();
 }

+ 35 - 0
gis_mapper/src/main/java/com/gis/mapper/provider/GoodsProvider.java

@@ -0,0 +1,35 @@
+package com.gis.mapper.provider;
+
+import com.gis.domain.dto.GoodsPageDto;
+import com.gis.domain.dto.PageDto;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+
+
+/**
+ * Created by owen on 2020/6/13 0013 10:56
+ */
+@Log4j2
+public class GoodsProvider {
+
+
+    public String search(GoodsPageDto param){
+        StringBuffer sql = new StringBuffer(
+                "select * from tb_goods where is_delete = '0' ");
+
+        String searchKey = param.getSearchKey();
+        if(!StringUtils.isAllBlank(searchKey)){
+            sql.append(" and ( name like '%").append(searchKey).append("%' )");
+        }
+
+        String type = param.getType();
+        if (StringUtils.isNotBlank(type)){
+            sql.append(" and type = '").append(type).append("'");
+        }
+
+
+        sql.append(" order by create_time desc");
+        log.info("sql: {}", sql.toString());
+        return sql.toString();
+    }
+}

+ 0 - 1
gis_mapper/src/main/java/com/gis/mapper/provider/UserProvider.java

@@ -1,7 +1,6 @@
 package com.gis.mapper.provider;
 
 import com.gis.domain.dto.PageDateDto;
-import com.gis.domain.dto.UserPageDateDto;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 

+ 3 - 0
gis_service/src/main/java/com/gis/service/BarrageService.java

@@ -3,6 +3,7 @@ package com.gis.service;
 
 import com.gis.domain.po.BarrageEntity;
 
+import java.time.LocalDate;
 
 
 /**
@@ -12,4 +13,6 @@ public interface BarrageService extends IBaseService<BarrageEntity, Long> {
 
 
     Integer getCountDisplay();
+
+    Integer countFindByDate(LocalDate now);
 }

+ 5 - 1
gis_service/src/main/java/com/gis/service/CommentService.java

@@ -1,9 +1,11 @@
 package com.gis.service;
 
 
+import com.gis.common.util.Result;
 import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.po.CommentEntity;
 
+import java.time.LocalDate;
 import java.util.List;
 
 
@@ -13,5 +15,7 @@ import java.util.List;
 public interface CommentService extends IBaseService<CommentEntity, Long> {
 
 
-    List<CommentEntity> search(PageDateDto param, Integer display);
+    Result search(PageDateDto param, Integer display);
+
+    Integer countFindByDate(LocalDate now);
 }

+ 3 - 0
gis_service/src/main/java/com/gis/service/GiftService.java

@@ -9,6 +9,7 @@ import com.gis.domain.po.GiftEntity;
 import com.gis.domain.vo.CommentVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDate;
 import java.util.List;
 
 
@@ -25,4 +26,6 @@ public interface GiftService extends IBaseService<GiftEntity, Long> {
     Result saveEntity(GiftDto param);
 
     Result upload(MultipartFile file);
+
+    Integer countFindByDate(LocalDate now);
 }

+ 17 - 0
gis_service/src/main/java/com/gis/service/GoodsService.java

@@ -0,0 +1,17 @@
+package com.gis.service;
+
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.GoodsPageDto;
+import com.gis.domain.dto.PageDateDto;
+import com.gis.domain.po.GoodsEntity;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface GoodsService extends IBaseService<GoodsEntity, Long> {
+
+
+    Result<GoodsEntity> search(GoodsPageDto param);
+}

+ 6 - 1
gis_service/src/main/java/com/gis/service/SceneService.java

@@ -5,9 +5,10 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.RoamViableDto;
 import com.gis.domain.dto.SceneDataDto;
-import com.gis.domain.dto.ScenePageDto;
 import com.gis.domain.po.SceneEntity;
 
+import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 
@@ -28,4 +29,8 @@ public interface SceneService extends IBaseService<SceneEntity, Long> {
     Result edit(SceneDataDto param);
 
     Result display(Long id);
+
+    Integer countFindByDate(LocalDate date);
+
+    Integer countTotal();
 }

+ 13 - 0
gis_service/src/main/java/com/gis/service/StatsService.java

@@ -0,0 +1,13 @@
+package com.gis.service;
+
+
+import com.gis.common.util.Result;
+
+/**
+ * Created by owen on 2020/3/11 0011 16:14
+ */
+public interface StatsService  {
+
+
+    Result flowCount();
+}

+ 0 - 1
gis_service/src/main/java/com/gis/service/SysUserService.java

@@ -2,7 +2,6 @@ package com.gis.service;
 
 
 import com.gis.domain.dto.PageDateDto;
-import com.gis.domain.dto.UserPageDateDto;
 import com.gis.domain.po.SysUserEntity;
 
 import java.util.List;

+ 1 - 1
gis_web/src/main/java/com/gis/web/aop/WebControllerLog.java

@@ -1,4 +1,4 @@
-package com.gis.web.aop;
+package com.gis.service.aop;
 
 import java.lang.annotation.*;
 

+ 1 - 1
gis_web/src/main/java/com/gis/web/aop/WebLogAspect.java

@@ -1,4 +1,4 @@
-package com.gis.web.aop;
+package com.gis.service.aop;
 
 import com.gis.common.util.JwtUtil;
 import lombok.extern.slf4j.Slf4j;

+ 6 - 0
gis_service/src/main/java/com/gis/service/impl/BarrageServiceImpl.java

@@ -7,6 +7,7 @@ import com.gis.service.BarrageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.List;
 
 
@@ -31,4 +32,9 @@ public class BarrageServiceImpl extends IBaseServiceImpl<BarrageEntity, Long> im
 
         return countDisplay.size();
     }
+
+    @Override
+    public Integer countFindByDate(LocalDate now) {
+        return entityMapper.countFindByDate(now);
+    }
 }

+ 10 - 2
gis_service/src/main/java/com/gis/service/impl/CommentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gis.service.impl;
 
+import com.gis.common.util.Result;
 import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.po.CommentEntity;
 import com.gis.mapper.IBaseMapper;
@@ -8,6 +9,7 @@ import com.gis.service.CommentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.List;
 
 
@@ -27,7 +29,13 @@ public class CommentServiceImpl extends IBaseServiceImpl<CommentEntity, Long> im
 
 
     @Override
-    public List<CommentEntity> search(PageDateDto param, Integer display) {
-        return entityMapper.search(param, display);
+    public Result search(PageDateDto param, Integer display) {
+        startPage(param);
+        return Result.success(entityMapper.search(param, display));
+    }
+
+    @Override
+    public Integer countFindByDate(LocalDate now) {
+        return entityMapper.countFindByDate(now);
     }
 }

+ 6 - 0
gis_service/src/main/java/com/gis/service/impl/GiftServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 
@@ -116,4 +117,9 @@ public class GiftServiceImpl extends IBaseServiceImpl<GiftEntity, Long> implemen
 
         return Result.success(basePath);
     }
+
+    @Override
+    public Integer countFindByDate(LocalDate now) {
+        return entityMapper.countFindByDate(now);
+    }
 }

+ 36 - 0
gis_service/src/main/java/com/gis/service/impl/GoodsServiceImpl.java

@@ -0,0 +1,36 @@
+package com.gis.service.impl;
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.GoodsPageDto;
+import com.gis.domain.dto.PageDateDto;
+import com.gis.domain.po.GoodsEntity;
+import com.gis.mapper.GoodsMapper;
+import com.gis.mapper.IBaseMapper;
+import com.gis.service.GoodsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * Created by owen on 2020/3/11 0011 16:16
+ */
+@Service
+public class GoodsServiceImpl extends IBaseServiceImpl<GoodsEntity, Long> implements GoodsService {
+
+    @Autowired
+    private GoodsMapper entityMapper;
+
+    @Override
+    public IBaseMapper<GoodsEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+    @Override
+    public Result<GoodsEntity> search(GoodsPageDto param) {
+        startPage(param);
+        return Result.success(entityMapper.search(param));
+    }
+}

+ 12 - 0
gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java

@@ -20,6 +20,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.util.Date;
 import java.util.Set;
 
 
@@ -315,6 +317,16 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
         return Result.success();
     }
 
+    @Override
+    public Integer countFindByDate(LocalDate date) {
+        return entityMapper.countFindByDate(date);
+    }
+
+    @Override
+    public Integer countTotal() {
+        return entityMapper.countTotal();
+    }
+
     /**
      * 2021.04.02 处理infoAttribute的m_title
      * String url  = "https://www.4dmodel.com/SuperTwo/hot_online/index.html?m=" + key;

+ 86 - 0
gis_service/src/main/java/com/gis/service/impl/StatsServiceImpl.java

@@ -0,0 +1,86 @@
+package com.gis.service.impl;
+
+import com.gis.common.util.Result;
+import com.gis.domain.vo.StatsVo;
+import com.gis.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.*;
+
+
+/**
+ * Created by owen on 2021/4/25 0011 16:16
+ */
+@Slf4j
+@Service
+public class StatsServiceImpl implements StatsService {
+
+    @Autowired
+    SceneService sceneService;
+
+    @Autowired
+    BarrageService barrageService;
+
+    @Autowired
+    CommentService commentService;
+
+    @Autowired
+    GiftService giftService;
+
+
+    @Override
+    public Result flowCount() {
+        List<StatsVo> result = new ArrayList<>();
+
+        // 线上史馆
+        StatsVo sceneCount = new StatsVo();
+        sceneCount.setType("scene");
+        sceneCount.setSort(1);
+        sceneCount.setTotal(sceneService.countTotal());
+        LocalDate now = LocalDate.now();
+        sceneCount.setToday(sceneService.countFindByDate(now));
+        sceneCount.setYesterday(sceneService.countFindByDate(now.minusDays(1)));
+
+        // 弹幕
+        StatsVo barrageCount = new StatsVo();
+        barrageCount.setType("barrage");
+        barrageCount.setSort(2);
+        barrageCount.setTotal(barrageService.findAll().size());
+        barrageCount.setToday(barrageService.countFindByDate(now));
+        barrageCount.setYesterday(barrageService.countFindByDate(now.minusDays(1)));
+
+
+        // 留言
+        StatsVo commentCount = new StatsVo();
+        commentCount.setType("comment");
+        commentCount.setSort(3);
+        commentCount.setTotal(commentService.findAll().size());
+        commentCount.setToday(commentService.countFindByDate(now));
+        commentCount.setYesterday(commentService.countFindByDate(now.minusDays(1)));
+
+
+        // 礼物
+        StatsVo giftCount = new StatsVo();
+        giftCount.setType("gift");
+        giftCount.setSort(3);
+        giftCount.setTotal(giftService.findAll().size());
+        giftCount.setToday(giftService.countFindByDate(now));
+        giftCount.setYesterday(giftService.countFindByDate(now.minusDays(1)));
+
+
+        // todo 目前缺官网,不知道数据从那里来, 可能在tb_scene_visit 加一个字段来区分是场景、官网数据
+
+        result.add(sceneCount);
+        result.add(barrageCount);
+        result.add(commentCount);
+        result.add(giftCount);
+
+        return Result.success(result);
+    }
+
+
+}

+ 1 - 1
gis_web/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>cms_army_macao</artifactId>
+        <artifactId>army_sichuan</artifactId>
         <groupId>com.gis</groupId>
         <version>1.0.0</version>
     </parent>

+ 3 - 8
gis_web/src/main/java/com/gis/web/controller/CommentController.java

@@ -6,9 +6,7 @@ import com.gis.domain.po.CommentEntity;
 import com.gis.domain.dto.CommentRequest;
 import com.gis.domain.vo.CommentVo;
 import com.gis.service.CommentService;
-import com.gis.service.util.CommentTree;
-import com.gis.service.util.CommentTreeUtil;
-import com.gis.web.aop.WebControllerLog;
+import com.gis.service.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,11 +36,8 @@ public class CommentController extends BaseController {
     @RequiresRoles(value = {"sys_admin", "sys_high"}, logical = Logical.OR)
     @ApiOperation("列表")
     @PostMapping("list")
-    public Result<CommentVo> list(@RequestBody PageDateDto param) {
-        startPage(param);
-
-        List<CommentEntity> all = commentService.search(param, null);
-        return Result.success(new PageInfo<>(all));
+    public Result<CommentEntity> list(@RequestBody PageDateDto param) {
+        return commentService.search(param, null);
     }
 
 

+ 1 - 1
gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -9,7 +9,7 @@ import com.gis.domain.dto.RoamViableDto;
 import com.gis.domain.dto.SceneDataDto;
 import com.gis.domain.po.SceneEntity;
 import com.gis.service.SceneService;
-import com.gis.web.aop.WebControllerLog;
+import com.gis.service.aop.WebControllerLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

+ 40 - 0
gis_web/src/main/java/com/gis/web/controller/StatsController.java

@@ -0,0 +1,40 @@
+package com.gis.web.controller;
+
+
+import com.gis.common.util.Result;
+import com.gis.domain.dto.GiftDto;
+import com.gis.domain.dto.PageDateDto;
+import com.gis.domain.po.GiftEntity;
+import com.gis.service.GiftService;
+import com.gis.service.StatsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+
+
+/**
+ * Created by owen on 2021/4/20 0018 12:17
+ */
+@Slf4j
+@Api(tags = "数据统计")
+@RestController
+@RequestMapping("manage/stats")
+public class StatsController extends BaseController {
+
+    @Autowired
+    StatsService statsService;
+
+    @ApiOperation("流量统计")
+    @GetMapping("flow")
+    public Result flowCount() {
+        return statsService.flowCount();
+    }
+
+
+
+}

+ 1 - 1
gis_web/src/main/java/com/gis/web/controller/SysUserController.java

@@ -8,7 +8,7 @@ import com.gis.domain.po.SysUserEntity;
 import com.gis.domain.dto.PasswordRequest;
 import com.gis.domain.dto.UserDto;
 import com.gis.service.SysUserService;
-import com.gis.web.aop.WebControllerLog;
+import com.gis.service.aop.WebControllerLog;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 13 - 18
gis_web/src/main/java/com/gis/web/controller/WebController.java

@@ -39,32 +39,29 @@ public class WebController extends BaseController {
     @Autowired
     private SysUserService sysUserService;
 
+    @Autowired
+    GoodsService goodsService;
 
+    @Autowired
+    BarrageService barrageService;
 
 
 
-
-
-
-
-
-
+    @ApiOperation("臧品列表")
+    @PostMapping("goodsList")
+    public Result<GoodsEntity> goodsList(@RequestBody GoodsPageDto param) {
+        return goodsService.search(param);
+    }
 
 
 
     @ApiOperation("留言列表")
-    @PostMapping("list")
-    public Result<CommentVo> list(@RequestBody PageDateDto param) {
-        startPage(param);
-
-        List<CommentEntity> all = commentService.search(param, 1);
-        CommentTreeUtil commentTreeUtil = new CommentTreeUtil(all);
-        List<CommentTree> commentTrees = commentTreeUtil.buildTree();
-
-        PageInfo<CommentTree> page = new PageInfo<>(commentTrees);
-        return Result.success(page);
+    @PostMapping("commentList")
+    public Result<CommentEntity> commentList(@RequestBody PageDateDto param) {
+        return commentService.search(param, 1);
     }
 
+
     @ApiOperation("留言")
     @PostMapping("comment")
     public Result comment(@Valid @RequestBody CommentRequest param) {
@@ -81,8 +78,6 @@ public class WebController extends BaseController {
 
 
 
-
-
     @ApiOperation("找回密码")
     @PostMapping("resetPassword")
     public Result resetPassword(@Valid @RequestBody ResetPasswordDto param) {

+ 0 - 1
gis_web/src/main/resources/data/data2.json

@@ -1 +0,0 @@
-{"audio":{"74896eac1c444beeb1da15a27e334dda":{"time":40000}},"hots":{},"weixinDesc":"","tourAudio":{},"overlays":[]}

+ 0 - 17
gis_web/src/main/resources/data/images.json

@@ -1,17 +0,0 @@
-
-{
-"metadata": "{\"camera_mode\":0,\"camera_position\":{\"x\":17.319578170776367,\"y\":0.5689632296562195,\"z\":30.42438507080078},\"camera_quaternion\":{\"x\":-0.0000020361233819675194,\"y\":0.9999978870169733,\"z\":-0.0012442941874225735,\"w\":-0.0016363646960161576},\"ortho_zoom\":-1,\"ss_zoom\":1,\"scan_id\":\"b1498df53a554a0bafec6646639964e6\",\"is_ortho\":false,\"floorVisibility\":[1]}",
-"created": "2019-04-12T01:15:48.811428Z",
-"modified": "2019-04-12T01:15:48.811961Z",
-"sid": "update",
-"name": "04.12.2019_09.15.38",
-"height": 1707,
-"width": 3034,
-"is_hero": true,
-"category": "user",
-"vision_generated_label": "",
-"vision_generated_name": "",
-"vision_image_index": -1,
-"created_by": 4084,
-"rating": null
-}

+ 0 - 1
gis_web/src/main/resources/data/smokeing.json

@@ -1 +0,0 @@
-{"devid":"610617128","b_name":null,"pname":"YD100N烟感","lid":null,"l_name":null,"pid":"NP-FDY100-N","payload":null,"reported":{"Temperature":null,"rssi":null,"dirtyPercent":"0%","signalStrength":null,"signalSNR":20,"rsrp":-46,"batteryPower":"100%","smokeScope":"0%","signalECL":0},"time":"2020-07-19 16:51:26","bid":null,"a_name":"港湾1号港11栋"}

+ 0 - 89
gis_web/src/main/resources/data/someData.json

@@ -1,89 +0,0 @@
-{
-  "model": {
-    "sid": "zhengzhou",
-    "name": "526190409SZGX",
-    "status": "viewable",
-    "floors": "",
-    "metainfo": { "allowed_methods": ["GET", "OPTIONS", "HEAD"] },
-    "images": [
-      {
-        "metadata": "{\"camera_mode\":0,\"camera_position\":{\"x\":17.319578170776367,\"y\":0.5689632296562195,\"z\":30.42438507080078},\"camera_quaternion\":{\"x\":-0.0000020361233819675194,\"y\":0.9999978870169733,\"z\":-0.0012442941874225735,\"w\":-0.0016363646960161576},\"ortho_zoom\":-1,\"ss_zoom\":1,\"scan_id\":\"b1498df53a554a0bafec6646639964e6\",\"is_ortho\":false,\"floorVisibility\":[1]}",
-        "created": "2019-04-12T01:15:48.811428Z",
-        "modified": "2019-04-12T01:15:48.811961Z",
-        "sid": "3itPh3K83Bq",
-        "name": "04.12.2019_09.15.38",
-        "height": 1707,
-        "width": 3034,
-        "is_hero": true,
-        "category": "user",
-        "vision_generated_label": "",
-        "vision_generated_name": "",
-        "vision_image_index": -1,
-        "created_by": 4084,
-        "rating": null
-      }
-    ],
-    "job": { "uuid": "dacf7dfa24ae47fab8fcebfe4dc41ab9" },
-    "player_options": {
-      "presented_by": true,
-      "highlight_reel": true,
-      "floor_plan": true,
-      "tour_buttons": true,
-      "dollhouse": true,
-      "fast_transitions": false,
-      "autoplay": false,
-      "contact_email": true,
-      "address": true,
-      "contact_name": true,
-      "model_summary": true,
-      "contact_phone": true,
-      "model_name": true,
-      "external_url": true
-    },
-    "modified": "2019-04-12T06:39:16.940410Z",
-    "is_public": true,
-    "summary": "",
-    "presented_by": "",
-    "contact_name": "",
-    "contact_phone": "",
-    "formatted_contact_phone": "",
-    "contact_email": "",
-    "external_url": "",
-    "camera_start": {
-      "camera": {
-        "zoom": "-1",
-        "quaternion": ["0.7013", "-0.7026", "0.0907", "-0.08"]
-      },
-      "pano": { "uuid": "2" },
-      "mode": "0"
-    }
-  },
-  "files": { "templates": ["data/{{number}}/{{filename}}"] },
-  "name": "526190409SZGX",
-  "summary": "",
-  "hoticon": {
-    "default": "images/4dagePoint2.png",
-    "higt": "images/4dagePoint.png"
-  },
-  "camera_start": {
-    "camera": {
-      "zoom": "-1",
-      "quaternion": ["0.7013", "-0.7026", "0.0907", "-0.08"]
-    },
-    "pano": { "uuid": "2" },
-    "mode": "0"
-  },
-  "loadlogo": false,
-  "special": "false",
-  "vision_version": "false",
-  "hotImageScale": "false",
-  "hideFloorMarker": "false",
-  "hideMouseMarker": "false",
-  "floorMarkerColor": "#4bcdfc",
-  "mouseMarkerColor": "#4bcdfc",
-  "momentTour": "walk",
-  "showHotListSta": "false",
-  "hotIconScale": "1",
-  "supportsVR": "false",
-  "weixinDesc": ""
-}