Merge remote-tracking branch 'origin/dev' into dev

db/traffic/初始化菜单.sql

-INSERT INTO `sys_menu` VALUES (80000, '交通量分析', NULL, '/traffic', -1, NULL, '', 8, '0', '0', '2019-04-28 20:38:32', '2019-04-28 20:38:46', '0');
-INSERT INTO `sys_menu` VALUES (81000, '观测站点', NULL, '/spot', 80000, NULL, 'views/traffic/trafficspot/index', 1, '0', '0', '2019-04-28 20:44:03', '2019-04-28 20:44:22', '0');
-INSERT INTO `sys_menu` VALUES (82000, '路线交通量分析', NULL, '/trafficroute', 80000, NULL, 'views/traffic/trafficroute/index', 2, '0', '0', '2019-04-28 20:46:10', '2019-04-29 13:52:04', '0');
-INSERT INTO `sys_menu` VALUES (83000, '路段交通量分析', NULL, '/trafficroadsection', 80000, NULL, 'views/traffic/trafficroadsection/index', 3, '0', '0', '2019-04-28 20:47:18', '2019-04-29 13:52:07', '0');
+INSERT INTO `sys_menu` VALUES (90000, '交通量分析', NULL, '/traffic', -1, NULL, '', 8, '0', '0', '2019-04-28 20:38:32', '2019-04-28 20:38:46', '0');
+INSERT INTO `sys_menu` VALUES (91000, '观测站点', NULL, '/spot', 90000, NULL, 'views/traffic/trafficspot/index', 1, '0', '0', '2019-04-28 20:44:03', '2019-04-28 20:44:22', '0');
+INSERT INTO `sys_menu` VALUES (92000, '路线交通量分析', NULL, '/trafficroute', 90000, NULL, 'views/traffic/trafficroute/index', 2, '0', '0', '2019-04-28 20:46:10', '2019-04-29 13:52:04', '0');
+INSERT INTO `sys_menu` VALUES (93000, '路段交通量分析', NULL, '/trafficroadsection', 90000, NULL, 'views/traffic/trafficroadsection/index', 3, '0', '0', '2019-04-28 20:47:18', '2019-04-29 13:52:07', '0');
\ No newline at end of file

pom.xml

@@ -100,13 +100,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- fastjson -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.28</version>
-        </dependency>
-
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>transport</artifactId>
@@ -132,92 +125,17 @@
             <artifactId>poi</artifactId>
             <version>3.8</version>
         </dependency>
-        <!--log4j需要的2个包-->
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <!-- javacommonslogging到slf4j的动态转换-->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-        <!--slf4j和log4j的整合输出为log4j-->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-        <!--不管是javautillogging还是log4j都会接收过来-->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>4.2.4.RELEASE</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
         <!--json三种包-->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.8.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.9.1</version>
-        </dependency>
-        <!-- jsp/servlet/jstl的jar包 -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>3.0-alpha-1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- 数据库驱动 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.38</version>
-        </dependency>
-        <!-- 数据库连接池：druid -->
+        <!-- fastjson -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.0.18</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.28</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmDdjgl.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -18,7 +20,7 @@ import java.time.LocalDateTime;
 @TableName("t_zhjc_xmjc_ztxm_ddjgl")
 @EqualsAndHashCode(callSuper = true)
 public class ZhjcXmjcZtxmDdjgl extends Model<ZhjcXmjcZtxmDdjgl> {
-private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
@@ -118,4 +120,11 @@ private static final long serialVersionUID = 1L;
      */
     private String gydw;
 
+    /**
+     * 坐标
+     */
+    @TableField(exist = false)
+    private String shape;
+
+
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmDtl.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -73,5 +74,10 @@ private static final long serialVersionUID = 1L;
    * 重复路止点桩号
    */
   private String cfldZdzh;
+  /**
+   * 坐标数据
+   */
+  @TableField(exist = false)
+  private String shape;
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmWq.java

 package com.elephant.framework.galaxy.aroad.module.zhjc.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -94,4 +95,10 @@ private static final long serialVersionUID = 1L;
    */
   private String gzcs;
 
+  /**
+   * 坐标
+   */
+  @TableField(exist = false)
+  private String shape;
+
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgDckhRwController.java

@@ -11,6 +11,7 @@ import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFf;
 import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwFfService;
 import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwService;
 import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.security.entity.GalaxyUser;
 import com.elephant.framework.galaxy.aroad.util.SecurityUtils;
 import lombok.AllArgsConstructor;
 import org.apache.poi.ss.formula.functions.T;
@@ -72,7 +73,7 @@ public class ZhjgDckhRwController extends BaseController {
      */
     @GetMapping("/db/page")
     public R getZhjgDckhRwDbPage(Page page, ZhjgDckhRw zhjgDckhRw) {
-//    GalaxyUser galaxyUser = SecurityUtils.getUser();
+     GalaxyUser galaxyUser = SecurityUtils.getUser();
 //    IloginDeptId = galaxyUser.getDeptId();
 //    zhjgDckhRw.setCydw(String.valueOf(deptId));
         zhjgDckhRw.setRwzt("1");

src/main/resources/application-prod.yml

+server:
+  port: 9997
 spring:
+  mvc:
+    static-path-pattern: /images/*
+  resources:
+    static-locations: classpath:images/
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 100MB # 最大支持文件大小
+      max-request-size: 300MB # 最大支持请求大小
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://galaxy-aroad:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://127.0.0.1:3304/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
     username: root
     password: root
+  cache:
+    type: redis
+  redis:
+    database: 1
+    host: 127.0.0.1
+    port: 6379
+    password:
+    timeout: 30000
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1ms
+        min-idle: 0
+        max-idle: 8
+    lettuce:
+      pool:
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1ms
+        max-active: 8
+      shutdown-timeout: 100ms
+
 mybatis-plus:
   mapper-locations: classpath:/mapper/*/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+prop:
+  upload-folder: E:\file
\ No newline at end of file

src/main/resources/mapper/zhjc/ZhjcXmjcZtxmDdjglMapper.xml

@@ -32,8 +32,12 @@
   </resultMap>
 
       <select id="getList" resultMap="zhjcXmjcZtxmDdjglMap">
-            select *
+            select ddj.*,shape.shape
             from t_zhjc_xmjc_ztxm_ddjgl ddj
+            LEFT JOIN
+            t_zhjc_xmjc_ztxm_ddjgl_shape shape
+            on
+            ddj.lxbh = shape.lxbm and ddj.qdzh =shape.qdzh and ddj.zdzh = shape.zdzh
             <where>
                   <if test="wr.year !=null">
                         ddj.year  =#{wr.year}

src/main/resources/mapper/zhjc/ZhjcXmjcZtxmDtlMapper.xml

@@ -18,14 +18,20 @@
         <result property="cfldbh" column="cfldbh"/>
         <result property="cfldQdzh" column="cfld_qdzh"/>
         <result property="cfldZdzh" column="cfld_zdzh"/>
+
   </resultMap>
       <select id="getList" resultMap="zhjcXmjcZtxmDtlMap">
-            select *
+          select  dtl.*,shape.shape
           from t_zhjc_xmjc_ztxm_dtl dtl
+          LEFT JOIN
+          t_zhjc_xmjc_ztxm_dtl_shape shape
+          on
+          dtl.lxmc = shape.lxmc and dtl.qdzh =shape.qdzh and dtl.zdzh = shape.zdzh
             <where>
                 <if test="wr.year !=null">
                     dtl.year  =#{wr.year}
                 </if>
             </where>
+            order by dtl.id
       </select>
 </mapper>

src/main/resources/mapper/zhjc/ZhjcXmjcZtxmWqMapper.xml

@@ -26,8 +26,12 @@
   </resultMap>
 
       <select id="getList" resultMap="zhjcXmjcZtxmWqMap">
-            select *
+            select wq.*,shape.shape
             from t_zhjc_xmjc_ztxm_wq wq
+            LEFT JOIN
+            t_zhjc_xmjc_ztxm_wq_shape shape
+            on
+            wq.qldm =shape.qldm
             <where>
                   <if test="wr.year !=null">
                         wq.year  =#{wr.year}