diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
index 4b7c5cc..6198eaa 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
@@ -17,7 +17,7 @@
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="仓库编码">
- <a-input placeholder="请输入仓库编码" v-model="queryParam.warehousecode"></a-input>
+ <a-input placeholder="请输入仓库编码" v-model="queryParam.warehouseCode"></a-input>
</a-form-item>
</a-col>
</template>
@@ -161,7 +161,7 @@
{
title:'仓库编码',
align:"center",
- dataIndex: 'warehousecode'
+ dataIndex: 'warehouseCode'
},
{
title:'地址',
@@ -218,7 +218,7 @@
deleteBatch: "/config/company/deleteBatch",
exportXlsUrl: "/config/company/exportXls",
importExcelUrl: "config/company/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue
new file mode 100644
index 0000000..afe26f7
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue
@@ -0,0 +1,183 @@
+<template>
+ <a-card :bordered="false">
+ <!-- 查询区域 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 查询区域-END -->
+
+ <!-- 操作按钮区域 -->
+ <div class="table-operator">
+ <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('用户仓库关系表')">导出</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">导入</a-button>
+ </a-upload>
+ <!-- 高级查询区域 -->
+ <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table区域-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+ <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ :scroll="{x:true}"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
+ @change="handleTableChange">
+
+ <template slot="htmlSlot" slot-scope="text">
+ <div v-html="text"></div>
+ </template>
+ <template slot="imgSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+ <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ </template>
+ <template slot="fileSlot" slot-scope="text">
+ <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+ <a-button
+ v-else
+ :ghost="true"
+ type="primary"
+ icon="download"
+ size="small"
+ @click="downloadFile(text)">
+ 下载
+ </a-button>
+ </template>
+
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">编辑</a>
+
+ <a-divider type="vertical" />
+ <a-dropdown>
+ <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a @click="handleDetail(record)">详情</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+ </a-table>
+ </div>
+
+ <sys-user-warehouse-modal ref="modalForm" @ok="modalFormOk"></sys-user-warehouse-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import SysUserWarehouseModal from './modules/SysUserWarehouseModal'
+
+ export default {
+ name: 'SysUserWarehouseList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ SysUserWarehouseModal
+ },
+ data () {
+ return {
+ description: '用户仓库关系表管理页面',
+ // 表头
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'用户名称',
+ align:"center",
+ dataIndex: 'username'
+ },
+ {
+ title:'用户表ID',
+ align:"center",
+ dataIndex: 'userid'
+ },
+ {
+ title:'仓库编码',
+ align:"center",
+ dataIndex: 'warehousecode'
+ },
+ {
+ title: '操作',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/config/sysUserWarehouse/list",
+ delete: "/config/sysUserWarehouse/delete",
+ deleteBatch: "/config/sysUserWarehouse/deleteBatch",
+ exportXlsUrl: "/config/sysUserWarehouse/exportXls",
+ importExcelUrl: "config/sysUserWarehouse/importExcel",
+
+ },
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'string',value:'username',text:'用户名称',dictCode:''})
+ fieldList.push({type:'int',value:'userid',text:'用户表ID',dictCode:''})
+ fieldList.push({type:'string',value:'warehousecode',text:'仓库编码',dictCode:''})
+ this.superFieldList = fieldList
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue
index 325eece..f5e90ea 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/CompanyForm.vue
@@ -14,10 +14,15 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="仓库编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehousecode">
- <a-input v-model="model.warehousecode" placeholder="请输入仓库编码" ></a-input>
+ <a-form-model-item label="仓库编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehouseCode">
+ <a-input v-model="model.warehouseCode" placeholder="请输入仓库编码" ></a-input>
</a-form-model-item>
</a-col>
+<!-- <a-col :span="24">-->
+<!-- <a-form-model-item label="仓库编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehouseCode">-->
+<!-- <j-dict-select-tag type="list" v-model="model.warehouseCode" dictCode="warehouse" placeholder="请选择仓库编码" />-->
+<!-- </a-form-model-item>-->
+<!-- </a-col>-->
<a-col :span="24">
<a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
<a-input v-model="model.address" placeholder="请输入地址" ></a-input>
@@ -101,7 +106,7 @@
name: [
{ required: true, message: '请输入货主名称!'},
],
- warehousecode: [
+ warehouseCode: [
{ required: true, message: '请输入仓库编码!'},
],
},
@@ -155,7 +160,7 @@
that.confirmLoading = false;
})
}
-
+
})
},
}
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseForm.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseForm.vue
new file mode 100644
index 0000000..959bf14
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseForm.vue
@@ -0,0 +1,120 @@
+<template>
+ <a-spin :spinning="confirmLoading">
+ <j-form-container :disabled="formDisabled">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item label="用户名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
+ <a-input v-model="model.username" placeholder="请输入用户名称" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="用户表ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userid">
+ <a-input-number v-model="model.userid" placeholder="请输入用户表ID" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="仓库编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="warehousecode">
+ <a-input v-model="model.warehousecode" placeholder="请输入仓库编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </j-form-container>
+ </a-spin>
+</template>
+
+<script>
+
+ import { httpAction, getAction } from '@/api/manage'
+ import { validateDuplicateValue } from '@/utils/util'
+
+ export default {
+ name: 'SysUserWarehouseForm',
+ components: {
+ },
+ props: {
+ //表单禁用
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ data () {
+ return {
+ model:{
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ confirmLoading: false,
+ validatorRules: {
+ userid: [
+ { required: true, message: '请输入用户表ID!'},
+ ],
+ warehousecode: [
+ { required: true, message: '请输入仓库编码!'},
+ ],
+ },
+ url: {
+ add: "/config/sysUserWarehouse/add",
+ edit: "/config/sysUserWarehouse/edit",
+ queryById: "/config/sysUserWarehouse/queryById"
+ }
+ }
+ },
+ computed: {
+ formDisabled(){
+ return this.disabled
+ },
+ },
+ created () {
+ //备份model原始值
+ this.modelDefault = JSON.parse(JSON.stringify(this.model));
+ },
+ methods: {
+ add () {
+ this.edit(this.modelDefault);
+ },
+ edit (record) {
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ },
+ submitForm () {
+ const that = this;
+ // 触发表单验证
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true;
+ let httpurl = '';
+ let method = '';
+ if(!this.model.id){
+ httpurl+=this.url.add;
+ method = 'post';
+ }else{
+ httpurl+=this.url.edit;
+ method = 'put';
+ }
+ httpAction(httpurl,this.model,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.$emit('ok');
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ })
+ }
+
+ })
+ },
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseModal.Style#Drawer.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseModal.Style#Drawer.vue
new file mode 100644
index 0000000..3f3fb21
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseModal.Style#Drawer.vue
@@ -0,0 +1,84 @@
+<template>
+ <a-drawer
+ :title="title"
+ :width="width"
+ placement="right"
+ :closable="false"
+ @close="close"
+ destroyOnClose
+ :visible="visible">
+ <sys-user-warehouse-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></sys-user-warehouse-form>
+ <div class="drawer-footer">
+ <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+ <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+ </div>
+ </a-drawer>
+</template>
+
+<script>
+
+ import SysUserWarehouseForm from './SysUserWarehouseForm'
+
+ export default {
+ name: 'SysUserWarehouseModal',
+ components: {
+ SysUserWarehouseForm
+ },
+ data () {
+ return {
+ title:"操作",
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ });
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+ .ant-btn {
+ margin-left: 30px;
+ margin-bottom: 30px;
+ float: right;
+ }
+ .drawer-footer{
+ position: absolute;
+ bottom: -8px;
+ width: 100%;
+ border-top: 1px solid #e8e8e8;
+ padding: 10px 16px;
+ text-align: right;
+ left: 0;
+ background: #fff;
+ border-radius: 0 0 2px 2px;
+ }
+</style>
\ No newline at end of file
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseModal.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseModal.vue
new file mode 100644
index 0000000..d991c1e
--- /dev/null
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/modules/SysUserWarehouseModal.vue
@@ -0,0 +1,60 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel"
+ cancelText="关闭">
+ <sys-user-warehouse-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></sys-user-warehouse-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import SysUserWarehouseForm from './SysUserWarehouseForm'
+ export default {
+ name: 'SysUserWarehouseModal',
+ components: {
+ SysUserWarehouseForm
+ },
+ data () {
+ return {
+ title:'',
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/LoginAccount.vue b/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/LoginAccount.vue
index 26b9824..6e7e2cf 100644
--- a/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/LoginAccount.vue
+++ b/jeecg-boot-master/ant-design-vue-jeecg/src/views/user/LoginAccount.vue
@@ -12,17 +12,16 @@
</a-input>
</a-form-model-item>
- <a-form-item>
+ <a-form-model-item required prop="warehouseCode">
<a-select
show-search
- prop="warehouseCode"
- v-model="model.warehouseCode"
placeholder="请选择仓库"
option-filter-prop="children"
+ v-model="model.warehouseCode"
>
<a-select-option v-for="item in warehouseList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
</a-select>
- </a-form-item>
+ </a-form-model-item>
<!-- <a-row :gutter="0">-->
<!-- <a-col :span="16">-->
@@ -71,7 +70,7 @@
password: [{
required: true, message: '请输入密码!', validator: 'click'
}],
- warehouseCode: [{ required: true, message: '请选择职级' }] ,
+ warehouseCode: [{ required: true, message: '请选择仓库' , validator: 'click'}] ,
// inputCode: [{
// required: true, message: '请输入验证码!'
// }]
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
index 79c0d44..b0b4cbb 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
@@ -94,6 +94,36 @@ public class JwtUtil {
}
/**
+ * 获得token中的信息无需secret解密也能获得
+ *
+ * @return token中包含的用户名
+ */
+ public static String getWarehouseCode(String token) {
+ try {
+ DecodedJWT jwt = JWT.decode(token);
+ return jwt.getClaim("warehouseCode").asString();
+ } catch (JWTDecodeException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 生成签名,5min后过期
+ *
+ * @param username 用户名
+ * @param secret 用户的密码
+ * @param warehouseCode 登录仓库
+ * @return 加密的token
+ */
+ public static String sign(String username, String secret, String warehouseCode) {
+ Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
+ Algorithm algorithm = Algorithm.HMAC256(secret);
+ // 附带username信息
+ return JWT.create().withClaim("username", username).withClaim("warehouseCode", warehouseCode)
+ .withExpiresAt(date).sign(algorithm);
+ }
+
+ /**
* 生成签名,5min后过期
*
* @param username 用户名
@@ -105,7 +135,6 @@ public class JwtUtil {
Algorithm algorithm = Algorithm.HMAC256(secret);
// 附带username信息
return JWT.create().withClaim("username", username).withExpiresAt(date).sign(algorithm);
-
}
/**
@@ -125,6 +154,22 @@ public class JwtUtil {
}
/**
+ * 根据request中的token获取用户账号
+ *
+ * @param request
+ * @return
+ * @throws JeecgBootException
+ */
+ public static String getWarehouseCodeByToken(HttpServletRequest request) throws JeecgBootException {
+ String accessToken = request.getHeader("X-Access-Token");
+ String warehouseCode = getWarehouseCode(accessToken);
+ if (oConvertUtils.isEmpty(warehouseCode)) {
+ throw new JeecgBootException("未获取到仓库编码");
+ }
+ return warehouseCode;
+ }
+
+ /**
* 从session中获取变量
* @param key
* @return
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
index 8797c62..b6a1dcc 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
@@ -108,8 +108,13 @@ public class LoginController {
return result;
}
+ if(StringUtils.isEmpty(warehouseCode)) {
+ result.error500("仓库编码错误");
+ return result;
+ }
+
//用户登录信息
- userInfo(sysUser, result);
+ userInfo(sysUser, result, warehouseCode);
//update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
// redisUtil.del(realKey);
//update-begin--Author:liusq Date:20210126 for：登录成功，删除redis中的验证码
@@ -127,14 +132,16 @@ public class LoginController {
@GetMapping("/user/getUserInfo")
public Result<JSONObject> getUserInfo(HttpServletRequest request){
Result<JSONObject> result = new Result<JSONObject>();
- String username = JwtUtil.getUserNameByToken(request);
+ String username = JwtUtil.getUserNameByToken(request);
+ String warehouseCode = JwtUtil.getWarehouseCodeByToken(request);
if(oConvertUtils.isNotEmpty(username)) {
// 根据用户名查询用户信息
SysUser sysUser = sysUserService.getUserByName(username);
//用户登录信息
- Result<JSONObject> resultObj=userInfo(sysUser, result);
+ Result<JSONObject> resultObj=userInfo(sysUser, result, warehouseCode);
JSONObject jsonObject=resultObj.getResult();
JSONObject obj=new JSONObject();
+ obj.put("warehouseCode", warehouseCode);
obj.put("userInfo",jsonObject.get("userInfo"));
obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
result.setResult(obj);
@@ -363,8 +370,13 @@ public class LoginController {
result.setMessage("手机验证码错误");
return result;
}
+
+ String warehouseCode = jsonObject.getString("warehouseCode");
+ if(StringUtils.isEmpty(warehouseCode)) {
+ return Result.error("仓库编码为空");
+ }
//用户信息
- userInfo(sysUser, result);
+ userInfo(sysUser, result, warehouseCode);
//添加日志
baseCommonService.addLog("用户名: " + sysUser.getUsername() + ",登录成功！", CommonConstant.LOG_TYPE_1, null);
@@ -377,9 +389,10 @@ public class LoginController {
*
* @param sysUser
* @param result
+ * @param warehouseCode
* @return
*/
- private Result<JSONObject> userInfo(SysUser sysUser, Result<JSONObject> result) {
+ private Result<JSONObject> userInfo(SysUser sysUser, Result<JSONObject> result, String warehouseCode) {
String syspassword = sysUser.getPassword();
String username = sysUser.getUsername();
// 获取用户部门信息
@@ -419,7 +432,7 @@ public class LoginController {
}
// update-end--Author:sunjianlei Date:20210802 for：获取用户租户信息
// 生成token
- String token = JwtUtil.sign(username, syspassword);
+ String token = JwtUtil.sign(username, syspassword, warehouseCode);
// 设置token缓存有效时间
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
index 7d5ae38..0c49152 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.oConvertUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.wms.config.company.entity.Company;
import org.jeecg.modules.wms.config.company.service.ICompanyService;
+import org.jeecg.utils.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -81,7 +83,11 @@ public class CompanyController extends JeecgController<Company, ICompanyService>
@AutoLog(value = "货主-添加")
@ApiOperation(value="货主-添加", notes="货主-添加")
@PostMapping(value = "/add")
- public Result<String> add(@RequestBody Company company) {
+ public Result<String> add(@RequestBody Company company, HttpServletRequest req) {
+ String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+ if(StringUtils.isNotEmpty(warehouseCode)) {
+ company.setWarehouseCode(warehouseCode);
+ }
companyService.save(company);
return Result.OK("添加成功！");
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java
index afc12ce..0a9ffd9 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/company/entity/Company.java
@@ -46,7 +46,7 @@ public class Company implements Serializable {
/**仓库代码*/
@Excel(name = "仓库代码", width = 15)
@ApiModelProperty(value = "仓库代码")
- private String warehousecode;
+ private String warehouseCode;
/**地址*/
@Excel(name = "地址", width = 15)
@ApiModelProperty(value = "地址")
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
index d9eb959..fd9ab68 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.oConvertUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.wms.config.material.entity.Material;
import org.jeecg.modules.wms.config.material.service.IMaterialService;
+import org.jeecg.utils.StringUtils;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -66,6 +68,8 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
+ String username = JwtUtil.getUserNameByToken(req);
+ String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
QueryWrapper<Material> queryWrapper = QueryGenerator.initQueryWrapper(material, req.getParameterMap());
Page<Material> page = new Page<Material>(pageNo, pageSize);
IPage<Material> pageList = materialService.page(page, queryWrapper);
@@ -81,7 +85,11 @@ public class MaterialController extends JeecgController<Material, IMaterialServi
@AutoLog(value = "物料管理-添加")
@ApiOperation(value="物料管理-添加", notes="物料管理-添加")
@PostMapping(value = "/add")
- public Result<String> add(@RequestBody Material material) {
+ public Result<String> add(@RequestBody Material material, HttpServletRequest req) {
+ String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+ if(StringUtils.isNotEmpty(warehouseCode)) {
+ material.setWarehousecode(warehouseCode);
+ }
materialService.save(material);
return Result.OK("添加成功！");
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/controller/SysUserWarehouseController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/controller/SysUserWarehouseController.java
new file mode 100644
index 0000000..47fe580
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/controller/SysUserWarehouseController.java
@@ -0,0 +1,172 @@
+package org.jeecg.modules.wms.config.sysUserWarehouse.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.wms.config.sysUserWarehouse.entity.SysUserWarehouse;
+import org.jeecg.modules.wms.config.sysUserWarehouse.service.ISysUserWarehouseService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 用户仓库关系表
+ * @Author: jeecg-boot
+ * @Date: 2022-10-21
+ * @Version: V1.0
+ */
+@Api(tags="用户仓库关系表")
+@RestController
+@RequestMapping("/config/sysUserWarehouse")
+@Slf4j
+public class SysUserWarehouseController extends JeecgController<SysUserWarehouse, ISysUserWarehouseService> {
+ @Autowired
+ private ISysUserWarehouseService sysUserWarehouseService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param sysUserWarehouse
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "用户仓库关系表-分页列表查询")
+ @ApiOperation(value="用户仓库关系表-分页列表查询", notes="用户仓库关系表-分页列表查询")
+ @GetMapping(value = "/list")
+ public Result<IPage<SysUserWarehouse>> queryPageList(SysUserWarehouse sysUserWarehouse,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<SysUserWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(sysUserWarehouse, req.getParameterMap());
+ Page<SysUserWarehouse> page = new Page<SysUserWarehouse>(pageNo, pageSize);
+ IPage<SysUserWarehouse> pageList = sysUserWarehouseService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 添加
+ *
+ * @param sysUserWarehouse
+ * @return
+ */
+ @AutoLog(value = "用户仓库关系表-添加")
+ @ApiOperation(value="用户仓库关系表-添加", notes="用户仓库关系表-添加")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody SysUserWarehouse sysUserWarehouse) {
+ sysUserWarehouseService.save(sysUserWarehouse);
+ return Result.OK("添加成功！");
+ }
+
+ /**
+ * 编辑
+ *
+ * @param sysUserWarehouse
+ * @return
+ */
+ @AutoLog(value = "用户仓库关系表-编辑")
+ @ApiOperation(value="用户仓库关系表-编辑", notes="用户仓库关系表-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public Result<String> edit(@RequestBody SysUserWarehouse sysUserWarehouse) {
+ sysUserWarehouseService.updateById(sysUserWarehouse);
+ return Result.OK("编辑成功!");
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "用户仓库关系表-通过id删除")
+ @ApiOperation(value="用户仓库关系表-通过id删除", notes="用户仓库关系表-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+ sysUserWarehouseService.removeById(id);
+ return Result.OK("删除成功!");
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "用户仓库关系表-批量删除")
+ @ApiOperation(value="用户仓库关系表-批量删除", notes="用户仓库关系表-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ this.sysUserWarehouseService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("批量删除成功!");
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "用户仓库关系表-通过id查询")
+ @ApiOperation(value="用户仓库关系表-通过id查询", notes="用户仓库关系表-通过id查询")
+ @GetMapping(value = "/queryById")
+ public Result<SysUserWarehouse> queryById(@RequestParam(name="id",required=true) String id) {
+ SysUserWarehouse sysUserWarehouse = sysUserWarehouseService.getById(id);
+ if(sysUserWarehouse==null) {
+ return Result.error("未找到对应数据");
+ }
+ return Result.OK(sysUserWarehouse);
+ }
+
+ /**
+ * 导出excel
+ *
+ * @param request
+ * @param sysUserWarehouse
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, SysUserWarehouse sysUserWarehouse) {
+ return super.exportXls(request, sysUserWarehouse, SysUserWarehouse.class, "用户仓库关系表");
+ }
+
+ /**
+ * 通过excel导入数据
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, SysUserWarehouse.class);
+ }
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/entity/SysUserWarehouse.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/entity/SysUserWarehouse.java
new file mode 100644
index 0000000..5c3c4f0
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/entity/SysUserWarehouse.java
@@ -0,0 +1,58 @@
+package org.jeecg.modules.wms.config.sysUserWarehouse.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 用户仓库关系表
+ * @Author: jeecg-boot
+ * @Date: 2022-10-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("sys_user_warehouse")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sys_user_warehouse对象", description="用户仓库关系表")
+public class SysUserWarehouse implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "主键")
+ private String id;
+ /**用户名称*/
+ @Excel(name = "用户名称", width = 15)
+ @ApiModelProperty(value = "用户名称")
+ private String username;
+ /**用户表ID*/
+ @Excel(name = "用户表ID", width = 15)
+ @ApiModelProperty(value = "用户表ID")
+ private Integer userid;
+ /**仓库编码*/
+ @Excel(name = "仓库编码", width = 15)
+ @ApiModelProperty(value = "仓库编码")
+ private String warehousecode;
+ /**创建人*/
+ @ApiModelProperty(value = "创建人")
+ private String createBy;
+ /**创建日期*/
+ @ApiModelProperty(value = "创建日期")
+ private Date createTime;
+ /**更新人*/
+ @ApiModelProperty(value = "更新人")
+ private String updateBy;
+ /**更新日期*/
+ @ApiModelProperty(value = "更新日期")
+ private Date updateTime;
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/mapper/SysUserWarehouseMapper.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/mapper/SysUserWarehouseMapper.java
new file mode 100644
index 0000000..6f33d4b
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/mapper/SysUserWarehouseMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.wms.config.sysUserWarehouse.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.wms.config.sysUserWarehouse.entity.SysUserWarehouse;
+
+/**
+ * @Description: 用户仓库关系表
+ * @Author: jeecg-boot
+ * @Date: 2022-10-21
+ * @Version: V1.0
+ */
+public interface SysUserWarehouseMapper extends BaseMapper<SysUserWarehouse> {
+
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/mapper/xml/SysUserWarehouseMapper.xml b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/mapper/xml/SysUserWarehouseMapper.xml
new file mode 100644
index 0000000..8ae30b9
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/mapper/xml/SysUserWarehouseMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.wms.config.sysUserWarehouse.mapper.SysUserWarehouseMapper">
+
+</mapper>
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/service/ISysUserWarehouseService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/service/ISysUserWarehouseService.java
new file mode 100644
index 0000000..dcc05f9
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/service/ISysUserWarehouseService.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.wms.config.sysUserWarehouse.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.wms.config.sysUserWarehouse.entity.SysUserWarehouse;
+
+/**
+ * @Description: 用户仓库关系表
+ * @Author: jeecg-boot
+ * @Date: 2022-10-21
+ * @Version: V1.0
+ */
+public interface ISysUserWarehouseService extends IService<SysUserWarehouse> {
+
+ String getWarehouseCodeByName(String username);
+}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/service/impl/SysUserWarehouseServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/service/impl/SysUserWarehouseServiceImpl.java
new file mode 100644
index 0000000..f3ebcfd
--- /dev/null
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/service/impl/SysUserWarehouseServiceImpl.java
@@ -0,0 +1,38 @@
+package org.jeecg.modules.wms.config.sysUserWarehouse.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.jeecg.modules.wms.config.sysUserWarehouse.entity.SysUserWarehouse;
+import org.jeecg.modules.wms.config.sysUserWarehouse.mapper.SysUserWarehouseMapper;
+import org.jeecg.modules.wms.config.sysUserWarehouse.service.ISysUserWarehouseService;
+import org.jeecg.utils.StringUtils;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.sql.Wrapper;
+
+/**
+ * @Description: 用户仓库关系表
+ * @Author: jeecg-boot
+ * @Date: 2022-10-21
+ * @Version: V1.0
+ */
+@Service
+public class SysUserWarehouseServiceImpl extends ServiceImpl<SysUserWarehouseMapper, SysUserWarehouse> implements ISysUserWarehouseService {
+
+ @Override
+ public String getWarehouseCodeByName(String username) {
+ if(StringUtils.isEmpty(username)) {
+ return null;
+ }
+ LambdaQueryWrapper<SysUserWarehouse> warehouseLambdaQueryWrapper = Wrappers.lambdaQuery();
+ warehouseLambdaQueryWrapper.eq(SysUserWarehouse::getUsername, username);
+ SysUserWarehouse sysUserWarehouse = this.getOne(warehouseLambdaQueryWrapper);
+ if(sysUserWarehouse == null) {
+ return null;
+ }
+ String warehouseCode = sysUserWarehouse.getWarehousecode();
+ return warehouseCode;
+ }
+}