Просмотр исходного кода

1、参照阿里代码规约进行调整;

zk 2 лет назад
Родитель
Сommit
da64495004
15 измененных файлов с 28 добавлено и 11 удалено
  1. 2 2
      sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java
  2. 1 1
      sckw-common/sckw-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
  3. 2 2
      sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java
  4. 1 0
      sckw-modules/sckw-file/src/main/java/com/sckw/file/dao/KwsFileInfoDao.java
  5. 1 1
      sckw-modules/sckw-file/src/main/java/com/sckw/file/service/dubbo/FileDubboApiServiceImpl.java
  6. 9 3
      sckw-modules/sckw-report/src/main/java/com/sckw/report/consumer/SckwBusSumConsumer.java
  7. 2 0
      sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java
  8. 2 2
      sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java
  9. 1 0
      sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderCirculateMapper.java
  10. 1 0
      sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java
  11. 1 0
      sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderSubcontractMapper.java
  12. 1 0
      sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderUnitMapper.java
  13. 1 0
      sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java
  14. 1 0
      sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTrackMapper.java
  15. 2 0
      sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

+ 2 - 2
sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -117,8 +117,8 @@ public class AuthServiceImpl implements IAuthService {
         entInfoResVo.setCertificateInfo(entCertificateResDtoList);
 
         //企业资质有效性判断  1、当前资质没过期,且状态是已认证  2、只要有认证过一次就算有效  参数判断
-        String checkType = "2";
-        if (checkType.equals("1")) {
+        String checkType = String.valueOf(Global.NUMERICAL_TWO);
+        if (checkType.equals(Global.NUMERICAL_ONE)) {
             for (EntCertificateResDto entCertificateResDto : entCertificateResDtoList) {
                 Date expireTime = entCertificateResDto.getExpireTime();
                 entInfoResVo.setValid(DateUtil.compare(new Date(), expireTime) <= 0);

+ 1 - 1
sckw-common/sckw-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,7 +1,7 @@
 com.sckw.core.aspect.DaoAspect
 com.sckw.core.exception.GlobalSystemExceptionHandler
 com.sckw.core.web.config.CustomConfig
-com.sckw.core.filter.LoginFilter
+com.sckw.core.filter.RequestCheckFilter
 com.sckw.core.config.MybatisPlusConfig
 com.sckw.core.config.JacksonConfig
 com.sckw.core.filter.ExceptionFilterConfig

+ 2 - 2
sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -5,7 +5,7 @@ import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.file.api.dto.FileInfoDTO;
 import com.sckw.file.service.FileService;
-import com.sckw.file.service.dubbo.FileDubboApiService;
+import com.sckw.file.service.dubbo.FileDubboApiServiceImpl;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -40,7 +40,7 @@ public class FileApiController {
     private FileService fileService;
 
     @Autowired
-    private FileDubboApiService fileDubboApiService;
+    private FileDubboApiServiceImpl fileDubboApiService;
 
     /**
      * 上传文件至OSS

+ 1 - 0
sckw-modules/sckw-file/src/main/java/com/sckw/file/dao/KwsFileInfoDao.java

@@ -25,6 +25,7 @@ public interface KwsFileInfoDao extends BaseMapper<kwfFileInfo> {
      * @param record
      * @return
      */
+    @Override
     int insert(kwfFileInfo record);
 
     /**

+ 1 - 1
sckw-modules/sckw-file/src/main/java/com/sckw/file/service/dubbo/FileDubboApiService.java → sckw-modules/sckw-file/src/main/java/com/sckw/file/service/dubbo/FileDubboApiServiceImpl.java

@@ -31,7 +31,7 @@ import java.util.Map;
 
 @Slf4j
 @DubboService(group = "design", version = "1.0.0",timeout = 50000)
-public class FileDubboApiService implements FileApiDubboService {
+public class FileDubboApiServiceImpl implements FileApiDubboService {
 
     @Autowired
     KwsFileInfoDao fileInfoDao;

+ 9 - 3
sckw-modules/sckw-report/src/main/java/com/sckw/report/consumer/SckwBusSumConsumer.java

@@ -46,6 +46,12 @@ public class SckwBusSumConsumer {
     @Autowired
     private MongoTemplate mongoTemplate;
 
+    private String TRADE_ORDER = "tradeOrder";
+
+    private String LOGISTICS_ORDER = "logisticsOrder";
+
+    private String WAYBILL_ORDER = "waybillOrder";
+
     /**
      * @desc 消息订阅
      * @author zk
@@ -77,7 +83,7 @@ public class SckwBusSumConsumer {
 
         /**业务存储**/
         /**贸易订单**/
-        if (busSum.getBusSumType().equals("tradeOrder")) {
+        if (busSum.getBusSumType().equals(TRADE_ORDER)) {
             SckwTradeOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwTradeOrder.class);
             order.set_id(order.getTOrderId());
             if (busSum.getMethod() == 1) {
@@ -100,7 +106,7 @@ public class SckwBusSumConsumer {
         }
 
         /**物流订单**/
-        if (busSum.getBusSumType().equals("logisticsOrder")) {
+        if (busSum.getBusSumType().equals(LOGISTICS_ORDER)) {
             SckwLogisticsOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwLogisticsOrder.class);
             if (busSum.getMethod() == 1) {
                 /**新增**/
@@ -117,7 +123,7 @@ public class SckwBusSumConsumer {
         }
 
         /**车辆运单**/
-        if (busSum.getBusSumType().equals("waybillOrder")) {
+        if (busSum.getBusSumType().equals(WAYBILL_ORDER)) {
             SckwWaybillOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwWaybillOrder.class);
             if (busSum.getMethod() == 1) {
                 /**新增**/

+ 2 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -657,6 +657,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
      * @date 2023/8/10
      *
      * @return*/
+    @Override
     public REnterpriseVo queryEntDetails(Long entId) {
         if (Objects.isNull(entId)) {
             return null;
@@ -671,6 +672,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
      * @author zk
      * @date 2023/8/10
      **/
+    @Override
     public KwsUserResDto queryUserDetails(String account, Integer systemType) {
         if (Objects.isNull(systemType) || StringUtils.isBlank(account)) {
             return null;

+ 2 - 2
sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -947,8 +947,8 @@ public class KwsEnterpriseService {
         enterpriseVo.setMainPhone(user != null ? user.getPhone() : null);
 
         //企业资质有效性判断  1、当前资质没过期,且状态是已认证  2、只要有认证过一次就算有效  参数判断
-        String checkType = "2";
-        if (checkType.equals("1")) {
+        String checkType = String.valueOf(Global.NUMERICAL_TWO);
+        if (checkType.equals(Global.NUMERICAL_ONE)) {
             List<CertificateResVo> certificates = queryCertificate(entId);
             for (CertificateResVo certificate : certificates) {
                 Date expireTime = certificate.getExpireTime();

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderCirculateMapper.java

@@ -11,6 +11,7 @@ import java.util.List;
 public interface KwtLogisticsOrderCirculateMapper extends BaseMapper<KwtLogisticsOrderCirculate> {
     int deleteByPrimaryKey(Long id);
 
+    @Override
     int insert(KwtLogisticsOrderCirculate record);
 
     int insertSelective(KwtLogisticsOrderCirculate record);

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -23,6 +23,7 @@ import java.util.Map;
 @Mapper
 public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
 
+    @Override
     int insert(KwtLogisticsOrder record);
 
 

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderSubcontractMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 public interface KwtLogisticsOrderSubcontractMapper extends BaseMapper<KwtLogisticsOrderSubcontract> {
     int deleteByPrimaryKey(Long id);
 
+    @Override
     int insert(KwtLogisticsOrderSubcontract record);
 
     int insertSelective(KwtLogisticsOrderSubcontract record);

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderUnitMapper.java

@@ -11,6 +11,7 @@ import java.util.List;
 public interface KwtLogisticsOrderUnitMapper extends BaseMapper<KwtLogisticsOrderUnit> {
     int deleteByPrimaryKey(Long id);
 
+    @Override
     int insert(KwtLogisticsOrderUnit record);
 
     int insertSelective(KwtLogisticsOrderUnit record);

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -17,6 +17,7 @@ import java.util.Map;
 public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
     int deleteByPrimaryKey(Long id);
 
+    @Override
     int insert(KwtWaybillOrder record);
 
     int insertSelective(KwtWaybillOrder record);

+ 1 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTrackMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 public interface KwtWaybillOrderTrackMapper extends BaseMapper<KwtWaybillOrderTrack> {
     int deleteByPrimaryKey(Long id);
 
+    @Override
     int insert(KwtWaybillOrderTrack record);
 
     int insertSelective(KwtWaybillOrderTrack record);

+ 2 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -81,6 +81,7 @@ public class TransportDubboServiceImpl implements TransportDubboService {
      * @param ids
      * @return
      */
+    @Override
     public List<KwtLogisticsOrderVO> getAcceptCarriageOrderDetail(List<String> ids) {
         List<KwtLogisticsOrderVO> list = new ArrayList<>();
         List<KwtLogisticsOrder> kwtLogisticsOrders = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>().in(KwtLogisticsOrder::getId, ids));
@@ -404,6 +405,7 @@ public class TransportDubboServiceImpl implements TransportDubboService {
 
 
     @Transactional(rollbackFor = Exception.class)
+    @Override
     public void contractSignLogisticsCompleted(ContractSignLogisticsParam param) {
         if (Objects.isNull(param.getUpdateBy()) || StringUtils.isBlank(param.getUpdateByName())) {
             throw new BusinessException("操作人信息不能为空!");