lrf 8 meses atrás
pai
commit
05850300ee
28 arquivos alterados com 160 adições e 77 exclusões
  1. 1 1
      src/main/java/com/free/utils/FormatJavaTimeModule.java
  2. 1 1
      src/main/java/com/free/utils/MyMetaObjectHandler.java
  3. 6 6
      src/main/java/com/free/controller/ChatRecordController.java
  4. 4 4
      src/main/java/com/free/controller/HistoryController.java
  5. 6 6
      src/main/java/com/free/controller/QuestionController.java
  6. 5 5
      src/main/java/com/free/controller/TransferApplyController.java
  7. 3 3
      src/main/java/com/free/controller/system/AdminController.java
  8. 3 3
      src/main/java/com/free/controller/system/CustomerController.java
  9. 3 3
      src/main/java/com/free/controller/system/DictDataController.java
  10. 3 3
      src/main/java/com/free/controller/system/DictTypeController.java
  11. 5 5
      src/main/java/com/free/controller/system/MenusController.java
  12. 3 3
      src/main/java/com/free/controller/system/RoleController.java
  13. 2 2
      src/main/java/com/free/dto/ChatRecordCreateDTO.java
  14. 1 1
      src/main/java/com/free/dto/PasswordUpdateDTO.java
  15. 1 1
      src/main/java/com/free/dto/ResetPasswordDTO.java
  16. 1 1
      src/main/java/com/free/dto/TransferApplyCreateDTO.java
  17. 1 1
      src/main/java/com/free/dto/system/MenusCreateDTO.java
  18. 3 4
      src/main/java/com/free/entity/ChatRecord.java
  19. 1 3
      src/main/java/com/free/entity/TransferApply.java
  20. 3 4
      src/main/java/com/free/entity/system/LoginRecord.java
  21. 1 1
      src/main/java/com/free/entity/system/Menus.java
  22. 1 1
      src/main/java/com/free/mq/MqService.java
  23. 2 2
      src/main/java/com/free/service/TransferApplyService.java
  24. 4 7
      src/main/java/com/free/service/system/MenusService.java
  25. 2 4
      src/main/java/com/free/utils/BaseEntity.java
  26. 1 1
      src/main/java/com/free/utils/JwtUtil.java
  27. 1 1
      src/main/resources/application.yml
  28. 92 0
      src/main/resources/db/dictData.json

+ 1 - 1
src/main/java/com/free/utils/FormatJavaTimeModule.java

@@ -1,4 +1,4 @@
-package com.free.utils;
+package com.free.config;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

+ 1 - 1
src/main/java/com/free/utils/MyMetaObjectHandler.java

@@ -1,4 +1,4 @@
-package com.free.utils;
+package com.free.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import lombok.extern.slf4j.Slf4j;

+ 6 - 6
src/main/java/com/free/controller/ChatRecordController.java

@@ -66,10 +66,10 @@ public class ChatRecordController {
       // 抛出异常,当前申请已结束
       throw new CustomizationException(ExceptionEnum.CHAT_APPLY_IS_CLOSE);
     }
-    Long customer_id = apply.getCustomer_id();
+    String customer_id = apply.getCustomer_id();
     String user_id = apply.getUser_id();
-    Long speaker = body.getSpeaker();
-    if (customer_id != speaker && user_id.equals(speaker.toString())) {
+    String speaker = body.getSpeaker();
+    if (customer_id.equals(speaker) && user_id.equals(speaker.toString())) {
       // 抛出异常,发言人既不是该申请的客服人员,也不是用户
       throw new CustomizationException(ExceptionEnum.CHAT_SPEAKER_NOT_IN_APPLY);
     }
@@ -94,7 +94,7 @@ public class ChatRecordController {
   /** 修改数据, 转人工对话不修改 */
   @ApiOperation("修改数据")
   // @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody ChatRecord data) {
+  public Object update(@PathVariable String id, @RequestBody ChatRecord data) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -147,7 +147,7 @@ public class ChatRecordController {
   /** 根据id查询 */
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -155,7 +155,7 @@ public class ChatRecordController {
   /** 根据id删除数据 , 无删除 */
   @ApiOperation("删除数据")
   // @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);

+ 4 - 4
src/main/java/com/free/controller/HistoryController.java

@@ -69,7 +69,7 @@ public class HistoryController {
   @PassToken
   @ApiOperation("修改数据")
   // @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody History data) {
+  public Object update(@PathVariable String id, @RequestBody History data) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -125,7 +125,7 @@ public class HistoryController {
   @PassToken
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -134,7 +134,7 @@ public class HistoryController {
   @PassToken
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);
@@ -149,7 +149,7 @@ public class HistoryController {
   @PassToken
   @ApiOperation("清空用户数据")
   @DeleteMapping("/clear/{user_id}")
-  public Object clear(@PathVariable long user_id) {
+  public Object clear(@PathVariable String user_id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("user_id", user_id);
     service.remove(qw);

+ 6 - 6
src/main/java/com/free/controller/QuestionController.java

@@ -57,7 +57,7 @@ public class QuestionController {
   @PassToken
   @ApiOperation("修改数据")
   @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody Question data) {
+  public Object update(@PathVariable String id, @RequestBody Question data) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -79,7 +79,7 @@ public class QuestionController {
     Long skip = null, limit = null;
     Map map = new HashMap();
     QueryWrapper qw = new QueryWrapper<>();
-    qw.select("id","title","platform","is_use");
+    qw.select("id", "title", "platform", "is_use");
     /** 参数处理处理 */
     for (String key : allParams.keySet()) {
       Object value = allParams.get(key);
@@ -88,8 +88,8 @@ public class QuestionController {
       } else if (key.equals("limit")) {
         limit = Long.valueOf(String.valueOf(value));
       } else {
-        if(key.equals("title")||key.equals("platform")){
-          qw.like(key,value);
+        if (key.equals("title") || key.equals("platform")) {
+          qw.like(key, value);
         } else {
           // 其他为查询条件
           qw.eq(key, value);
@@ -115,7 +115,7 @@ public class QuestionController {
   @PassToken
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -124,7 +124,7 @@ public class QuestionController {
   @PassToken
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);

+ 5 - 5
src/main/java/com/free/controller/TransferApplyController.java

@@ -76,7 +76,7 @@ public class TransferApplyController {
     }
     TransferApply data = new TransferApply();
     data.setApply_time(LocalDateTime.now());
-    data.setUser_id(body.getUser_id().toString(TransferApplyClose));
+    data.setUser_id(body.getUser_id().toString());
     this.service.save(data);
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", data.getId());
@@ -90,7 +90,7 @@ public class TransferApplyController {
   /** 修改数据 */
   @ApiOperation("修改数据")
   @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody TransferApply data) {
+  public Object update(@PathVariable String id, @RequestBody TransferApply data) {
     // 如果是受理申请,需要查看,除该数据外.当前申请的用户 是否有已被受理 且 未关闭 的转人工申请.
     // 如果有: 则无法受理当前申请, 需要将之前 受理且未关闭的申请先关闭后再受理
     String is_agree = data.getIs_agree();
@@ -123,7 +123,7 @@ public class TransferApplyController {
 
     }
     // 获取客服人员id
-    Long customer_id = Long.valueOf(String.valueOf(userMap.get("id")));
+    String customer_id = (String) userMap.get("id");
     updateData.setCustomer_id(customer_id);
     updateData.setIs_agree(data.getIs_agree());
     this.service.updateById(updateData);
@@ -183,7 +183,7 @@ public class TransferApplyController {
   /** 根据id查询 */
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -191,7 +191,7 @@ public class TransferApplyController {
   /** 根据id删除数据 */
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);

+ 3 - 3
src/main/java/com/free/controller/system/AdminController.java

@@ -68,7 +68,7 @@ public class AdminController {
   /** 修改数据 */
   @ApiOperation("修改数据")
   @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody Admin data) {
+  public Object update(@PathVariable String id, @RequestBody Admin data) {
     QueryWrapper<Admin> qw = new QueryWrapper<Admin>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -126,7 +126,7 @@ public class AdminController {
   /** 根据id查询 */
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -134,7 +134,7 @@ public class AdminController {
   /** 根据id删除数据 */
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper<Admin> qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);

+ 3 - 3
src/main/java/com/free/controller/system/CustomerController.java

@@ -67,7 +67,7 @@ public class CustomerController {
   /** 修改数据 */
   @ApiOperation("修改数据")
   @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody Customer data) {
+  public Object update(@PathVariable String id, @RequestBody Customer data) {
     QueryWrapper<Customer> qw = new QueryWrapper<Customer>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -124,7 +124,7 @@ public class CustomerController {
   /** 根据id查询 */
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -132,7 +132,7 @@ public class CustomerController {
   /** 根据id删除数据 */
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper<Customer> qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);

+ 3 - 3
src/main/java/com/free/controller/system/DictDataController.java

@@ -85,7 +85,7 @@ public class DictDataController {
   /** 修改数据 */
   @ApiOperation("修改数据")
   @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody DictData data) {
+  public Object update(@PathVariable String id, @RequestBody DictData data) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -101,7 +101,7 @@ public class DictDataController {
   /** 根据id查询 */
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -109,7 +109,7 @@ public class DictDataController {
   /** 根据id删除数据 */
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);

+ 3 - 3
src/main/java/com/free/controller/system/DictTypeController.java

@@ -89,7 +89,7 @@ public class DictTypeController {
   /** 修改数据 */
   @ApiOperation("修改数据")
   @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody DictType data) {
+  public Object update(@PathVariable String id, @RequestBody DictType data) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -105,7 +105,7 @@ public class DictTypeController {
   /** 根据id查询 */
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -113,7 +113,7 @@ public class DictTypeController {
   /** 根据id删除数据 */
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);

+ 5 - 5
src/main/java/com/free/controller/system/MenusController.java

@@ -59,7 +59,7 @@ public class MenusController {
   /** 修改数据 */
   @ApiOperation("修改数据")
   @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody Menus data) {
+  public Object update(@PathVariable String id, @RequestBody Menus data) {
     QueryWrapper<Menus> qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -83,7 +83,7 @@ public class MenusController {
   /** 根据id查询 */
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -91,7 +91,7 @@ public class MenusController {
   /** 根据id删除数据 */
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);
@@ -118,7 +118,7 @@ public class MenusController {
     return ResponseFormat.success(list);
   }
 
-  private void toInsertMenusData(List<Map> list, Long parent_id) {
+  private void toInsertMenusData(List<Map> list, String parent_id) {
     ObjectMapper mapper = new ObjectMapper();
     for (int i = 0; i < list.size(); i++) {
       Map m = list.get(i);
@@ -144,7 +144,7 @@ public class MenusController {
         continue;
       }
       // 处理children,获取parent_id
-      Long children_parent_id = menuData.getId();
+      String children_parent_id = menuData.getId();
       toInsertMenusData(children, children_parent_id);
     }
   }

+ 3 - 3
src/main/java/com/free/controller/system/RoleController.java

@@ -94,7 +94,7 @@ public class RoleController {
   /** 修改数据 */
   @ApiOperation("修改数据")
   @PostMapping("/{id}")
-  public Object update(@PathVariable long id, @RequestBody Role data) {
+  public Object update(@PathVariable String id, @RequestBody Role data) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = this.service.count(qw);
@@ -110,7 +110,7 @@ public class RoleController {
   /** 根据id查询 */
   @ApiOperation("查询数据")
   @GetMapping("/{id}")
-  public Object fetch(@PathVariable long id) {
+  public Object fetch(@PathVariable String id) {
     Object newData = service.getById(id);
     return ResponseFormat.success(newData);
   }
@@ -118,7 +118,7 @@ public class RoleController {
   /** 根据id删除数据 */
   @ApiOperation("删除数据")
   @DeleteMapping("/{id}")
-  public Object delete(@PathVariable long id) {
+  public Object delete(@PathVariable String id) {
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", id);
     Long num = service.count(qw);

+ 2 - 2
src/main/java/com/free/dto/ChatRecordCreateDTO.java

@@ -7,9 +7,9 @@ import lombok.Data;
 @Data
 public class ChatRecordCreateDTO {
   @NotNull(message = "缺少当前会话信息")
-  private Long apply_id;
+  private String apply_id;
   @NotNull(message = "缺少发言人信息")
-  private Long speaker;
+  private String speaker;
   @NotBlank(message = "请输入发言内容")
   private String content;
   private String content_type;

+ 1 - 1
src/main/java/com/free/dto/PasswordUpdateDTO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class PasswordUpdateDTO {
   @NotNull(message = "缺少用户信息")
-  private Long id;
+  private String id;
 
   @NotBlank(message = "请填写新密码")
   private String password;

+ 1 - 1
src/main/java/com/free/dto/ResetPasswordDTO.java

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class ResetPasswordDTO {
   @NotNull(message = "缺少用户信息")
-  private Long id;
+  private String id;
 
   @NotBlank(message = "缺少用户类型")
   private String type;

+ 1 - 1
src/main/java/com/free/dto/TransferApplyCreateDTO.java

@@ -7,6 +7,6 @@ import lombok.Data;
 @Data
 public class TransferApplyCreateDTO {
   @NotNull(message = "缺少用户信息")
-  private Long user_id;
+  private String user_id;
 
 }

+ 1 - 1
src/main/java/com/free/dto/system/MenusCreateDTO.java

@@ -19,7 +19,7 @@ public class MenusCreateDTO {
   @NotBlank(message = "请填写目录类型")
   private String type;
 
-  private Long parent_id;
+  private String parent_id;
   
   private Long order_num;
 

+ 3 - 4
src/main/java/com/free/entity/ChatRecord.java

@@ -26,22 +26,21 @@ public class ChatRecord extends BaseEntity {
   @Column(comment = "转人工申请id")
   @TableField(value = "apply_id")
   @ApiModelProperty("转人工申请id")
-  private Long apply_id;
+  private String apply_id;
 
   @Column(comment = "发言人")
   @TableField(value = "speaker")
   @ApiModelProperty("发言人")
-  private Long speaker;
+  private String speaker;
 
   @Column(comment = "客服人员id")
   @TableField(value = "customer_id")
   @ApiModelProperty("客服人员id")
-  private Long customer_id;
+  private String customer_id;
 
   @Column(comment = "用户id")
   @TableField(value = "user_id")
   @ApiModelProperty("用户id")
-  /**UUID */
   private String user_id;
 
   @TableField(fill = FieldFill.INSERT)

+ 1 - 3
src/main/java/com/free/entity/TransferApply.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.free.utils.BaseEntity;
 import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.annotation.DefaultValue;
 import com.gitee.sunchenbin.mybatis.actable.annotation.Table;
 
 import io.swagger.annotations.ApiModel;
@@ -26,13 +25,12 @@ public class TransferApply extends BaseEntity {
   @Column(comment = "客服人员id")
   @TableField(value = "customer_id")
   @ApiModelProperty("客服人员id")
-  private Long customer_id;
+  private String customer_id;
 
 
   @Column(comment = "用户id")
   @TableField(value = "user_id")
   @ApiModelProperty("用户id")
-  /**UUID */
   private String user_id;
 
 

+ 3 - 4
src/main/java/com/free/entity/system/LoginRecord.java

@@ -25,17 +25,16 @@ import lombok.Data;
 @TableName(value = "loginRecord")
 @ApiModel("登录登记表")
 public class LoginRecord {
-  @TableId(type = IdType.AUTO) // mybatis-plus主键注解
+  @TableId(type = IdType.ASSIGN_UUID) // mybatis-plus主键注解
   @IsKey
-  @IsAutoIncrement
   @Column(name = "id", comment = "数据id")
   @ApiModelProperty("数据id")
-  private Long id;
+  private String id;
   
   @Column(comment = "用户id")
   @TableField(value = "user_id")
   @ApiModelProperty("用户id")
-  private Long user_id;
+  private String user_id;
 
   @Column(comment = "用户类型")
   @TableField(value = "type")

+ 1 - 1
src/main/java/com/free/entity/system/Menus.java

@@ -36,7 +36,7 @@ public class Menus extends BaseEntity{
   @Column(comment = "父级id")
   @TableField(value = "parent_id")
   @ApiModelProperty("父级id")
-  private Long parent_id;
+  private String parent_id;
 
   @Column(comment = "显示顺序")
   @TableField(value = "order_num")

+ 1 - 1
src/main/java/com/free/mq/MqService.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Service;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.free.config.FormatJavaTimeModule;
 import com.free.entity.TransferApply;
-import com.free.utils.FormatJavaTimeModule;
 import com.free.utils.Utils;
 
 @Service

+ 2 - 2
src/main/java/com/free/service/TransferApplyService.java

@@ -35,7 +35,7 @@ public class TransferApplyService extends ServiceImpl<TransferApplyMapper, Trans
     List<Map> returnData = new ArrayList<>();
     for (TransferApply i : list) {
       Map map = Utils.objectToMap(i);
-      Long customer_id = i.getCustomer_id();
+      String customer_id = i.getCustomer_id();
       if (null != customer_id) {
         Customer cData = customerService.getById(customer_id);
         if (null != cData) {
@@ -59,7 +59,7 @@ public class TransferApplyService extends ServiceImpl<TransferApplyMapper, Trans
    */
   public List<Map> getDataLastRecord(List<Map> list) {
     for (Map map : list) {
-      Long apply_id = Utils.getLongValue(map.get("id"));
+      String apply_id = (String) map.get("id");
       QueryWrapper qw = new QueryWrapper<>();
       qw.select("content", "time", "is_read","content_type");
       qw.eq("apply_id", apply_id);

+ 4 - 7
src/main/java/com/free/service/system/MenusService.java

@@ -32,6 +32,7 @@ public class MenusService extends ServiceImpl<MenusMapper, Menus> {
 
   /**
    * 根据传来的所有目录,递归处理
+   * 
    * @param list
    * @return
    */
@@ -81,17 +82,13 @@ public class MenusService extends ServiceImpl<MenusMapper, Menus> {
   public List<Map<String, Object>> treeMenu(List<Map<String, Object>> list, List<Map<String, Object>> allList) {
     for (Map<String, Object> m : list) {
       // 取id,找parent_id 与其一致的数据
-      Long id = (Long) m.get("id");
+      String id = (String) m.get("id");
       String name = (String) m.get("name");
       List<Map<String, Object>> children = new ArrayList<>();
       // 找children
       for (Map<String, Object> am : allList) {
-        Object value = am.get("parent_id");
-        if (null == value) {
-          continue;
-        }
-        Long parent_id = Long.valueOf(String.valueOf(value));
-        if (parent_id == id) {
+        String parent_id = (String) am.get("parent_id");
+        if (parent_id.equals(id)) {
           // 为子目录,放入children中
           am.put("parent_name", name);
           children.add(am);

+ 2 - 4
src/main/java/com/free/utils/BaseEntity.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.annotation.IsAutoIncrement;
 import com.gitee.sunchenbin.mybatis.actable.annotation.IsKey;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -18,12 +17,11 @@ import lombok.Data;
 
 @Data
 public class BaseEntity {
-  @TableId(type = IdType.AUTO) // mybatis-plus主键注解
+  @TableId(type = IdType.ASSIGN_UUID) // mybatis-plus主键注解
   @IsKey
-  @IsAutoIncrement
   @Column(name = "id", comment = "数据id")
   @ApiModelProperty("数据id")
-  private Long id;
+  private String id;
 
   @TableField(fill = FieldFill.INSERT, select = false)
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")

+ 1 - 1
src/main/java/com/free/utils/JwtUtil.java

@@ -119,7 +119,7 @@ public class JwtUtil {
    */
   public static void createLoginRecord(String token) {
     Map<String, Object> map = getDetails(token);
-    Long user_id = (Long) map.get("id");
+    String user_id = (String) map.get("id");
     String type = (String) map.get("type");
     // 第一次登录是创建,以后都是更新, 每个用户都有1个登录数据,但是能否使用要看过期时间
     QueryWrapper<LoginRecord> qw = new QueryWrapper<>();

+ 1 - 1
src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
       location: D:/temp/customerUpload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.153:3306/customer?serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.1.153:3306/customer-test?serverTimezone=GMT%2B8
     username: root
     password: root
   rabbitmq:

+ 92 - 0
src/main/resources/db/dictData.json

@@ -0,0 +1,92 @@
+[
+  {
+    "code": "is_use",
+    "label": "使用",
+    "value": "0",
+    "sort": 0
+  },
+  {
+    "code": "is_use",
+    "label": "禁用",
+    "value": "1",
+    "sort": 1
+  },
+  {
+    "code": "confirm",
+    "label": "是",
+    "value": "0",
+    "sort": 0
+  },
+  {
+    "code": "confirm",
+    "label": "否",
+    "value": "1",
+    "sort": 1
+  },
+  {
+    "code": "menus_type",
+    "label": "目录",
+    "value": "0",
+    "sort": 0
+  },
+  {
+    "code": "menus_type",
+    "label": "菜单",
+    "value": "1",
+    "sort": 1
+  },
+  {
+    "code": "menus_type",
+    "label": "子页面",
+    "value": "2",
+    "sort": 2
+  },
+  {
+    "code": "icon",
+    "label": "el-icon-house",
+    "value": "el-icon-house",
+    "sort": 0
+  },
+  {
+    "code": "icon",
+    "label": "el-icon-user",
+    "value": "el-icon-user",
+    "sort": 1
+  },
+  {
+    "code": "icon",
+    "label": "el-icon-setting",
+    "value": "el-icon-setting",
+    "sort": 2
+  },
+  {
+    "code": "icon",
+    "label": "el-icon-tickets",
+    "value": "el-icon-tickets",
+    "sort": 3
+  },
+  {
+    "code": "icon",
+    "label": "el-icon-question",
+    "value": "el-icon-question",
+    "sort": 4
+  },
+  {
+    "code": "icon",
+    "label": "el-icon-s-tools",
+    "value": "el-icon-s-tools",
+    "sort": 5
+  },
+  {
+    "code": "icon",
+    "label": "el-icon-s-custom",
+    "value": "el-icon-s-custom",
+    "sort": 6
+  },
+  {
+    "code": "icon",
+    "label": "el-icon-chat-dot-square",
+    "value": "el-icon-chat-dot-square",
+    "sort": 7
+  }
+]