bugfix

sckw-auth/src/main/java/com/sckw/auth/model/vo/req/LoginReqVo.java

@@ -3,6 +3,7 @@ package com.sckw.auth.model.vo.req;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 import java.io.Serial;
 import java.io.Serializable;

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/DeptInfoResVo.java

@@ -1,5 +1,7 @@
 package com.sckw.auth.model.vo.res;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sckw.core.utils.LongToStringUtils;
 import lombok.Data;
 
 /**
@@ -13,6 +15,7 @@ public class DeptInfoResVo {
     /**
      * 机构ID
      */
+    @JsonSerialize(using = LongToStringUtils.class)
     private long id;
 
     /**

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/EntInfoResVo.java

@@ -1,5 +1,7 @@
 package com.sckw.auth.model.vo.res;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sckw.core.utils.LongToStringUtils;
 import com.sckw.system.api.model.dto.res.EntCertificateResDto;
 import lombok.Data;
 
@@ -17,6 +19,7 @@ public class EntInfoResVo {
     /**
      * 企业id
      */
+    @JsonSerialize(using = LongToStringUtils.class)
     private Long id;
 
     /**

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo.java

@@ -1,5 +1,7 @@
 package com.sckw.auth.model.vo.res;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sckw.core.utils.LongToStringUtils;
 import com.sckw.system.api.model.dto.res.KwsRoleResDto;
 import lombok.Data;
 
@@ -26,6 +28,7 @@ public class LoginResVo implements Serializable {
     /**
      * 用户id
      */
+    @JsonSerialize(using = LongToStringUtils.class)
     private long id;
 
     /**

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/LongToStringUtils.java

@@ -1,9 +1,9 @@
 package com.sckw.core.utils;
 
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
 
 import java.io.IOException;
 
@@ -14,8 +14,9 @@ import java.io.IOException;
  */
 public class LongToStringUtils extends JsonSerializer<Long> {
 
+
     @Override
-    public void serialize(Long aLong, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
+    public void serialize(Long aLong, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
         if(null!=aLong) {
             jsonGenerator.writeString(String.valueOf(aLong));
         }

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/KwsRoleResDto.java

@@ -1,5 +1,7 @@
 package com.sckw.system.api.model.dto.res;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sckw.core.utils.LongToStringUtils;
 import lombok.Data;
 
 import java.io.Serial;
@@ -19,6 +21,7 @@ public class KwsRoleResDto implements Serializable {
     /**
      * 角色id
      */
+    @JsonSerialize(using = LongToStringUtils.class)
     private long id;
 
     /**

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/DelsMenuReqVo.java

@@ -0,0 +1,23 @@
+package com.sckw.system.model.vo.req;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author czh
+ * @desc 删菜单
+ * @date 2023/7/10
+ */
+@Data
+public class DelsMenuReqVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -350332473495147582L;
+
+    /**
+     * 主键id
+     */
+    private String ids;
+}

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/FindMenuTreeResVo.java

@@ -1,8 +1,8 @@
 package com.sckw.system.model.vo.res;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.sckw.core.utils.LongToStringUtils;
 import lombok.Data;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 import java.io.Serial;
 import java.io.Serializable;

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/QueryChildMenuResVo.java

@@ -1,8 +1,8 @@
 package com.sckw.system.model.vo.res;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.sckw.core.utils.LongToStringUtils;
 import lombok.Data;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 import java.io.Serial;
 import java.io.Serializable;

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsMenuService.java

@@ -129,7 +129,7 @@ public class KwsMenuService {
      * @date: 2023/6/25
      */
     public void deleteByKey(String ids) throws SystemException {
-        List<Long> list = Arrays.stream(ids.split(",")).map(Long::parseLong).toList();
+        List<Long> list = Arrays.stream(ids.split(Global.COMMA)).map(Long::parseLong).toList();
         /*1、删除菜单*/
         List<KwsMenu> kwsMenus = kwsMenuDao.selectByKeys(list);
         if (CollectionUtils.isEmpty(kwsMenus)) {
@@ -320,31 +320,30 @@ public class KwsMenuService {
         return kwsMenuDao.selectAll();
     }
 
-    @Transactional()
+    @Transactional(rollbackFor = {})
     public void moveMenu(MoveMenuReqVo reqVo) {
         KwsMenu kwsMenu = kwsMenuDao.selectByKey(reqVo.getId());
         if (Objects.isNull(kwsMenu)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.MENU_NOT_EXISTS);
         }
 
-//        //查出要被换位置的按钮
-//        KwsMenu targetMenu = getTargetMenu(reqVo.getMoveType(), kwsMenu);
-//
-//        //修改要换位置的按钮
+        //查出要被换位置的按钮
+        KwsMenu targetMenu = getTargetMenu(reqVo.getMoveType(), kwsMenu);
+        if (Objects.isNull(targetMenu)) {
+            return;
+        }
+
+        //修改要换位置的按钮
         kwsMenu.setSort(kwsMenu.getSort() + reqVo.getMoveType());
         if (kwsMenuDao.update(kwsMenu) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-//
-//        if (Objects.isNull(targetMenu)) {
-//            return;
-//        }
-//
-//        //更新被换位置的按钮
-//        targetMenu.setSort(targetMenu.getSort() - reqVo.getMoveType());
-//        if (kwsMenuDao.update(targetMenu) <= 0) {
-//            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
-//        }
+
+        //更新被换位置的按钮
+        targetMenu.setSort(targetMenu.getSort() - reqVo.getMoveType());
+        if (kwsMenuDao.update(targetMenu) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
     }