Merge branch 'master' of http://git.iamsee.com/dunbai/railway

.drone_prod.yml

@@ -0,0 +1,72 @@
+kind: pipeline
+name: default
+type:
+steps:
+  - name: build
+    image: maven:3.8.1-openjdk-8
+    volumes:
+      - name: cache # The Volume's name
+        path: /root/.m2 # The path in the container
+    commands:
+      #- mvn help:effective-settings # check maven
+      - ls -hl /root/.m2/
+      - mvn -version
+      - java -version
+      - mvn help:effective-settings
+      - mvn clean package -DskipTests
+      - pwd
+
+      - ls -hl
+      - ls -hl railway-admin
+      - ls -hl railway-admin/target
+      #- name: docker
+      #  image: plugins/docker
+      #  volumes:
+      #    - name: dockersock
+      #      path: /var/run/docker.sock
+      ##  settings:
+      #    username: iamsee
+      #    password: zhuotong
+      #        from_secret: zhuotong
+      #    debug: true
+      #      launch_debug: true
+      #insecure: true
+      #    mirror: https://mgjrzxtn.mirror.aliyuncs.com
+      #    #registry: 192.168.1.100:10000
+      #    repo: iamsee/railway-admin
+      #      purge: true
+  #    tags:
+  #      - ${DRONE_COMMIT_SHA:1.0.0}
+  #      - ${DRONE_COMMIT}
+  #      - v1
+  #      - latest
+  - name: scp_files
+    image: appleboy/drone-scp
+    settings:
+      host: 182.92.65.152
+      username: root
+      password: Swsc2021!bd
+      debug: true
+      target: /www/wwwroot/api.svstrong.com/release
+      source: railway-admin/target/railway-admin.jar
+      rm: true
+  - name: deploy
+    image:  appleboy/drone-ssh
+    settings:
+      host: 182.92.65.152
+      username: root
+      password: Swsc2021!bd
+      debug: true
+      script:
+        - export PATH=/usr/local/bin:$PATH
+        - echo $PATH
+        - pkill -9 java
+        - nohup java -jar /www/wwwroot/api.svstrong.com/release/railway-admin/target/railway-admin.jar --spring.profiles.active=prod > /www/wwwroot/api.svstrong.com/out.log 2>&1 &
+volumes:
+  - name: cache # The name use in this pipeline,
+    host:
+      path: /tmp/cache # The path be used in the host.
+  - name: dockersock
+    host:
+      path: /var/run/docker.sock
+      

README.md

@@ -5,4 +5,5 @@ http://drone.iamsee.com/dunbai/railway  登录账户为自己的git账户
 http://railway.iamsee.com/
 
 项目运行日志地址在服务器
-/www/wwwroot/railway.iamsee.com/out.log
+/www/wwwroot/railway.iamsee.com/out.log
+

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java

@@ -109,28 +109,46 @@ public class BusJcbFdfxjyqController extends BaseController {
 
     @ApiOperation(value = "提交")
     @PutMapping("/submit")
-    public AjaxResult submit(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
+    public AjaxResult submit(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) throws Exception {
         busJcbFdfxjyq.setUpdateBy(getUsername());
+        //将文件转成base64
+        if(busJcbFdfxjyq.getPicUrl()!=null&&!"".equals(busJcbFdfxjyq.getPicUrl())){
+            MultipartFile multipartFile = BASE64DecodedMultipartFile.base64ToMultipart(busJcbFdfxjyq.getPicUrl());
+            String path = sysFileService.uploadFile(multipartFile);
+            busJcbFdfxjyq.setPicUrl(path);
+        }
         return toAjax(busJcbFdfxjyqService.submit(busJcbFdfxjyq));
     }
 
     @ApiOperation(value = "退回")
     @PutMapping("/reject")
-    public AjaxResult reject(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
+    public AjaxResult reject(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) throws Exception {
         busJcbFdfxjyq.setUpdateBy(getUsername());
+        //将文件转成base64
+        if(busJcbFdfxjyq.getPicUrl()!=null&&!"".equals(busJcbFdfxjyq.getPicUrl())){
+            MultipartFile multipartFile = BASE64DecodedMultipartFile.base64ToMultipart(busJcbFdfxjyq.getPicUrl());
+            String path = sysFileService.uploadFile(multipartFile);
+            busJcbFdfxjyq.setPicUrl(path);
+        }
         return toAjax(busJcbFdfxjyqService.reject(busJcbFdfxjyq));
     }
 
     @ApiOperation(value = "确认")
     @PutMapping("/confirm")
-    public AjaxResult confirm(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
+    public AjaxResult confirm(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) throws Exception {
         busJcbFdfxjyq.setUpdateBy(getUsername());
+        //将文件转成base64
+        if(busJcbFdfxjyq.getPicUrl()!=null&&!"".equals(busJcbFdfxjyq.getPicUrl())){
+            MultipartFile multipartFile = BASE64DecodedMultipartFile.base64ToMultipart(busJcbFdfxjyq.getPicUrl());
+            String path = sysFileService.uploadFile(multipartFile);
+            busJcbFdfxjyq.setPicUrl(path);
+        }
         return toAjax(busJcbFdfxjyqService.confirm(busJcbFdfxjyq));
     }
 
     @ApiOperation(value = "导出")
     @GetMapping("/export")
-    public AjaxResult export(@RequestParam String id) {
+    public AjaxResult export(@RequestParam String id) throws InterruptedException {
         //获取基础数据
         BusJcbFdfxjyq info = busJcbFdfxjyqService.getInfo(id);
         WordUtils wordUtil=new WordUtils();
@@ -158,13 +176,16 @@ public class BusJcbFdfxjyqController extends BaseController {
         params.put("${xlfdFdsxlqj}", info.getXlfdFdsxlqj().toString());
         params.put("${xlfdFdczxlqj}", info.getXlfdFdczxlqj().toString());
         params.put("${sdgjcztSddg}", StringUtils.yesOrNo(info.getSdgjcztSddg()));
-        params.put("${qrr}", info.getConfirmUser());
+        params.put("${confirmUser}", info.getConfirmUser()==null?"":info.getConfirmUser());
+        params.put("${czwt}", info.getCzwt());
         //填充图片信息
         Map<String,Object> header = new HashMap<>();
         header.put("width", 450);
         header.put("height", 110);
         header.put("type", "jpg");
         InputStream inputStream = HttpUtils.sendGetStream(info.getPicUrl(), "");
+        //解决网络传输造成流读取不全问题
+        Thread.sleep(200);
         header.put("content", WordUtils.inputStream2ByteArray(inputStream, true));
         params.put("${header}",header);
 

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -117,9 +117,9 @@ public class BusJcbGlkgController extends BaseController {
         WordUtils wordUtil = new WordUtils();
         //填充变量
         Map<String, Object> params = new HashMap<>();
-        params.put("${kgh}", info.getKgbh());
-        params.put("${qj}", info.getStationName());
-        params.put("${wd}", info.getTemperature());
+        params.put("${kgh}", info.getKgbh() == null ? "" : info.getKgbh());
+        params.put("${qj}", info.getStationName() == null ? "" : info.getStationName());
+        params.put("${wd}", info.getTemperature() == null ? "" : info.getTemperature());
         params.put("${jcrq}", DateUtils.parseCheckDate(info.getCheckDate()));
         params.put("${jgxA}", StringUtils.yesOrNo(info.getJgxA()));
         params.put("${jgxB}", StringUtils.yesOrNo(info.getJgxB()));
@@ -151,9 +151,9 @@ public class BusJcbGlkgController extends BaseController {
         params.put("${kgjgxjdztA}", StringUtils.yesOrNo(info.getKgjgxjdztA()));
         params.put("${kgjgxjdztDzz}", StringUtils.getSlash(info.getKgjgxjdztDzz()));
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
-        params.put("${jcr}", info.getCheckUser());
-        params.put("${qrr}", info.getConfirmUser());
-        params.put("${czwt}", info.getCzwt());
+        params.put("${jcr}", info.getCheckUser() == null ? "" : info.getCheckUser());
+        params.put("${qrr}", info.getConfirmUser() == null ? "" : info.getConfirmUser());
+        params.put("${czwt}", info.getCzwt() == null ? "" : info.getCzwt());
 
         //生成word文件的文件名
         String fileName = "隔离开关手册.docx";

railway-admin/src/main/resources/application-dev.yml

@@ -132,6 +132,8 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+  jackson:
+    time-zone: GMT+8
 
 # token配置
 token:

railway-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,188 @@
+# 项目相关配置
+railway:
+  # 名称
+  name: Railway
+  # 版本
+  version: 1.0.0
+  # 版权年份
+  copyrightYear: 2021
+  # 实例演示开关
+  demoEnabled: true
+  # 获取ip地址开关
+  addressEnabled: false
+  # 验证码类型 math 数组计算 char 字符验证
+  captchaType: math
+  # 本地文件上传文件路径 示例（ Windows配置D:/railway/uploadPath，Linux配置 /home/railway/uploadPath）
+  filePath: /mnt/railway/uploadPath
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为80
+  port: 2021
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # tomcat最大线程数，默认为200
+    max-threads: 800
+    # Tomcat启动初始化的线程数，默认值25
+    min-spare-threads: 30
+
+# 日志配置
+logging:
+  level:
+    com.railway: debug
+    org.springframework: warn
+
+# Spring配置
+spring:
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  # 文件上传
+  servlet:
+    multipart:
+      # 单个文件大小
+      max-file-size: 10MB
+      # 设置总上传的文件大小
+      max-request-size: 20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 127.0.0.1
+    # 端口，默认为6379
+    port: 6380
+    # 数据库索引
+    database: 0
+    # 密码
+    password: '$jgkj001'
+    # 连接超时时间
+    timeout: 100s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+  # 数据源配置
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://localhost:3306/railway?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: railway
+        password: 'F8b3LDBaBe5KeTSS'
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: railway
+        login-password: F8b3LDBaBe5KeTSS
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+
+# token配置
+token:
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认60分钟）（改为30天）
+  expireTime: 43200
+
+# MyBatis配置
+mybatis:
+  # 搜索指定包别名
+  typeAliasesPackage: com.railway.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*,/business/*
+
+# FastDFS配置
+fdfs:
+  domain: http://30.129.231.12
+  soTimeout: 3000
+  connectTimeout: 2000
+  trackerList: 30.129.231.12:22122
+
+# Minio配置
+minio:
+  url: http://30.129.231.12:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+  bucketName: test

railway-business/src/main/java/com/railway/business/baseinfo/domain/BasePreventFlood.java

@@ -1,5 +1,6 @@
 package com.railway.business.baseinfo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,6 +36,7 @@ public class BasePreventFlood extends BaseEntity{
     private String deptName;
 
     @ApiModelProperty(value = "填写日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date fillDate;
 
     @ApiModelProperty(value = "填写人")

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusBlq.java

@@ -1,5 +1,6 @@
 package com.railway.business.baseinfo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +73,7 @@ public class BusBlq extends BaseEntity{
     private String sccj;
 
     @ApiModelProperty(value = "投运日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date tyrq;
 
     @ApiModelProperty(value = "避雷器类型")
@@ -91,6 +93,7 @@ public class BusBlq extends BaseEntity{
     private String mdh;
 
     @ApiModelProperty(value = "脱离器投运日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date tlqtyrq;
 
     @ApiModelProperty(value = "脱离器状态")
@@ -102,6 +105,7 @@ public class BusBlq extends BaseEntity{
     private String sbxjzt;
 
     @ApiModelProperty(value = "预防性试验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date yfxsyrq;
 
     @ApiModelProperty(value = "引线距接地体最小距离（mm） -t线(1)")

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusFdfxjyq.java

@@ -1,5 +1,6 @@
 package com.railway.business.baseinfo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -84,9 +85,11 @@ public class BusFdfxjyq extends BaseEntity{
     private String sccj;
 
     @ApiModelProperty(value = "出厂日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ccrq;
 
     @ApiModelProperty(value = "投运日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date tyrq;
 
     @ApiModelProperty(value = "使用寿命（年）")

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusZzdzxx.java

@@ -1,5 +1,6 @@
 package com.railway.business.baseinfo.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -152,9 +153,11 @@ public class BusZzdzxx extends BaseEntity{
     private String sccj;
 
     @ApiModelProperty(value = "投运日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date tyrq;
 
     @ApiModelProperty(value = "出厂日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date ccrq;
 
     @ApiModelProperty(value = "设计寿命（年）")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebXsjcjl.java

@@ -1,5 +1,6 @@
 package com.railway.business.catenary.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
@@ -31,6 +32,7 @@ public class BusJcebXsjcjl extends BusJceb{
     private String qxdj;
 
     @ApiModelProperty(value = "要求完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date yqwcsj;
 
     @ApiModelProperty(value = "处理措施 0紧固 1更换")
@@ -50,6 +52,7 @@ public class BusJcebXsjcjl extends BusJceb{
     private String clqxczz;
 
     @ApiModelProperty(value = "处理日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date clrq;
 
     @ApiModelProperty(value = "用户id")

railway-business/src/main/java/com/railway/business/safetool/domain/BaseSafetyTool.java

@@ -1,5 +1,6 @@
 package com.railway.business.safetool.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.railway.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -56,9 +57,11 @@ public class BaseSafetyTool extends BaseEntity{
     private String testCycleText;
 
     @ApiModelProperty(value = "上次试验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date lastTestDate;
 
     @ApiModelProperty(value = "下次试验日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date nextTestDate;
 
     @ApiModelProperty(value = "试验结果(0:失败1：成功)")
@@ -66,6 +69,7 @@ public class BaseSafetyTool extends BaseEntity{
     private String testResult;
 
     @ApiModelProperty(value = "实际试验时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date testDate;
 
     @ApiModelProperty(value = "试验结果描述")
@@ -81,6 +85,7 @@ public class BaseSafetyTool extends BaseEntity{
     private String scrapReason;
 
     @ApiModelProperty(value = "报废时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date scrapDate;
 
     @ApiModelProperty(value = "报废操作人")
@@ -92,6 +97,7 @@ public class BaseSafetyTool extends BaseEntity{
     private String produceFactory;
 
     @ApiModelProperty(value = "生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date produceDate;
 
     @ApiModelProperty(value = "del_flag")

railway-business/src/main/java/com/railway/business/safetool/domain/SecScheduledTool.java

@@ -5,10 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-
 import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotNull;
 /**
  * 安全计划和工具关系表
  * @author lijie 2021-12-04
@@ -31,17 +28,6 @@ public class SecScheduledTool extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
-    @ApiModelProperty(value = "create_by")
-    @Length(min = 1, max = 64, message = "【create_by】长度必须介于 {min} 和 {max} 之间")
-    private String createBy;
-
-    @ApiModelProperty(value = "update_by")
-    @Length(min = 1, max = 64, message = "【update_by】长度必须介于 {min} 和 {max} 之间")
-    private String updateBy;
-
-    @ApiModelProperty(value = "update_time")
-    private Date updateTime;
-
     public SecScheduledTool() {
     }
 

railway-business/src/main/resources/mapper/baseinfo/BaseStationMapper.xml

@@ -160,7 +160,7 @@
         and  t.line_id=#{lineId}
       </if>
       <if test="stationName!=null and stationName!=''">
-        and  t.station_name=#{stationName}
+        and  t.station_name like concat('%', #{stationName}, '%')
       </if>
       <if test="stationType!=null and stationType!=''">
         and  t.station_type=#{stationType}
@@ -189,7 +189,7 @@
         and  t.line_id=#{lineId}
       </if>
       <if test="stationName!=null and stationName!=''">
-        and  t.station_name=#{stationName}
+        and  t.station_name like concat('%', #{stationName}, '%')
       </if>
       <if test="stationType!=null and stationType!=''">
         and  t.station_type=#{stationType}

railway-business/src/main/resources/mapper/baseinfo/BaseSubstationMapper.xml

@@ -198,19 +198,19 @@
         and t.dept_id=#{deptId}
       </if>
       <if test="deptName!=null and deptName!=''">
-        and v.dept_name=#{deptName}
+        and v.dept_name like concat('%', #{deptName}, '%')
       </if>
       <if test="lineId!=null and lineId!=''">
         and t.line_id=#{lineId}
       </if>
       <if test="lineName!=null and lineName!=''">
-        and v.line_name=#{lineName}
+        and v.line_name like concat('%', #{lineName}, '%')
       </if>
       <if test="workArea!=null and workArea!=''">
         and t.work_area=#{workArea}
       </if>
       <if test="substationName!=null and substationName!=''">
-        and t.substation_name=#{substationName}
+        and t.substation_name like concat('%', #{substationName}, '%')
       </if>
       <if test="orderNum!=null and orderNum!=''">
         and t.order_num=#{orderNum}

railway-business/src/main/resources/mapper/baseinfo/BusBlqMapper.xml

@@ -723,9 +723,6 @@
       <if test="dydj!=null and dydj!=''">
         and t.dydj=#{dydj}
       </if>
-      <if test="remark!=null and remark!=''">
-        and t.remark=#{remark}
-      </if>
       <if test="sccj!=null and sccj!=''">
         and t.sccj=#{sccj}
       </if>

railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml

@@ -8,7 +8,7 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="dept_station_id" property="deptStationId"/>
-    <result column="pillarStart" property="pillarStart"/>
+    <result column="pillar_start" property="pillarStart"/>
     <result column="pillar_end" property="pillarEnd"/>
     <result column="operation_date" property="operationDate"/>
     <result column="lmdjcspjl_zhz1" property="lmdjcspjlZhz1"/>