同步功能修改

src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java

@@ -113,8 +113,7 @@ public class ThrDeptController {
         filterThrDeptRequest.setName(thrDeptEntity.getName());
         filterThrDeptRequest.setThirdSysFk(thrDeptEntity.getThirdSysFk());
         filterThrDeptRequest.setStatus(thrDeptEntity.getStatus());
-        List<ThrDeptEntity> thrDeptEntities = thrDeptService.filterThrInvWarehouse(filterThrDeptRequest);
+        if (!thrDeptService.editExit(thrDeptEntity.getCode(), thrDeptEntity.getCode(), thrDeptEntity.getId())) {
-        if(thrDeptEntities.size()==0 ){
             thrDeptEntity.setPid(null); // 不能修改父级 pid
             thrDeptEntity.setUpdateTime(new Date());
             boolean b = thrDeptService.updateInvWarehouse(thrDeptEntity);

src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java

@@ -12,13 +12,11 @@ import java.util.List;
 @Mapper
 public interface InvSpaceDao extends BaseMapperPlus<InvSpace, InvSpace, InvSpace> {
 
-    int deleteByPrimaryKey(Integer id);
 
     int insertEntity(InvSpace record);
 
     int insertSelective(InvSpace record);
 
-    InvSpace selectByPrimaryKey(Integer id);
 
     int updateByPrimaryKeySelective(InvSpace record);
 

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -154,11 +154,17 @@ public class SpGetHttpClient {
 
     public BaseResponse<String> updateSynsSet(SyncDataSetResponse syncDataSetResponse) {
         String json = JSONUtil.toJsonStr(syncDataSetResponse);
+        try {
             String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/system/param/syncData/save", json, buildHeader());
             BaseResponse<String> response =
                     JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
                     });
             return response;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ResultVOUtils.error(500, "连接上级服务失败");
+
     }
 
 

src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.auth.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -68,7 +69,8 @@ public class InvSpaceServiceImpl extends ServiceImpl<InvSpaceDao, InvSpace> impl
         invSpace.setUpdateTime(date);
         invSpace.setCreateUser(user.getUserName());
         invSpace.setUpdateUser(user.getUserName());
-        invSpaceDao.insertEntity(invSpace);
+        invSpace.setId(IdUtil.getSnowflakeNextId());
+        invSpaceDao.insert(invSpace);
         return ResultVOUtils.success();
     }
 
@@ -92,8 +94,8 @@ public class InvSpaceServiceImpl extends ServiceImpl<InvSpaceDao, InvSpace> impl
     @Override
     public BaseResponse deleteSpace(String id) {
         //校验此货位是否已经被使用，如果已经被使用，不能删除
-        Integer spaceId = Integer.valueOf(id);
+        Long spaceId = Long.valueOf(id);
-        InvSpace invSpace = invSpaceDao.selectByPrimaryKey(spaceId);
+        InvSpace invSpace = invSpaceDao.selectById(spaceId);
 
         //todo 代码迁移，后面记得修改
 
@@ -108,7 +110,7 @@ public class InvSpaceServiceImpl extends ServiceImpl<InvSpaceDao, InvSpace> impl
 //        if (count > 0) {
 //            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "此货位已被使用，无法删除！");
 //        }
-        invSpaceDao.deleteByPrimaryKey(spaceId);
+        invSpaceDao.deleteById(spaceId);
         return ResultVOUtils.success();
     }
 

src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java

@@ -122,7 +122,7 @@ public class InvWarehouseServiceImpl extends ServiceImpl<InvWarehouseDao, InvWar
 
     @Override
     public boolean insertInvSubWarehouse(InvWarehouseEntity invWarehouseEntity) {
-        return invWarehouseDao.insertInvSubWarehouse(invWarehouseEntity);
+        return invWarehouseDao.insert(invWarehouseEntity) > 0;
     }
 
     @Override

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

@@ -247,7 +247,7 @@ public class HeartService {
                 }
                 break;
             case USER_DATA:
-                if (!needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) {
+                if (needExec(info.getBasicDept(), info.getBasicInv(), info.getSysUser())) {
                     uploadData(exportType, taskId, x -> x.getUserData(info, taskId, now, syncTime));
                 }
                 break;
@@ -758,7 +758,7 @@ public class HeartService {
         syncTimeMap.put("oldDate", syncTime);
 
         //确认有开启第三方部门信息同步
-        if (needExec(info.getBasicThirdDept())) {
+        if (needExec(info.getBasicThirdInv())) {
             Map<String, Object> map;
             if (syncTime == null) {
                 map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT);

src/main/java/com/glxp/api/service/thrsys/ThrDeptService.java

@@ -14,6 +14,8 @@ public interface ThrDeptService extends IService<ThrDeptEntity> {
 
     ThrDeptEntity findDefault(Boolean advaceType, Boolean isDefault);
 
+    boolean editExit(String code, String thirdSysFk, Long id);
+
     List<ThrDeptEntity> filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest);
 
     List<ThrDeptEntity> filterGroupInvWarehouse(FilterThrDeptRequest filterThrDeptRequest);

src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.thrsys.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.res.BaseResponse;
@@ -48,6 +49,11 @@ public class ThrDeptServiceImpl extends ServiceImpl<ThrDeptDao,ThrDeptEntity> im
         return null;
     }
 
+    @Override
+    public boolean editExit(String code, String thirdSysFk, Long id) {
+        return thrDeptDao.exists(new QueryWrapper<ThrDeptEntity>().eq("code", code).eq("thirdSysFk", thirdSysFk).ne("id", id));
+    }
+
     @Override
     public List<ThrDeptEntity> filterThrInvWarehouse(FilterThrDeptRequest filterThrDeptRequest) {
         if (filterThrDeptRequest == null) {

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -60,7 +60,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
 
 
             //定时上传最近更新基础数据至上游轮询时间
-            long timeInterval1 = syncDataSetEntity.getSyncTime() * 60 * 1000L;
+            long timeInterval1 = syncDataSetEntity.getSyncTime() * 6 * 1000L;
             long curTime1 = System.currentTimeMillis();
             Long lastTime1 = (Long) redisUtil.get("SPS_SYNC_UPLOAD_DATA");
             if (lastTime1 == null) {

src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml

@@ -31,18 +31,6 @@
         remark
     </sql>
 
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from auth_space
-        where id = #{id,jdbcType=INTEGER}
-    </select>
-
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete
-        from auth_space
-        where id = #{id,jdbcType=INTEGER}
-    </delete>
 
     <insert id="insertEntity" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.auth.InvSpace"
             useGeneratedKeys="true">
@@ -269,7 +257,8 @@
         </foreach>
     </insert>
 
-    <select id="filterList" parameterType="com.glxp.api.req.auth.FilterInvSpaceRequest" resultType="com.glxp.api.res.auth.InvSpaceResponse">
+    <select id="filterList" parameterType="com.glxp.api.req.auth.FilterInvSpaceRequest"
+            resultType="com.glxp.api.res.auth.InvSpaceResponse">
         select s.*,
                w.name   invStorageName,
                iws.name invSubStorageName
@@ -401,7 +390,8 @@
     </select>
 
     <select id="getMaxSpaceCode" resultType="java.lang.String">
-        select max(code) from auth_space
+        select max(code)
+        from auth_space
         <where>
             <if test="invCode != null and invCode != ''">
                 and invWarehouseCode = #{invCode}

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -217,6 +217,9 @@
             <if test="advanceType != null">
                 advanceType=#{advanceType},
             </if>
+            <if test="updateTime != null">
+                updateTime=#{updateTime},
+            </if>
             <if test="spUse != null">
                 spUse=#{spUse},
             </if>

src/main/resources/schemas/schema_v2.1.sql

@@ -388,4 +388,4 @@ CALL Pro_Temp_ColumnWork('thr_corp', 'id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
-
+CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2);