【BUG】增加字段

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebRecordVo.java

@@ -37,4 +37,11 @@ public class JcebRecordVo implements Serializable {
   @ApiModelProperty(value = "记录日期/操作日期")
   @JsonFormat(pattern = "yyyy-MM-dd")
   private Date operationDate;
+
+  /**
+   * 地面磁感应器编号
+   */
+  @ApiModelProperty(value = "地面磁感应器编号")
+  private String gyqNumber;
+
 }

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

@@ -213,17 +213,14 @@
 
 
   <select id="getInfo" resultMap="BaseResultMap">
-    SELECT
-    DISTINCT
+    SELECT DISTINCT
     v.dept_id, v.dept_name,
     v.line_id, v.line_name,
     v.station_name, v.station_id,
     t.*
     FROM bus_jceb_lbjghjl t
     LEFT JOIN v_station v ON t.dept_station_id = v.dept_station_id
-    WHERE
-    t.del_flag = '0'
-    AND s.del_flag = '0'
+    WHERE t.del_flag = '0'
     AND t.id = #{id}
   </select>
 

railway-framework/src/main/java/com/railway/framework/aspectj/LogAspect.java

@@ -20,6 +20,7 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,12 +39,20 @@ public class LogAspect {
 
   private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
 
+  /**
+   * 定义默认切入点
+   */
+  @Pointcut(value = "execution(* com.railway..*.controller..*.*(..))")
+  private void controllerMethod() {
+  }
+
   /**
    * 处理完请求后执行
    *
    * @param joinPoint 切点
    */
-  @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
+  @AfterReturning(value = "controllerMethod()",
+      pointcut = "@annotation(controllerLog)", returning = "jsonResult")
   public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) {
     handleLog(joinPoint, controllerLog, null, jsonResult);
   }