Skip to content

D
device-new-platform
Commit 897d7fa5 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加站点

parent 5614dede
Expand all Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 559 deletions
device-manager-ui/admin/public/index.html
View file @ 897d7fa5
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>设备管理平台</title> <title>设备管理平台</title>
<link rel="stylesheet" href="https://unpkg.com/element-ui@2.15.5/lib/theme-chalk/index.css"> <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.5/lib/theme-chalk/index.css">
</head> </head>
<body> <body>
<noscript> <noscript>
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<script src="https://unpkg.com/vue@2.6.14/dist/vue.runtime.min.js"></script> <script src="https://unpkg.zhimg.com/vue@2.6.14/dist/vue.runtime.min.js"></script>
<script src="https://unpkg.com/vuex@3.6.0/dist/vuex.min.js"></script> <script src="https://unpkg.zhimg.com/vuex@3.6.0/dist/vuex.min.js"></script>
<script src="https://unpkg.com/vue-router@3.4.9/dist/vue-router.min.js"></script> <script src="https://unpkg.zhimg.com/vue-router@3.4.9/dist/vue-router.min.js"></script>
<script src="https://unpkg.com/element-ui@2.15.5/lib/index.js"></script> <script src="https://unpkg.zhimg.com/element-ui@2.15.5/lib/index.js"></script>
<script src="https://unpkg.com/vue-amap/dist/index.js"></script> <script src="https://unpkg.zhimg.com/vue-amap/dist/index.js"></script>
</body> </body>
</html> </html>
device-manager-ui/admin/src/assets/mixins/table.js
View file @ 897d7fa5
...@@ -264,7 +264,7 @@ export default { ...@@ -264,7 +264,7 @@ export default {
// 自定义索引号 // 自定义索引号
handleIndexMethod(index) { handleIndexMethod(index) {
//prePageResult 每页条数 //prePageResult 每页条数
console.log("index:"+index) //console.log("index:"+index)
let size = this.tableData.pageInfo.prePageResult; let size = this.tableData.pageInfo.prePageResult;
let page = this.tableData.pageInfo.currPage; let page = this.tableData.pageInfo.currPage;
let count = parseInt(size) * (parseInt(page) - 1) let count = parseInt(size) * (parseInt(page) - 1)
......
device-manager-ui/admin/src/router.js
View file @ 897d7fa5
...@@ -38,7 +38,7 @@ const router = new Router({ ...@@ -38,7 +38,7 @@ const router = new Router({
...restBuilder('user', 'system/user'), // 用户管理 -- 管理用户 ...restBuilder('user', 'system/user'), // 用户管理 -- 管理用户
...restBuilder('param', 'system/param'), // 系统管理--参数管理 ...restBuilder('param', 'system/param'), // 系统管理--参数管理
...restBuilder('task', 'system/task'), // 系统管理--任务管理 ...restBuilder('task', 'system/task'), // 系统管理--任务管理
builder('site/list', 'system/site/index'),//站点 // builder('site/list', 'system/site/index'),//站点
...restBuilder('sitestat', 'sitestat'),//站点设备管理 ...restBuilder('sitestat', 'sitestat'),//站点设备管理
builder('sitestat/maplist', 'sitestat/maplist'),//地图站点 builder('sitestat/maplist', 'sitestat/maplist'),//地图站点
builder('sitestat/mapDetail', 'sitestat/mapDetail'),//地图设备 builder('sitestat/mapDetail', 'sitestat/mapDetail'),//地图设备
......
device-manager-ui/admin/yarn.lock
View file @ 897d7fa5
This diff is collapsed.
device-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SitAllInfoVO.java deleted 100644 → 0
View file @ 5614dede
package com.mortals.xhx.module.site.model.vo;
import com.mortals.xhx.module.site.model.SiteEntity;
import lombok.Data;
/**
* 站点完整信息
*/
@Data
public class SitAllInfoVO extends SiteEntity {
}
device-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @ 897d7fa5
...@@ -7,6 +7,8 @@ import com.mortals.framework.exception.AppException; ...@@ -7,6 +7,8 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.EnabledEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.model.SiteQuery; import com.mortals.xhx.module.site.model.SiteQuery;
import com.mortals.xhx.module.site.model.SiteTreeSelect; import com.mortals.xhx.module.site.model.SiteTreeSelect;
...@@ -44,17 +46,15 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic ...@@ -44,17 +46,15 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "haveSonArea", paramService.getParamBySecondOrganize("Site", "haveSonArea")); this.addDict(model, "haveSonArea", paramService.getParamBySecondOrganize("Site", "haveSonArea"));
this.addDict(model, "workday1", paramService.getParamBySecondOrganize("Site", "workday1")); this.addDict(model, "workday1", YesNoEnum.getEnumMap());
this.addDict(model, "workday2", paramService.getParamBySecondOrganize("Site", "workday2")); this.addDict(model, "workday2", YesNoEnum.getEnumMap());
this.addDict(model, "workday3", paramService.getParamBySecondOrganize("Site", "workday3")); this.addDict(model, "workday3", YesNoEnum.getEnumMap());
this.addDict(model, "workday4", paramService.getParamBySecondOrganize("Site", "workday4")); this.addDict(model, "workday4", YesNoEnum.getEnumMap());
this.addDict(model, "workday5", paramService.getParamBySecondOrganize("Site", "workday5")); this.addDict(model, "workday5",YesNoEnum.getEnumMap());
this.addDict(model, "workday6", paramService.getParamBySecondOrganize("Site", "workday6")); this.addDict(model, "workday6", YesNoEnum.getEnumMap());
this.addDict(model, "workday7", paramService.getParamBySecondOrganize("Site", "workday7")); this.addDict(model, "workday7",YesNoEnum.getEnumMap());
this.addDict(model, "level", paramService.getParamBySecondOrganize("Site", "level")); this.addDict(model, "isSite", YesNoEnum.getEnumMap());
this.addDict(model, "building", paramService.getParamBySecondOrganize("Site", "building")); this.addDict(model, "status", EnabledEnum.getEnumMap());
this.addDict(model, "isSite", paramService.getParamBySecondOrganize("Site", "isSite"));
this.addDict(model, "status", paramService.getParamBySecondOrganize("Site", "status"));
super.init(model, context); super.init(model, context);
} }
...@@ -167,71 +167,4 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic ...@@ -167,71 +167,4 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
return super.infoAfter(id, model, entity, context); return super.infoAfter(id, model, entity, context);
} }
/**
* 条件查询，无分页信息
* @param query
* @return
*/
@PostMapping({"list/noPage"})
@UnAuth
public Rest<Object> getList(@RequestBody SiteQuery query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询" + this.getModuleDesc();
int code=1;
try {
if(CollectionUtils.isNotEmpty(query.getAreaCodeList())){
List<SiteEntity> siteEntityList= query.getAreaCodeList().parallelStream().flatMap(areaId ->
this.service.getFlatSitesByAreaCode(areaId, getContext()).stream()
).distinct().collect(Collectors.toList());
model.put("data", siteEntityList);
}else {
List<SiteEntity> result = this.getService().find(query, context);
model.put("data", result);
}
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
//this.init(model, context);
ret.setCode(code);
ret.setData(model);
//ret.setDict(model.remove("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
/**
* 包含站点下面的模块以及模块下面的数据统计
* @param query
* @return
*/
@PostMapping({"list/allInfo"})
@UnAuth
public Rest<Object> list(@RequestBody SiteQuery query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询" + this.getModuleDesc();
int code=1;
try {
List<SiteEntity> result = this.getService().getListAllInfoByQuery(query, context);
model.put("data", result);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
this.init(model, context);
ret.setCode(code);
ret.setData(model);
ret.setDict(model.remove("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment