rev:基础功能维护修改

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("删除字典详情")

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))

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);
 
     /**
      * 创建参数

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);
+        IPage<Param> pages = new Page<>(page.getPage() + 1, page.getSize());
-        return paramPage;
+        paramMapper.selectPage(pages, queryWrapper);
+        return pages;
     }
 
     @Override

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;
 
 
 }

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.setCreate_id(currentUserId);
-        permission.setCreateName(nickName);
+        permission.setCreate_name(nickName);
-        permission.setUpdateId(currentUserId);
+        permission.setUpdate_id(currentUserId);
-        permission.setUpdateName(nickName);
+        permission.setUpdate_name(nickName);
-        permission.setUpdateTime(new Date());
+        permission.setUpdate_time(DateUtil.now());
-        permission.setCreateTime(new Date());
+        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.setUpdate_time(DateUtil.now());
-        permission.setUpdateId(SecurityUtils.getCurrentUserId());
+        permission.setUpdate_id(SecurityUtils.getCurrentUserId());
-        permission.setUpdateName(SecurityUtils.getCurrentNickName());
+        permission.setUpdate_name(SecurityUtils.getCurrentNickName());
         dataPermissionMapper.updateById(permission);
     }
 

mes/qd/src/views/system/dict/dictDetail.vue

@@ -38,7 +38,7 @@
           </el-form-item>
           <el-form-item label="排序" prop="dict_sort">
             <el-input-number
-              v-model.number="form.dictSort"
+              v-model.number="form.dict_sort"
               :min="0"
               :max="999"
               controls-position="right"
@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column prop="label" label="字典标签" align="center" width="120" show-overflow-tooltip />
         <el-table-column prop="value" label="字典值" align="center" width="60" />
-        <el-table-column prop="dictSort" label="排序" align="center" width="65" />
+        <el-table-column prop="dict_sort" label="排序" align="center" width="65" />
         <el-table-column prop="para1" label="参数1" align="center" width="65" />
         <el-table-column prop="para2" label="参数2" align="center" width="65" />
         <el-table-column prop="para3" label="参数3" align="center" width="65" />
@@ -106,7 +106,7 @@ import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
 
-const defaultForm = { dictId: null, name: null, label: null, value: null, dictSort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
+const defaultForm = { dict_id: null, name: null, label: null, value: null, dictSort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
 
 export default {
   components: { pagination, rrOperation, udOperation },
@@ -116,8 +116,8 @@ export default {
         title: '字典详情',
         url: 'api/dict/dictDetail',
         query: { code: '' },
-        idField: 'dictId',
+        idField: 'dict_id',
-        sort: ['dictSort,asc', 'dictId,desc'],
+        sort: ['dict_sort,asc', 'dict_id,desc'],
         crudMethod: { ...crudDictDetail },
         optShow: {
           add: true,
@@ -133,11 +133,11 @@ export default {
     presenter(),
     header(),
     form(function() {
-      return Object.assign({ dict: { dictId: this.dictId }}, defaultForm)
+      return Object.assign({ dict: { dict_id: this.dict_id }}, defaultForm)
     })],
   data() {
     return {
-      dictId: null,
+      dict_id: null,
       rules: {
         label: [
           { required: true, message: '请输入字典标签', trigger: 'blur' }

mes/qd/src/views/system/user/index.vue

@@ -122,9 +122,9 @@
                 <!--:disabled="level !== 1 && item.level <= level"-->
                 <el-option
                   v-for="item in roles"
-                  :key="item.roleId"
+                  :key="item.role_id"
                   :label="item.name"
-                  :value="item.roleId"
+                  :value="item.role_id"
                 />
               </el-select>
             </el-form-item>
@@ -214,7 +214,7 @@
             :data="deptsDatas"
             :default-checked-keys="depChecked"
             :props="deptProps"
-            node-key="dept_ud"
+            node-key="dept_id"
             highlight-current
             check-strictly
             @check="handCheck"
@@ -348,7 +348,7 @@ export default {
   name: 'User',
   components: { RelevanceDeptDialog, RelevanceUserDialog, Treeselect, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
-    return CRUD({ title: '用户', idField: 'userId', url: 'api/users', crudMethod: { ...crudUser }})
+    return CRUD({ title: '用户', idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 数据字典
@@ -445,6 +445,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        debugger
         this.crud.delAllLoading = true
         this.crud.doDelete(datas)
       }).catch(() => {
@@ -453,10 +454,10 @@ export default {
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
       this.getRoles()
-      if (form.dept_ud == null) {
+      if (form.dept_id == null) {
         crudDept.getDepts()
       } else {
-        this.getSupDepts(form.dept_ud)
+        this.getSupDepts(form.dept_id)
       }
       // this.getRoleLevel() 暂时不用
       form.is_used = form.enabled.toString()
@@ -541,8 +542,8 @@ export default {
         })
       })
     },
-    getSupDepts(dept_ud) {
+    getSupDepts(dept_id) {
-      crudDept.getDeptSuperior(dept_ud).then(res => {
+      crudDept.getDeptSuperior(dept_id).then(res => {
         console.log('父部门', res)
         const date = res.content
         this.buildDepts(date)
@@ -575,17 +576,18 @@ export default {
     },
     normalizer(node) {
       return {
-        id: node.dept_ud,
+        id: node.dept_id,
         label: node.name,
         children: node.children
       }
     },
     // 切换部门
     handleNodeClick(data) {
-      this.query.dept_ud = data.dept_ud
+      debugger
+      this.query.dept_id = data.dept_id
       this.query.needAll = true
       this.crud.toQuery()
-      this.query.dept_ud = null
+      this.query.dept_id = null
     },
     // 改变状态
     changeEnabled(row) {
@@ -660,7 +662,7 @@ export default {
         this.$nextTick(function() {
           for (let j = 0; j < row.roles.length; j++) {
             for (let i = 0; i < this.rolesDatas.length; i++) {
-              if (this.rolesDatas[i].roleId == row.roles[j].roleId) {
+              if (this.rolesDatas[i].role_id === row.roles[j].role_id) {
                 this.$refs.roleTable.toggleRowSelection(this.rolesDatas[i], true)
                 break
               }
@@ -686,11 +688,11 @@ export default {
           this.permissions = res
           this.dataDialog.person_name = row.person_name
           this.dataDialog.username = row.username
-          this.dataDialog.userId = row.userId
+          this.dataDialog.user_id = row.user_id
           this.dataPermissionTitle = '[' + row.person_name + '] 数据权限'
           this.dataPerm = true
           // 回显数据
-          crudDataPermission.getDataShow(row.userId).then(res => {
+          crudDataPermission.getDataShow(row.user_id).then(res => {
             this.$nextTick(function() {
               for (var index = 0; index < res.length; index++) {
                 for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {
@@ -733,7 +735,7 @@ export default {
         this.relevanceDept = true
       } else if (row.permissionId == '1605128919449735168') { // 自身
         const param = {
-          userId: this.dataDialog.userId
+          user_id: this.dataDialog.user_id
         }
         this.dataDialog.dataScopeType[index].users = []
         this.dataDialog.dataScopeType[index].users.push(param)
@@ -767,7 +769,7 @@ export default {
     },
     savePermise() {
       const param = {
-        userId: this.dataDialog.userId,
+        user_id: this.dataDialog.user_id,
         datas: this.multipleSelection
       }
       console.log('param', param)
@@ -783,7 +785,7 @@ export default {
       this.depChecked = []
     },
     giveValue(row) {
-      this.depCheckedId = row.userId
+      this.depCheckedId = row.user_id
     },
     clearCheck() { // 清空选中
       if (this.flag) this.$refs.deptUser.setCheckedKeys([])
@@ -801,12 +803,12 @@ export default {
     },
     saveChecked() {
       const user = {
-        userId: this.depCheckedId
+        user_id: this.depCheckedId
       }
       if (this.flag) {
         user.deptIds = this.$refs.deptUser.getCheckedKeys()
       } else {
-        user.rolesIds = this.crud.selections.map(item => (item.roleId))
+        user.rolesIds = this.crud.selections.map(item => (item.role_id))
       }
       crudUser.edit(user).then(res => {
         this.cancelForm()
@@ -860,7 +862,7 @@ export default {
     },
     showDatas(row) {
       const param = {
-        userId: this.dataDialog.userId,
+        user_id: this.dataDialog.user_id,
         permissionScopeType: row.value
       }
       crudDataPermission.getDataDetail(param).then(res => {