和林分支

leiSP-admin/src/main/java/com/sooka/web/controller/system/SysLoginController.java

@@ -1,12 +1,18 @@
 package com.sooka.web.controller.system;
 
+import com.business.zhsq_qk.ksh.controller.ZhsqKshController;
+import com.business.zhsq_qk.ksh.service.IZhsqKshService;
+import com.business.zhsq_qk.zhcx.service.IZhsqZhcxService;
 import com.sooka.common.core.controller.BaseController;
 import com.sooka.common.core.domain.AjaxResult;
 import com.sooka.common.utils.ServletUtils;
 import com.sooka.common.utils.StringUtils;
 import com.sooka.framework.util.ShiroUtils;
+import com.sooka.system.domain.SysDept;
 import com.sooka.system.domain.SysRole;
 import com.sooka.system.domain.SysUser;
+import com.sooka.system.mapper.SysDeptMapper;
+import com.sooka.system.service.ISysConfigService;
 import com.sooka.system.service.ISysUserService;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
@@ -14,10 +20,13 @@ import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,6 +42,9 @@ public class SysLoginController extends BaseController
     @Autowired
     private ISysUserService userService;
 
+    @Autowired
+    private ZhsqKshController kshController;
+
 
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response)
@@ -77,9 +89,79 @@ public class SysLoginController extends BaseController
         }
     }
 
+    @GetMapping("/login/{username}/{password}")
+    public String getLogin(@PathVariable("username") String username, @PathVariable("password")String password,ModelMap modelMap)
+    {
+        UsernamePasswordToken token = new UsernamePasswordToken(username, password, false);
+        Subject subject = SecurityUtils.getSubject();
+        try
+        {
+            subject.login(token);
+            AjaxResult success=AjaxResult.success();
+            SysUser sysuser = ShiroUtils.getSysUser();
+            boolean isAdmin = sysuser.getDept().getParentId() == 0;
+            if(isAdmin||sysuser.getDept().getPostId()==5){
+                success.put("perFlag","zhzx");//人员身份为管理员或指挥中心
+            }else if(sysuser.getDept().getPostId()==7){
+                //街道登录查询所有社区
+                success.put("perFlag","jd");//人员身份为管理员或指挥中心
+            }
+            return ksh(modelMap);
+        }
+        catch (AuthenticationException e)
+        {
+            String msg = "用户或密码错误";
+            if (StringUtils.isNotEmpty(e.getMessage()))
+            {
+                msg = e.getMessage();
+            }
+            return msg;
+        }
+    }
+
     @GetMapping("/unauth")
     public String unauth()
     {
         return "error/unauth";
     }
+
+    @Resource
+    SysDeptMapper deptMapper;
+
+    @Autowired
+    private IZhsqZhcxService zhsqZhcxService;
+
+    @Autowired
+    private ISysConfigService configService;//获取系统参数配置，超图用
+
+    private String prefix = "zhsq_qk/ksh";
+
+    public String ksh(ModelMap mmap){
+        SysUser sysUser = ShiroUtils.getSysUser();
+        getMapMmap(mmap);
+        boolean isAdmin = sysUser.getDept().getParentId() == 0;
+        if(isAdmin||sysUser.getDept().getPostId()==5){
+            mmap.put("perFlag","zhzx");//人员身份为管理员或指挥中心
+            mmap.put("jdId","0");
+        }else if(sysUser.getDept().getPostId()==7){
+            //街道登录查询所有社区
+            mmap.put("perFlag","jd");
+            mmap.put("jdId",sysUser.getDept().getParentId());
+            SysDept sysDept = deptMapper.selectDeptById(ShiroUtils.getSysUser().getDept().getDeptId());
+            mmap.put("layerId", sysDept.getLayerId());//图层ID
+            mmap.put("centerpointLon", sysDept.getCenterpointLon());//图层中心点(经度)
+            mmap.put("centerpointLat", sysDept.getCenterpointLat());//图层中心点(纬度)
+        }
+        mmap.put("loginName", ShiroUtils.getLoginName());//当前登录人
+        zhsqZhcxService.injectCommunity(mmap);
+        return prefix + "/ksh";
+    }
+
+    private void getMapMmap(ModelMap mmap) {
+        mmap.put("iServerMap", configService.selectConfigByKey("superMap.iServer"));//超图服务
+        mmap.put("iServerJilinshengAndQikaiMap", configService.selectConfigByKey("superMap.iServer.JilinshengAndQikai.map"));//省矢量及区影像服务路径
+        mmap.put("iServerJieDaoSheQuMap", configService.selectConfigByKey("superMap.iServer.jiedaoshequ.map"));//街道社区地图
+        mmap.put("iServerqiKaiQuMapCenterPoint", configService.selectConfigByKey("superMap.iServer.qiKaiQu.map.centerPoint"));//汽开区中心点
+        mmap.put("iServerJieDaoSheQuData", configService.selectConfigByKey("superMap.iServer.jiedaoshequ.data"));//街道社区数据源
+    }
 }

leiSP-admin/src/main/resources/application-druid.yml

@@ -21,16 +21,17 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://121.37.83.100:53306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
-#                username: limeng
-#                password: limeng123456
-                url: jdbc:mysql://127.0.0.1:3306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
+                url: jdbc:mysql://121.36.228.66:63306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
                 username: root
-#                pasword: sys200888
+                password: sooka123456
+#                url: jdbc:mysql://192.168.1.13:63306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
+#                username: root
+#                password: sooka1a2b3c4d%...
+
 #                password: 1a2b3c!
 #                url: jdbc:mysql://192.168.0.144:3306/zhsq_qk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&useSSL=false
 #                username: root
-                password: 123456
+#                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

leiSP-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 8080
+  port: 16020
   servlet:
     # 应用的访问路径
     context-path: /qk

leiSP-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -3,14 +3,14 @@
 PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
-	
+
 	<settings>
 		<setting name="cacheEnabled"             value="true"  />  <!-- 全局映射器启用缓存 -->
 		<setting name="useGeneratedKeys"         value="true"  />  <!-- 允许 JDBC 支持自动生成主键 -->
 		<setting name="defaultExecutorType"      value="REUSE" />  <!-- 配置默认的执行器 -->
 		<setting name="logImpl"                  value="SLF4J" />  <!-- 指定 MyBatis 所用日志的具体实现 -->
 		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>  驼峰式命名 -->
-		<setting name="logImpl" value="STDOUT_LOGGING" /> <!-- 打印查询语句 -->
+		<!-- <setting name="logImpl" value="STDOUT_LOGGING" />  打印查询语句 -->
 	</settings>
-	
+
 </configuration>

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/fzjc_qiKaiQuJuMinZongShu.js

@@ -138,7 +138,7 @@ $(document).ready(function () {//弹出对话框
     $('#openDialogJuMin').on('click', function () {
         var jdId = -1;
         var url = prefix + "/rktj/qkqjmzs/" + jdId;
-        $.modal.openDetailFull("汽开区居民总数", url, 1200)
+        $.modal.openDetailFull("居民总数", url, 1200)
     });
 })
 
@@ -153,7 +153,7 @@ function openDialog_juMin(name) {//弹出对话框
             if(e.length > 0){
                 var jdId = e[0].deptId;
                 var url = prefix + "/rktj/qkqjmzs/" + jdId;
-                $.modal.openDetailFull("汽开区居民总数", url, 1200);
+                $.modal.openDetailFull("居民总数", url, 1200);
             }
         }
     });

leiSP-admin/src/main/resources/static/bigdata/fzjc/js/sjsq_5.js

@@ -6,6 +6,7 @@ $(document).ready(function () {
     let colors1 = ['#ffcc00', '#00ffcc', '#00fff0', '#5519ff'];
     let option;
     $.post(ctx + "fzjc/sjsqYsjzstj",function (res){
+        console.log(res)
         option = {
             tooltip: {
                 trigger: 'axis'

leiSP-admin/src/main/resources/static/bigdata/ksh/css/visualization.css

@@ -188,7 +188,7 @@ a:hover {
 
 
 .logo-title {
-	width: 42.416rem;
+	width: 58.416rem;
 	height: 4rem;
 	text-align: center;
 	margin: 0 auto;
@@ -259,7 +259,7 @@ a:hover {
 
 .nav-con a {
 	width: 25%;
-	float: left;
+	/*float: left;*/
 	display: inline-block;
 	padding: 0.833rem 1.666rem;
 	background: url(../img/nav-bg.png) center no-repeat;

leiSP-admin/src/main/resources/static/bigdata/ksh/js/dataSwitches.js

@@ -475,7 +475,7 @@ $(document).ready(function () {
             title: '数据统计',
             width: "1200",
             height: "630",
-            url: ctx + "/ksh/goTypeOfBarChart/" + deptId + "/" + year + "/" + type,
+            url: ctx + "/ksh/goTypeOfBarChart/" + getDept() + "/" + year + "/" + type,
             btn: btn,
             callBack: doSubmit
         };
@@ -654,6 +654,7 @@ $(document).ready(function () {
             },
             /**查询上报+归档**/
             getReportsAndFile:function (res) {
+                // console.log(res)
                 // 事件处理情况（上报+归档）
                 let option = {
                     legend: {
@@ -674,24 +675,14 @@ $(document).ready(function () {
                         dimensions: ['product', '上报', '归档'],
                         source: [
                             {
-                                product: '锦程街道',
+                                product: '城关镇',
                                 上报: res[0].sbs,
                                 归档: res[0].gds
                             },
                             {
-                                product: '东风街道',
+                                product: '盛乐镇',
                                 上报: res[1].sbs,
                                 归档: res[1].gds
-                            },
-                            {
-                                product: '前程街道',
-                                上报: res[2].sbs,
-                                归档: res[2].gds
-                            },
-                            {
-                                product: '富民街道',
-                                上报: res[3].sbs,
-                                归档: res[3].gds
                             }
                         ]
                     },
@@ -803,24 +794,14 @@ $(document).ready(function () {
                         dimensions: ['product', '签收', '办结'],
                         source: [
                             {
-                                product: '锦程街道',
+                                product: '城关镇',
                                 签收: res[0].qss,
                                 办结: res[0].bjs
                             },
                             {
-                                product: '东风街道',
+                                product: '盛乐镇',
                                 签收: res[1].qss,
                                 办结: res[1].bjs
-                            },
-                            {
-                                product: '前程街道',
-                                签收: res[2].qss,
-                                办结: res[2].bjs
-                            },
-                            {
-                                product: '富民街道',
-                                签收: res[3].qss,
-                                办结: res[3].bjs
                             }
                         ]
                     },
@@ -1135,7 +1116,7 @@ $(document).ready(function () {
                     },
                     yAxis: {
                         type: 'category',
-                        data: [res[0].deptName, res[1].deptName, res[2].deptName, res[3].deptName],
+                        data: [res[0].deptName,res[1].deptName],
                         axisLine: {
                             lineStyle: {
                                 color: '#00cdef'
@@ -1180,62 +1161,25 @@ $(document).ready(function () {
                                 )
                             }
                         },
-                            {
-                                id:res[1].deptId,
-                                value: res[1].qiyeCount,
-                                itemStyle: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        1, 0, 0, 1,
-                                        [{
-                                            offset: 0,
-                                            color: '#00feff'
-                                        },
-                                            {
-                                                offset: 1,
-                                                color: '#0066cc'
-                                            }
-                                        ]
-                                    )
-                                }
-                            },
-                            {
-                                id:res[2].deptId,
-                                value: res[2].qiyeCount,
-                                itemStyle: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        1, 0, 0, 1,
-                                        [{
-                                            offset: 0,
-                                            color: '#00feff'
-                                        },
-                                            {
-                                                offset: 1,
-                                                color: '#0066cc'
-                                            }
-                                        ]
-
-                                    )
-                                }
-                            },
-                            {
-                                id:res[3].deptId,
-                                value: res[3].qiyeCount,
-                                itemStyle: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        1, 0, 0, 1,
-                                        [{
-                                            offset: 0,
-                                            color: '#00feff'
-                                        },
-                                            {
-                                                offset: 1,
-                                                color: '#0066cc'
-                                            }
-                                        ]
+                        {
+                            id:res[1].deptId,
+                            value: res[1].qiyeCount,
+                            itemStyle: {
+                                color: new echarts.graphic.LinearGradient(
+                                    1, 0, 0, 1,
+                                    [{
+                                        offset: 0,
+                                        color: '#00feff'
+                                    },
+                                        {
+                                            offset: 1,
+                                            color: '#0066cc'
+                                        }
+                                    ]
 
-                                    )
-                                }
+                                )
                             }
+                        }
                         ]
                     }]
                 };

leiSP-admin/src/main/resources/static/bigdata/ksh/js/mapIndex.js

@@ -2,11 +2,11 @@ var map, marker = null, editableLayers = null, url = iServerMap,dataUrl=iServerJ
 var workspace_qk=iServerJilinshengAndQikaiMap;//省矢量及区影像，固定加载。
 var workspace_jdsq=iServerJieDaoSheQuMap;//街道社区的地图服务路径，固定加载。
 //样例：省矢量图，当做经开矢量图使用
-var map_jilinShiLiang = L.supermap.tiledMapLayer(workspace_qk+'/吉林省矢量地图 ', {
+var map_jilinShiLiang = L.supermap.tiledMapLayer(workspace_qk+'/ChinaDark4326', {
     noWrap: true
 });
 //样例：经开影像图
-var map_qikaiYingXiang = L.supermap.tiledMapLayer( workspace_qk+'/经开影像 ', {
+var map_qikaiYingXiang = L.supermap.tiledMapLayer( workspace_jdsq+'/heshengyingxiang', {
     noWrap: true
 });
 //样例：东风街道
@@ -85,8 +85,8 @@ function initAllMap(){
         layersList.push(map_qikaiYingXiang);//固定，汽开影像
         //指挥中心或管理员登录，查看全区范围轮廓图
         mapPoint=iServerqiKaiQuMapCenterPoint;//全区中心点
-        zoom=12;
-        layersList.push(L.supermap.tiledMapLayer( workspace_jdsq+'/qikaiquanqu', { noWrap: true }));//汽开全区
+        zoom=16;
+        layersList.push(L.supermap.tiledMapLayer( workspace_jdsq+'/heshengxiaoqu84', { noWrap: true }));//汽开全区
         // layersList.push(L.supermap.tiledMapLayer( workspace_jdsq+'/dongfengjiedao', { noWrap: true }));//东风街道
         // layersList.push(L.supermap.tiledMapLayer( workspace_jdsq+'/qianchengjiedao', { noWrap: true }));//前程街道
         // layersList.push(L.supermap.tiledMapLayer( workspace_jdsq+'/jinchengjiedao', { noWrap: true }));//锦程街道
@@ -96,12 +96,13 @@ function initAllMap(){
         //街道登录，仅查看本街道范围轮廓图
         layersList.push(L.supermap.tiledMapLayer( workspace_jdsq+'/'+layerId, { noWrap: true }));//加载本街道范围轮廓图
         mapPoint=getSuperMapCenterPoint(centerpointLat+","+centerpointLon);//本街道中心点
-        zoom=14;
+        zoom=16;
         /*layersList.push(map_dfjd_chuangye);//测试样例*/
         //街道登录后，查询本街道下所有社区建筑图，涉及图层：矢量图，影像图，街道图（layerId），本街道所有社区图
 
         //加载本街道下所有社区建筑图
     }
+    console.log(mapPoint);
     initMap(mapPoint,layersList,zoom);
 }
 var resultData = [];
@@ -121,7 +122,6 @@ function callbackFunction(e) {
     L.supermap
         .featureService(dataUrl)
         .getFeaturesByGeometry(geometryParam, function (serviceResult) {
-            console.log(serviceResult);
             if (!serviceResult.result) {
                 return;
             }

leiSP-admin/src/main/resources/static/bigdata/ksh/js/visualization.js

@@ -67,7 +67,8 @@ function fullScreen() {
     var jdId = $("#jdId").val();
     var sqId = $("#sqId").val();
     var url = prefix + "/fullScreen/" + year + "/" + jdId + "/" + sqId + "/" + isYxt + "/" + isRfh;
-    $.modal.openDetailFull("汽开区智慧社区数据孪生平台", url, 1200);
+    console.log(url);
+    $.modal.openDetailFull("和林格尔县全域视联平台数字综治平台数据孪生系统", url, 1200);
 }
 
 //全区、街道、社区切换
@@ -308,7 +309,7 @@ function reloadData() {
      */
     if(isYxt){
         if($("#jdId").val() == -1){//汽开全区轮廓图
-            layersList.push(L.supermap.tiledMapLayer( workspace_jdsq+'/qikaiquanqu', { noWrap: true }));//汽开全区
+            layersList.push(L.supermap.tiledMapLayer( workspace_jdsq+'/heshengxiaoqu84', { noWrap: true }));//汽开全区
         }else {//选中具体街道、社区轮廓图
             for (var i = 0; i < map_jiedaoList.length; i++) {
                 layersList.push(L.supermap.tiledMapLayer(workspace_jdsq + '/' + map_jiedaoList[i].layerId, {noWrap: true}));//加载本街道范围轮廓图
@@ -339,16 +340,16 @@ function reloadData() {
      * 中心点、zoom
      */
     if($("#jdId").val() == -1 && $("#sqId").val() == -1){
-        zoom=12;
+        zoom=16;
         mapPoint=iServerqiKaiQuMapCenterPoint;//全区中心点
     }else if ($("#jdId").val() != -1 && $("#sqId").val() == -1 && map_jiedaoList[0].centerpointLat != null && map_jiedaoList[0].centerpointLat != "" && map_jiedaoList[0].centerpointLon != null && map_jiedaoList[0].centerpointLon != "") {
-        zoom = 14;
+        zoom = 16;
         mapPoint = getSuperMapCenterPoint(map_jiedaoList[0].centerpointLat + "," + map_jiedaoList[0].centerpointLon);//本街道中心点
     } else if($("#sqId").val() != -1 && $("#sqId").val() != -1&& map_shequList[0].centerpointLat != null && map_shequList[0].centerpointLat != "" && map_shequList[0].centerpointLon != null && map_shequList[0].centerpointLon != ""){
         zoom = 16;
         mapPoint = getSuperMapCenterPoint(map_shequList[0].centerpointLat + "," + map_shequList[0].centerpointLon);//本社区中心点
     }else {
-        zoom=12;
+        zoom=16;
         mapPoint=iServerqiKaiQuMapCenterPoint;//全区中心点
     }
     initMap(mapPoint,layersList,zoom);//重新初始化地图对象

leiSP-admin/src/main/resources/templates/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>汽开区综治中心信息平台</title>
+    <title>和林格尔县全域视联平台数字综治系统</title>
     <!-- 避免IE使用兼容模式 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="shortcut icon" href="../static/sooka.ico" th:href="@{sooka.ico}"/>
@@ -179,7 +179,7 @@
                         <i class="fa fa-bars"></i>
                     </a>
                 </div>
-                <div style="float: left;margin: 8px 0 0 0; font-size: 24px; color: #fff; font-weight: bold">汽开区综治中心信息平台</div>
+                <div style="float: left;margin: 8px 0 0 0; font-size: 24px; color: #fff; font-weight: bold">和林格尔县全域视联平台数字综治系统</div>
                 <ul class="nav navbar-top-links navbar-right welcome-message">
                     <!--<li><a title="示例" href="" target="_blank"><i class="fa fa-video-camera"></i> 示例</a></li>
                     <li><a title="文档" href="" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
@@ -240,7 +240,7 @@
                     th:src="@{/system/main}" frameborder="0" seamless></iframe>
         </div>
         <div class="footer">
-            <div class="pull-right">汽开区智慧社区后台管理系统</div>
+            <div class="pull-right">智慧社区平台后台管理系统</div>
         </div>
     </div>
     <!--右侧部分结束-->

leiSP-admin/src/main/resources/templates/login.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <title>汽开区综治中心信息平台</title>
+    <title>和林格尔县数字综治平台</title>
     <meta name="description" content="后台管理框架">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
@@ -56,7 +56,7 @@
                 <strong th:if="${@config.getKey('sys.account.registerUser')}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
             </div>
         </div>-->
-        <div style=" font-size: 36px; font-weight: bold; margin-bottom: 20px">汽开区综治中心信息平台</div>
+        <div style=" font-size: 36px; font-weight: bold; margin-bottom: 20px">和林格尔县全域视联平台数字综治平台</div>
         <div>
             <form id="signupForm" autocomplete="off">
                 <h4 style=" color: #333;margin-bottom: 20px; border-bottom: 2px solid #1269ff; display: block; width: fit-content; padding-bottom: 5px;">请登录</h4>

leiSP-admin/src/main/resources/templates/main.html

@@ -348,7 +348,7 @@
         </div>
 
         <div id="div_yqtx" class="data-fl-row m-t-30">
-            <span>一汽退休老干部统计</span>
+            <span>退休老干部统计</span>
             <div id="data_yqtx" class="data-image"  ></div>
         </div>
     </div>
@@ -610,7 +610,7 @@
                                 type: 'pie',
                                 radius: ['30%', '50%'],
                                 data: [
-                                    { value: dataList[0], name: nameList[0]+'一汽退休老干部人数', itemStyle: {
+                                    { value: dataList[0], name: nameList[0]+'退休老干部人数', itemStyle: {
                                             color: new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
                                                 offset: 0,
                                                 color: '#006000'
@@ -619,7 +619,7 @@
                                                 color: '#AAAAFF'
                                             }]),
                                         } },
-                                    { value: dataList[1], name: nameList[1]+'一汽退休老干部人数', itemStyle: {
+                                    { value: dataList[1], name: nameList[1]+'退休老干部人数', itemStyle: {
                                             color: new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
                                                 offset: 0,
                                                 color: '#A5A552'

leiSP-framework/src/main/java/com/sooka/framework/config/ShiroConfig.java

@@ -289,6 +289,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/logout", "logout");
         // 不需要拦截的访问
         filterChainDefinitionMap.put("/login", "anon,captchaValidate");
+        filterChainDefinitionMap.put("/login/**", "anon,captchaValidate");
         // 注册相关
         filterChainDefinitionMap.put("/register", "anon,captchaValidate");
         // 系统权限列表

mybusiness/src/main/java/com/business/zhsq_qk/eventRank/controller/ZhsqEventRankController.java

@@ -304,7 +304,7 @@ public class ZhsqEventRankController extends BaseController
     private JSONArray getReportsAndFile(Long deptId,String year) {
         JSONArray jsonArray = new JSONArray();
         //取得四个街道 锦程街道 东风街道 前程街道 富民街道
-        String [] arr = {"170387468639","172291278969","288313983756","288313983755"};
+        String [] arr = {"288313984701","288313984722"};
         if(deptId == 0){
             for (int i=0;i<arr.length;i++){
                 SysDept sysDept = new SysDept();
@@ -338,7 +338,7 @@ public class ZhsqEventRankController extends BaseController
     private JSONArray getSignAndDone(Long deptId,String year) {
         JSONArray jsonArray = new JSONArray();
         //取得四个街道 锦程街道 东风街道 前程街道 富民街道
-        String [] arr = {"170387468639","172291278969","288313983756","288313983755"};
+        String [] arr = {"288313984701","288313984722"};
         if(deptId == 0){
             for (int i=0;i<arr.length;i++){
                 SysDept sysDept = new SysDept();

mybusiness/src/main/java/com/business/zhsq_qk/ksh/controller/ZhsqKshController.java

@@ -111,8 +111,8 @@ public class ZhsqKshController extends BaseController
      */
     @GetMapping()
     public String ksh(ModelMap mmap){
-        getMapMmap(mmap);
         SysUser sysUser = ShiroUtils.getSysUser();
+        getMapMmap(mmap);
         boolean isAdmin = sysUser.getDept().getParentId() == 0;
         if(isAdmin||sysUser.getDept().getPostId()==5){
             mmap.put("perFlag","zhzx");//人员身份为管理员或指挥中心

mybusiness/src/main/resources/templates/zhsq_qk/eventProcess/eventProcess/choseEventLatLng.html

@@ -36,10 +36,10 @@
     var map, marker = null, editableLayers = null, url = iServerMap,dataUrl=iServerJieDaoSheQuData;//初始化基本参数
     var workspace_qk=iServerJilinshengAndQikaiMap;//省矢量及区影像，固定加载。
     var workspace_jdsq=iServerJieDaoSheQuMap;//街道社区的地图服务路径
-    var map_jilinShiLiang = L.supermap.tiledMapLayer(workspace_qk+'/吉林省矢量地图 ', {
+    var map_jilinShiLiang = L.supermap.tiledMapLayer(iServerJieDaoSheQuMap+'/heshengyingxiang ', {
         noWrap: true
     });
-    var map_qikaiYingXiang = L.supermap.tiledMapLayer( workspace_qk+'/经开影像 ', {
+    var map_qikaiYingXiang = L.supermap.tiledMapLayer( iServerJieDaoSheQuMap+'/heshengyingxiang ', {
         noWrap: true
     });
     //当前用户所在街道

mybusiness/src/main/resources/templates/zhsq_qk/fzjc/fzjc.html

@@ -2,7 +2,7 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org">
 	<head>
 		<meta charset="utf-8" />
-		<title>汽开区综治中心信息平台辅助决策系统</title>
+		<title>和林格尔县全域视联平台数字综治系统</title>
 		<link rel="shortcut icon" href="../static/sooka.ico" th:href="@{/sooka.ico}"/>
 		<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 		<script th:src="@{/js/jquery.min.js}"></script>
@@ -34,12 +34,12 @@
 					</ul>
 				</div>
 				<div class="logo-title">
-					<h6>汽开区综治中心信息平台辅助决策系统</h6>
+					<h6>和林格尔县全域视联平台数字综治辅助决策系统</h6>
 				</div>
 				<div class="fast-menu">
 					<a title="后台管理系统" href="javascript:void(0)" id="goHtgl">后台管理系统</a>
 					<a href="">辅助决策系统</a>
-					<a title="数据孪生" href="javascript:void(0)" id="goKsh">治理平台</a>
+					<a title="数据孪生" href="javascript:void(0)" id="goKsh">数据孪生系统</a>
 				</div>
 			</div>
 			<!-- 导航结束 -->
@@ -51,7 +51,7 @@
 						<i class="chart-block-normal"></i>
 						<i class="chart-block-normal"></i>
 						<i class="chart-block-normal"></i>
-						<div class="chart-title">汽开区居民总数</div>
+						<div class="chart-title">居民总数</div>
 						<div class="chart-first">
 							<div class="people-count" id="openDialogJuMin" style="cursor: pointer">
 								<div class="p-t">居民总数</div><label id="rkTotal" class="count" style="cursor: pointer"></label><div class="p-n">人</div>

mybusiness/src/main/resources/templates/zhsq_qk/fzjc/rktj/qkqjmzs.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('汽开区居民总数')" />
+    <th:block th:include="include :: header('居民总数')" />
 </head>
 <body class="gray-bg">
 <div class="container-div">
@@ -407,4 +407,4 @@
     });
 </script>
 </body>
-</html>
+</html>

mybusiness/src/main/resources/templates/zhsq_qk/ksh/fullScreen.html

@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block th:include="include :: header('汽开区智慧社区数据孪生平台')" />
+    <th:block th:include="include :: header('和林格尔县全域视联平台数字综治平台数据孪生系统')" />
     <script th:src="@{/bigdata/ksh/js/jquery.js}" type="text/javascript" charset="utf-8"></script>
     <script th:src="@{/bigdata/js/businessutil.js}"></script>
     <script th:src="@{/bigdata/js/dateweatherutil.js}"></script>
@@ -19,10 +19,8 @@
         <div class="nav" style="display: none">
             <div class="nav-con">
                 <a class="nav-a" deptId="-1" id="-1" style="display:none">所有街道</a>
-                <a class="nav-a" deptId="170387468639"  id="170387468639">锦程街道</a>
-                <a class="nav-a" deptId="172291278969"  id="172291278969">东风街道</a>
-                <a class="nav-a" deptId="288313983756"  id="288313983756">前程街道</a>
-                <a class="nav-a" deptId="288313983755"  id="288313983755">富民街道</a>
+                <a class="nav-a" deptId="288313984701"  id="288313984701">城关镇</a>
+                <a class="nav-a" deptId="288313984722"  id="288313984722">盛乐镇</a>
             </div>
             <div class="nav-right">
                 <span id="day"></span>
@@ -43,7 +41,8 @@
                                 <option value="2019">2019</option>
                                 <option value="2020">2020</option>
                                 <option value="2021">2021</option>
-                                <option value="2022" selected>2022</option>
+                                <option value="2022">2022</option>
+                                <option value="2023" selected>2023</option>
                             </select>
                         </span>
                     </div>
@@ -179,6 +178,8 @@
     });
 
     function onNavClick(jdId){
+        console.log(jdId);
+
         // 根据当前人登录选择默认导航
         // $("#" + jdId).click();
         setTimeout("$('#"+jdId+"').click()",200);

mybusiness/src/main/resources/templates/zhsq_qk/ksh/ksh.html

@@ -3,7 +3,7 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
     <script th:inline="javascript"> var ctx = [[@{/}]]; </script>
-    <th:block th:include="include :: header('汽开区智慧社区数据孪生平台')" />
+    <th:block th:include="include :: header('和林格尔县全域视联平台数字综治平台数据孪生系统')" />
     <script th:src="@{/bigdata/ksh/js/jquery.js}" type="text/javascript" charset="utf-8"></script>
     <script th:src="@{/bigdata/js/businessutil.js}"></script>
     <script th:src="@{/bigdata/js/dateweatherutil.js}"></script>
@@ -39,22 +39,21 @@
                 <div class="s-r"></div>
             </div>
             <div class="logo-title">
-                <h6>汽开区智慧社区数据孪生平台</h6>
+                <a href="http://116.142.80.12:15001"><h6>和林格尔县全域视联平台数字综治平台数据孪生系统</h6></a>
             </div>
             <div class="fast-menu">
                 <a title="后台管理系统" href="javascript:void(0)" id="goHtgl">后台管理系统</a>
-                <a title="数据孪生" href="javascript:void(0)" id="goKsh">治理平台</a>
+                <a title="数据孪生" href="javascript:void(0)" id="goKsh">智慧综治平台</a>
                 <a title="辅助决策系统" href="javascript:void(0)" id="goFzjc">辅助决策系统</a>
             </div>
         </div>
         <div class="nav">
-            <div class="nav-left"><img th:src="@{/bigdata/ksh/img/qk-logo.png}"><span>汽开区智慧社区数据孪生平台</span></div>
+            <div class="nav-left"><img th:src="@{/bigdata/ksh/img/qk-logo.png}"><span>和林格尔县全域视联平台数字综治平台数据孪生系统</span></div>
             <div class="nav-con">
                 <a class="nav-a" deptId="-1" id="-1" style="display:none">所有街道</a>
-                <a class="nav-a" deptId="170387468639"  id="170387468639">锦程街道</a>
-                <a class="nav-a" deptId="172291278969"  id="172291278969">东风街道</a>
-                <a class="nav-a" deptId="288313983756"  id="288313983756">前程街道</a>
-                <a class="nav-a" deptId="288313983755"  id="288313983755">富民街道</a>
+                <a class="nav-a" deptId="288313984701"  id="288313984701">城关镇</a>
+                <a class="nav-a" deptId="288313984722"  id="288313984722">盛乐镇</a>
+
             </div>
             <div class="nav-right">
                 <span id="day"></span>

mybusiness/src/main/resources/templates/zhsq_qk/ksh/ksh_jd.html

@@ -25,12 +25,13 @@
                         <option>2020</option>
                         <option>2021</option>
                         <option>2022</option>
+                        <option>2023</option>
                     </select>
                 </div>
                 <div class="s-r"></div>
             </div>
             <div class="logo-title">
-                <h6>汽开区智慧社区数据孪生平台</h6>
+                <h6>智慧综治平台数据孪生系统</h6>
             </div>
             <div class="fast-menu">
                 <a title="后台管理系统" href="javascript:void(0)" id="goHtgl">后台管理系统</a>
@@ -39,7 +40,7 @@
             </div>
         </div>
         <div class="nav">
-            <div class="nav-left"><img th:src="@{/bigdata/ksh/img/qk-logo.png}"><span>汽开区智慧社区数据孪生平台</span></div>
+            <div class="nav-left"><img th:src="@{/bigdata/ksh/img/qk-logo.png}"><span>智慧综治平台数据孪生系统</span></div>
             <div class="nav-con">
                 <a class="nav-a" href="#">锦程街道</a>
                 <a class="nav-a" href="#">东风街道</a>

mybusiness/src/main/resources/templates/zhsq_qk/loudong/loudong/choseBuilding.html

@@ -36,10 +36,10 @@
     var map, marker = null, editableLayers = null, url = iServerMap,dataUrl=iServerJieDaoSheQuData;//初始化基本参数
     var workspace_qk=iServerJilinshengAndQikaiMap;//省矢量及区影像，固定加载。
     var workspace_jdsq=iServerJieDaoSheQuMap;//街道社区的地图服务路径
-    var map_jilinShiLiang = L.supermap.tiledMapLayer(workspace_qk+'/吉林省矢量地图 ', {
+    var map_jilinShiLiang = L.supermap.tiledMapLayer(workspace_qk+'/heshengyingxiang', {
         noWrap: true
     });
-    var map_qikaiYingXiang = L.supermap.tiledMapLayer( workspace_qk+'/经开影像 ', {
+    var map_qikaiYingXiang = L.supermap.tiledMapLayer( workspace_qk+'/heshengyingxiang', {
         noWrap: true
     });
     //当前用户所在街道

mybusiness/src/main/resources/templates/zhsq_qk/person/person/juzhu.html

@@ -127,7 +127,7 @@
         <div class="page">
             <div class="subpage">
                 <div class="padding-con cell_dotted_b">
-                    <div class="sm_tit">长春市汽开区[[*{zhsqFangjian.jdName}]][[*{zhsqFangjian.sqName}]]证明信(存根)</div>
+                    <div class="sm_tit">区[[*{zhsqFangjian.jdName}]][[*{zhsqFangjian.sqName}]]证明信(存根)</div>
                     <div class="dy_cell_r">
                         第&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号
                     </div>