Merge remote-tracking branch 'origin/master' into test

sys-api-service/src/main/java/com/xy/entity/SysDictLog.java

@@ -32,6 +32,12 @@ public class SysDictLog implements Serializable {
     @ApiModelProperty(value = "id")
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
+    
+    @ApiModelProperty(value = "字典ID")
+    private Integer sysDictId;
+
+    @ApiModelProperty(value = "编码值")
+    private String value;
 
 
     @ApiModelProperty(value = "父编码")

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

@@ -2,6 +2,7 @@ package com.xy.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
@@ -319,8 +320,23 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
         if (sysDictLog == null) {
             return R.fail("字典日志不存在");
         }
+        Boolean isSync = sysDictLog.getIsSync();
+        if (BooleanUtil.isTrue(isSync)) {
+            return R.fail("已同步，请勿重复操作");
+        }
+        Integer sysDictId = sysDictLog.getSysDictId();
+        SysDict sysDict = getById(sysDictId);
         SysDictDto.SyncProd syncProd = BeanUtil.copyProperties(sysDictLog, SysDictDto.SyncProd.class);
-        String res = sendPost(SYNC_DICT_URL, JSONUtil.toJsonStr(syncProd));
+        syncProd.setValue(sysDictLog.getValue());
+        if (sysDict != null) {
+            //非删除
+            syncProd.setCssClass(sysDict.getCssClass());
+            syncProd.setListClass(sysDict.getListClass());
+        }
+
+        String body = JSONUtil.toJsonStr(syncProd);
+        log.info("字典同步数据: {}", body);
+        String res = sendPost(SYNC_DICT_URL, body);
         if ("fail".equals(res)) {
             return R.fail("同步失败，请稍后重试");
         } else {