#FIX 字典同步

sys-api-service/src/main/java/com/xy/service/SysDictLogServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.dto.SysDictLogDto;
+import com.xy.entity.SysDict;
 import com.xy.entity.SysDictLog;
 import com.xy.mapper.SysDictLogMapper;
 import com.xy.sys.EnumSysDictOperateType;
@@ -63,7 +64,8 @@ public class SysDictLogServiceImpl extends ServiceImpl<SysDictLogMapper, SysDict
      * @param operateType
      * @return
      */
-    public boolean handleLog(SysDictLog sysDictLog, EnumSysDictOperateType operateType) {
+    public boolean handleLog(SysDict sysDict, SysDictLog sysDictLog, EnumSysDictOperateType operateType) {
+        sysDictLog.setSysDictId(sysDict.getId());
         sysDictLog.setId(null);
         sysDictLog.setIsSync(false);
         sysDictLog.setOperateType(operateType.getIntCode());

sys-api-service/src/main/java/com/xy/service/SysDictServiceImpl.java

@@ -108,7 +108,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         String paterCode = syncProd.getPaterCode();
         String code = syncProd.getCode();
         Integer operateType = syncProd.getOperateType();
-        if (SysDictDto.SYNC_PWD.equals(syncProd.getPwd())) {
+        if (!SysDictDto.SYNC_PWD.equals(syncProd.getPwd())) {
             throw new CommRuntimeException("非法请求!");
         }
         try {
@@ -332,7 +332,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
             //非删除
             syncProd.setCssClass(sysDict.getCssClass());
             syncProd.setListClass(sysDict.getListClass());
+            syncProd.setOrders(sysDict.getOrders());
         }
+        syncProd.setPwd(SysDictDto.SYNC_PWD);
 
         String body = JSONUtil.toJsonStr(syncProd);
         log.info("字典同步数据: {}", body);
@@ -361,7 +363,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         save(sysDict);
         //日志
         SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
-        sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.ADD);
+        sysDictLogService.handleLog(sysDict, sysDictLog, EnumSysDictOperateType.ADD);
         //刷新redis
         refuRedis(sysDict);
         return R.ok();
@@ -387,7 +389,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
                 sysDicts.forEach(sd -> {
                     sd.setPaterCode(update.getCode());
                     SysDictLog sysDictLog = BeanUtil.copyProperties(sd, SysDictLog.class);
-                    sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.ADD);
+                    sysDictLogService.handleLog(sysDict, sysDictLog, EnumSysDictOperateType.ADD);
                 });
             }
         }
@@ -400,7 +402,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         update(new SysDict().setPaterCode(obj.getCode()), new LambdaQueryWrapper<SysDict>().eq(SysDict::getPaterCode, sysDict.getCode()));
         //日志
         SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
-        sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.UPDATE);
+        sysDictLogService.handleLog(sysDict, sysDictLog, EnumSysDictOperateType.UPDATE);
 
         //刷新redis
         refuRedis(obj);
@@ -419,7 +421,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         if (CollUtil.isNotEmpty(list)) {
             list.forEach(sysDict -> {
                 SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
-                sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.DEL);
+                sysDictLogService.handleLog(sysDict, sysDictLog, EnumSysDictOperateType.DEL);
             });
         }
 
@@ -437,7 +439,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
                 removeBatchByIds(sysDicts);
                 sysDicts.forEach(sysDict -> {
                     SysDictLog sysDictLog = BeanUtil.copyProperties(sysDict, SysDictLog.class);
-                    sysDictLogService.handleLog(sysDictLog, EnumSysDictOperateType.DEL);
+                    sysDictLogService.handleLog(sysDict, sysDictLog, EnumSysDictOperateType.DEL);
                 });
             }