129
        if (res.data.fail) {
131 130
          this.$Message.warning(res.data.fail)
132 131
        } else {
132
          this.$emit('refresh-data')
133 133
          this.$Message.success('提交成功!')
134 134
        }
135 135
      } else {
@ -142,7 +142,7 @@ export default {
142 142
      if (startDate && endDate) {
143 143
        const start = +new Date(startDate)
144 144
        const end = +new Date(endDate)
145
        return (end - start) / (24 * 60 * 60 * 1000)
145
        return (end - start) / (24 * 60 * 60 * 1000) + 1
146 146
      } else {
147 147
        return 0
148 148
      }
@ -150,6 +150,7 @@ export default {
150 150
    // 计算结束时间
151 151
    calEndTime (startDate, duration) {
152 152
      if (startDate && duration) {
153
        duration = duration - 1
153 154
        const endDate = formatDateTime(new Date(+new Date(startDate) + (duration * 24 * 60 * 60 * 1000)))
154 155
        return endDate
155 156
      } else {

+ 1 - 1
security-protection-platform/src/modules/workorder/components/modal/workorderinfomodal.vue

@ -15,7 +15,7 @@
15 15
    </div>
16 16
    <div v-if="status" class="approval-info row">
17 17
      <div class="col-6">审批人:<span>{{ data.approver }}</span></div>
18
      <div class="col-6">审批结果:<span>{{ data.result===0?'同意':'驳回' }}</span></div>
18
      <div class="col-6">审批结果:<span>{{ data.result==='0'?'失败':'成功' }}</span></div>
19 19
      <div class="col-12">审批时间:<span>{{ data.approveTime }}</span></div>
20 20
      <div class="col-12">审批意见:<span>{{ data.comments }}</span></div>
21 21
    </div>

+ 68 - 14
security-protection-platform/src/routes.js

@ -18,21 +18,41 @@ export const constantRoutes = [
18 18
    hidden: true
19 19
  },
20 20
  {
21
    name: 'dashboard',
22
    path: '/dashboard',
23
    component: () => import(/* webpackChunkName: "dashboard" */ './modules/dashboard'),
24
    meta: { title: '首页', icon: 'home' },
25
    children: [
26
      {
27
        name: 'dashboardch',
28
        path: '',
29
        meta: { title: '首页', icon: 'home' }
30
      }
31
    ]
32
  },
33
  {
21 34
    path: '/videoSurveillance',
22 35
    component: Layout,
23
    meta: { icon: 'home' },
36
    meta: { icon: 'video' },
24 37
    children: [
25 38
      {
26 39
        name: 'videoSurveillance',
27 40
        path: '',
28 41
        component: () => import(/* webpackChunkName: "videoSurveillance" */ './modules/videoSurveillance'),
29
        meta: { title: '视频监控', icon: 'home' }
30
      },
42
        meta: { title: '视频监控', icon: 'video' }
43
      }
44
    ]
45
  },
46
  {
47
    path: '/access',
48
    component: Layout,
49
    meta: { icon: 'file-solution-outline' },
50
    children: [
31 51
      {
32
        name: 'videoSurveillance/distinguishRecord',
33
        path: '/videoSurveillance/distinguishRecord',
34
        component: () => import(/* webpackChunkName: "distinguishRecord" */ './modules/videoSurveillance/distinguishRecord'),
35
        hidden: true
52
        name: 'access',
53
        path: '',
54
        component: () => import(/* webpackChunkName: "sys_attendance" */ './modules/access/index.vue'),
55
        meta: { title: '进出记录', icon: 'file-solution-outline' }
36 56
      }
37 57
    ]
38 58
  },
@ -57,13 +77,26 @@ export const constantRoutes = [
57 77
  }, {
58 78
    path: '/workorder',
59 79
    component: Layout,
60
    meta: { icon: 'home' },
80
    meta: { icon: 'calendar-outline' },
61 81
    children: [
62 82
      {
63 83
        name: 'workorder',
64 84
        path: '',
65 85
        component: () => import(/* webpackChunkName: "workorder" */ './modules/workorder'),
66
        meta: { title: '假勤管理', icon: 'home' }
86
        meta: { title: '假勤管理', icon: 'calendar-outline' }
87
      }
88
    ]
89
  },
90
  {
91
    path: '/alarm',
92
    component: Layout,
93
    meta: { icon: 'bell' },
94
    children: [
95
      {
96
        name: 'ai_alarm',
97
        path: '',
98
        component: () => import(/* webpackChunkName: "alarm" */ './modules/aialarm/index.vue'),
99
        meta: { title: 'AI报警', icon: 'bell' }
67 100
      }
68 101
    ]
69 102
  }, {
@ -80,19 +113,40 @@ export const constantRoutes = [
80 113
        meta: { title: '设备管理' }
81 114
      },
82 115
      {
83
        name: 'sys_attendance',
84
        path: 'attendance',
85
        component: () => import(/* webpackChunkName: "sys_attendance" */ './modules/system/attendance'),
86
        meta: { title: '考勤配置' }
116
        name: 'sys_task',
117
        path: 'assignment',
118
        component: () => import(/* webpackChunkName: "sys__task" */ './modules/system/assignment'),
119
        meta: { title: 'AI任务' }
87 120
      },
88 121
      {
89 122
        name: 'sys_monitor',
90 123
        path: 'monitor',
91 124
        component: () => import(/* webpackChunkName: "sys_monitor" */ './modules/system/monitor'),
92 125
        meta: { title: '监控布局' }
126
      },
127
      {
128
        name: 'sys_attendance',
129
        path: 'attendance',
130
        component: () => import(/* webpackChunkName: "sys_attendance" */ './modules/system/attendance'),
131
        meta: { title: '考勤配置' }
93 132
      }
94 133
    ]
95
  }, {
134
  },
135
  {
136
    path: '/usermana',
137
    component: Layout,
138
    meta: { icon: 'lock' },
139
    children: [
140
      {
141
        name: 'usermana',
142
        path: '',
143
        component: () => import(/* webpackChunkName: "user_rights" */ './modules/usermana'),
144
        meta: { title: '用户管理', icon: 'lock' }
145
      }
146
147
    ]
148
  },
149
  {
96 150
    path: '*',
97 151
    hidden: true,
98 152
    component: {

+ 1 - 0
security-protection-platform/src/styles/index.scss

@ -25,6 +25,7 @@ html {
25 25
*,
26 26
*:before,
27 27
*:after {
28
  font-family: inherit;
28 29
  box-sizing: inherit;
29 30
}
30 31

二进制
security-protection-platform/static/video-js.swf


ipu-baidumap-lib初始化 · de813af52e - Nuosi Git Service
Ver Código Fonte

ipu-baidumap-lib初始化

leijie 8 anos atrás
pai
commit
de813af52e
55 arquivos alterados com 188 adições e 0 exclusões
  1. 11 0
      ipu-baidumap-lib/AndroidManifest.xml
  2. BIN
      ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_base_v4_0_0.so
  3. BIN
      ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_cloud_v4_0_0.so
  4. BIN
      ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_map_v4_0_0.so
  5. BIN
      ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_radar_v4_0_0.so
  6. BIN
      ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_search_v4_0_0.so
  7. BIN
      ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_util_v4_0_0.so
  8. BIN
      ipu-baidumap-lib/libs/arm64-v8a/liblocSDK6a.so
  9. BIN
      ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_base_v4_0_0.so
  10. BIN
      ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_cloud_v4_0_0.so
  11. BIN
      ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_map_v4_0_0.so
  12. BIN
      ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_radar_v4_0_0.so
  13. BIN
      ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_search_v4_0_0.so
  14. BIN
      ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_util_v4_0_0.so
  15. BIN
      ipu-baidumap-lib/libs/armeabi-v7a/liblocSDK6a.so
  16. BIN
      ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_base_v4_0_0.so
  17. BIN
      ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_cloud_v4_0_0.so
  18. BIN
      ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_map_v4_0_0.so
  19. BIN
      ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_radar_v4_0_0.so
  20. BIN
      ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_search_v4_0_0.so
  21. BIN
      ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_util_v4_0_0.so
  22. BIN
      ipu-baidumap-lib/libs/armeabi/liblocSDK6a.so
  23. BIN
      ipu-baidumap-lib/libs/baidumapapi_base_v4_0_0.jar
  24. BIN
      ipu-baidumap-lib/libs/baidumapapi_cloud_v4_0_0.jar
  25. BIN
      ipu-baidumap-lib/libs/baidumapapi_map_v4_0_0.jar
  26. BIN
      ipu-baidumap-lib/libs/baidumapapi_radar_v4_0_0.jar
  27. BIN
      ipu-baidumap-lib/libs/baidumapapi_search_v4_0_0.jar
  28. BIN
      ipu-baidumap-lib/libs/baidumapapi_util_v4_0_0.jar
  29. BIN
      ipu-baidumap-lib/libs/ipubaidumap1.0.jar
  30. BIN
      ipu-baidumap-lib/libs/locSDK_6.13.jar
  31. BIN
      ipu-baidumap-lib/libs/x86/libBaiduMapSDK_base_v4_0_0.so
  32. BIN
      ipu-baidumap-lib/libs/x86/libBaiduMapSDK_cloud_v4_0_0.so
  33. BIN
      ipu-baidumap-lib/libs/x86/libBaiduMapSDK_map_v4_0_0.so
  34. BIN
      ipu-baidumap-lib/libs/x86/libBaiduMapSDK_radar_v4_0_0.so
  35. BIN
      ipu-baidumap-lib/libs/x86/libBaiduMapSDK_search_v4_0_0.so
  36. BIN
      ipu-baidumap-lib/libs/x86/libBaiduMapSDK_util_v4_0_0.so
  37. BIN
      ipu-baidumap-lib/libs/x86/liblocSDK6a.so
  38. BIN
      ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_base_v4_0_0.so
  39. BIN
      ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_cloud_v4_0_0.so
  40. BIN
      ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_map_v4_0_0.so
  41. BIN
      ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_radar_v4_0_0.so
  42. BIN
      ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_search_v4_0_0.so
  43. BIN
      ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_util_v4_0_0.so
  44. BIN
      ipu-baidumap-lib/libs/x86_64/liblocSDK6a.so
  45. BIN
      ipu-baidumap-lib/res/drawable-hdpi/ground_overlay.png
  46. BIN
      ipu-baidumap-lib/res/drawable-hdpi/icon_gcoding.png
  47. BIN
      ipu-baidumap-lib/res/drawable-hdpi/icon_geo.png
  48. BIN
      ipu-baidumap-lib/res/drawable-hdpi/map_mark.png
  49. BIN
      ipu-baidumap-lib/res/drawable-hdpi/popup.png
  50. 56 0
      ipu-baidumap-lib/res/layout/activity_bdmap.xml
  51. 40 0
      ipu-baidumap-lib/res/layout/activity_lbs.xml
  52. 48 0
      ipu-baidumap-lib/res/layout/activity_poi.xml
  53. 7 0
      ipu-baidumap-lib/res/values/dimens.xml
  54. 6 0
      ipu-baidumap-lib/res/values/strings.xml
  55. 20 0
      ipu-baidumap-lib/res/values/styles.xml

+ 11 - 0
ipu-baidumap-lib/AndroidManifest.xml

@ -0,0 +1,11 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    package="com.ai.ipu.baidumap"
4
    android:versionCode="1"
5
    android:versionName="1.0" >
6
7
    <uses-sdk
8
        android:minSdkVersion="8"
9
        android:targetSdkVersion="15" />
10
11
</manifest>

BIN
ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_base_v4_0_0.so


BIN
ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_cloud_v4_0_0.so


BIN
ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_map_v4_0_0.so


BIN
ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_radar_v4_0_0.so


BIN
ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_search_v4_0_0.so


BIN
ipu-baidumap-lib/libs/arm64-v8a/libBaiduMapSDK_util_v4_0_0.so


BIN
ipu-baidumap-lib/libs/arm64-v8a/liblocSDK6a.so


BIN
ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_base_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_cloud_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_map_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_radar_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_search_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi-v7a/libBaiduMapSDK_util_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi-v7a/liblocSDK6a.so


BIN
ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_base_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_cloud_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_map_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_radar_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_search_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi/libBaiduMapSDK_util_v4_0_0.so


BIN
ipu-baidumap-lib/libs/armeabi/liblocSDK6a.so


BIN
ipu-baidumap-lib/libs/baidumapapi_base_v4_0_0.jar


BIN
ipu-baidumap-lib/libs/baidumapapi_cloud_v4_0_0.jar


BIN
ipu-baidumap-lib/libs/baidumapapi_map_v4_0_0.jar


BIN
ipu-baidumap-lib/libs/baidumapapi_radar_v4_0_0.jar


BIN
ipu-baidumap-lib/libs/baidumapapi_search_v4_0_0.jar


BIN
ipu-baidumap-lib/libs/baidumapapi_util_v4_0_0.jar


BIN
ipu-baidumap-lib/libs/ipubaidumap1.0.jar


BIN
ipu-baidumap-lib/libs/locSDK_6.13.jar


BIN
ipu-baidumap-lib/libs/x86/libBaiduMapSDK_base_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86/libBaiduMapSDK_cloud_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86/libBaiduMapSDK_map_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86/libBaiduMapSDK_radar_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86/libBaiduMapSDK_search_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86/libBaiduMapSDK_util_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86/liblocSDK6a.so


BIN
ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_base_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_cloud_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_map_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_radar_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_search_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86_64/libBaiduMapSDK_util_v4_0_0.so


BIN
ipu-baidumap-lib/libs/x86_64/liblocSDK6a.so


BIN
ipu-baidumap-lib/res/drawable-hdpi/ground_overlay.png


BIN
ipu-baidumap-lib/res/drawable-hdpi/icon_gcoding.png


BIN
ipu-baidumap-lib/res/drawable-hdpi/icon_geo.png


BIN
ipu-baidumap-lib/res/drawable-hdpi/map_mark.png


BIN
ipu-baidumap-lib/res/drawable-hdpi/popup.png


+ 56 - 0
ipu-baidumap-lib/res/layout/activity_bdmap.xml

@ -0,0 +1,56 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:layout_height="match_parent" >
5
    
6
	 <com.baidu.mapapi.map.MapView 
7
        android:id="@+id/bdMapView"
8
        android:layout_width="match_parent"
9
        android:layout_height="match_parent"
10
        android:clickable="true"/>
11
	 
12
	 <LinearLayout
13
	     android:layout_width="match_parent"
14
	     android:layout_height="wrap_content"	
15
	     android:orientation="horizontal"
16
		 android:layout_above="@+id/ll_addoverlay">
17
	     
18
	     <Button 
19
		     android:id="@+id/location"
20
		     android:layout_width="wrap_content"
21
		     android:layout_height="wrap_content"
22
		     android:layout_weight="0"
23
		     android:text="定位"/>
24
	     <Button 
25
	        android:id="@+id/pointSin"
26
	        android:layout_width="wrap_content"
27
		    android:layout_height="wrap_content"
28
		    android:text="定位单点"/>
29
	     <Button 
30
	        android:id="@+id/pointMul"
31
	        android:layout_width="wrap_content"
32
		    android:layout_height="wrap_content"
33
		    android:text="定位多点"/>
34
	     
35
	 </LinearLayout>
36
	 
37
	 <LinearLayout
38
	     android:id="@+id/ll_addoverlay"
39
	     android:layout_width="match_parent"
40
	     android:layout_height="wrap_content"
41
	     android:orientation="horizontal"	
42
		 android:layout_alignParentBottom="true">
43
	     	     
44
	     <Button 
45
	         android:id="@+id/addMarker"
46
	         android:layout_width="wrap_content"
47
	         android:layout_height="wrap_content"
48
	         android:text="添加标注"/>
49
	     <Button 
50
	         android:id="@+id/addPolygon"
51
	         android:layout_width="wrap_content"
52
	         android:layout_height="wrap_content"
53
	         android:text="添加覆盖物"/>
54
	 </LinearLayout> 
55
    
56
</RelativeLayout>

+ 40 - 0
ipu-baidumap-lib/res/layout/activity_lbs.xml

@ -0,0 +1,40 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:layout_height="match_parent"
5
    android:orientation="vertical" >
6
    
7
	  <com.baidu.mapapi.map.MapView 
8
        android:id="@+id/bdLbsMapView"
9
        android:layout_width="match_parent"
10
        android:layout_height="match_parent"
11
        android:clickable="true"/>
12
    
13
    <LinearLayout 
14
        android:layout_width="match_parent"
15
        android:layout_height="wrap_content">
16
        
17
        <Button 
18
            android:id="@+id/cityLbsSearch"
19
            android:layout_width="0dp"
20
            android:layout_weight="1"
21
            android:layout_height="wrap_content"
22
            android:text="城市搜索"/>
23
        
24
        <Button 
25
            android:id="@+id/nearbyLbsSearch"
26
            android:layout_width="0dp"
27
            android:layout_weight="1"
28
            android:layout_height="wrap_content"
29
            android:text="周边搜索"/>
30
        
31
        <Button 
32
            android:id="@+id/boundsLbsSearch"
33
            android:layout_width="0dp"
34
            android:layout_weight="1"
35
            android:layout_height="wrap_content"
36
            android:text="区域搜索"/>
37
        
38
       </LinearLayout>
39
        
40
</RelativeLayout>

+ 48 - 0
ipu-baidumap-lib/res/layout/activity_poi.xml

@ -0,0 +1,48 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:layout_height="match_parent" >
5
    
6
	
7
    <com.baidu.mapapi.map.MapView 
8
        android:id="@+id/bdPoiMapView"
9
        android:layout_width="match_parent"
10
        android:layout_height="match_parent"
11
        android:clickable="true"/>
12
    
13
    <LinearLayout 
14
        android:id="@+id/ll_poisearch"
15
        android:layout_width="match_parent"
16
        android:layout_height="wrap_content">
17
        
18
        <Button 
19
            android:id="@+id/cityPoiSearch"
20
            android:layout_width="0dp"
21
            android:layout_weight="1"
22
            android:layout_height="wrap_content"
23
            android:text="城市搜索"/>
24
        
25
        <Button 
26
            android:id="@+id/nearbyPoiSearch"
27
            android:layout_width="0dp"
28
            android:layout_weight="1"
29
            android:layout_height="wrap_content"
30
            android:text="周边搜索"/>
31
        
32
        <Button 
33
            android:id="@+id/boundsPoiSearch"
34
            android:layout_width="0dp"
35
            android:layout_weight="1"
36
            android:layout_height="wrap_content"
37
            android:text="区域搜索"/>
38
        
39
    </LinearLayout>
40
    
41
    <EditText 
42
        android:id="@+id/poikeyword"
43
        android:layout_width="match_parent"
44
        android:layout_height="wrap_content"
45
        android:layout_below="@+id/ll_poisearch"
46
        android:text="联通"/>
47
	 
48
</RelativeLayout>

+ 7 - 0
ipu-baidumap-lib/res/values/dimens.xml

@ -0,0 +1,7 @@
1
<resources>
2
3
    <!-- Default screen margins, per the Android Design guidelines. -->
4
    <dimen name="activity_horizontal_margin">16dp</dimen>
5
    <dimen name="activity_vertical_margin">16dp</dimen>
6
7
</resources>

+ 6 - 0
ipu-baidumap-lib/res/values/strings.xml

@ -0,0 +1,6 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<resources>
3
4
        <string name="app_name">baidumap</string>
5
6
</resources>

+ 20 - 0
ipu-baidumap-lib/res/values/styles.xml

@ -0,0 +1,20 @@
1
<resources>
2
3
    <!--
4
        Base application theme, dependent on API level. This theme is replaced
5
        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
6
    -->
7
    <style name="AppBaseTheme" parent="@android:style/Theme.Light.NoTitleBar">
8
        <!--
9
            Theme customizations available in newer API levels can go in
10
            res/values-vXX/styles.xml, while customizations related to
11
            backward-compatibility can go here.
12
        -->
13
    </style>
14
15
    <!-- Application theme. -->
16
    <style name="AppTheme" parent="AppBaseTheme">
17
        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
18
    </style>
19
20
</resources>

新增救援者信息 · e13ecac6ec - Nuosi Git Service
浏览代码

新增救援者信息

konghl 4 年之前
父节点
当前提交
e13ecac6ec

+ 12 - 0
ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/RescueDaoImpl.java

@ -127,4 +127,16 @@ public class RescueDaoImpl extends AbstractBizDao implements RescueDao {
127 127
		dataMap.put("LOG_ID", params.getString("alarmLogId"));
128 128
		return dao.delete("LR_RESCUE_LOG", dataMap) > 0;
129 129
	}
130
	
131
	@Override
132
	public List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception {
133
		StringBuilder sql = new StringBuilder();
134
		
135
		sql.append(" SELECT RESCUERS_ID ID,PARTY_CODE CODE ,PARTY_NAME NAME  ");
136
		sql.append(" FROM LR_RESCUERS ");
137
		sql.append(" WHERE DATA_STATUS ='").append(EbcConstant.data_status_valid).append("' ");
138
		
139
		return dao.executeSelect(sql.toString(), pageNum, pageSize);
140
	}
141
	
130 142
}

+ 10 - 2
ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/RescueDao.java

@ -41,8 +41,6 @@ public interface RescueDao {
41 41
	 */
42 42
	String addRescueLog(Map<String, Object> dataMap) throws Exception;
43 43
44
	
45
	
46 44
	/**
47 45
	 * 修改报警救援日志
48 46
	 * @param dataMap
@ -59,4 +57,14 @@ public interface RescueDao {
59 57
	 */
60 58
	boolean deleteRescueLog(JMap params) throws Exception;
61 59
	
60
	/**
61
	 * 获取救援者的下拉列表
62
	 * @param params
63
	 * @param pageNum 当前页数
64
	 * @param pageSize 每页条数
65
	 * @return
66
	 * @throws Exception
67
	 */
68
	List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception;
69
	
62 70
}

+ 6 - 6
ebc-sea-platform/src/main/java/com/ai/ipu/server/enums/UserEnums.java

@ -17,12 +17,12 @@ public enum UserEnums {
17 17
	eightUser(8, "郑十", "8888", 1, 1, "zhengshi", "员工"),
18 18
	nineUser(0, "刘一", "9999", 1, 1, "liuyi", "员工"),
19 19
	// 救援者
20
	oneRescuer(0, "童一", "1001", 2, 1, "tongyi", "员工"), 
21
	twoRescuer(0, "童二", "1002", 2, 1, "tonger", "员工"),
22
	threeRescuer(0, "童三", "1003", 2, 1, "tongsan", "员工"),
23
	fourRescuer(0, "童四", "1004", 2, 1, "tongsi", "员工"),
24
	fiveRescuer(0, "童五", "1005", 2, 1, "tongwu", "员工"), 
25
	sixRescuer(0, "童六", "1006", 2, 1, "tongliu", "员工");
20
	oneRescuer(1, "童一", "1001", 2, 1, "tongyi", "员工"), 
21
	twoRescuer(2, "童二", "1002", 2, 1, "tonger", "员工"),
22
	threeRescuer(3, "童三", "1003", 2, 1, "tongsan", "员工"),
23
	fourRescuer(4, "童四", "1004", 2, 1, "tongsi", "员工"),
24
	fiveRescuer(5, "童五", "1005", 2, 1, "tongwu", "员工"), 
25
	sixRescuer(6, "童六", "1006", 2, 1, "tongliu", "员工");
26 26
27 27
	public int id; // id
28 28
	public String userName;// 姓名

+ 4 - 3
ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/RescueServiceImpl.java

@ -5,6 +5,8 @@ import java.util.HashMap;
5 5
import java.util.List;
6 6
import java.util.Map;
7 7
8
import javax.websocket.Session;
9
8 10
import org.slf4j.Logger;
9 11
import org.slf4j.LoggerFactory;
10 12
import org.springframework.beans.factory.annotation.Autowired;
@ -30,8 +32,7 @@ public class RescueServiceImpl implements RescueService {
30 32
31 33
	@Override
32 34
	public List<Map<String, Object>> queryListRescuerInfo(JMap params, int pageNum, int pageSize) throws Exception {
33
		// TODO 调用uspa接口获取人员信息 暂时用枚举(救援的部门为2)
34
		return UserEnums.getUserListByDepy(2);
35
		return rescueDao.queryListRescuerInfo(params, pageNum, pageSize);
35 36
	}
36 37
37 38
	@Override
@ -55,7 +56,7 @@ public class RescueServiceImpl implements RescueService {
55 56
	@Override
56 57
	public JMap queryPageRescueLog(JMap params, int pageNum, int pageSize) throws Exception {
57 58
		// TODO 计算求救时间、按时间查询
58
59
		
59 60
		return rescueDao.queryPageRescueLog(params, pageNum, pageSize);
60 61
	}
61 62

android-share - Nuosi Git Service

ipu的trunk版的android工程和服务端工程。

leijie 3b751fd7a7 迁出ipu-mobile-ui,ipu-plugin-basic工程;迁入keep-live,show-client,show-server,ipu-sdk-demo,ipu-push-test,super-client工程; 3 years ago
..
src 3b751fd7a7 迁出ipu-mobile-ui,ipu-plugin-basic工程;迁入keep-live,show-client,show-server,ipu-sdk-demo,ipu-push-test,super-client工程; 3 years ago
.gitignore 3b751fd7a7 迁出ipu-mobile-ui,ipu-plugin-basic工程;迁入keep-live,show-client,show-server,ipu-sdk-demo,ipu-push-test,super-client工程; 3 years ago
build.gradle 3b751fd7a7 迁出ipu-mobile-ui,ipu-plugin-basic工程;迁入keep-live,show-client,show-server,ipu-sdk-demo,ipu-push-test,super-client工程; 3 years ago