Prechádzať zdrojové kódy

【CHG】统一部分常见字段和表名

ZhaoMn 4 rokov pred
rodič
commit
d9dacd12e9
32 zmenil súbory, kde vykonal 435 pridanie a 310 odobranie
  1. 11 2
      railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusDmcgyqServiceImpl.java
  2. 11 3
      railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusFdfxjyqServiceImpl.java
  3. 8 5
      railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusFjxgmdServiceImpl.java
  4. 9 7
      railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusGlkgServiceImpl.java
  5. 60 50
      railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusJcxcServiceImpl.java
  6. 60 50
      railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusSdtzServiceImpl.java
  7. 11 3
      railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusWjcxcServiceImpl.java
  8. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbBlqService.java
  9. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbFdfxjyqService.java
  10. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbGlkgService.java
  11. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebGjsfxService.java
  12. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebJddzService.java
  13. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebJyzqsjlService.java
  14. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebLbjghjlService.java
  15. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebQmjcjlService.java
  16. 3 3
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebXsjcjlService.java
  17. 9 6
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java
  18. 16 3
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java
  19. 10 9
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java
  20. 9 7
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java
  21. 6 3
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbJcxcServiceImpl.java
  22. 15 5
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java
  23. 14 6
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebGjsfxServiceImpl.java
  24. 92 86
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJddzServiceImpl.java
  25. 14 9
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJyzqsjlServiceImpl.java
  26. 6 3
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebLbjghjlServiceImpl.java
  27. 9 6
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebQmjcjlServiceImpl.java
  28. 14 6
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebXsjcjlServiceImpl.java
  29. 8 5
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJlgzServiceImpl.java
  30. 5 3
      railway-framework/src/main/java/com/railway/framework/config/MyBatisConfig.java
  31. 5 3
      railway-framework/src/main/java/com/railway/framework/interceptor/impl/SameUrlDataInterceptor.java
  32. 6 3
      railway-generator/src/main/java/com/railway/generator/controller/IndexController.java

+ 11 - 2
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusDmcgyqServiceImpl.java

@@ -17,12 +17,17 @@ import java.util.Date;
 @Service
 @Transactional(readOnly = true)
 public class BusDmcgyqServiceImpl implements IBusDmcgyqService{
-@Autowired
-private BusDmcgyqMapper busDmcgyqMapper;
+
+	private final BusDmcgyqMapper busDmcgyqMapper;
+
+	public BusDmcgyqServiceImpl(BusDmcgyqMapper busDmcgyqMapper) {
+		this.busDmcgyqMapper = busDmcgyqMapper;
+	}
 
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusDmcgyq busDmcgyq) {
 	    busDmcgyq.setCreateTime(new Date());
@@ -33,6 +38,7 @@ private BusDmcgyqMapper busDmcgyqMapper;
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -46,6 +52,7 @@ private BusDmcgyqMapper busDmcgyqMapper;
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusDmcgyq busDmcgyq) {
 		busDmcgyq.setUpdateTime(new Date());
@@ -56,6 +63,7 @@ private BusDmcgyqMapper busDmcgyqMapper;
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusDmcgyq getInfo(String id) {
 		return busDmcgyqMapper.getInfo(id);
 	}
@@ -63,6 +71,7 @@ private BusDmcgyqMapper busDmcgyqMapper;
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusDmcgyq> getList(BusDmcgyq busDmcgyq) {
 		return busDmcgyqMapper.getList(busDmcgyq);
 	}

+ 11 - 3
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusFdfxjyqServiceImpl.java

@@ -3,7 +3,6 @@ package com.railway.business.baseinfo.service.impl;
 import com.railway.business.baseinfo.mapper.BusFdfxjyqMapper;
 import com.railway.business.baseinfo.domain.BusFdfxjyq;
 import com.railway.business.baseinfo.service.IBusFdfxjyqService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
@@ -15,12 +14,17 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusFdfxjyqServiceImpl implements IBusFdfxjyqService{
-@Autowired
-private BusFdfxjyqMapper busFdfxjyqMapper;
+
+	private final BusFdfxjyqMapper busFdfxjyqMapper;
+
+	public BusFdfxjyqServiceImpl(BusFdfxjyqMapper busFdfxjyqMapper) {
+		this.busFdfxjyqMapper = busFdfxjyqMapper;
+	}
 
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusFdfxjyq busFdfxjyq) {
 		return busFdfxjyqMapper.insert(busFdfxjyq);
@@ -29,6 +33,7 @@ private BusFdfxjyqMapper busFdfxjyqMapper;
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -42,6 +47,7 @@ private BusFdfxjyqMapper busFdfxjyqMapper;
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusFdfxjyq busFdfxjyq) {
 		return busFdfxjyqMapper.update(busFdfxjyq);
@@ -50,6 +56,7 @@ private BusFdfxjyqMapper busFdfxjyqMapper;
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusFdfxjyq getInfo(String id) {
 		return busFdfxjyqMapper.getInfo(id);
 	}
@@ -57,6 +64,7 @@ private BusFdfxjyqMapper busFdfxjyqMapper;
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusFdfxjyq> getList(BusFdfxjyq busFdfxjyq) {
 		return busFdfxjyqMapper.getList(busFdfxjyq);
 	}

+ 8 - 5
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusFjxgmdServiceImpl.java

@@ -5,7 +5,6 @@ import com.railway.common.enums.DelFlagEnum;
 import com.railway.business.baseinfo.mapper.BusFjxgmdMapper;
 import com.railway.business.baseinfo.service.IBusFjxgmdService;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,8 +18,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusFjxgmdServiceImpl implements IBusFjxgmdService{
-    @Autowired
-    private BusFjxgmdMapper busFjxgmdMapper;
+
+    private final BusFjxgmdMapper busFjxgmdMapper;
+
+    public BusFjxgmdServiceImpl(BusFjxgmdMapper busFjxgmdMapper) {
+        this.busFjxgmdMapper = busFjxgmdMapper;
+    }
 
     /**
      * 新增
@@ -77,8 +80,8 @@ public class BusFjxgmdServiceImpl implements IBusFjxgmdService{
 
     /**
      * 通过支柱信息获取对锚列表
-     * @param busFjxgmd
-     * @return
+     * @param busFjxgmd 支柱信息
+     * @return 对锚列表
      */
     @Override
     public List<BusFjxgmd> getListByZz(BusFjxgmd busFjxgmd) {

+ 9 - 7
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusGlkgServiceImpl.java

@@ -1,16 +1,14 @@
 package com.railway.business.baseinfo.service.impl;
 
 import com.railway.business.baseinfo.domain.BusGlkg;
-import com.railway.common.enums.DelFlagEnum;
 import com.railway.business.baseinfo.mapper.BusGlkgMapper;
 import com.railway.business.baseinfo.service.IBusGlkgService;
+import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.util.Date;
 import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 /**
 * 基础数据-检查表-隔离开关
 * @author author
@@ -19,8 +17,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusGlkgServiceImpl implements IBusGlkgService{
-@Autowired
-private BusGlkgMapper busGlkgMapper;
+
+	private final BusGlkgMapper busGlkgMapper;
+
+	public BusGlkgServiceImpl(BusGlkgMapper busGlkgMapper) {
+		this.busGlkgMapper = busGlkgMapper;
+	}
 
 	/**
 	* 新增

+ 60 - 50
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusJcxcServiceImpl.java

@@ -3,67 +3,77 @@ package com.railway.business.baseinfo.service.impl;
 import com.railway.business.baseinfo.mapper.BusJcxcMapper;
 import com.railway.business.baseinfo.domain.BusJcxc;
 import com.railway.business.baseinfo.service.IBusJcxcService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 import java.util.Date;
+
 /**
-* 基础数据-交叉线岔
-* @author zcf
-* @date 2021/10/26
-*/
+ * 基础数据-交叉线岔
+ *
+ * @author zcf
+ * @date 2021/10/26
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusJcxcServiceImpl implements IBusJcxcService{
-@Autowired
-private BusJcxcMapper busJcxcMapper;
+public class BusJcxcServiceImpl implements IBusJcxcService {
+
+  private final BusJcxcMapper busJcxcMapper;
+
+  public BusJcxcServiceImpl(BusJcxcMapper busJcxcMapper) {
+    this.busJcxcMapper = busJcxcMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcxc busJcxc) {
-	    busJcxc.setCreateTime(new Date());
-        busJcxc.setCreateBy(SecurityUtils.getUsername());
-		return busJcxcMapper.insert(busJcxc);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcxc busJcxc) {
+    busJcxc.setCreateTime(new Date());
+    busJcxc.setCreateBy(SecurityUtils.getUsername());
+    return busJcxcMapper.insert(busJcxc);
+  }
 
-	/**
-	* 删除
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcxcMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcxcMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcxc busJcxc) {
-		busJcxc.setUpdateTime(new Date());
-    	busJcxc.setUpdateBy(SecurityUtils.getUsername());
-		return busJcxcMapper.update(busJcxc);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcxc busJcxc) {
+    busJcxc.setUpdateTime(new Date());
+    busJcxc.setUpdateBy(SecurityUtils.getUsername());
+    return busJcxcMapper.update(busJcxc);
+  }
 
-	/**
-	* 获取单个
-	*/
-	public BusJcxc getInfo(String id) {
-		return busJcxcMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcxc getInfo(String id) {
+    return busJcxcMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	public List<BusJcxc> getList(BusJcxc busJcxc) {
-		return busJcxcMapper.getList(busJcxc);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcxc> getList(BusJcxc busJcxc) {
+    return busJcxcMapper.getList(busJcxc);
+  }
 }

+ 60 - 50
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusSdtzServiceImpl.java

@@ -3,67 +3,77 @@ package com.railway.business.baseinfo.service.impl;
 import com.railway.business.baseinfo.mapper.BusSdtzMapper;
 import com.railway.business.baseinfo.domain.BusSdtz;
 import com.railway.business.baseinfo.service.IBusSdtzService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 import java.util.Date;
+
 /**
-* 智能查询-隧道台账
-* @author wuhonghao
-* @date 2021/10/26
-*/
+ * 智能查询-隧道台账
+ *
+ * @author wuhonghao
+ * @date 2021/10/26
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusSdtzServiceImpl implements IBusSdtzService{
-@Autowired
-private BusSdtzMapper busSdtzMapper;
+public class BusSdtzServiceImpl implements IBusSdtzService {
+
+  private final BusSdtzMapper busSdtzMapper;
+
+  public BusSdtzServiceImpl(BusSdtzMapper busSdtzMapper) {
+    this.busSdtzMapper = busSdtzMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusSdtz busSdtz) {
-	    busSdtz.setCreateTime(new Date());
-        busSdtz.setCreateBy(SecurityUtils.getUsername());
-		return busSdtzMapper.insert(busSdtz);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusSdtz busSdtz) {
+    busSdtz.setCreateTime(new Date());
+    busSdtz.setCreateBy(SecurityUtils.getUsername());
+    return busSdtzMapper.insert(busSdtz);
+  }
 
-	/**
-	* 删除
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busSdtzMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busSdtzMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusSdtz busSdtz) {
-		busSdtz.setUpdateTime(new Date());
-    	busSdtz.setUpdateBy(SecurityUtils.getUsername());
-		return busSdtzMapper.update(busSdtz);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusSdtz busSdtz) {
+    busSdtz.setUpdateTime(new Date());
+    busSdtz.setUpdateBy(SecurityUtils.getUsername());
+    return busSdtzMapper.update(busSdtz);
+  }
 
-	/**
-	* 获取单个
-	*/
-	public BusSdtz getInfo(String id) {
-		return busSdtzMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusSdtz getInfo(String id) {
+    return busSdtzMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	public List<BusSdtz> getList(BusSdtz busSdtz) {
-		return busSdtzMapper.getList(busSdtz);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusSdtz> getList(BusSdtz busSdtz) {
+    return busSdtzMapper.getList(busSdtz);
+  }
 }

+ 11 - 3
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusWjcxcServiceImpl.java

@@ -3,7 +3,6 @@ package com.railway.business.baseinfo.service.impl;
 import com.railway.business.baseinfo.mapper.BusWjcxcMapper;
 import com.railway.business.baseinfo.domain.BusWjcxc;
 import com.railway.business.baseinfo.service.IBusWjcxcService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,12 +16,17 @@ import java.util.Date;
 @Service
 @Transactional(readOnly = true)
 public class BusWjcxcServiceImpl implements IBusWjcxcService{
-@Autowired
-private BusWjcxcMapper busWjcxcMapper;
+
+	private final BusWjcxcMapper busWjcxcMapper;
+
+	public BusWjcxcServiceImpl(BusWjcxcMapper busWjcxcMapper) {
+		this.busWjcxcMapper = busWjcxcMapper;
+	}
 
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusWjcxc busWjcxc) {
 	    busWjcxc.setCreateTime(new Date());
@@ -33,6 +37,7 @@ private BusWjcxcMapper busWjcxcMapper;
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -46,6 +51,7 @@ private BusWjcxcMapper busWjcxcMapper;
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusWjcxc busWjcxc) {
 		busWjcxc.setUpdateTime(new Date());
@@ -56,6 +62,7 @@ private BusWjcxcMapper busWjcxcMapper;
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusWjcxc getInfo(String id) {
 		return busWjcxcMapper.getInfo(id);
 	}
@@ -63,6 +70,7 @@ private BusWjcxcMapper busWjcxcMapper;
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusWjcxc> getList(BusWjcxc busWjcxc) {
 		return busWjcxcMapper.getList(busWjcxc);
 	}

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbBlqService.java

@@ -44,21 +44,21 @@ public interface IBusJcbBlqService{
     /**
      * 提交
      * @param busJcbBlq
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcbBlq busJcbBlq);
 
     /**
      * 退回
      * @param busJcbBlq
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcbBlq busJcbBlq);
 
     /**
      * 确认
      * @param busJcbBlq
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcbBlq busJcbBlq);
 

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbFdfxjyqService.java

@@ -44,21 +44,21 @@ public interface IBusJcbFdfxjyqService{
     /**
      * 提交
      * @param busJcbFdfxjyq
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcbFdfxjyq busJcbFdfxjyq);
 
     /**
      * 退回
      * @param busJcbFdfxjyq
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcbFdfxjyq busJcbFdfxjyq);
 
     /**
      * 确认
      * @param busJcbFdfxjyq
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcbFdfxjyq busJcbFdfxjyq);
 

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbGlkgService.java

@@ -17,21 +17,21 @@ public interface IBusJcbGlkgService{
     /**
      * 提交
      * @param busJcbGlkg
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcbGlkg busJcbGlkg);
 
     /**
      * 退回
      * @param busJcbGlkg
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcbGlkg busJcbGlkg);
 
     /**
      * 确认
      * @param busJcbGlkg
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcbGlkg busJcbGlkg);
 

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebGjsfxService.java

@@ -38,21 +38,21 @@ public interface IBusJcebGjsfxService{
     /**
      * 提交
      * @param busJcebGjsfx
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcebGjsfx busJcebGjsfx);
 
     /**
      * 退回
      * @param busJcebGjsfx
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcebGjsfx busJcebGjsfx);
 
     /**
      * 确认
      * @param busJcebGjsfx
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcebGjsfx busJcebGjsfx);
 

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebJddzService.java

@@ -35,19 +35,19 @@ public interface IBusJcebJddzService{
 
     /**
      * 提交
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcebJddz busJcebJddz);
 
     /**
      * 退回
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcebJddz busJcebJddz);
 
     /**
      * 确认
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcebJddz busJcebJddz);
 

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebJyzqsjlService.java

@@ -38,21 +38,21 @@ public interface IBusJcebJyzqsjlService{
     /**
      * 提交
      * @param busJcebJyzqsjl
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcebJyzqsjl busJcebJyzqsjl);
 
     /**
      * 退回
      * @param busJcebJyzqsjl
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcebJyzqsjl busJcebJyzqsjl);
 
     /**
      * 确认
      * @param busJcebJyzqsjl
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcebJyzqsjl busJcebJyzqsjl);
 

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebLbjghjlService.java

@@ -38,21 +38,21 @@ public interface IBusJcebLbjghjlService {
     /**
      * 提交
      * @param busJcebLbjghjl
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcebLbjghjl busJcebLbjghjl);
 
     /**
      * 退回
      * @param busJcebLbjghjl
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcebLbjghjl busJcebLbjghjl);
 
     /**
      * 确认
      * @param busJcebLbjghjl
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcebLbjghjl busJcebLbjghjl);
 

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebQmjcjlService.java

@@ -38,21 +38,21 @@ public interface IBusJcebQmjcjlService {
     /**
      * 提交
      * @param busJcebQmjcjl
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcebQmjcjl busJcebQmjcjl);
 
     /**
      * 退回
      * @param busJcebQmjcjl
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcebQmjcjl busJcebQmjcjl);
 
     /**
      * 确认
      * @param busJcebQmjcjl
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcebQmjcjl busJcebQmjcjl);
 }

+ 3 - 3
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebXsjcjlService.java

@@ -36,19 +36,19 @@ public interface IBusJcebXsjcjlService{
 
     /**
      * 提交
-     * @return
+     * @return 提交结果
      */
     int submit(BusJcebXsjcjl busJcebXsjcjl);
 
     /**
      * 退回
-     * @return
+     * @return 退回结果
      */
     int reject(BusJcebXsjcjl busJcebXsjcjl);
 
     /**
      * 确认
-     * @return
+     * @return 确认结果
      */
     int confirm(BusJcebXsjcjl busJcebXsjcjl);
 }

+ 9 - 6
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java

@@ -8,7 +8,6 @@ import com.railway.business.catenary.service.IBusJcbBlqService;
 import com.railway.common.utils.SecurityUtils;
 import java.util.Date;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 /**
@@ -19,8 +18,12 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 @Transactional(readOnly = true)
 public class BusJcbBlqServiceImpl implements IBusJcbBlqService{
-@Autowired
-private BusJcbBlqMapper busJcbBlqMapper;
+
+	private final BusJcbBlqMapper busJcbBlqMapper;
+
+	public BusJcbBlqServiceImpl(BusJcbBlqMapper busJcbBlqMapper) {
+		this.busJcbBlqMapper = busJcbBlqMapper;
+	}
 
 	/**
 	* 新增
@@ -85,7 +88,7 @@ private BusJcbBlqMapper busJcbBlqMapper;
 	/**
 	 * 提交
 	 * @param busJcbBlq
-	 * @return
+	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -107,7 +110,7 @@ private BusJcbBlqMapper busJcbBlqMapper;
 	/**
 	 * 退回
 	 * @param busJcbBlq
-	 * @return
+	 * @return 退回结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -120,7 +123,7 @@ private BusJcbBlqMapper busJcbBlqMapper;
 	/**
 	 * 确认
 	 * @param busJcbBlq
-	 * @return
+	 * @return 确认结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)

+ 16 - 3
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java

@@ -5,7 +5,6 @@ import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbDmcgyqMapper;
 import com.railway.business.catenary.service.IBusJcbDmcgyqService;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,12 +18,18 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusJcbDmcgyqServiceImpl implements IBusJcbDmcgyqService{
-@Autowired
-private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
+
+	private final BusJcbDmcgyqMapper busJcbDmcgyqMapper;
+
+	public BusJcbDmcgyqServiceImpl(
+			BusJcbDmcgyqMapper busJcbDmcgyqMapper) {
+		this.busJcbDmcgyqMapper = busJcbDmcgyqMapper;
+	}
 
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusJcbDmcgyq busJcbDmcgyq) {
 		busJcbDmcgyq.setUserId(SecurityUtils.getUserId());
@@ -36,6 +41,7 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -49,6 +55,7 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusJcbDmcgyq busJcbDmcgyq) {
 		busJcbDmcgyq.setUpdateTime(new Date());
@@ -59,6 +66,7 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusJcbDmcgyq getInfo(String id) {
 		return busJcbDmcgyqMapper.getInfo(id);
 	}
@@ -66,6 +74,7 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusJcbDmcgyq> getList(BusJcbDmcgyq busJcbDmcgyq) {
 		return busJcbDmcgyqMapper.getList(busJcbDmcgyq);
 	}
@@ -73,6 +82,7 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	/**
 	 * 获取上次检查记录
 	 */
+	@Override
 	public BusJcbDmcgyq getLastRecord() {
 		return busJcbDmcgyqMapper.getLastRecord(SecurityUtils.getUserId());
 	}
@@ -80,6 +90,7 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	/**
 	 * 提交
 	 */
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcbDmcgyq busJcbDmcgyq) {
 		busJcbDmcgyq.setUpdateTime(new Date());
@@ -91,6 +102,7 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	/**
 	 * 退回
 	 */
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int reject(BusJcbDmcgyq busJcbDmcgyq) {
 		busJcbDmcgyq.setUpdateTime(new Date());
@@ -102,6 +114,7 @@ private BusJcbDmcgyqMapper busJcbDmcgyqMapper;
 	/**
 	 * 确认
 	 */
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int confirm(BusJcbDmcgyq busJcbDmcgyq) {
 		busJcbDmcgyq.setUpdateTime(new Date());

+ 10 - 9
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java

@@ -1,14 +1,10 @@
 package com.railway.business.catenary.service.impl;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.railway.business.catenary.domain.BusJcbGlkg;
 import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbFdfxjyqMapper;
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
 import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,8 +18,13 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusJcbFdfxjyqServiceImpl implements IBusJcbFdfxjyqService{
-@Autowired
-private BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
+
+	private final BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
+
+	public BusJcbFdfxjyqServiceImpl(
+			BusJcbFdfxjyqMapper busJcbFdfxjyqMapper) {
+		this.busJcbFdfxjyqMapper = busJcbFdfxjyqMapper;
+	}
 
 	/**
 	* 新增
@@ -88,7 +89,7 @@ private BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
 	/**
 	 * 提交
 	 * @param busJcbFdfxjyq
-	 * @return
+	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -109,7 +110,7 @@ private BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
 	/**
 	 * 退回
 	 * @param busJcbFdfxjyq
-	 * @return
+	 * @return 退回结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -122,7 +123,7 @@ private BusJcbFdfxjyqMapper busJcbFdfxjyqMapper;
 	/**
 	 * 确认
 	 * @param busJcbFdfxjyq
-	 * @return
+	 * @return 确认结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)

+ 9 - 7
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java

@@ -7,7 +7,6 @@ import com.railway.business.catenary.mapper.BusJcbGlkgMapper;
 import com.railway.business.catenary.service.IBusJcbGlkgService;
 import com.railway.common.utils.SecurityUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,8 +20,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusJcbGlkgServiceImpl implements IBusJcbGlkgService{
-@Autowired
-private BusJcbGlkgMapper busJcbGlkgMapper;
+
+	private final BusJcbGlkgMapper busJcbGlkgMapper;
+
+	public BusJcbGlkgServiceImpl(BusJcbGlkgMapper busJcbGlkgMapper) {
+		this.busJcbGlkgMapper = busJcbGlkgMapper;
+	}
 
 	/**
 	* 新增
@@ -30,7 +33,6 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusJcbGlkg busJcbGlkg) {
-		Long userID = SecurityUtils.getUserId();
 		busJcbGlkg.setCreateTime(new Date());
 		busJcbGlkg.setUpdateTime(new Date());
 		busJcbGlkg.setDelFlag(DelFlagEnum.NOT_DELETE.getCode());
@@ -44,7 +46,7 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	/**
 	 * 提交
 	 * @param busJcbGlkg
-	 * @return
+	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -57,7 +59,7 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	/**
 	 * 退回
 	 * @param busJcbGlkg
-	 * @return
+	 * @return 退回结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -70,7 +72,7 @@ private BusJcbGlkgMapper busJcbGlkgMapper;
 	/**
 	 * 确认
 	 * @param busJcbGlkg
-	 * @return
+	 * @return 确认结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)

+ 6 - 3
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbJcxcServiceImpl.java

@@ -5,7 +5,6 @@ import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbJcxcMapper;
 import com.railway.business.catenary.service.IBusJcbJcxcService;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,8 +18,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusJcbJcxcServiceImpl implements IBusJcbJcxcService{
-@Autowired
-private BusJcbJcxcMapper busJcbJcxcMapper;
+
+	private final BusJcbJcxcMapper busJcbJcxcMapper;
+
+	public BusJcbJcxcServiceImpl(BusJcbJcxcMapper busJcbJcxcMapper) {
+		this.busJcbJcxcMapper = busJcbJcxcMapper;
+	}
 
 	/**
 	* 新增

+ 15 - 5
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java

@@ -1,12 +1,9 @@
 package com.railway.business.catenary.service.impl;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
 import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbWjcxcMapper;
 import com.railway.business.catenary.domain.BusJcbWjcxc;
 import com.railway.business.catenary.service.IBusJcbWjcxcService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,12 +17,17 @@ import java.util.Date;
 @Service
 @Transactional(readOnly = true)
 public class BusJcbWjcxcServiceImpl implements IBusJcbWjcxcService{
-@Autowired
-private BusJcbWjcxcMapper busJcbWjcxcMapper;
+
+	private final BusJcbWjcxcMapper busJcbWjcxcMapper;
+
+	public BusJcbWjcxcServiceImpl(BusJcbWjcxcMapper busJcbWjcxcMapper) {
+		this.busJcbWjcxcMapper = busJcbWjcxcMapper;
+	}
 
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusJcbWjcxc busJcbWjcxc) {
 		busJcbWjcxc.setUserId(SecurityUtils.getUserId());
@@ -37,6 +39,7 @@ private BusJcbWjcxcMapper busJcbWjcxcMapper;
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -50,6 +53,7 @@ private BusJcbWjcxcMapper busJcbWjcxcMapper;
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusJcbWjcxc busJcbWjcxc) {
 		busJcbWjcxc.setUpdateTime(new Date());
@@ -60,6 +64,7 @@ private BusJcbWjcxcMapper busJcbWjcxcMapper;
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusJcbWjcxc getInfo(String id) {
 		return busJcbWjcxcMapper.getInfo(id);
 	}
@@ -67,6 +72,7 @@ private BusJcbWjcxcMapper busJcbWjcxcMapper;
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusJcbWjcxc> getList(BusJcbWjcxc busJcbWjcxc) {
 		return busJcbWjcxcMapper.getList(busJcbWjcxc);
 	}
@@ -74,6 +80,7 @@ private BusJcbWjcxcMapper busJcbWjcxcMapper;
 	/**
 	 * 获取上次检查记录
 	 */
+	@Override
 	public BusJcbWjcxc getLastRecord() {
 		return busJcbWjcxcMapper.getLastRecord(SecurityUtils.getUserId());
 	}
@@ -81,6 +88,7 @@ private BusJcbWjcxcMapper busJcbWjcxcMapper;
 	/**
 	 * 提交
 	 */
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int submit(BusJcbWjcxc busJcbWjcxc) {
 		busJcbWjcxc.setUpdateTime(new Date());
@@ -92,6 +100,7 @@ private BusJcbWjcxcMapper busJcbWjcxcMapper;
 	/**
 	 * 退回
 	 */
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int reject(BusJcbWjcxc busJcbWjcxc) {
 		busJcbWjcxc.setUpdateTime(new Date());
@@ -103,6 +112,7 @@ private BusJcbWjcxcMapper busJcbWjcxcMapper;
 	/**
 	 * 确认
 	 */
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int confirm(BusJcbWjcxc busJcbWjcxc) {
 		busJcbWjcxc.setUpdateTime(new Date());

+ 14 - 6
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebGjsfxServiceImpl.java

@@ -4,7 +4,6 @@ import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebGjsfxMapper;
 import com.railway.business.catenary.domain.BusJcebGjsfx;
 import com.railway.business.catenary.service.IBusJcebGjsfxService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -18,12 +17,17 @@ import java.util.Date;
 @Service
 @Transactional(readOnly = true)
 public class BusJcebGjsfxServiceImpl implements IBusJcebGjsfxService{
-@Autowired
-private BusJcebGjsfxMapper busJcebGjsfxMapper;
+
+	private final BusJcebGjsfxMapper busJcebGjsfxMapper;
+
+	public BusJcebGjsfxServiceImpl(BusJcebGjsfxMapper busJcebGjsfxMapper) {
+		this.busJcebGjsfxMapper = busJcebGjsfxMapper;
+	}
 
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusJcebGjsfx busJcebGjsfx) {
 	    busJcebGjsfx.setCreateTime(new Date());
@@ -34,6 +38,7 @@ private BusJcebGjsfxMapper busJcebGjsfxMapper;
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -47,6 +52,7 @@ private BusJcebGjsfxMapper busJcebGjsfxMapper;
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusJcebGjsfx busJcebGjsfx) {
 		busJcebGjsfx.setUpdateTime(new Date());
@@ -57,6 +63,7 @@ private BusJcebGjsfxMapper busJcebGjsfxMapper;
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusJcebGjsfx getInfo(String id) {
 		return busJcebGjsfxMapper.getInfo(id);
 	}
@@ -64,6 +71,7 @@ private BusJcebGjsfxMapper busJcebGjsfxMapper;
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusJcebGjsfx> getList(BusJcebGjsfx busJcebGjsfx) {
 		return busJcebGjsfxMapper.getList(busJcebGjsfx);
 	}
@@ -71,7 +79,7 @@ private BusJcebGjsfxMapper busJcebGjsfxMapper;
 	/**
 	 * 提交
 	 * @param busJcebGjsfx
-	 * @return
+	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -85,7 +93,7 @@ private BusJcebGjsfxMapper busJcebGjsfxMapper;
 	/**
 	 * 退回
 	 * @param busJcebGjsfx
-	 * @return
+	 * @return 退回结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -99,7 +107,7 @@ private BusJcebGjsfxMapper busJcebGjsfxMapper;
 	/**
 	 * 确认
 	 * @param busJcebGjsfx
-	 * @return
+	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)

+ 92 - 86
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJddzServiceImpl.java

@@ -5,107 +5,113 @@ import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebJddzMapper;
 import com.railway.business.catenary.service.IBusJcebJddzService;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+
 /**
-* @author zcf
-* @date 2021/10/24
-*/
+ * @author zcf
+ * @date 2021/10/24
+ */
 @Service
 @Transactional(readOnly = true)
-public class BusJcebJddzServiceImpl implements IBusJcebJddzService{
-@Autowired
-private BusJcebJddzMapper busJcebJddzMapper;
+public class BusJcebJddzServiceImpl implements IBusJcebJddzService {
+
+  private final BusJcebJddzMapper busJcebJddzMapper;
+
+  public BusJcebJddzServiceImpl(BusJcebJddzMapper busJcebJddzMapper) {
+    this.busJcebJddzMapper = busJcebJddzMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusJcebJddz busJcebJddz) {
-	    busJcebJddz.setCreateTime(new Date());
-        busJcebJddz.setCreateBy(SecurityUtils.getUsername());
-		busJcebJddz.setUserId(SecurityUtils.getUserId());
-		return busJcebJddzMapper.insert(busJcebJddz);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BusJcebJddz busJcebJddz) {
+    busJcebJddz.setCreateTime(new Date());
+    busJcebJddz.setCreateBy(SecurityUtils.getUsername());
+    busJcebJddz.setUserId(SecurityUtils.getUserId());
+    return busJcebJddzMapper.insert(busJcebJddz);
+  }
 
-	/**
-	* 删除
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busJcebJddzMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = busJcebJddzMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusJcebJddz busJcebJddz) {
-		busJcebJddz.setUpdateTime(new Date());
-    	busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
-		return busJcebJddzMapper.update(busJcebJddz);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BusJcebJddz busJcebJddz) {
+    busJcebJddz.setUpdateTime(new Date());
+    busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
+    return busJcebJddzMapper.update(busJcebJddz);
+  }
 
-	/**
-	* 获取单个
-	*/
-	public BusJcebJddz getInfo(String id) {
-		return busJcebJddzMapper.getInfo(id);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BusJcebJddz getInfo(String id) {
+    return busJcebJddzMapper.getInfo(id);
+  }
 
-	/**
-	* 查询列表
-	*/
-	public List<BusJcebJddz> getList(BusJcebJddz busJcebJddz) {
-		return busJcebJddzMapper.getList(busJcebJddz);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BusJcebJddz> getList(BusJcebJddz busJcebJddz) {
+    return busJcebJddzMapper.getList(busJcebJddz);
+  }
 
-	/**
-	 * 提交
-	 * @return
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int submit(BusJcebJddz busJcebJddz) {
-		busJcebJddz.setUpdateTime(new Date());
-		busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
-		busJcebJddz.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
-		return busJcebJddzMapper.update(busJcebJddz);
-	}
+  /**
+   * 提交
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int submit(BusJcebJddz busJcebJddz) {
+    busJcebJddz.setUpdateTime(new Date());
+    busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
+    busJcebJddz.setSubmitState(TestTableStatusEnum.REPORTED.getCode());
+    return busJcebJddzMapper.update(busJcebJddz);
+  }
 
-	/**
-	 * 退回
-	 * @return
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int reject(BusJcebJddz busJcebJddz) {
-		busJcebJddz.setUpdateTime(new Date());
-		busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
-		busJcebJddz.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
-		return busJcebJddzMapper.update(busJcebJddz);
-	}
+  /**
+   * 退回
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int reject(BusJcebJddz busJcebJddz) {
+    busJcebJddz.setUpdateTime(new Date());
+    busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
+    busJcebJddz.setSubmitState(TestTableStatusEnum.RETURNED.getCode());
+    return busJcebJddzMapper.update(busJcebJddz);
+  }
 
-	/**
-	 * 确认
-	 * @return
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int confirm(BusJcebJddz busJcebJddz) {
-		busJcebJddz.setUpdateTime(new Date());
-		busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
-		busJcebJddz.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
-		return busJcebJddzMapper.update(busJcebJddz);
-	}
+  /**
+   * 确认
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int confirm(BusJcebJddz busJcebJddz) {
+    busJcebJddz.setUpdateTime(new Date());
+    busJcebJddz.setUpdateBy(SecurityUtils.getUsername());
+    busJcebJddz.setSubmitState(TestTableStatusEnum.COMPLETED.getCode());
+    return busJcebJddzMapper.update(busJcebJddz);
+  }
 
 }

+ 14 - 9
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJyzqsjlServiceImpl.java

@@ -1,13 +1,9 @@
 package com.railway.business.catenary.service.impl;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.railway.business.catenary.domain.BusJcebGjsfx;
 import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebJyzqsjlMapper;
 import com.railway.business.catenary.domain.BusJcebJyzqsjl;
 import com.railway.business.catenary.service.IBusJcebJyzqsjlService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,12 +17,17 @@ import java.util.Date;
 @Service
 @Transactional(readOnly = true)
 public class BusJcebJyzqsjlServiceImpl implements IBusJcebJyzqsjlService{
-@Autowired
-private BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
+
+	private final BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
+
+	public BusJcebJyzqsjlServiceImpl(BusJcebJyzqsjlMapper busJcebJyzqsjlMapper) {
+		this.busJcebJyzqsjlMapper = busJcebJyzqsjlMapper;
+	}
 
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusJcebJyzqsjl busJcebJyzqsjl) {
 	    busJcebJyzqsjl.setCreateTime(new Date());
@@ -37,6 +38,7 @@ private BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -50,6 +52,7 @@ private BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusJcebJyzqsjl busJcebJyzqsjl) {
 		busJcebJyzqsjl.setUpdateTime(new Date());
@@ -60,6 +63,7 @@ private BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusJcebJyzqsjl getInfo(String id) {
 		return busJcebJyzqsjlMapper.getInfo(id);
 	}
@@ -67,6 +71,7 @@ private BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusJcebJyzqsjl> getList(BusJcebJyzqsjl busJcebJyzqsjl) {
 		return busJcebJyzqsjlMapper.getList(busJcebJyzqsjl);
 	}
@@ -74,7 +79,7 @@ private BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 	/**
 	 * 提交
 	 * @param busJcebJyzqsjl
-	 * @return
+	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -88,7 +93,7 @@ private BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 	/**
 	 * 退回
 	 * @param busJcebJyzqsjl
-	 * @return
+	 * @return 退回结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -102,7 +107,7 @@ private BusJcebJyzqsjlMapper busJcebJyzqsjlMapper;
 	/**
 	 * 确认
 	 * @param busJcebJyzqsjl
-	 * @return
+	 * @return 确认结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)

+ 6 - 3
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebLbjghjlServiceImpl.java

@@ -7,7 +7,6 @@ import com.railway.business.catenary.mapper.BusJcebLbjghjlMapper;
 import com.railway.business.catenary.service.IBusJcebLbjghjlService;
 import com.railway.common.utils.SecurityUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,8 +20,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusJcebLbjghjlServiceImpl implements IBusJcebLbjghjlService {
-@Autowired
-private BusJcebLbjghjlMapper busJcebLbjghjlMapper;
+
+	private final BusJcebLbjghjlMapper busJcebLbjghjlMapper;
+
+	public BusJcebLbjghjlServiceImpl(BusJcebLbjghjlMapper busJcebLbjghjlMapper) {
+		this.busJcebLbjghjlMapper = busJcebLbjghjlMapper;
+	}
 
 	/**
 	* 新增

+ 9 - 6
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebQmjcjlServiceImpl.java

@@ -7,7 +7,6 @@ import com.railway.business.catenary.mapper.BusJcebQmjcjlMapper;
 import com.railway.business.catenary.service.IBusJcebQmjcjlService;
 import com.railway.common.utils.SecurityUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,8 +20,12 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusJcebQmjcjlServiceImpl implements IBusJcebQmjcjlService {
-@Autowired
-private BusJcebQmjcjlMapper busJcebQmjcjlMapper;
+
+	private final BusJcebQmjcjlMapper busJcebQmjcjlMapper;
+
+	public BusJcebQmjcjlServiceImpl(BusJcebQmjcjlMapper busJcebQmjcjlMapper) {
+		this.busJcebQmjcjlMapper = busJcebQmjcjlMapper;
+	}
 
 	/**
 	* 新增
@@ -83,7 +86,7 @@ private BusJcebQmjcjlMapper busJcebQmjcjlMapper;
 	/**
 	 * 提交
 	 * @param busJcebQmjcjl
-	 * @return
+	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -97,7 +100,7 @@ private BusJcebQmjcjlMapper busJcebQmjcjlMapper;
 	/**
 	 * 退回
 	 * @param busJcebQmjcjl
-	 * @return
+	 * @return 退回结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -111,7 +114,7 @@ private BusJcebQmjcjlMapper busJcebQmjcjlMapper;
 	/**
 	 * 确认
 	 * @param busJcebQmjcjl
-	 * @return
+	 * @return 确认结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)

+ 14 - 6
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebXsjcjlServiceImpl.java

@@ -5,7 +5,6 @@ import com.railway.business.catenary.enums.TestTableStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebXsjcjlMapper;
 import com.railway.business.catenary.service.IBusJcebXsjcjlService;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -18,12 +17,17 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusJcebXsjcjlServiceImpl implements IBusJcebXsjcjlService{
-@Autowired
-private BusJcebXsjcjlMapper busJcebXsjcjlMapper;
+
+	private final BusJcebXsjcjlMapper busJcebXsjcjlMapper;
+
+	public BusJcebXsjcjlServiceImpl(BusJcebXsjcjlMapper busJcebXsjcjlMapper) {
+		this.busJcebXsjcjlMapper = busJcebXsjcjlMapper;
+	}
 
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusJcebXsjcjl busJcebXsjcjl) {
 		busJcebXsjcjl.setUserId(SecurityUtils.getUserId());
@@ -35,6 +39,7 @@ private BusJcebXsjcjlMapper busJcebXsjcjlMapper;
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -48,6 +53,7 @@ private BusJcebXsjcjlMapper busJcebXsjcjlMapper;
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusJcebXsjcjl busJcebXsjcjl) {
 		busJcebXsjcjl.setUpdateTime(new Date());
@@ -58,6 +64,7 @@ private BusJcebXsjcjlMapper busJcebXsjcjlMapper;
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusJcebXsjcjl getInfo(String id) {
 		return busJcebXsjcjlMapper.getInfo(id);
 	}
@@ -65,13 +72,14 @@ private BusJcebXsjcjlMapper busJcebXsjcjlMapper;
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusJcebXsjcjl> getList(BusJcebXsjcjl busJcebXsjcjl) {
 		return busJcebXsjcjlMapper.getList(busJcebXsjcjl);
 	}
 	
 	/**
 	 * 提交
-	 * @return
+	 * @return 提交结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -84,7 +92,7 @@ private BusJcebXsjcjlMapper busJcebXsjcjlMapper;
 
 	/**
 	 * 退回
-	 * @return
+	 * @return 退回结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -97,7 +105,7 @@ private BusJcebXsjcjlMapper busJcebXsjcjlMapper;
 
 	/**
 	 * 确认
-	 * @return
+	 * @return 确认结果
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)

+ 8 - 5
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJlgzServiceImpl.java

@@ -10,7 +10,6 @@ import com.railway.business.catenary.mapper.BusJlgzPicMapper;
 import com.railway.business.catenary.service.IBusJlgzService;
 import com.railway.common.utils.SecurityUtils;
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,10 +23,14 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class BusJlgzServiceImpl implements IBusJlgzService {
-@Autowired
-private BusJlgzMapper busJlgzMapper;
-@Autowired
-private BusJlgzPicMapper busJlgzPicMapper;
+
+	private final BusJlgzMapper busJlgzMapper;
+	private final BusJlgzPicMapper busJlgzPicMapper;
+
+	public BusJlgzServiceImpl(BusJlgzMapper busJlgzMapper, BusJlgzPicMapper busJlgzPicMapper) {
+		this.busJlgzMapper = busJlgzMapper;
+		this.busJlgzPicMapper = busJlgzPicMapper;
+	}
 
 	/**
 	* 新增

+ 5 - 3
railway-framework/src/main/java/com/railway/framework/config/MyBatisConfig.java

@@ -10,7 +10,6 @@ import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
@@ -32,11 +31,14 @@ import com.railway.common.utils.StringUtils;
 @Configuration
 public class MyBatisConfig {
 
-  @Autowired
-  private Environment env;
+  private final Environment env;
 
   static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
 
+  public MyBatisConfig(Environment env) {
+    this.env = env;
+  }
+
   public static String setTypeAliasesPackage(String typeAliasesPackage) {
     ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
     MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);

+ 5 - 3
railway-framework/src/main/java/com/railway/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -12,7 +12,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -32,8 +31,11 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor {
   @Value("${token.header}")
   private String header;
 
-  @Autowired
-  private RedisCache redisCache;
+  private final RedisCache redisCache;
+
+  public SameUrlDataInterceptor(RedisCache redisCache) {
+    this.redisCache = redisCache;
+  }
 
   @SuppressWarnings("unchecked")
   @Override

+ 6 - 3
railway-generator/src/main/java/com/railway/generator/controller/IndexController.java

@@ -9,7 +9,6 @@ import com.railway.generator.util.FreemarkerTool;
 import freemarker.template.TemplateException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -27,13 +26,17 @@ import static com.railway.generator.util.StringPlusUtils.underlineToCamelCase;
 
 /**
  * spring boot code generator
+ * @author railway
  */
 @Controller
 @Slf4j
 public class IndexController {
 
-  @Autowired
-  private FreemarkerTool freemarkerTool;
+  private final FreemarkerTool freemarkerTool;
+
+  public IndexController(FreemarkerTool freemarkerTool) {
+    this.freemarkerTool = freemarkerTool;
+  }
 
   @RequestMapping("/")
   public String index() {