diff --git a/src/main/java/com/cm/systemcity/controller/apis/bindingdepartment/BindingDepartmentController.java b/src/main/java/com/cm/systemcity/controller/apis/bindingdepartment/BindingDepartmentController.java index 3a5ee11..f66817d 100644 --- a/src/main/java/com/cm/systemcity/controller/apis/bindingdepartment/BindingDepartmentController.java +++ b/src/main/java/com/cm/systemcity/controller/apis/bindingdepartment/BindingDepartmentController.java @@ -175,7 +175,6 @@ public class BindingDepartmentController extends AbstractController { @GetMapping("list-all-sys-user") public List> listAllSysUser() throws SearchException{ Map params = requestParams(); - params.put("userType","2"); params.put("weChat",false); return bindingDepartment.listAllSysUser(params); } diff --git a/src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java b/src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java index b33213e..ee75d2b 100644 --- a/src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java +++ b/src/main/java/com/cm/systemcity/controller/datarelease/DataReleaseController.java @@ -2,12 +2,14 @@ package com.cm.systemcity.controller.datarelease; import com.cm.common.base.AbstractController; import com.cm.common.constants.ISystemConstant; +import com.cm.common.exception.ParamsException; import com.cm.common.exception.SearchException; import com.cm.common.pojo.ListPage; import com.cm.common.result.ErrorResult; import com.cm.common.result.SuccessResultData; import com.cm.common.result.SuccessResultList; import com.cm.common.utils.DateUtil; +import com.cm.plugin.map.pojo.dto.GridDTO; import com.cm.systemcity.dao.datarelease.IDataReleaseDao; import com.cm.systemcity.dao.reportcase.IReportCaseDao; import com.cm.systemcity.pojo.dtos.dict.DictDTO; @@ -20,15 +22,16 @@ import com.cm.systemcity.service.dict.IDictService; import com.cm.systemcity.service.readstate.IReadStateService; import com.cm.systemcity.service.reportcase.IReportCaseService; import com.cm.systemcity.service.userlocation.IUserLocationService; +import com.cm.systemcity.service.userpoints.IUserPointsService; import com.cm.systemcity.utils.BigDataResult; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -48,11 +51,21 @@ public class DataReleaseController extends AbstractController { @Autowired private IDataReleaseDao dataReleaseDao; @Autowired + private MongoTemplate mongoTemplate; + @Autowired private IDictService dictService; @Autowired private IReportCaseService reportCaseService; @Autowired private IUserLocationService userLocationService; + @Autowired + private IUserPointsService userPointsService; + + @GetMapping("repair-data") + public void repairData(){ + // 更新地图左侧人员树缓存 + mongoTemplate.remove(new Query(), "INDEX_PANEL_GRID_TREE"); + } @ApiOperation(value = "案件情况-数量", notes = "案件情况-数量") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @@ -196,54 +209,56 @@ public class DataReleaseController extends AbstractController { @GetMapping("get-7day-report-case") public BigDataResult get7DayReportCase(){ Map reqParams = requestParams(); - // {data:{},list:[{name:'受理',value:585},{name:'立案',value:25},{name:'下派',value:89},{name:'处理',value:856}, - // {name:'检查',value:856},{name:'归档',value:856}],msg:'加载成功',state:'200'} + // 为了避免案件类型没传，单独处理 + if(reqParams.get("caseFlowType") == null || "".equals(reqParams.get("caseFlowType").toString().trim())){ + reqParams.put("caseFlowType", "1,2"); + } List> resList = new ArrayList<>(); Map itemMap; String nowDate = DateUtil.getDay(); - String last7Date = DateUtil.getBeforeDate(7,"yyyy-MM-dd"); - reqParams.put("modifiedStr",last7Date + " 00:00:00"); - reqParams.put("modifiedEnd", nowDate + " 00:00:00"); + String last7Date = DateUtil.getBeforeDate(6,"yyyy-MM-dd"); + reqParams.put("startTime",last7Date + " 00:00:00"); + reqParams.put("endTime", nowDate + " 23:59:59"); // 受理 - reqParams.put("caseStatusCompareUp","1"); + /*reqParams.put("caseStatusCompareUp","1"); List> list1 = dataReleaseDao.listReportCase(reqParams); itemMap = new HashMap<>(4); itemMap.put("name", "受理"); itemMap.put("value", list1 == null ? 0 : list1.size()); - resList.add(itemMap); + resList.add(itemMap);*/ // 立案 - reqParams.put("caseStatusCompareUp","2"); + /*reqParams.put("caseStatusCompareUp","2"); List> list2 = dataReleaseDao.listReportCase(reqParams); itemMap = new HashMap<>(4); itemMap.put("name", "立案"); itemMap.put("value", list2 == null ? 0 : list2.size()); - resList.add(itemMap); - // 下派 - reqParams.put("caseStatusCompareUp","3"); + resList.add(itemMap);*/ + // 待下中 + reqParams.put("caseStatus","2"); List> list3 = dataReleaseDao.listReportCase(reqParams); itemMap = new HashMap<>(4); - itemMap.put("name", "下派"); + itemMap.put("name", "下派中"); itemMap.put("value", list3 == null ? 0 : list3.size()); resList.add(itemMap); // 处理 - reqParams.put("caseStatusCompareUp","4"); + reqParams.put("caseStatus","3"); List> list4 = dataReleaseDao.listReportCase(reqParams); itemMap = new HashMap<>(4); - itemMap.put("name", "处理"); + itemMap.put("name", "处理中"); itemMap.put("value", list4 == null ? 0 : list4.size()); resList.add(itemMap); // 检查 - reqParams.put("caseStatusCompareUp","5"); + reqParams.put("caseStatus","4"); List> list5 = dataReleaseDao.listReportCase(reqParams); itemMap = new HashMap<>(4); - itemMap.put("name", "检查"); + itemMap.put("name", "检查中"); itemMap.put("value", list5 == null ? 0 : list5.size()); resList.add(itemMap); // 归档 - reqParams.put("caseStatusCompareUp","6"); + reqParams.put("caseStatus","6"); List> list6 = dataReleaseDao.listReportCase(reqParams); itemMap = new HashMap<>(4); - itemMap.put("name", "归档"); + itemMap.put("name", "已归档"); itemMap.put("value", list6 == null ? 0 : list6.size()); resList.add(itemMap); BigDataResult bdr = new BigDataResult(); @@ -271,6 +286,8 @@ public class DataReleaseController extends AbstractController { || !"null".equals(gradeItem.get("grade").toString()) ){ nowGrade += Integer.parseInt(gradeItem.get("grade").toString()); + } else { + } } BigDecimal ratioBigDecimal = new BigDecimal(( nowGrade.doubleValue() / totalGrade.doubleValue() ) * 100) @@ -285,33 +302,83 @@ public class DataReleaseController extends AbstractController { return bdr; } + @ApiOperation(value = "案件满意度二级列表", notes = "案件满意度二级列表") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-grade-ratio") + public SuccessResultList>> listGradeRatio(){ + Map params = requestParams(); + params.put("caseStatus","6"); + // 只显示近7天的情况 + String startTime = DateUtil.getBeforeDate(7, "yyyy-MM-dd"); + startTime += " 00:00:00"; + String endTime = DateUtil.getDay(); + endTime += " 23:59:59"; + params.put("startTime", startTime); + params.put("endTime", endTime); + List> gradeList = dataReleaseDao.listReportCase(params); + Integer totalGrade = 0; + Integer nowGrade = 0; + totalGrade = gradeList.size() * 5; + for(Map item : gradeList){ + item.put("gmt_create", item.get("gmt_create").toString().substring(0,19)); + if(item.get("grade") == null + || "0".equals(item.get("grade").toString()) + || "".equals(item.get("grade").toString())){ + nowGrade += 3; + } else { + nowGrade += Integer.parseInt(item.get("grade").toString()); + } + } + if(totalGrade == 0){ + return new SuccessResultList<>(new ArrayList<>(), 1, 0L); + } + Map totalInfoMap = new HashMap<>(8); + totalInfoMap.put("case_reporter", "合计: " + gradeList.size() + "件"); + BigDecimal ratioBigDecimal = new BigDecimal(( nowGrade.doubleValue() / totalGrade.doubleValue() ) * 100) + .setScale(2,BigDecimal.ROUND_HALF_UP); + totalInfoMap.put("grade", "总体满意度: " + ratioBigDecimal.doubleValue()); + List> resList = new LinkedList<>(); + resList.add(totalInfoMap); + for(Map item : gradeList){ + resList.add(item); + } + return new SuccessResultList<>(resList, 1, 0L); + } + @ApiOperation(value = "各月份案件情况统计", notes = "各月份案件情况统计") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("get-month-report-case") public BigDataResult getMonthReportCase(){ Map reqParams = requestParams(); - // {data:{},list:[{name:' 1月',value:22},{name:'2月',value:'968'},{name:'3月',value:6952},{name:'4月',value:5955},{name:'5月', - // value:1204},{name:'6月',value:2054},{name:'7月',value:3250},{name:'8月',value:1048}, - // {name:'9月',value:458},{name:'10月',value:1520},{name:'11月',value:1952},{name:'12月',value:702},],msg:'加载成功',state:'200'} BigDataResult bdr = new BigDataResult(); - String year = DateUtil.getYear(); + Integer year = Integer.parseInt(DateUtil.getYear()); + Integer month; + if(DateUtil.getMonth().length() > 1 || "0".equals(DateUtil.getMonth().substring(0,1))){ + month = Integer.parseInt(DateUtil.getMonth().replaceAll("0", "")); + } else { + month = Integer.parseInt(DateUtil.getMonth()); + } List monthList = new ArrayList<>(); - List> resList = new ArrayList<>(); - for(int i = 1;i <= 12; i++){ - if(i < 10){ - monthList.add(year + "-0" + i); + for(int i = 0; i < 12; i++){ + if(month - i == 0){ + monthList.add((year - 1) + "-" + 12); continue; } - monthList.add(year + "-" + i); + if(month - i < 0){ + monthList.add((year -1) + "-" + (12 + (month - i))); + continue; + } + monthList.add(year + "-" + (month - i)); } - for(int i = 0; i < monthList.size(); i++){ - reqParams.clear(); - reqParams.put("gmtCreateLike", monthList.get(i)); - Map itemMap = new HashMap<>(4); + List> resList = new ArrayList<>(); + for(String str : monthList){ + Map resMap = new HashMap<>(8); + String queryTime = str.length() == 6 ? str.replace("-", "-0") : str; + reqParams.put("gmtCreateLike", queryTime); List> list = dataReleaseDao.listReportCase(reqParams); - itemMap.put("name", (i+1) + "月"); - itemMap.put("value", list == null ? 0 : list.size()); - resList.add(itemMap); + resMap.put("name", queryTime); + resMap.put("value", list == null ? 0 : list.size()); + resList.add(resMap); } bdr.setList(resList); return bdr; @@ -422,6 +489,33 @@ public class DataReleaseController extends AbstractController { return resList; } + /** + * 7日案件进展情况列表 + */ + @GetMapping("list-page-7day-report-case") + public SuccessResultList> listPage7DayReportCase(ListPage page) throws SearchException { + Map params = requestParams(); + // 为了避免案件类型没传，单独处理 + if(params.get("caseFlowType") == null || "".equals(params.get("caseFlowType").toString().trim())){ + params.put("caseFlowType", "1,2"); + } + // 查询7天内的数据 + if(params.get("startTime") == null && params.get("endTime") == null){ + String startTime = DateUtil.getBeforeDate(6, "yyyy-MM-dd"); + String endTime = DateUtil.getDay(); + params.put("startTime", startTime); + params.put("endTime", endTime); + } + // 案件状态没传情况 + if(params.get("caseStatus") == null || "".equals(params.get("caseStatus").toString())){ + params.put("caseStatus", "2,3,4,5,6"); + } + page.setParams(params); + + SuccessResultList> resList = reportCaseService.listPageReportCase(page); + return resList; + } + /** * 查看案件详情 */ @@ -460,6 +554,8 @@ public class DataReleaseController extends AbstractController { resObj.put("long", item.get("case_longitude").toString()); resObj.put("lat", item.get("case_latitude").toString()); resObj.put("text", item.get("case_content") == null ? "" : item.get("case_content").toString()); + resObj.put("reportCaseId", item.get("report_case_id") == null ? "" : item.get("report_case_id").toString()); + resObj.put("caseReporter", item.get("case_reporter") == null ? "" : item.get("case_reporter").toString()); resList.add(resObj); } } @@ -473,6 +569,76 @@ public class DataReleaseController extends AbstractController { return reportCaseService.listCaseStatisticRatio(params); } + /** + * 各月份案件统计情况 -大数据 + * @return + */ + @GetMapping("list-report-case-month") + public SuccessResultList>> listReportCaseMonth(){ + Map params = requestParams(); + Integer year = Integer.parseInt(DateUtil.getYear()); + Integer month; + if(DateUtil.getMonth().length() > 1 || "0".equals(DateUtil.getMonth().substring(0,1))){ + month = Integer.parseInt(DateUtil.getMonth().replaceAll("0", "")); + } else { + month = Integer.parseInt(DateUtil.getMonth()); + } + List monthList = new ArrayList<>(); + for(int i = 0; i < 12; i++){ + if(month - i == 0){ + monthList.add((year - 1) + "-" + 12); + continue; + } + if(month - i < 0){ + monthList.add((year -1) + "-" + (12 + (month - i))); + continue; + } + monthList.add(year + "-" + (month - i)); + } + List> resList = new ArrayList<>(); + for(String str : monthList){ + Map resMap = new HashMap<>(8); + String queryTime = str.length() == 6 ? str.replace("-", "-0") : str; + params.put("gmtCreateLike", queryTime); + List> list = dataReleaseDao.listReportCase(params); + resMap.put("yearMonth", queryTime); + resMap.put("totalCount", list.size()); + // 下派中 + Integer xiapai = 0; + // 处理中 + Integer chuli = 0; + // 检查中 + Integer jiancha = 0; + // 已归档 + Integer guidang = 0; + for(Map item : list){ + if(item.get("case_status") != null && "2".equals(item.get("case_status").toString())){ + xiapai++; + } + if(item.get("case_status") != null && "3".equals(item.get("case_status").toString())){ + chuli++; + } + if(item.get("case_status") != null && "4".equals(item.get("case_status").toString())){ + jiancha++; + } + if(item.get("case_status") != null && "6".equals(item.get("case_status").toString())){ + guidang++; + } + } + resMap.put("xiapai", xiapai); + resMap.put("chuli", chuli); + resMap.put("jiancha", jiancha); + resMap.put("guidang", guidang); + resList.add(resMap); + } + return new SuccessResultList<>(resList, 1, 0L); + } + + /** + * 大数据页面人员实施定位 二级弹窗列表页数据接口 + * @param page + * @return + */ @GetMapping("list-page-user-location") public SuccessResultList> listPageUserLocation (ListPage page){ Map params = requestParams(); @@ -492,12 +658,26 @@ public class DataReleaseController extends AbstractController { dto.setIsOverstep(temp.get("is_overstep") == null ? "" : temp.get("is_overstep").toString()); dto.setUserName(temp.get("user_name") == null ? "" : temp.get("user_name").toString()); dto.setCreator(temp.get("creator") == null ? "" : temp.get("creator").toString()); - dto.setGmtCreate(temp.get("gmt_create") == null ? "" : temp.get("gmt_create").toString()); + dto.setGmtCreate(temp.get("gmt_create") == null ? "" : temp.get("gmt_create").toString().substring(11,19)); dto.setUserAvatar(temp.get("user_avatar") == null ? "" : temp.get("user_avatar").toString()); - dto.setUserPhone(temp.get("user_phone") == null ? "" : temp.get("user_phone").toString()); + // 如果取不到手机号 则使用登录账号 + if(temp.get("user_phone") == null){ + dto.setUserPhone(temp.get("user_username") == null ? "" : temp.get("user_username").toString()); + } else { + dto.setUserPhone(temp.get("user_phone").toString()); + } resList.add(dto); } PageInfo> pageInfo = new PageInfo<>(userLocationList); return new SuccessResultList<>(resList, pageInfo.getPageNum(), pageInfo.getTotal()); } + + @GetMapping("list-user-and-points-by-userids-by-grid-service") + public List listUserAndPointsByUserIdsByGridService () throws ParamsException, SearchException{ + Map params = requestParams(); + if (params.get("userIds") == null || StringUtils.isBlank(params.get("userIds").toString())) { + return new ArrayList<>(); + } + return userPointsService.listUserAndPointsByUserIdsByGridService(params); + } } diff --git a/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java b/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java index 2194318..d37bb8d 100755 --- a/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java +++ b/src/main/java/com/cm/systemcity/service/userlocation/impl/UserLocationServiceImpl.java @@ -951,6 +951,7 @@ public class UserLocationServiceImpl extends BaseService implements IUserLocatio gridPointArray.add(gridPointDTO); } item.setPointArray(gridPointArray); + } resultDTO.addAll(gridDTOS); return resultDTO; diff --git a/src/main/resources/mybatis/mapper/bindingdepartment/bindingdepartment-mapper.xml b/src/main/resources/mybatis/mapper/bindingdepartment/bindingdepartment-mapper.xml index 5b5e6d1..4ae18fa 100644 --- a/src/main/resources/mybatis/mapper/bindingdepartment/bindingdepartment-mapper.xml +++ b/src/main/resources/mybatis/mapper/bindingdepartment/bindingdepartment-mapper.xml @@ -194,9 +194,6 @@ t1.user_name LIKE CONCAT('%', CONCAT(#{keywords}, '%')) ) - - AND t1.user_type = '2' - AND t1.user_username NOT LIKE 'WX%' diff --git a/src/main/resources/mybatis/mapper/datarelease/datarelease-mapper.xml b/src/main/resources/mybatis/mapper/datarelease/datarelease-mapper.xml index 7322a7b..c75c0ec 100644 --- a/src/main/resources/mybatis/mapper/datarelease/datarelease-mapper.xml +++ b/src/main/resources/mybatis/mapper/datarelease/datarelease-mapper.xml @@ -27,8 +27,11 @@ city_report_case WHERE is_delete = '0' + + AND FIND_IN_SET(case_flow_type, #{caseFlowType}) + - AND case_status = #{caseStatus} + AND FIND_IN_SET(case_status, #{caseStatus}) AND case_flow_type = '1' @@ -53,12 +56,19 @@ AND case_status =]]> #{caseStatusCompareUp} + + AND gmt_create =]]> #{startTime} + + + AND gmt_create #{endTime} + AND gmt_modified =]]> #{modifiedStr} AND gmt_modified #{modifiedEnd} + ORDER BY gmt_create DESC SELECT + report_case_id, + case_reporter, case_content, case_longitude, case_latitude, @@ -134,7 +146,7 @@ FROM city_report_case WHERE - case_status = '3' + case_status = '2' AND LEFT(gmt_create, 10) = ]]> #{startTime} @@ -164,7 +176,8 @@ SELECT t1.*, t2.user_avatar, - t2.user_phone + t2.user_phone, + t2.user_username FROM city_user_location t1 INNER JOIN sys_user t2 ON t1.creator = t2.user_id diff --git a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml index ff43e9e..3ae8c9f 100755 --- a/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml +++ b/src/main/resources/mybatis/mapper/reportcase/reportcase-mapper.xml @@ -308,7 +308,7 @@ AND t1.case_type_id = #{caseTypeId} - AND t1.case_status = #{caseStatus} + AND FIND_IN_SET(t1.case_status, #{caseStatus}) AND t1.is_accept = #{isAccept} diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml index 169d2ff..fb631fc 100755 --- a/src/main/resources/mybatis/mybatis-config.xml +++ b/src/main/resources/mybatis/mybatis-config.xml @@ -5,7 +5,7 @@ - + diff --git a/src/main/resources/static/assets/js/baidu-map/baidu-map-1.0.0.min.js b/src/main/resources/static/assets/js/baidu-map/baidu-map-1.0.0.min.js index 9ec4c79..4d14554 100644 --- a/src/main/resources/static/assets/js/baidu-map/baidu-map-1.0.0.min.js +++ b/src/main/resources/static/assets/js/baidu-map/baidu-map-1.0.0.min.js @@ -302,9 +302,6 @@ BaiduMap.prototype.setLabelFontSize = function (size) { } label.show(); label.setOffset(new BMap.Size(-label.content.length * size / 2, -size / 2)); - label.setStyle({ - fontSize: size + 'px' - }) } } // 获得Map对象 @@ -362,10 +359,16 @@ BaiduMap.prototype.setDefaultConfig = function () { // 缩放结束 self.map.addEventListener('zoomend', function (event) { var zoom = this.getZoom(); - if (zoom < 16) { + if (zoom < 13) { self.setLabelFontSize(0); - } else { + } else if (zoom < 15) { self.setLabelFontSize(12); + } else if (zoom < 16) { + self.setLabelFontSize(14); + } else if (zoom < 17) { + self.setLabelFontSize(16); + } else { + self.setLabelFontSize(18); } }) } @@ -767,7 +770,7 @@ BaiduMap.prototype.initBackgroundGrid = function (option) { border: 'none', backgroundColor: 'transparent', textShadow: '1px 1px 1px #fff, -1px -1px 1px #fff, 1px -1px 1px #fff, -1px 1px 1px #fff', - fontSize: '0px' + fontSize: self.gridOption.const.LABEL_FONT_SIZE + 'px' }); label.setOffset(new BMap.Size(-backgroundGrid.label.length * self.gridOption.const.LABEL_FONT_SIZE / 2, -self.gridOption.const.LABEL_FONT_SIZE / 2)); label.setPosition(self.getCenterPoint(backgroundGrid.pointArray)); diff --git a/src/main/resources/static/route/bigdata/list-case-info-7dayajjz.html b/src/main/resources/static/route/bigdata/list-case-info-7dayajjz.html new file mode 100644 index 0000000..f47fd69 --- /dev/null +++ b/src/main/resources/static/route/bigdata/list-case-info-7dayajjz.html @@ -0,0 +1,434 @@ + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+
+
+
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/bigdata/list-grade-ratio-ajmyd.html b/src/main/resources/static/route/bigdata/list-grade-ratio-ajmyd.html new file mode 100644 index 0000000..d8afeb3 --- /dev/null +++ b/src/main/resources/static/route/bigdata/list-grade-ratio-ajmyd.html @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/bigdata/list-hour-user-rysshyqk.html b/src/main/resources/static/route/bigdata/list-hour-user-rysshyqk.html index 3aa6547..5d6907b 100644 --- a/src/main/resources/static/route/bigdata/list-hour-user-rysshyqk.html +++ b/src/main/resources/static/route/bigdata/list-hour-user-rysshyqk.html @@ -157,13 +157,12 @@ return rowData; } },*/ - {field: 'gmtCreate', width: 190, title: '上报时间', align:'center', + {field: 'gmtCreate', width: 190, title: '位置记录时间', align:'center', templet: function(row) { var rowData = row[this.field]; if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { return '-'; } - rowData = gmtCreateFormatter(rowData, row); return rowData; } }, @@ -190,7 +189,7 @@ function showUserLocation(creator, lng, lat) { dialog.open({ - url: restAjax.path('route/userlocation/map_location.html?userId={userId}&lng={lng}&lat={lat}', [creator, lng, lat]), + url: restAjax.path('route/bigdata/show_user_location.html?userId={userId}&lng={lng}&lat={lat}', [creator, lng, lat]), title: '查看位置', width: '600px', height: '550px', @@ -214,43 +213,6 @@ return value; } - // 操作栏格式 - function formatterOperation(val, row) { - return '
'+ - ''+ - '
'; - } - function getTableUrl() { - var url = restAjax.path('api/userlocation/listpageuserlocation', []); - var keywords = $('#keywords').val(); - var params = '?t='+ new Date().getTime(); - if('' != keywords) { - params += '&keywords='+ encodeURI(keywords); - } - if('' == $('#date').val()) { - $('#date').val(formatterDate(new Date())); - } - if('' == $('#startTime').val()) { - $('#startTime').val('00:00:00'); - } - if('' == $('#endTime').val()) { - $('#endTime').val('23:59:59'); - } - var date = $('#date').val(); - var startTime = $('#startTime').val(); - var endTime = $('#endTime').val(); - if('' != date) { - params += '&date='+ date; - } - if('' != startTime) { - params += '&startTime='+ startTime; - } - if('' != endTime) { - params += '&endTime='+ endTime; - } - return url + params; - } - // 事件 - 搜索 $(document).on('click', '#search', function() { loadTable(1); diff --git a/src/main/resources/static/route/bigdata/list-report-case-gyfajqk.html b/src/main/resources/static/route/bigdata/list-report-case-gyfajqk.html new file mode 100644 index 0000000..7021be4 --- /dev/null +++ b/src/main/resources/static/route/bigdata/list-report-case-gyfajqk.html @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/bigdata/show_user_location.html b/src/main/resources/static/route/bigdata/show_user_location.html new file mode 100644 index 0000000..4a24078 --- /dev/null +++ b/src/main/resources/static/route/bigdata/show_user_location.html @@ -0,0 +1,118 @@ + + + + + + + + + + +
+
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/communityboss/list-level-N.html b/src/main/resources/static/route/communityboss/list-level-N.html index b95b283..0461b62 100644 --- a/src/main/resources/static/route/communityboss/list-level-N.html +++ b/src/main/resources/static/route/communityboss/list-level-N.html @@ -28,8 +28,8 @@ -
@@ -165,11 +165,11 @@ }); // 数据同步按钮事件 - $(document).on('click', '#data-repair', function(){ + $(document).on('click', '#repair-data', function(){ var loadIndex = layer.load(1); - top.restAjax.get('app/dev-test/release/data-repair', {}, null, function(code, data) { + top.restAjax.get('app/data-external-release/repair-data', {}, null, function(code, data) { layer.close(loadIndex); - layer.msg('同步完成'); + layer.msg('执行完成'); }, function(code, data) { layer.close(loadIndex); });