diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..5e5c0e9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM openjdk:8u292-jre-buster
+ARG JAR_FILE=/target/*.jar
+COPY ${JAR_FILE} systemmanage-0.0.1-SNAPSHOT.jar
+ENTRYPOINT ["java","-jar","-Dspring.profiles.active=prod","/systemmanage-0.0.1-SNAPSHOT.jar"]
+
+# 时区问题
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 21b1caf..8eca450 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,10 +9,10 @@
cn.com.tenlion
- systembase
+ systemmanage
0.0.1-SNAPSHOT
- system-base
- base
+ system-manage
+ manage
1.8
2.1.4
diff --git a/src/main/java/cn/com/tenlion/systembase/controller/api/schoolkey/SchoolKeyController.java b/src/main/java/cn/com/tenlion/systembase/controller/api/schoolkey/SchoolKeyController.java
index 2f85bce..7961de4 100644
--- a/src/main/java/cn/com/tenlion/systembase/controller/api/schoolkey/SchoolKeyController.java
+++ b/src/main/java/cn/com/tenlion/systembase/controller/api/schoolkey/SchoolKeyController.java
@@ -119,7 +119,7 @@ public class SchoolKeyController extends DefaultBaseController {
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("get-by-id-card-number/{cardNumber}")
public PopulationDTO getByIdCardNumber(@PathVariable("cardNumber") String cardNumber) {
- String url = "http://192.168.0.109:8080/population";
+ String url = "http://10.25.242.190:37210/population";
PopulationDTO populationDTO = populationMsgService.getByIdCardNumber(url, cardNumber);
return populationDTO;
}
diff --git a/src/main/java/cn/com/tenlion/systembase/remote/populationmsg/IPopulationMsgService.java b/src/main/java/cn/com/tenlion/systembase/remote/populationmsg/IPopulationMsgService.java
index 8871ed8..1be7632 100644
--- a/src/main/java/cn/com/tenlion/systembase/remote/populationmsg/IPopulationMsgService.java
+++ b/src/main/java/cn/com/tenlion/systembase/remote/populationmsg/IPopulationMsgService.java
@@ -17,7 +17,7 @@ import ink.wgink.annotation.rpc.rest.params.RemoteServerParams;
@RemoteService
public interface IPopulationMsgService {
- @RemoteGetMethod("/app/basepopulationinforelease/getByIdCardNumber/{userId}")
+ @RemoteGetMethod("/app/basepopulationinfo/release/getByIdCardNumber/{userId}")
PopulationDTO getByIdCardNumber(@RemoteServerParams String remotePath, @RemotePathParams("userId") String userId);
}
\ No newline at end of file
diff --git a/src/main/java/cn/com/tenlion/systembase/service/keyareacheckrenovation/impl/KeyAreaCheckRenovationServiceImpl.java b/src/main/java/cn/com/tenlion/systembase/service/keyareacheckrenovation/impl/KeyAreaCheckRenovationServiceImpl.java
index 88212b0..eee90ae 100644
--- a/src/main/java/cn/com/tenlion/systembase/service/keyareacheckrenovation/impl/KeyAreaCheckRenovationServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/systembase/service/keyareacheckrenovation/impl/KeyAreaCheckRenovationServiceImpl.java
@@ -195,7 +195,7 @@ public class KeyAreaCheckRenovationServiceImpl extends DefaultBaseService implem
KeyArea keyArea = setKafkaData(keyAreaCheckRenovationVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0013");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -210,7 +210,7 @@ public class KeyAreaCheckRenovationServiceImpl extends DefaultBaseService implem
KeyArea keyArea = setKafkaData(keyAreaCheckRenovationVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0013");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -224,7 +224,7 @@ public class KeyAreaCheckRenovationServiceImpl extends DefaultBaseService implem
private void deleteKafka(String uid) {
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0013");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
diff --git a/src/main/java/cn/com/tenlion/systembase/service/keyplace/impl/KeyPlaceServiceImpl.java b/src/main/java/cn/com/tenlion/systembase/service/keyplace/impl/KeyPlaceServiceImpl.java
index 601818c..763504d 100644
--- a/src/main/java/cn/com/tenlion/systembase/service/keyplace/impl/KeyPlaceServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/systembase/service/keyplace/impl/KeyPlaceServiceImpl.java
@@ -193,7 +193,7 @@ public class KeyPlaceServiceImpl extends DefaultBaseService implements IKeyPlace
KeyPlace keyPlace = setKafkaData(keyPlaceVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0011");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -208,7 +208,7 @@ public class KeyPlaceServiceImpl extends DefaultBaseService implements IKeyPlace
KeyPlace keyPlace = setKafkaData(keyPlaceVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0011");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -222,7 +222,7 @@ public class KeyPlaceServiceImpl extends DefaultBaseService implements IKeyPlace
private void deleteKafka(String uid) {
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0011");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
diff --git a/src/main/java/cn/com/tenlion/systembase/service/organization/impl/OrganizationServiceImpl.java b/src/main/java/cn/com/tenlion/systembase/service/organization/impl/OrganizationServiceImpl.java
index eba5e34..7d46f77 100644
--- a/src/main/java/cn/com/tenlion/systembase/service/organization/impl/OrganizationServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/systembase/service/organization/impl/OrganizationServiceImpl.java
@@ -204,7 +204,7 @@ public class OrganizationServiceImpl extends DefaultBaseService implements IOrga
OrgOrganization orgOrganization = setKafkaData(organizationVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0015");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -219,7 +219,7 @@ public class OrganizationServiceImpl extends DefaultBaseService implements IOrga
OrgOrganization orgOrganization = setKafkaData(organizationVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0015");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -233,7 +233,7 @@ public class OrganizationServiceImpl extends DefaultBaseService implements IOrga
private void deleteKafka(String uid) {
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0015");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
diff --git a/src/main/java/cn/com/tenlion/systembase/service/school/impl/SchoolServiceImpl.java b/src/main/java/cn/com/tenlion/systembase/service/school/impl/SchoolServiceImpl.java
index c05e88d..20dcdbf 100644
--- a/src/main/java/cn/com/tenlion/systembase/service/school/impl/SchoolServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/systembase/service/school/impl/SchoolServiceImpl.java
@@ -193,7 +193,7 @@ public class SchoolServiceImpl extends DefaultBaseService implements ISchoolServ
School school = setKafkaData(schoolVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0012");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -208,7 +208,7 @@ public class SchoolServiceImpl extends DefaultBaseService implements ISchoolServ
School school = setKafkaData(schoolVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0012");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -222,7 +222,7 @@ public class SchoolServiceImpl extends DefaultBaseService implements ISchoolServ
private void deleteKafka(String uid) {
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0012");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
diff --git a/src/main/java/cn/com/tenlion/systembase/service/schoolkey/impl/SchoolKeyServiceImpl.java b/src/main/java/cn/com/tenlion/systembase/service/schoolkey/impl/SchoolKeyServiceImpl.java
index d9bcc6d..1901d2e 100644
--- a/src/main/java/cn/com/tenlion/systembase/service/schoolkey/impl/SchoolKeyServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/systembase/service/schoolkey/impl/SchoolKeyServiceImpl.java
@@ -4,11 +4,12 @@ import cn.com.tenlion.systembase.dao.schoolkey.ISchoolKeyDao;
import cn.com.tenlion.systembase.pojo.bos.schoolkey.SchoolKeyBO;
import cn.com.tenlion.systembase.pojo.dtos.bigdta.SchoolKey;
import cn.com.tenlion.systembase.pojo.dtos.grid.GridDTO;
+import cn.com.tenlion.systembase.pojo.dtos.school.SchoolDTO;
import cn.com.tenlion.systembase.pojo.dtos.schoolkey.SchoolKeyDTO;
import cn.com.tenlion.systembase.pojo.pos.schoolkey.SchoolKeyPO;
-import cn.com.tenlion.systembase.pojo.vos.keyareacheckrenovation.KeyAreaCheckRenovationVO;
import cn.com.tenlion.systembase.pojo.vos.schoolkey.SchoolKeyVO;
import cn.com.tenlion.systembase.service.grid.IGridService;
+import cn.com.tenlion.systembase.service.school.ISchoolService;
import cn.com.tenlion.systembase.service.schoolkey.ISchoolKeyService;
import com.alibaba.fastjson.JSONObject;
import ink.wgink.common.base.DefaultBaseService;
@@ -41,6 +42,8 @@ public class SchoolKeyServiceImpl extends DefaultBaseService implements ISchoolK
private IGridService gridService;
@Autowired
private KafkaTemplate kafkaTemplate;
+ @Autowired
+ private ISchoolService schoolService;
@Override
public void save(SchoolKeyVO schoolKeyVO) {
@@ -69,7 +72,8 @@ public class SchoolKeyServiceImpl extends DefaultBaseService implements ISchoolK
}
schoolKeyDao.save(params);
- saveKafka(schoolKeyId, schoolKeyVO);
+ SchoolDTO schoolDTO = schoolService.get(schoolKeyVO.getSchoolId());
+ saveKafka(schoolKeyId, schoolKeyVO, schoolDTO);
return schoolKeyId;
}
@@ -115,7 +119,8 @@ public class SchoolKeyServiceImpl extends DefaultBaseService implements ISchoolK
}
schoolKeyDao.update(params);
- updateKafka(schoolKeyId, schoolKeyVO);
+ SchoolDTO schoolDTO = schoolService.get(schoolKeyVO.getSchoolId());
+ updateKafka(schoolKeyId, schoolKeyVO, schoolDTO);
}
@Override
@@ -190,11 +195,11 @@ public class SchoolKeyServiceImpl extends DefaultBaseService implements ISchoolK
return count == null ? 0 : count;
}
- private void saveKafka(String uid, SchoolKeyVO schoolKeyVO) {
- SchoolKey schoolKey = setKafkaData(schoolKeyVO);
+ private void saveKafka(String uid, SchoolKeyVO schoolKeyVO, SchoolDTO schoolDTO) {
+ SchoolKey schoolKey = setKafkaData(schoolKeyVO, schoolDTO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0016");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -205,11 +210,11 @@ public class SchoolKeyServiceImpl extends DefaultBaseService implements ISchoolK
kafkaTemplate.send("tableSync", jsonObject.toJSONString());
}
- private void updateKafka(String uid, SchoolKeyVO schoolKeyVO) {
- SchoolKey schoolKey = setKafkaData(schoolKeyVO);
+ private void updateKafka(String uid, SchoolKeyVO schoolKeyVO, SchoolDTO schoolDTO) {
+ SchoolKey schoolKey = setKafkaData(schoolKeyVO, schoolDTO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0016");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -223,7 +228,7 @@ public class SchoolKeyServiceImpl extends DefaultBaseService implements ISchoolK
private void deleteKafka(String uid) {
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0016");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -234,10 +239,10 @@ public class SchoolKeyServiceImpl extends DefaultBaseService implements ISchoolK
kafkaTemplate.send("tableSync", jsonObject.toJSONString());
}
- private SchoolKey setKafkaData(SchoolKeyVO schoolKeyVO) {
+ private SchoolKey setKafkaData(SchoolKeyVO schoolKeyVO, SchoolDTO schoolDTO) {
SchoolKey schoolKey = new SchoolKey();
// 学校名称
- schoolKey.setschool_name(schoolKeyVO.getSchoolName());
+ schoolKey.setschool_name(schoolDTO.getSchoolName());
// 姓名
schoolKey.setfull_name(schoolKeyVO.getFullName());
// 曾用名
@@ -259,7 +264,7 @@ public class SchoolKeyServiceImpl extends DefaultBaseService implements ISchoolK
// 经度
schoolKey.setlongitude(schoolKeyVO.getLongitude());
// 纬度
- schoolKey.setlatitude(schoolKey.getlatitude());
+ schoolKey.setlatitude(schoolKeyVO.getLatitude());
GridDTO gridDTO = gridService.get(schoolKeyVO.getGrid());
if(null != gridDTO) {
// 网格名称
diff --git a/src/main/java/cn/com/tenlion/systembase/service/stuteasafe/impl/StuTeaSafeServiceImpl.java b/src/main/java/cn/com/tenlion/systembase/service/stuteasafe/impl/StuTeaSafeServiceImpl.java
index 3ca0230..0e3388c 100644
--- a/src/main/java/cn/com/tenlion/systembase/service/stuteasafe/impl/StuTeaSafeServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/systembase/service/stuteasafe/impl/StuTeaSafeServiceImpl.java
@@ -207,7 +207,7 @@ public class StuTeaSafeServiceImpl extends DefaultBaseService implements IStuTea
StuTeaSafe stuTeaSafe = setKafkaData(stuTeaSafeVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0017");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -222,7 +222,7 @@ public class StuTeaSafeServiceImpl extends DefaultBaseService implements IStuTea
StuTeaSafe stuTeaSafe = setKafkaData(stuTeaSafeVO);
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0017");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
@@ -236,7 +236,7 @@ public class StuTeaSafeServiceImpl extends DefaultBaseService implements IStuTea
private void deleteKafka(String uid) {
JSONObject jsonObject = new JSONObject();
// 实体模板编码
- jsonObject.put("tableNumber", "C0018");
+ jsonObject.put("tableNumber", "C0017");
// 数据主键
jsonObject.put("uid", uid);
// 设置数据操作方法
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 27f935a..ad8f662 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,10 +1,12 @@
server:
- port: 8082
- url: http://192.168.0.111:8082/systembase
- system-title: 房屋管理系统
- system-sub-title: 房屋管理系统
+ port: 7011
+ ip: 1.24.238.149
+ url: http://${server.ip}:37210/manage
+ system-title: 综合治理系统
+ system-sub-title: 智慧城市
+ nav-page: ${api-path.user-center-2}
servlet:
- context-path: /systembase
+ context-path: /manage
spring:
login-url: /oauth/login
@@ -25,67 +27,123 @@ spring:
max-request-size: 1GB
datasource:
druid:
- url: jdbc:mysql://192.168.0.151:3306/db_base?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC
+ url: jdbc:mysql://192.168.158.18:3306/db_smart_city_manage?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
db-type: mysql
driver-class-name: com.mysql.cj.jdbc.Driver
- username: root
- password: root
+ username: tsroot
+ password: TSkj@0471.TSROOT
initial-size: 2
min-idle: 2
- max-active: 10
- # 配置获取连接等待超时的时间
+ max-active: 200
max-wait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
time-between-eviction-runs-millis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
min-evictable-idle-time-millis: 300000
validation-query: SELECT 1 FROM DUAL
test-while-idle: true
test-on-borrow: false
test-on-return: false
- # 打开PSCache，并且指定每个连接上PSCache的大小
pool-prepared-statements: true
max-pool-prepared-statement-per-connection-size: 10
- # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
filter:
commons-log:
connection-logger-name: stat,wall,log4j
stat:
log-slow-sql: true
slow-sql-millis: 2000
- # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
- # 合并多个DruidDataSource的监控数据
use-global-data-source-stat: true
+ data:
+ mongodb:
+ uri: mongodb://smartcity:smartcity@192.168.158.20:6011/smartcity
+ redis:
+ database: 6
+ host: 192.168.158.20
+ port: 6012
+ password: TSkj@0471.REDIS
+ timeout: 3000ms
+ jedis:
+ pool:
+ max-active: 8
+ max-wait: 1ms
+ max-idle: 8
+ min-idle: 0
+ kafka:
+ bootstrap-servers: 192.168.158.14:9092
+ producer:
+ # 写入失败时，重试次数。当leader节点失效，一个repli节点会替代成为leader节点，此时可能出现写入失败，
+ # 当retris为0时，produce不会重复。retirs重发，此时repli节点完全成为leader节点，不会产生消息丢失。
+ retries: 0
+ #procedure要求leader在考虑完成请求之前收到的确认数，用于控制发送记录在服务端的持久化，其值可以为如下：
+ #acks = 0 如果设置为零，则生产者将不会等待来自服务器的任何确认，该记录将立即添加到套接字缓冲区并视为已发送。在这种情况下，无法保证服务器已收到记录，并且重试配置将不会生效（因为客户端通常不会知道任何故障），为每条记录返回的偏移量始终设置为-1。
+ #acks = 1 这意味着leader会将记录写入其本地日志，但无需等待所有副本服务器的完全确认即可做出回应，在这种情况下，如果leader在确认记录后立即失败，但在将数据复制到所有的副本服务器之前，则记录将会丢失。
+ #acks = all 这意味着leader将等待完整的同步副本集以确认记录，这保证了只要至少一个同步副本服务器仍然存活，记录就不会丢失，这是最强有力的保证，这相当于acks = -1的设置。
+ #可以设置的值为：all, -1, 0, 1
+ acks: 1
+ consumer:
+ group-id: SmartCity
+ # smallest和largest才有效，如果smallest重新0开始读取，如果是largest从logfile的offset读取。一般情况下我们都是设置smallest
+ auto-offset-reset: earliest
+ # 设置自动提交offset
+ enable-auto-commit: true
+ # 如果'enable.auto.commit'为true，则消费者偏移自动提交给Kafka的频率（以毫秒为单位），默认值为5000。
+ auto-commit-interval: 100
+ max-poll-records: 5
mybatis:
config-location: classpath:mybatis/mybatis-config.xml
mapper-locations: classpath*:mybatis/mapper/**/*.xml
-logging:
- level:
- root: error
- com.cm: debug
- ink.wgink: debug
- cn.com: debug
+access-control:
+ role-permission: false
swagger:
- base-package-list: ink.wgink,cn.com
+ base-package-list: ink.wgink,cn.com.tenlion
-# 文件上传管理
file:
- # 文件的保存路径
- upload-path: E:\house
- # 图片类型
+ upload-path: /project/UploadFiles/
image-types: png,jpg,jpeg,gif,blob
- # 视频类型
video-types: mp4,rmvb
- # 音频类型
- audio-types: mp3,wmv
- # 文件类型
+ audio-types: mp3,wmv,amr
file-types: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
- # 同时上传最大支持数
max-file-count: 6
- # 图片输出压缩质量，大于0，默认0.4
image-output-quality: 0.4
- # 媒体最大时长（单位：秒）
\ No newline at end of file
+ # 启用minIo
+ use-min-io: true
+ # 与use-min-io配套使用
+ min-io:
+ endpoint: http://192.168.158.17:9001
+ access-key: smartcity
+ secret-key: smartcity
+
+api-path:
+ #103 155
+ user-center: http://10.25.242.190:37210/usercenter
+ user-center-2: http://1.24.238.149:37210/usercenter
+
+security:
+ oauth2:
+ oauth-server: ${api-path.user-center-2}
+ oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} #外网
+ client:
+ client-id: 0bca7c46c2f64637935ef5ce2da2dfba
+ client-secret: ZVM3U1IwRkxvYVRoSU8yWWdlaURQQ0JQR2tUQSszcnlTdjQzVVFZZ3I3dmxIdG9KZmEyTjJIRnI0dG1McEdEVA==
+ user-authorization-uri: ${security.oauth2.oauth-server}/oauth2_client/authorize #外网
+ access-token-uri: ${api-path.user-center}/oauth2_client/token
+ grant-type: authorization_code
+ resource:
+ jwt:
+ key-uri: ${api-path.user-center}/oauth2_client/token_key
+ token-info-uri: ${api-path.user-center}/oauth2_client/check_token
+ user-info-uri: ${api-path.user-center}/user
+ authorization:
+ check-token-access: ${api-path.user-center}/oauth2_client/token_key
+
+
+
+logging:
+ enable-api-log: false
+ file:
+ name: /project/logs/manage-logs.log
+ level:
+ root: error
+ ink.wgink: debug
diff --git a/src/main/resources/templates/comprehensivecenter/save-BMap.html b/src/main/resources/templates/comprehensivecenter/save-BMap.html
index b1967ec..0a708b3 100644
--- a/src/main/resources/templates/comprehensivecenter/save-BMap.html
+++ b/src/main/resources/templates/comprehensivecenter/save-BMap.html
@@ -173,7 +173,7 @@
$(document).on('click', '#locationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/comprehensivecenter/save.html b/src/main/resources/templates/comprehensivecenter/save.html
index a634543..11a0aa8 100644
--- a/src/main/resources/templates/comprehensivecenter/save.html
+++ b/src/main/resources/templates/comprehensivecenter/save.html
@@ -155,6 +155,36 @@
var map;
var marker;
+ function initMap(longitude, latitude) {
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
+ map = L.map('mapContainer', {
+ crs: L.CRS.EPSG3857,
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
+ maxZoom: 18,
+ zoom: 8,
+ boxZoom: false,
+ scrollWheelZoom: true,
+ dragging: true,
+ doubleClickZoom: false,
+ zoomControl: false
+ });
+ L.control.zoom().addTo(map);
+ L.control.scale().addTo(map);
+ L.supermap.tiledMapLayer(url1, {noWrap: true}).addTo(map);
+ marker = L.marker();
+ map.on('click',addPoint);
+ }
+
+ function addPoint(e){
+ if(marker)map.removeLayer(marker);
+ marker = L.marker(e.latlng, {
+ draggable:false,
+ riseOnHover: true
+ }).addTo(map)
+ $('#longitude').val(e.latlng.lng);
+ $('#latitude').val(e.latlng.lat);
+ }
+
// 组织层级change事件
form.on('select(centerLevel)', function(data){
if(!data.value) {
@@ -175,7 +205,7 @@
$(document).on('click', '#locationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -217,36 +247,6 @@
});
}
- function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
- map = L.map('mapContainer', {
- crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
- maxZoom: 18,
- zoom: 2,
- boxZoom: false,
- scrollWheelZoom: true,
- dragging: true,
- doubleClickZoom: false,
- zoomControl: false
- });
- L.control.zoom().addTo(map);
- L.control.scale().addTo(map);
- L.supermap.tiledMapLayer(url1, {noWrap: true}).addTo(map);
- marker = L.marker();
- map.on('click',addPoint);
- }
-
- function addPoint(e){
- if(marker)map.removeLayer(marker);
- marker = L.marker(e.latlng, {
- draggable:false,
- riseOnHover: true
- }).addTo(map)
- $('#longitude').val(e.latlng.lng);
- $('#latitude').val(e.latlng.lat);
- }
-
function closeBox() {
parent.layer.close(parent.layer.getFrameIndex(window.name));
}
diff --git a/src/main/resources/templates/comprehensivecenter/update.html b/src/main/resources/templates/comprehensivecenter/update.html
index 0983fe1..a7020bf 100644
--- a/src/main/resources/templates/comprehensivecenter/update.html
+++ b/src/main/resources/templates/comprehensivecenter/update.html
@@ -157,12 +157,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -211,7 +211,7 @@
$(document).on('click', '#locationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/comprehensivemsgcenter/save.html b/src/main/resources/templates/comprehensivemsgcenter/save.html
index 9d78307..ccf714f 100644
--- a/src/main/resources/templates/comprehensivemsgcenter/save.html
+++ b/src/main/resources/templates/comprehensivemsgcenter/save.html
@@ -179,12 +179,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -236,7 +236,7 @@
$(document).on('click', '#locationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/comprehensivemsgcenter/update.html b/src/main/resources/templates/comprehensivemsgcenter/update.html
index 6c50ece..c9b1939 100644
--- a/src/main/resources/templates/comprehensivemsgcenter/update.html
+++ b/src/main/resources/templates/comprehensivemsgcenter/update.html
@@ -180,12 +180,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -242,7 +242,7 @@
$(document).on('click', '#locationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#locationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/default-home.html b/src/main/resources/templates/default-home.html
index ed34efe..0f564da 100644
--- a/src/main/resources/templates/default-home.html
+++ b/src/main/resources/templates/default-home.html
@@ -872,7 +872,7 @@
$(document).on('click', '#area', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#area').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#area').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/enterprise/save.html b/src/main/resources/templates/enterprise/save.html
index 12f085b..357e032 100644
--- a/src/main/resources/templates/enterprise/save.html
+++ b/src/main/resources/templates/enterprise/save.html
@@ -648,7 +648,7 @@
// 初始化类型ID下拉选择
function initEnterpriseTypeIdSelect() {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9041ffbf-6fb6-4a0d-909b-92aff2d0f432', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/9041ffbf-6fb6-4a0d-909b-92aff2d0f432', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('enterpriseTypeIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('enterpriseTypeIdSelectTemplateBox').innerHTML = html;
});
@@ -660,7 +660,7 @@
// 初始化证件类型ID下拉选择
function initLegalPersonIdCardCodeSelect() {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('legalPersonIdCardCodeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('legalPersonIdCardCodeSelectTemplateBox').innerHTML = html;
});
@@ -986,7 +986,7 @@
// 初始化安全隐患类型ID下拉选择
function initHiddenDangerTypeIdSelect() {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/c15f10cf-0e92-46b9-b5ba-98f6ebc1701e', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/c15f10cf-0e92-46b9-b5ba-98f6ebc1701e', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('hiddenDangerTypeIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('hiddenDangerTypeIdSelectTemplateBox').innerHTML = html;
});
@@ -998,7 +998,7 @@
// 初始化关注度ID下拉选择
function initDegreeOfConcernIdSelect() {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/6f046742-7399-4c57-bfe2-d159470f4b45', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/6f046742-7399-4c57-bfe2-d159470f4b45', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('degreeOfConcernIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('degreeOfConcernIdSelectTemplateBox').innerHTML = html;
});
@@ -1167,7 +1167,7 @@
$('#areaName').on('click', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
width: '600px',
height: '225px',
onClose: function() {
diff --git a/src/main/resources/templates/enterprise/update.html b/src/main/resources/templates/enterprise/update.html
index 194deb8..4e84cb2 100644
--- a/src/main/resources/templates/enterprise/update.html
+++ b/src/main/resources/templates/enterprise/update.html
@@ -650,7 +650,7 @@
// 初始化类型ID下拉选择
function initEnterpriseTypeIdSelect(selectValue) {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9041ffbf-6fb6-4a0d-909b-92aff2d0f432', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/9041ffbf-6fb6-4a0d-909b-92aff2d0f432', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('enterpriseTypeIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('enterpriseTypeIdSelectTemplateBox').innerHTML = html;
});
@@ -666,7 +666,7 @@
// 初始化类型ID下拉选择
function initLegalPersonIdCardCodeSelect(selectValue) {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('legalPersonIdCardCodeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('legalPersonIdCardCodeSelectTemplateBox').innerHTML = html;
});
@@ -1000,7 +1000,7 @@
// 初始化安全隐患类型ID下拉选择
function initHiddenDangerTypeIdSelect(selectValue) {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/c15f10cf-0e92-46b9-b5ba-98f6ebc1701e', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/c15f10cf-0e92-46b9-b5ba-98f6ebc1701e', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('hiddenDangerTypeIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('hiddenDangerTypeIdSelectTemplateBox').innerHTML = html;
});
@@ -1016,7 +1016,7 @@
// 初始化关注度ID下拉选择
function initDegreeOfConcernIdSelect(selectValue) {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/6f046742-7399-4c57-bfe2-d159470f4b45', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/6f046742-7399-4c57-bfe2-d159470f4b45', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('degreeOfConcernIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('degreeOfConcernIdSelectTemplateBox').innerHTML = html;
});
@@ -1204,7 +1204,7 @@
$('#areaName').on('click', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
width: '600px',
height: '225px',
onClose: function() {
diff --git a/src/main/resources/templates/homicide/save.html b/src/main/resources/templates/homicide/save.html
index 47a955b..5aa7b5b 100644
--- a/src/main/resources/templates/homicide/save.html
+++ b/src/main/resources/templates/homicide/save.html
@@ -116,7 +116,7 @@
$(document).on('click', '#happenLocationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#happenLocationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#happenLocationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/homicide/update.html b/src/main/resources/templates/homicide/update.html
index aae43aa..afaecaa 100644
--- a/src/main/resources/templates/homicide/update.html
+++ b/src/main/resources/templates/homicide/update.html
@@ -118,7 +118,7 @@
$(document).on('click', '#happenLocationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#happenLocationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#happenLocationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/homicidesuspect/save.html b/src/main/resources/templates/homicidesuspect/save.html
index c0ff0cd..976ea75 100644
--- a/src/main/resources/templates/homicidesuspect/save.html
+++ b/src/main/resources/templates/homicidesuspect/save.html
@@ -467,7 +467,7 @@
/*$(document).on('click', '#nativePlaceName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#nativePlaceName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#nativePlaceName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -493,7 +493,7 @@
/*$(document).on('click', '#householdRegisterName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#householdRegisterName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#householdRegisterName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -519,7 +519,7 @@
$(document).on('click', '#currentResidenceName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#currentResidenceName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#currentResidenceName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/homicidesuspect/update.html b/src/main/resources/templates/homicidesuspect/update.html
index 2c1b640..7e21f2d 100644
--- a/src/main/resources/templates/homicidesuspect/update.html
+++ b/src/main/resources/templates/homicidesuspect/update.html
@@ -470,7 +470,7 @@
/*$(document).on('click', '#nativePlaceName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#nativePlaceName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#nativePlaceName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -496,7 +496,7 @@
/*$(document).on('click', '#householdRegisterName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#householdRegisterName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#householdRegisterName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -522,7 +522,7 @@
/*$(document).on('click', '#currentResidenceName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#currentResidenceName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#currentResidenceName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/homicidevictim/save.html b/src/main/resources/templates/homicidevictim/save.html
index 360107c..a39d653 100644
--- a/src/main/resources/templates/homicidevictim/save.html
+++ b/src/main/resources/templates/homicidevictim/save.html
@@ -438,7 +438,7 @@
/*$(document).on('click', '#nativePlaceName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#nativePlaceName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#nativePlaceName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -464,7 +464,7 @@
/*$(document).on('click', '#householdRegisterName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#householdRegisterName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#householdRegisterName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -490,7 +490,7 @@
/*$(document).on('click', '#currentResidenceName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#currentResidenceName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#currentResidenceName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/homicidevictim/update.html b/src/main/resources/templates/homicidevictim/update.html
index 118e299..a30f0ed 100644
--- a/src/main/resources/templates/homicidevictim/update.html
+++ b/src/main/resources/templates/homicidevictim/update.html
@@ -442,7 +442,7 @@
/*$(document).on('click', '#nativePlaceName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#nativePlaceName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#nativePlaceName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -468,7 +468,7 @@
/*$(document).on('click', '#householdRegisterName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#householdRegisterName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#householdRegisterName').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -494,7 +494,7 @@
/*$(document).on('click', '#currentResidenceName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#currentResidenceName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#currentResidenceName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/importantevent/save.html b/src/main/resources/templates/importantevent/save.html
index 568f541..d9d2763 100644
--- a/src/main/resources/templates/importantevent/save.html
+++ b/src/main/resources/templates/importantevent/save.html
@@ -152,12 +152,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -185,7 +185,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/importantevent/update.html b/src/main/resources/templates/importantevent/update.html
index ee69ce1..6643b23 100644
--- a/src/main/resources/templates/importantevent/update.html
+++ b/src/main/resources/templates/importantevent/update.html
@@ -154,12 +154,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -192,7 +192,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/institution/save.html b/src/main/resources/templates/institution/save.html
index ea6c751..4fe1567 100644
--- a/src/main/resources/templates/institution/save.html
+++ b/src/main/resources/templates/institution/save.html
@@ -105,7 +105,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/institution/update.html b/src/main/resources/templates/institution/update.html
index 09b58c6..07ee041 100644
--- a/src/main/resources/templates/institution/update.html
+++ b/src/main/resources/templates/institution/update.html
@@ -110,7 +110,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/keyareacheckrenovation/save.html b/src/main/resources/templates/keyareacheckrenovation/save.html
index 19f0a48..7c9094d 100644
--- a/src/main/resources/templates/keyareacheckrenovation/save.html
+++ b/src/main/resources/templates/keyareacheckrenovation/save.html
@@ -209,12 +209,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -242,7 +242,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/keyareacheckrenovation/update.html b/src/main/resources/templates/keyareacheckrenovation/update.html
index b1571eb..e60d607 100644
--- a/src/main/resources/templates/keyareacheckrenovation/update.html
+++ b/src/main/resources/templates/keyareacheckrenovation/update.html
@@ -211,12 +211,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -249,7 +249,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/keyplace/save.html b/src/main/resources/templates/keyplace/save.html
index 9cecd84..4ffc27e 100644
--- a/src/main/resources/templates/keyplace/save.html
+++ b/src/main/resources/templates/keyplace/save.html
@@ -158,12 +158,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -191,7 +191,7 @@
$(document).on('click', '#areaName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/keyplace/update.html b/src/main/resources/templates/keyplace/update.html
index d587b53..85d290b 100644
--- a/src/main/resources/templates/keyplace/update.html
+++ b/src/main/resources/templates/keyplace/update.html
@@ -160,12 +160,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -198,7 +198,7 @@
$(document).on('click', '#areaName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/line/save.html b/src/main/resources/templates/line/save.html
index 3bd1571..031654a 100644
--- a/src/main/resources/templates/line/save.html
+++ b/src/main/resources/templates/line/save.html
@@ -186,7 +186,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/line/update.html b/src/main/resources/templates/line/update.html
index d3214ec..6a1a701 100644
--- a/src/main/resources/templates/line/update.html
+++ b/src/main/resources/templates/line/update.html
@@ -188,7 +188,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/linecase/save.html b/src/main/resources/templates/linecase/save.html
index e5153b1..5e35531 100644
--- a/src/main/resources/templates/linecase/save.html
+++ b/src/main/resources/templates/linecase/save.html
@@ -212,7 +212,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/linecase/update.html b/src/main/resources/templates/linecase/update.html
index ea2a2b3..1710359 100644
--- a/src/main/resources/templates/linecase/update.html
+++ b/src/main/resources/templates/linecase/update.html
@@ -218,7 +218,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/logisticssafe/save.html b/src/main/resources/templates/logisticssafe/save.html
index 962d7ed..958c574 100644
--- a/src/main/resources/templates/logisticssafe/save.html
+++ b/src/main/resources/templates/logisticssafe/save.html
@@ -245,12 +245,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -379,7 +379,7 @@
$(document).on('click', '#enterpriseLocationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#enterpriseLocationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#enterpriseLocationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/logisticssafe/update.html b/src/main/resources/templates/logisticssafe/update.html
index 9e30df5..9370f6d 100644
--- a/src/main/resources/templates/logisticssafe/update.html
+++ b/src/main/resources/templates/logisticssafe/update.html
@@ -247,12 +247,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -386,7 +386,7 @@
$(document).on('click', '#enterpriseLocationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#enterpriseLocationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#enterpriseLocationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/lrs/save.html b/src/main/resources/templates/lrs/save.html
index 6056808..763002c 100644
--- a/src/main/resources/templates/lrs/save.html
+++ b/src/main/resources/templates/lrs/save.html
@@ -136,7 +136,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/lrs/update.html b/src/main/resources/templates/lrs/update.html
index 0dc2e66..bb7a0cf 100644
--- a/src/main/resources/templates/lrs/update.html
+++ b/src/main/resources/templates/lrs/update.html
@@ -138,7 +138,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/massprevention/save.html b/src/main/resources/templates/massprevention/save.html
index 865ddc1..ff4ecfd 100644
--- a/src/main/resources/templates/massprevention/save.html
+++ b/src/main/resources/templates/massprevention/save.html
@@ -132,7 +132,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/massprevention/update.html b/src/main/resources/templates/massprevention/update.html
index 2d820b7..a387105 100644
--- a/src/main/resources/templates/massprevention/update.html
+++ b/src/main/resources/templates/massprevention/update.html
@@ -134,7 +134,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/organization/save.html b/src/main/resources/templates/organization/save.html
index f80c657..124f100 100644
--- a/src/main/resources/templates/organization/save.html
+++ b/src/main/resources/templates/organization/save.html
@@ -587,7 +587,7 @@
// 初始化组织类型ID下拉选择
function initOrganizationTypeIdSelect() {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9041ffbf-6fb6-4a0d-909b-92aff2d0f432', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/9041ffbf-6fb6-4a0d-909b-92aff2d0f432', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('organizationTypeIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('organizationTypeIdSelectTemplateBox').innerHTML = html;
});
@@ -598,7 +598,7 @@
}
function initMasterIdCardCodeSelect() {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('masterIdCardCodeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('masterIdCardCodeSelectTemplateBox').innerHTML = html;
});
@@ -820,7 +820,7 @@
// 初始化关注度ID下拉选择
function initDegreeOfConcernIdSelect() {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/6f046742-7399-4c57-bfe2-d159470f4b45', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/6f046742-7399-4c57-bfe2-d159470f4b45', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('degreeOfConcernIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('degreeOfConcernIdSelectTemplateBox').innerHTML = html;
});
@@ -986,7 +986,7 @@
$('#areaName').on('click', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
width: '600px',
height: '225px',
onClose: function() {
diff --git a/src/main/resources/templates/organization/update.html b/src/main/resources/templates/organization/update.html
index ec23d62..04bee9c 100644
--- a/src/main/resources/templates/organization/update.html
+++ b/src/main/resources/templates/organization/update.html
@@ -589,7 +589,7 @@
// 初始化组织类型ID下拉选择
function initOrganizationTypeIdSelect(selectValue) {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/9041ffbf-6fb6-4a0d-909b-92aff2d0f432', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/9041ffbf-6fb6-4a0d-909b-92aff2d0f432', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('organizationTypeIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('organizationTypeIdSelectTemplateBox').innerHTML = html;
});
@@ -604,7 +604,7 @@
}
function initMasterIdCardCodeSelect(selectValue) {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/76c5044f-805a-4313-b1e8-79e966b97c0d', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('masterIdCardCodeSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('masterIdCardCodeSelectTemplateBox').innerHTML = html;
});
@@ -834,7 +834,7 @@
// 初始化关注度ID下拉选择
function initDegreeOfConcernIdSelect(selectValue) {
- top.restAjax.get(top.restAjax.path('api/data/listbyparentid/6f046742-7399-4c57-bfe2-d159470f4b45', []), {}, null, function(code, data, args) {
+ top.restAjax.get(top.restAjax.path('api/mongo/data/list/parent-id/6f046742-7399-4c57-bfe2-d159470f4b45', []), {}, null, function(code, data, args) {
laytpl(document.getElementById('degreeOfConcernIdSelectTemplate').innerHTML).render(data, function(html) {
document.getElementById('degreeOfConcernIdSelectTemplateBox').innerHTML = html;
});
@@ -1019,7 +1019,7 @@
$('#areaName').on('click', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#areaName').val())]),
width: '600px',
height: '225px',
onClose: function() {
diff --git a/src/main/resources/templates/publicvideo/save.html b/src/main/resources/templates/publicvideo/save.html
index c7397bc..f165284 100644
--- a/src/main/resources/templates/publicvideo/save.html
+++ b/src/main/resources/templates/publicvideo/save.html
@@ -148,7 +148,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/publicvideo/update.html b/src/main/resources/templates/publicvideo/update.html
index a42a70a..fdb8e97 100644
--- a/src/main/resources/templates/publicvideo/update.html
+++ b/src/main/resources/templates/publicvideo/update.html
@@ -150,7 +150,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/school/save.html b/src/main/resources/templates/school/save.html
index 3158f78..765a738 100644
--- a/src/main/resources/templates/school/save.html
+++ b/src/main/resources/templates/school/save.html
@@ -203,12 +203,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -236,7 +236,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -322,7 +322,7 @@
$(document).on('click', '#belongDeptName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#belongDeptName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#belongDeptName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/school/update.html b/src/main/resources/templates/school/update.html
index 0d91d52..f79feaf 100644
--- a/src/main/resources/templates/school/update.html
+++ b/src/main/resources/templates/school/update.html
@@ -205,12 +205,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -243,7 +243,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
@@ -337,7 +337,7 @@
$(document).on('click', '#belongDeptName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#belongDeptName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#belongDeptName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/schoolkey/list.html b/src/main/resources/templates/schoolkey/list.html
index 5380a9d..191b658 100644
--- a/src/main/resources/templates/schoolkey/list.html
+++ b/src/main/resources/templates/schoolkey/list.html
@@ -65,11 +65,14 @@
var laydate = layui.laydate;
var common = layui.common;
var resizeTimeout = null;
- var tableUrl = 'api/schoolkey/listpage?schoolId={schoolId}';
+ var tableUrl = 'api/schoolkey/listpage';
var schoolId = top.restAjax.params(window.location.href).schoolId;
// 初始化表格
function initTable() {
+ if(schoolId) {
+ tableUrl += '?schoolId={schoolId}';
+ }
table.render({
elem: '#dataTable',
id: 'dataTable',
@@ -111,6 +114,11 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
+ if(1 == rowData) {
+ rowData = '是'
+ }else {
+ rowData = '否'
+ }
return rowData;
}
}
diff --git a/src/main/resources/templates/schoolkey/save.html b/src/main/resources/templates/schoolkey/save.html
index 577e6e8..c399d72 100644
--- a/src/main/resources/templates/schoolkey/save.html
+++ b/src/main/resources/templates/schoolkey/save.html
@@ -201,12 +201,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -247,7 +247,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/schoolkey/update.html b/src/main/resources/templates/schoolkey/update.html
index d389b61..5ef3703 100644
--- a/src/main/resources/templates/schoolkey/update.html
+++ b/src/main/resources/templates/schoolkey/update.html
@@ -203,12 +203,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -257,7 +257,7 @@
$(document).on('click', '#location', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#location').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/stuteasafe/save.html b/src/main/resources/templates/stuteasafe/save.html
index 57c0581..dac9e89 100644
--- a/src/main/resources/templates/stuteasafe/save.html
+++ b/src/main/resources/templates/stuteasafe/save.html
@@ -222,12 +222,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -322,7 +322,7 @@
$(document).on('click', '#happenLocationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#happenLocationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#happenLocationName').val())]),
width: '800px',
height: '225px',
onClose: function () {
diff --git a/src/main/resources/templates/stuteasafe/update.html b/src/main/resources/templates/stuteasafe/update.html
index f35b30f..5b8be0c 100644
--- a/src/main/resources/templates/stuteasafe/update.html
+++ b/src/main/resources/templates/stuteasafe/update.html
@@ -225,12 +225,12 @@
var marker;
function initMap(longitude, latitude) {
- var url1 = 'http://support.supermap.com.cn:8090/iserver/services/map-Temperature/rest/maps/%E4%B8%AD%E5%9B%BD1981-2010%E5%B9%B41%E6%9C%88%E5%B9%B3%E5%9D%87%E6%B0%94%E6%B8%A9%E5%88%86%E5%B8%83%E5%9B%BE';
+ var url1 = 'https://iserver.supermap.io/iserver/services/map-china400/rest/maps/China';
map = L.map('mapContainer', {
crs: L.CRS.EPSG3857,
- center: {lon: 0, lat: 0},
+ center: {lon: 113.11412662267688, lat: 40.98896497581636},
maxZoom: 18,
- zoom: 2,
+ zoom: 8,
boxZoom: false,
scrollWheelZoom: true,
dragging: true,
@@ -335,7 +335,7 @@
$(document).on('click', '#happenLocationName', function() {
top.dialog.open({
title: '选择地区',
- url: top.restAjax.path('route/area/get-select?areaName={areaName}', [encodeURI($('#happenLocationName').val())]),
+ url: top.restAjax.path('route/mongo/area/get-select?areaName={areaName}', [encodeURI($('#happenLocationName').val())]),
width: '800px',
height: '225px',
onClose: function () {