bug修复

api-admin/pom.xml

@@ -96,11 +96,11 @@
         <!--<version>1.0</version>-->
         <!--</dependency>-->
         <!--mybatis -->
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.3.2</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.mybatis.spring.boot</groupId>-->
+<!--            <artifactId>mybatis-spring-boot-starter</artifactId>-->
+<!--            <version>1.3.2</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.itfsw</groupId>
             <artifactId>mybatis-generator-plugin</artifactId>
@@ -304,7 +304,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.2</version>
+            <version>3.5.3</version>
         </dependency>
 
     </dependencies>

api-admin/src/main/java/com/glxp/sale/admin/config/MasterDataSourceConfig.java

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.config;
 
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.annotation.MapperScan;
@@ -39,7 +40,7 @@ public class MasterDataSourceConfig {//TODO Mapper
     @Primary
     public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource)
             throws Exception {
-        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
         sessionFactory.setDataSource(masterDataSource);
         sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
                 .getResources(MasterDataSourceConfig.MAPPER_LOCATION));

api-admin/src/main/java/com/glxp/sale/admin/controller/sync/SpsSyncDataController.java

@@ -247,7 +247,7 @@ public class SpsSyncDataController {
                         .build();
             }
         }
-        baseResponse.setCode(ResultEnum.SUCCESS.getCode());
+        baseResponse.setCode(20000);
         baseResponse.setData(relaySyncResponse);
         return baseResponse;
     }
@@ -277,14 +277,9 @@ public class SpsSyncDataController {
         if (StrUtil.isBlank(basicExportStatusEntity.getId())) {
             return ResultVOUtils.error(500, "缺少唯一标识！");
         }
-        if (StrUtil.isEmpty(basicExportStatusEntity.getReceiveStatus())) {
-            basicExportStatusEntity.setEndTime(DateUtil.getDateTime());
-        }
-        basicExportStatusEntity.setUpdateTime(new Date());
-        basicExportStatusEntity.setStatus(BasicExportStatusEnum.COMPLETED.getCode());
         boolean b = basicExportService.update(Wrappers.lambdaUpdate(BasicExportStatusEntity.class)
-                .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.COMPLETED.getCode())
                 .set(BasicExportStatusEntity::getEndTime, new Date())
+                .set(BasicExportStatusEntity::getStatus, BasicExportStatusEnum.COMPLETED.getCode())
                 .set(BasicExportStatusEntity::getUpdateTime, new Date())
                 .set(BasicExportStatusEntity::getReceiveStatus, 1)
                 .eq(BasicExportStatusEntity::getId, basicExportStatusEntity.getId())
@@ -293,7 +288,7 @@ public class SpsSyncDataController {
         if (b)
             return ResultVOUtils.success("更新成功！");
         else
-            return ResultVOUtils.error(500, "更新成功！");
+            return ResultVOUtils.error(500, "更新失败！");
     }
 
 }

api-admin/src/main/java/com/glxp/sale/admin/dao/sync/BasicExportDao.java

@@ -3,7 +3,6 @@ package com.glxp.sale.admin.dao.sync;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.sale.admin.entity.sync.BasicExportStatusEntity;
 import com.glxp.sale.admin.req.sync.BasicExportStatusRequest;
-import com.glxp.sale.admin.service.sync.BasicExportService;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BasicExportStatusEntity.java

@@ -1,5 +1,8 @@
 package com.glxp.sale.admin.entity.sync;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -14,23 +17,39 @@ import java.util.Date;
 @NoArgsConstructor
 @TableName("basic_export_status")
 public class BasicExportStatusEntity {
+    @TableId(type = IdType.INPUT)
     private String id;
+    @TableField(value = "taskId")
     private String taskId;
+    @TableField(value = "idDatas")
     private String idDatas;
+    @TableField(value = "status")
     private Integer status;
+    @TableField(value = "type")
     private String type;
     /**
      * 传输状态 1.接口 2.文件
      */
+    @TableField(value = "transportType")
     private Integer transportType;
+    @TableField(value = "updateTime")
     private Date updateTime;
+    @TableField(value = "scheduleType")
     private Integer scheduleType;
+    @TableField(exist = false)
     private int fromType;           //来源类型：0：默认，自助平台，1:中继服务
+    @TableField(value = "startTime")
     private String startTime;
+    @TableField(value = "endTime")
     private String endTime;
+    @TableField(value = "remark")
     private String remark;
+    @TableField(value = "superiorService")
     private String superiorService; //上游服务
+    @TableField(value = "subordinateService")
     private String subordinateService; //下游服务
+    @TableField(value = "cacheFilePath")
     private String cacheFilePath;
+    @TableField(value = "receiveStatus")
     private String receiveStatus;
 }

api-admin/src/main/java/com/glxp/sale/admin/http/SpGetHttp.java

@@ -332,7 +332,7 @@ public class SpGetHttp {
 
 
     public void finishTask(String id) {
-        String result = UHttpClient.mipsGetHead(getSpmsUrl() + "/spssync/basic/udiinfo/finishTask"
+        String result = UHttpClient.postJson(getSpmsUrl() + "/spssync/basic/udiinfo/finishTask"
                 , Map.of("id", id), getHeaders());
 
     }

api-admin/src/main/resources/application.properties

@@ -2,7 +2,6 @@ spring.profiles.active=dev
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 mybatis.config-location=classpath:mybatis/mybatis-config.xml
 mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml
-mybatis-plus.map-underscore-to-camel-case=false
 spring.jmx.enabled=false
 server.tomcat.max-http-form-post-size=100MB
 server.tomcat.max-http-post-size=100MB