rev:基础功能维护修改

2023-06-20 08:40:08 +08:00
parent caa6ce91b2
commit cea8a12506
8 changed files with 58 additions and 51 deletions
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
@@ -105,7 +105,7 @@ public class SysDictController {
 //    @SaCheckPermission("dict:edit")
    public ResponseEntity<Object> updateDetail(@RequestBody Dict resources){
        dictService.updateDetail(resources);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        return new ResponseEntity<>(HttpStatus.OK);
    }

    @Log("删除字典详情")
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java
@@ -44,7 +44,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
        if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString();
        IPage<Dict> pages = new Page<>(page.getPage() + 1, page.getSize());
        QueryWrapper<Dict> lam = new QueryWrapper<>();
-        lam.select("MAX(dict_id) AS dictId, code, name")
+        lam.select("MAX(dict_id) AS dict_id, code, name")
                .lambda()
                .like(ObjectUtil.isNotEmpty(blurry), Dict::getCode, blurry)
                .or(ObjectUtil.isNotEmpty(blurry))
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/ISysParamService.java
@@ -1,5 +1,6 @@
 package org.nl.wms.system_manage.service.param;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.query.PageQuery;
@@ -25,7 +26,7 @@ public interface ISysParamService extends IService<Param> {
     * @param page      分页信息
     * @return
     */
-    Page<Param> queryPage(Map whereJson, PageQuery page);
+    IPage<Param> queryPage(Map whereJson, PageQuery page);

    /**
     * 创建参数
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/param/impl/SysParamServiceImpl.java
@@ -3,6 +3,7 @@ package org.nl.wms.system_manage.service.param.impl;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -11,6 +12,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.system_manage.service.dict.dao.Dict;
 import org.nl.wms.system_manage.service.param.ISysParamService;
 import org.nl.wms.system_manage.service.param.dao.Param;
 import org.nl.wms.system_manage.service.param.dao.mapper.SysParamMapper;
@@ -38,11 +40,12 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> impl
    private final SysParamMapper paramMapper;

    @Override
-    public Page<Param> queryPage(Map whereJson, PageQuery page) {
+    public IPage<Param> queryPage(Map whereJson, PageQuery page) {
        QueryWrapper<Param> queryWrapper = new QueryWrapper<>();
        queryWrapper.orderBy(true, true, "create_time");
-        Page<Param> paramPage = paramMapper.selectPage(page.build(), queryWrapper);
-        return paramPage;
+        IPage<Param> pages = new Page<>(page.getPage() + 1, page.getSize());
+        paramMapper.selectPage(pages, queryWrapper);
+        return pages;
    }

    @Override
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/dao/SysDataPermission.java
@@ -47,7 +47,7 @@ public class SysDataPermission implements Serializable {
    /**
     * 排序
     */
-    private BigDecimal orderSort;
+    private BigDecimal order_sort;

    /**
     * 备注
@@ -57,42 +57,42 @@ public class SysDataPermission implements Serializable {
    /**
     * 是否启用
     */
-    private String isUsed;
+    private String is_used;

    /**
     * 是否删除
     */
-    private String isDelete;
+    private String is_delete;

    /**
     * 创建人标识
     */
-    private String createId;
+    private String create_id;

    /**
     * 创建人
     */
-    private String createName;
+    private String create_name;

    /**
     * 创建时间
     */
-    private Date createTime;
+    private String create_time;

    /**
     * 修改人标识
     */
-    private String updateId;
+    private String update_id;

    /**
     * 修改人
     */
-    private String updateName;
+    private String update_name;

    /**
     * 修改时间
     */
-    private Date updateTime;
+    private String update_time;


 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/permission/impl/SysDataPermissionServiceImpl.java
@@ -1,5 +1,6 @@
 package org.nl.wms.system_manage.service.permission.impl;

+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -60,12 +61,12 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM


        permission.setPermissionId(IdUtil.getSnowflake(1, 1).nextIdStr());
-        permission.setCreateId(currentUserId);
-        permission.setCreateName(nickName);
-        permission.setUpdateId(currentUserId);
-        permission.setUpdateName(nickName);
-        permission.setUpdateTime(new Date());
-        permission.setCreateTime(new Date());
+        permission.setCreate_id(currentUserId);
+        permission.setCreate_name(nickName);
+        permission.setUpdate_id(currentUserId);
+        permission.setUpdate_name(nickName);
+        permission.setUpdate_time(DateUtil.now());
+        permission.setCreate_time(DateUtil.now());
        dataPermissionMapper.insert(permission);
    }

@@ -74,9 +75,9 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM
    public void update(SysDataPermission permission) {
        SysDataPermission dataPermission = dataPermissionMapper.selectById(permission.getPermissionId());
        if (ObjectUtil.isEmpty(dataPermission)) throw new BadRequestException("被删除或无权限，操作失败!");
-        permission.setUpdateTime(new Date());
-        permission.setUpdateId(SecurityUtils.getCurrentUserId());
-        permission.setUpdateName(SecurityUtils.getCurrentNickName());
+        permission.setUpdate_time(DateUtil.now());
+        permission.setUpdate_id(SecurityUtils.getCurrentUserId());
+        permission.setUpdate_name(SecurityUtils.getCurrentNickName());
        dataPermissionMapper.updateById(permission);
    }