bug修复

src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java

@@ -4,7 +4,6 @@ package com.glxp.api.dao.basic;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
-import com.glxp.api.res.thrsys.ThrCorpsResponse;
 import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,7 +20,7 @@ public interface BasicCorpDao extends BaseMapperPlus<BasicCorpDao, BasicCorpEnti
 
     int insert(BasicCorpEntity basicUnitMaintainEntity);
 
-    int updateById(BasicCorpEntity basicUnitMaintainSaveRequest);
+    int customUpdateById(BasicCorpEntity basicUnitMaintainSaveRequest);
 
     BasicCorpEntity selectByThirdId(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
 

src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java

@@ -5,7 +5,6 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.BasicCorpDao;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
-import com.glxp.api.res.thrsys.ThrCorpsResponse;
 import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
 import com.glxp.api.service.basic.BasicCorpService;
 import org.springframework.stereotype.Service;
@@ -56,7 +55,7 @@ public class BasicCorpServiceImpl implements BasicCorpService {
     @Override
     public boolean updateById(BasicCorpEntity basicUnitMaintainSaveRequest) {
         basicUnitMaintainSaveRequest.setUpdateTime(new Date());
-        return basicCorpDao.updateById(basicUnitMaintainSaveRequest)>0?true:false;
+        return basicCorpDao.customUpdateById(basicUnitMaintainSaveRequest)>0?true:false;
     }
 
     @Override

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -539,17 +539,20 @@ public class HeartService {
         cn.hutool.json.JSONObject obj = JSONUtil.parseObj(data);
         SpsSyncBasicDataResponse bean = obj.get("data", SpsSyncBasicDataResponse.class);
         this.insertBasicData(bean);
-        String taskId = obj.getStr("taskId");
+        String taskId = bean.getTaskId();
-        BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
-        basicDownloadStatusEntity.setId(CustomUtil.getId());
-        basicDownloadStatusEntity.setTaskId(taskId);
-        basicDownloadStatusEntity.setStartTime(new Date());
-        basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA);
-        basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成
-        basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA);
-        basicDownloadStatusEntity.setScheduleType(1);
-        basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
         if (StrUtil.isNotBlank(taskId)) {
+            //插入下载记录
+            BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
+            basicDownloadStatusEntity.setId(CustomUtil.getId());
+            basicDownloadStatusEntity.setTaskId(taskId);
+            basicDownloadStatusEntity.setStartTime(new Date());
+            basicDownloadStatusEntity.setUpdateTime(new Date());
+            basicDownloadStatusEntity.setEndTime(new Date());
+            basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_BASIC_DATA);
+            basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_SUCCESS); //下载完成
+            basicDownloadStatusEntity.setType(BasicProcessStatus.BASIC_DATA);
+            basicDownloadStatusEntity.setScheduleType(1);
+            basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
             //通知自助平台任务已完成
             spGetHttp.finishTask(taskId);
         }

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -171,7 +171,7 @@
     </insert>
 
 
-    <update id="updateById" parameterType="com.glxp.api.entity.basic.BasicCorpEntity">
+    <update id="customUpdateById" parameterType="com.glxp.api.entity.basic.BasicCorpEntity">
         UPDATE basic_corp
         <trim prefix="set" suffixOverrides=",">
             <if test="thirdId != null">thirdId=#{thirdId},</if>