diff --git a/module-material-store/src/main/java/cn/com/tenlion/materialstore/util/MaterialTypeEnum.java b/module-material-store/src/main/java/cn/com/tenlion/materialstore/util/MaterialTypeEnum.java index f0e0e82..d4752e7 100644 --- a/module-material-store/src/main/java/cn/com/tenlion/materialstore/util/MaterialTypeEnum.java +++ b/module-material-store/src/main/java/cn/com/tenlion/materialstore/util/MaterialTypeEnum.java @@ -28,4 +28,7 @@ public enum MaterialTypeEnum { return typeName; } +// public static ArrayList> getType() { +// return type; +// } } diff --git a/module-material-store/src/main/resources/mybatis/mapper/materialaudio/material-audio-mapper.xml b/module-material-store/src/main/resources/mybatis/mapper/materialaudio/material-audio-mapper.xml index ee17817..4da6ba9 100644 --- a/module-material-store/src/main/resources/mybatis/mapper/materialaudio/material-audio-mapper.xml +++ b/module-material-store/src/main/resources/mybatis/mapper/materialaudio/material-audio-mapper.xml @@ -258,7 +258,7 @@ AND t1.material_id = #{materialId} - ORDER BY t1.material_order + ORDER BY t1.gmt_create DESC, t1.material_order diff --git a/module-material-store/src/main/resources/mybatis/mapper/materiallink/material-link-mapper.xml b/module-material-store/src/main/resources/mybatis/mapper/materiallink/material-link-mapper.xml index f1760c5..5044847 100644 --- a/module-material-store/src/main/resources/mybatis/mapper/materiallink/material-link-mapper.xml +++ b/module-material-store/src/main/resources/mybatis/mapper/materiallink/material-link-mapper.xml @@ -272,7 +272,7 @@ AND t1.material_id = #{materialId} - ORDER BY t1.material_order + ORDER BY t1.gmt_create DESC, t1.material_order diff --git a/module-material-store/src/main/resources/mybatis/mapper/materialmap/material-map-mapper.xml b/module-material-store/src/main/resources/mybatis/mapper/materialmap/material-map-mapper.xml index 655c58b..3942c9f 100644 --- a/module-material-store/src/main/resources/mybatis/mapper/materialmap/material-map-mapper.xml +++ b/module-material-store/src/main/resources/mybatis/mapper/materialmap/material-map-mapper.xml @@ -284,7 +284,7 @@ AND t1.material_id = #{materialId} - ORDER BY t1.material_order + ORDER BY t1.gmt_create DESC, t1.material_order diff --git a/module-material-store/src/main/resources/mybatis/mapper/materialphoto/material-photo-mapper.xml b/module-material-store/src/main/resources/mybatis/mapper/materialphoto/material-photo-mapper.xml index 55456b3..34b2500 100644 --- a/module-material-store/src/main/resources/mybatis/mapper/materialphoto/material-photo-mapper.xml +++ b/module-material-store/src/main/resources/mybatis/mapper/materialphoto/material-photo-mapper.xml @@ -262,7 +262,7 @@ AND t1.material_id = #{materialId} - ORDER BY t1.material_order + ORDER BY t1.gmt_create DESC, t1.material_order diff --git a/module-material-store/src/main/resources/mybatis/mapper/materialtext/material-text-mapper.xml b/module-material-store/src/main/resources/mybatis/mapper/materialtext/material-text-mapper.xml index acbf140..eaa97b1 100644 --- a/module-material-store/src/main/resources/mybatis/mapper/materialtext/material-text-mapper.xml +++ b/module-material-store/src/main/resources/mybatis/mapper/materialtext/material-text-mapper.xml @@ -274,7 +274,7 @@ AND t1.material_id = #{materialId} - ORDER BY t1.material_order + ORDER BY t1.gmt_create DESC, t1.material_order diff --git a/module-material-store/src/main/resources/mybatis/mapper/materialvideo/material-video-mapper.xml b/module-material-store/src/main/resources/mybatis/mapper/materialvideo/material-video-mapper.xml index cc6b5d3..b9b2682 100644 --- a/module-material-store/src/main/resources/mybatis/mapper/materialvideo/material-video-mapper.xml +++ b/module-material-store/src/main/resources/mybatis/mapper/materialvideo/material-video-mapper.xml @@ -258,7 +258,7 @@ AND t1.material_id = #{materialId} - ORDER BY t1.material_order + ORDER BY t1.gmt_create DESC, t1.material_order diff --git a/module-material-store/src/main/resources/templates/materialaudio/list.html b/module-material-store/src/main/resources/templates/materialaudio/list.html index 77902f7..eb77d29 100644 --- a/module-material-store/src/main/resources/templates/materialaudio/list.html +++ b/module-material-store/src/main/resources/templates/materialaudio/list.html @@ -44,15 +44,15 @@ - + + + - + + + diff --git a/module-material-store/src/main/resources/templates/materialaudio/save.html b/module-material-store/src/main/resources/templates/materialaudio/save.html index 0c499a2..72f2f00 100644 --- a/module-material-store/src/main/resources/templates/materialaudio/save.html +++ b/module-material-store/src/main/resources/templates/materialaudio/save.html @@ -58,12 +58,12 @@ --> -
+ -
+ + + - + + +
@@ -96,7 +96,7 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'materialLinkId', width: 180, title: '链接素材表', align:'center', + {field: 'creatorName', width: 180, title: '发布人', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -105,7 +105,7 @@ return rowData; } }, - {field: 'materialLinkPath', width: 180, title: '跳转路径', align:'center', + {field: 'materialLinkPath', width: 320, title: '跳转路径', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -114,7 +114,7 @@ return rowData; } }, - {field: 'materialLinkMode', width: 180, title: '跳转方式', align:'center', + {field: 'materialOrder', width: 80, title: '排序', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -123,74 +123,25 @@ return rowData; } }, - {field: 'materialId', width: 180, title: '素材包ID', align:'center', - templet: function(row) { + { + field: 'gmtCreate', width: 180, title: '创建时间', align: 'center', + templet: function (row) { var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + if (typeof (rowData) === 'undefined' || rowData == null || rowData == '') { return '-'; } return rowData; } }, - {field: 'materialOrder', width: 180, title: '排序', align:'center', + { + field: 'materialStatus', width: 150, title: '素材状态', fixed: 'right', align:'center', templet: function(row) { var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'materialRemark', width: 180, title: '备注', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'creator', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'gmtCreate', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'modifier', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'gmtModified', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'isDelete', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; + var materialRemark = row['materialRemark']; + if(rowData == 1) { + return ''; + }else { + return ''; } return rowData; } diff --git a/module-material-store/src/main/resources/templates/materiallink/save.html b/module-material-store/src/main/resources/templates/materiallink/save.html index d6abb41..bb3710f 100644 --- a/module-material-store/src/main/resources/templates/materiallink/save.html +++ b/module-material-store/src/main/resources/templates/materiallink/save.html @@ -22,36 +22,36 @@
-
+
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
+ + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/module-material-store/src/main/resources/templates/materiallink/update.html b/module-material-store/src/main/resources/templates/materiallink/update.html index 6795100..b86627d 100644 --- a/module-material-store/src/main/resources/templates/materiallink/update.html +++ b/module-material-store/src/main/resources/templates/materiallink/update.html @@ -22,36 +22,36 @@
-
+
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
+ + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/module-material-store/src/main/resources/templates/materialmap/list.html b/module-material-store/src/main/resources/templates/materialmap/list.html index 73c4089..32b5ae2 100644 --- a/module-material-store/src/main/resources/templates/materialmap/list.html +++ b/module-material-store/src/main/resources/templates/materialmap/list.html @@ -44,15 +44,15 @@ - + + + - + + +
@@ -96,7 +96,7 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'materialMapId', width: 180, title: '经纬度素材表', align:'center', + {field: 'creatorName', width: 180, title: '发布人', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -105,7 +105,7 @@ return rowData; } }, - {field: 'materialMapLong', width: 180, title: '经度', align:'center', + {field: 'materialMapLong', width: 100, title: '经度', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -114,7 +114,7 @@ return rowData; } }, - {field: 'materialMapLat', width: 180, title: '纬度', align:'center', + {field: 'materialMapLat', width: 100, title: '纬度', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -123,7 +123,7 @@ return rowData; } }, - {field: 'materialMapAddress', width: 180, title: '地址', align:'center', + {field: 'materialMapAddress', width: 320, title: '地址', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -132,7 +132,7 @@ return rowData; } }, - {field: 'materialId', width: 180, title: '素材包ID', align:'center', + {field: 'materialOrder', width: 80, title: '排序', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { @@ -141,65 +141,25 @@ return rowData; } }, - {field: 'materialOrder', width: 180, title: '排序', align:'center', - templet: function(row) { + { + field: 'gmtCreate', width: 180, title: '创建时间', align: 'center', + templet: function (row) { var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + if (typeof (rowData) === 'undefined' || rowData == null || rowData == '') { return '-'; } return rowData; } }, - {field: 'materialRemark', width: 180, title: '备注', align:'center', + { + field: 'materialStatus', width: 150, title: '素材状态', fixed: 'right', align:'center', templet: function(row) { var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'creator', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'gmtCreate', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'modifier', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'gmtModified', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'isDelete', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; + var materialRemark = row['materialRemark']; + if(rowData == 1) { + return ''; + }else { + return ''; } return rowData; } diff --git a/module-material-store/src/main/resources/templates/materialmap/save.html b/module-material-store/src/main/resources/templates/materialmap/save.html index 03d3ec0..d28dd75 100644 --- a/module-material-store/src/main/resources/templates/materialmap/save.html +++ b/module-material-store/src/main/resources/templates/materialmap/save.html @@ -22,42 +22,49 @@
-
- -
- -
-
-
- -
- -
-
+ + + + + + + + + + + + + +
-
- -
- -
-
-
+ + + + + + + +
+
+
+
-
+
@@ -70,6 +77,7 @@
+ @@ -92,6 +100,39 @@ parent.layer.close(parent.layer.getFrameIndex(window.name)); } + //初始化百度地图 + function initMap(longitude, latitude) { + map = new BMap.Map("mapContainer", {enableMapClick: false,}); + var point = new BMap.Point(longitude, latitude); + map.centerAndZoom(point, 13); + map.disableDoubleClickZoom(); + map.addControl(new BMap.NavigationControl()); + map.addControl(new BMap.ScaleControl()); + map.addControl(new BMap.OverviewMapControl()); + map.addControl(new BMap.MapTypeControl()); + map.enableScrollWheelZoom();//启用地图滚轮放大缩小 + map.enableContinuousZoom();//开启缩放平滑 + // 点击获取地址 + var geocoder= new BMap.Geocoder(); + mapMarkPoint(map, point); + map.addEventListener("click", function(e) { + map.clearOverlays(); + $('#materialMapLong').val(e.point.lng); + $('#materialMapLat').val(e.point.lat); + point = new BMap.Point(e.point.lng, e.point.lat); + mapMarkPoint(map, point); + geocoder.getLocation(e.point, function(rs) { + $('#materialMapAddress').val(rs.address); + }); + }); + } + + //地图标点 + function mapMarkPoint(map, point) { + var marker = new BMap.Marker(point); + map.addOverlay(marker); + } + function refreshDownloadTemplet(fileName, file) { var dataRander = {}; dataRander[fileName] = file; @@ -145,6 +186,7 @@ // 初始化内容 function initData() { + initMap('109.85017859252311', '40.66017700460503'); } initData(); diff --git a/module-material-store/src/main/resources/templates/materialmap/update.html b/module-material-store/src/main/resources/templates/materialmap/update.html index 0439c3c..e278e0c 100644 --- a/module-material-store/src/main/resources/templates/materialmap/update.html +++ b/module-material-store/src/main/resources/templates/materialmap/update.html @@ -22,42 +22,49 @@
-
- -
- -
-
-
- -
- -
-
+ + + + + + + + + + + + + +
-
- -
- + + + + + + + +
+
+
-
- -
- -
-
-
+
@@ -70,6 +77,7 @@
+ @@ -94,6 +102,39 @@ parent.layer.close(parent.layer.getFrameIndex(window.name)); } + //初始化百度地图 + function initMap(longitude, latitude) { + map = new BMap.Map("mapContainer", {enableMapClick: false,}); + var point = new BMap.Point(longitude, latitude); + map.centerAndZoom(point, 13); + map.disableDoubleClickZoom(); + map.addControl(new BMap.NavigationControl()); + map.addControl(new BMap.ScaleControl()); + map.addControl(new BMap.OverviewMapControl()); + map.addControl(new BMap.MapTypeControl()); + map.enableScrollWheelZoom();//启用地图滚轮放大缩小 + map.enableContinuousZoom();//开启缩放平滑 + // 点击获取地址 + var geocoder= new BMap.Geocoder(); + mapMarkPoint(map, point); + map.addEventListener("click", function(e) { + map.clearOverlays(); + $('#materialMapLong').val(e.point.lng); + $('#materialMapLat').val(e.point.lat); + point = new BMap.Point(e.point.lng, e.point.lat); + mapMarkPoint(map, point); + geocoder.getLocation(e.point, function(rs) { + $('#materialMapAddress').val(rs.address); + }); + }); + } + + //地图标点 + function mapMarkPoint(map, point) { + var marker = new BMap.Marker(point); + map.addOverlay(marker); + } + function refreshDownloadTemplet(fileName, file) { var dataRander = {}; dataRander[fileName] = file; @@ -155,6 +196,7 @@ } form.val('dataForm', dataFormData); form.render(null, 'dataForm'); + initMap(data.materialMapLong, data.materialMapLat); }, function(code, data) { top.dialog.msg(data.msg); }, function() { diff --git a/module-material-store/src/main/resources/templates/materialphoto/list.html b/module-material-store/src/main/resources/templates/materialphoto/list.html index 9d54eea..df135a6 100644 --- a/module-material-store/src/main/resources/templates/materialphoto/list.html +++ b/module-material-store/src/main/resources/templates/materialphoto/list.html @@ -42,19 +42,20 @@
diff --git a/module-material-store/src/main/resources/templates/materialphoto/save.html b/module-material-store/src/main/resources/templates/materialphoto/save.html index 95fba3e..c823c79 100644 --- a/module-material-store/src/main/resources/templates/materialphoto/save.html +++ b/module-material-store/src/main/resources/templates/materialphoto/save.html @@ -64,12 +64,12 @@ -
+ diff --git a/module-material-store/src/main/resources/templates/materialphoto/update.html b/module-material-store/src/main/resources/templates/materialphoto/update.html index e7c1530..a365777 100644 --- a/module-material-store/src/main/resources/templates/materialphoto/update.html +++ b/module-material-store/src/main/resources/templates/materialphoto/update.html @@ -64,12 +64,12 @@ -
+ diff --git a/module-material-store/src/main/resources/templates/materialtext/list.html b/module-material-store/src/main/resources/templates/materialtext/list.html index f51bcb6..67365b6 100644 --- a/module-material-store/src/main/resources/templates/materialtext/list.html +++ b/module-material-store/src/main/resources/templates/materialtext/list.html @@ -44,15 +44,15 @@ - + + + - + + +
diff --git a/module-material-store/src/main/resources/templates/materialtext/save.html b/module-material-store/src/main/resources/templates/materialtext/save.html index ea36b46..34facba 100644 --- a/module-material-store/src/main/resources/templates/materialtext/save.html +++ b/module-material-store/src/main/resources/templates/materialtext/save.html @@ -40,12 +40,12 @@ -
+ diff --git a/module-material-store/src/main/resources/templates/materialtext/update.html b/module-material-store/src/main/resources/templates/materialtext/update.html index a188b56..e95feb6 100644 --- a/module-material-store/src/main/resources/templates/materialtext/update.html +++ b/module-material-store/src/main/resources/templates/materialtext/update.html @@ -40,12 +40,12 @@ -
+ diff --git a/module-material-store/src/main/resources/templates/materialvideo/list.html b/module-material-store/src/main/resources/templates/materialvideo/list.html index 433aad5..285a288 100644 --- a/module-material-store/src/main/resources/templates/materialvideo/list.html +++ b/module-material-store/src/main/resources/templates/materialvideo/list.html @@ -44,15 +44,15 @@ - + + + - + + +
diff --git a/module-material-store/src/main/resources/templates/materialvideo/save.html b/module-material-store/src/main/resources/templates/materialvideo/save.html index b957133..2a25c93 100644 --- a/module-material-store/src/main/resources/templates/materialvideo/save.html +++ b/module-material-store/src/main/resources/templates/materialvideo/save.html @@ -63,12 +63,12 @@
--> -
+ diff --git a/module-material-store/src/main/resources/templates/materialvideo/update.html b/module-material-store/src/main/resources/templates/materialvideo/update.html index e1f0bb8..0cc2e67 100644 --- a/module-material-store/src/main/resources/templates/materialvideo/update.html +++ b/module-material-store/src/main/resources/templates/materialvideo/update.html @@ -56,12 +56,12 @@ -
+