Commit bcc5f2ca0c87442e62725d9975cebeb2d60abac9
1 parent
f3c3d3dd
导入导出权限控制
Showing
47 changed files
with
165 additions
and
17 deletions
ant-design-vue-jeecg/src/views/system/UserList.vue
... | ... | @@ -63,8 +63,8 @@ |
63 | 63 | <!-- 操作按钮区域 --> |
64 | 64 | <div class="table-operator" style="border-top: 5px"> |
65 | 65 | <a-button v-has="'user:add'" @click="handleAdd" type="primary" icon="plus">添加用户</a-button> |
66 | - <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button> | |
67 | - <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" | |
66 | + <a-button v-has="'user:export'" type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button> | |
67 | + <a-upload v-has="'user:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" | |
68 | 68 | @change="handleImportExcel"> |
69 | 69 | <a-button type="primary" icon="import">导入</a-button> |
70 | 70 | </a-upload> |
... | ... |
ant-design-vue-jeecg/src/views/system/config/AddressList.vue
... | ... | @@ -27,8 +27,8 @@ |
27 | 27 | <!-- 操作按钮区域 --> |
28 | 28 | <div class="table-operator"> |
29 | 29 | <a-button @click="handleAdd" v-has="'address:add'" type="primary" icon="plus">新增</a-button> |
30 | - <a-button type="primary" icon="download" @click="handleExportXls('接口地址')">导出</a-button> | |
31 | - <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" | |
30 | + <a-button v-has="'address:export'" type="primary" icon="download" @click="handleExportXls('接口地址')">导出</a-button> | |
31 | + <a-upload v-has="'address:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" | |
32 | 32 | @change="handleImportExcel"> |
33 | 33 | <a-button type="primary" icon="import">导入</a-button> |
34 | 34 | </a-upload> |
... | ... |
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
... | ... | @@ -3,8 +3,9 @@ |
3 | 3 | <!-- 操作按钮区域 --> |
4 | 4 | <div class="table-operator" v-if="mainId"> |
5 | 5 | <a-button v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button> |
6 | - <a-button type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button> | |
6 | + <a-button v-has="'inventoryDetail:export'" type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button> | |
7 | 7 | <a-upload |
8 | + v-has="'inventoryDetail:import'" | |
8 | 9 | name="file" |
9 | 10 | :showUploadList="false" |
10 | 11 | :multiple="false" |
... | ... | @@ -139,11 +140,11 @@ export default { |
139 | 140 | key: 'companyCode', |
140 | 141 | scopedSlots: {customRender: 'companyCode'} |
141 | 142 | }, |
142 | - { | |
143 | - title: '库区', | |
144 | - align: "center", | |
145 | - dataIndex: 'zoneCode' | |
146 | - }, | |
143 | + // { | |
144 | + // title: '库区', | |
145 | + // align: "center", | |
146 | + // dataIndex: 'zoneCode' | |
147 | + // }, | |
147 | 148 | { |
148 | 149 | title: '容器编码', |
149 | 150 | align: "center", |
... | ... |
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
... | ... | @@ -6,7 +6,16 @@ |
6 | 6 | <a-row :gutter="24"> |
7 | 7 | <a-col :xl="6" :lg="7" :md="8" :sm="24"> |
8 | 8 | <a-form-item label="库区"> |
9 | - <a-input placeholder="请输入库区" v-model="queryParam.zoneCode"></a-input> | |
9 | + <a-select | |
10 | + show-search | |
11 | + placeholder="请选择库区" | |
12 | + option-filter-prop="children" | |
13 | + :filter-option="filterOption" | |
14 | + v-model="queryParam.zoneCode"> | |
15 | + <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code"> | |
16 | + {{item.name}} | |
17 | + </a-select-option> | |
18 | + </a-select> | |
10 | 19 | </a-form-item> |
11 | 20 | </a-col> |
12 | 21 | <a-col :xl="6" :lg="7" :md="8" :sm="24"> |
... | ... | @@ -54,8 +63,8 @@ |
54 | 63 | <!-- 操作按钮区域 --> |
55 | 64 | <div class="table-operator"> |
56 | 65 | <a-button v-has="'inventoryHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button> |
57 | - <a-button type="primary" icon="download" @click="handleExportXls('库存表')">导出</a-button> | |
58 | - <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" | |
66 | + <a-button v-has="'inventoryHeader:export'" type="primary" icon="download" @click="handleExportXls('库存表')">导出</a-button> | |
67 | + <a-upload v-has="'inventoryHeader:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" | |
59 | 68 | @change="handleImportExcel"> |
60 | 69 | <a-button type="primary" icon="import">导入</a-button> |
61 | 70 | </a-upload> |
... | ... | @@ -84,6 +93,12 @@ |
84 | 93 | :customRow="clickThenSelect" |
85 | 94 | @change="handleTableChange"> |
86 | 95 | |
96 | + <span slot="zoneCode" slot-scope="zoneCode"> | |
97 | + <a-tag :key="zoneCode" color=blue> | |
98 | + {{ solutionZoneCode(zoneCode) }} | |
99 | + </a-tag> | |
100 | + </span> | |
101 | + | |
87 | 102 | <template slot="htmlSlot" slot-scope="text"> |
88 | 103 | <div v-html="text"></div> |
89 | 104 | </template> |
... | ... | @@ -140,6 +155,7 @@ import {getAction} from '@/api/manage' |
140 | 155 | import InventoryDetailList from './InventoryDetailList' |
141 | 156 | import {initDictOptions, filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
142 | 157 | import '@/assets/less/TableExpand.less' |
158 | +import { getZoneList } from '@api/api' | |
143 | 159 | |
144 | 160 | export default { |
145 | 161 | name: "InventoryHeaderList", |
... | ... | @@ -150,6 +166,7 @@ export default { |
150 | 166 | }, |
151 | 167 | data() { |
152 | 168 | return { |
169 | + zoneList: [], | |
153 | 170 | description: '库存表管理页面', |
154 | 171 | // 表头 |
155 | 172 | columns: [ |
... | ... | @@ -161,7 +178,9 @@ export default { |
161 | 178 | { |
162 | 179 | title: '库区', |
163 | 180 | align: "center", |
164 | - dataIndex: 'zoneCode' | |
181 | + dataIndex: 'zoneCode', | |
182 | + key: 'zoneCode', | |
183 | + scopedSlots: {customRender: 'zoneCode'} | |
165 | 184 | }, |
166 | 185 | { |
167 | 186 | title: '容器号', |
... | ... | @@ -245,6 +264,7 @@ export default { |
245 | 264 | }, |
246 | 265 | created() { |
247 | 266 | this.getSuperFieldList(); |
267 | + this.loadFrom(); | |
248 | 268 | }, |
249 | 269 | computed: { |
250 | 270 | importExcelUrl: function () { |
... | ... | @@ -252,6 +272,17 @@ export default { |
252 | 272 | } |
253 | 273 | }, |
254 | 274 | methods: { |
275 | + solutionZoneCode(value) { | |
276 | + var actions = [] | |
277 | + Object.keys(this.zoneList).some((key) => { | |
278 | + if (this.zoneList[key].code == ('' + value)) { | |
279 | + actions.push(this.zoneList[key].name) | |
280 | + return true | |
281 | + } | |
282 | + }) | |
283 | + return actions.join('') | |
284 | + }, | |
285 | + | |
255 | 286 | initDictConfig() { |
256 | 287 | }, |
257 | 288 | clickThenSelect(record) { |
... | ... | @@ -296,6 +327,13 @@ export default { |
296 | 327 | this.loading = false; |
297 | 328 | }) |
298 | 329 | }, |
330 | + loadFrom() { | |
331 | + getZoneList().then((res) => { | |
332 | + if (res.success) { | |
333 | + this.zoneList = res.result | |
334 | + } | |
335 | + }); | |
336 | + }, | |
299 | 337 | getSuperFieldList() { |
300 | 338 | let fieldList = []; |
301 | 339 | fieldList.push({type: 'string', value: 'companyCode', text: '货主', dictCode: ''}) |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
... | ... | @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; |
7 | 7 | import io.swagger.annotations.ApiOperation; |
8 | 8 | import lombok.extern.slf4j.Slf4j; |
9 | 9 | import org.apache.shiro.SecurityUtils; |
10 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
10 | 11 | import org.apache.shiro.authz.annotation.RequiresRoles; |
11 | 12 | import org.jeecg.common.api.vo.Result; |
12 | 13 | import org.jeecg.common.constant.CommonConstant; |
... | ... | @@ -76,6 +77,7 @@ public class QuartzJobController { |
76 | 77 | * @return |
77 | 78 | */ |
78 | 79 | // @RequiresRoles("admin") |
80 | + @RequiresPermissions("quartzJob:add") | |
79 | 81 | @RequestMapping(value = "/add", method = RequestMethod.POST) |
80 | 82 | public Result<?> add(@RequestBody QuartzJob quartzJob) { |
81 | 83 | quartzJobService.saveAndScheduleJob(quartzJob); |
... | ... | @@ -186,6 +188,7 @@ public class QuartzJobController { |
186 | 188 | * @param quartzJob |
187 | 189 | */ |
188 | 190 | @RequestMapping(value = "/exportXls") |
191 | + @RequiresPermissions("quartzJob:export") | |
189 | 192 | public ModelAndView exportXls(HttpServletRequest request, QuartzJob quartzJob) { |
190 | 193 | // Step.1 组装查询条件 |
191 | 194 | QueryWrapper<QuartzJob> queryWrapper = QueryGenerator.initQueryWrapper(quartzJob, request.getParameterMap()); |
... | ... | @@ -211,6 +214,7 @@ public class QuartzJobController { |
211 | 214 | * @return |
212 | 215 | */ |
213 | 216 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
217 | + @RequiresPermissions("quartzJob:export") | |
214 | 218 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException { |
215 | 219 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
216 | 220 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
... | ... | @@ -387,6 +387,7 @@ public class SysAnnouncementController { |
387 | 387 | * @param request |
388 | 388 | */ |
389 | 389 | @RequestMapping(value = "/exportXls") |
390 | + @RequiresPermissions("annountCement:export") | |
390 | 391 | public ModelAndView exportXls(SysAnnouncement sysAnnouncement, HttpServletRequest request) { |
391 | 392 | // Step.1 组装查询条件 |
392 | 393 | LambdaQueryWrapper<SysAnnouncement> queryWrapper = new LambdaQueryWrapper<SysAnnouncement>(sysAnnouncement); |
... | ... | @@ -410,6 +411,7 @@ public class SysAnnouncementController { |
410 | 411 | * @return |
411 | 412 | */ |
412 | 413 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
414 | + @RequiresPermissions("annountCement:import") | |
413 | 415 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
414 | 416 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
415 | 417 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
... | ... | @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
6 | 6 | import lombok.extern.slf4j.Slf4j; |
7 | 7 | import org.apache.commons.lang3.StringUtils; |
8 | 8 | import org.apache.shiro.SecurityUtils; |
9 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
9 | 10 | import org.apache.shiro.authz.annotation.RequiresRoles; |
10 | 11 | import org.jeecg.common.api.vo.Result; |
11 | 12 | import org.jeecg.common.constant.CacheConstant; |
... | ... | @@ -328,6 +329,7 @@ public class SysDepartController { |
328 | 329 | * @param request |
329 | 330 | */ |
330 | 331 | @RequestMapping(value = "/exportXls") |
332 | + @RequiresPermissions("sysDepart:export") | |
331 | 333 | public ModelAndView exportXls(SysDepart sysDepart, HttpServletRequest request) { |
332 | 334 | // Step.1 组装查询条件 |
333 | 335 | QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, request.getParameterMap()); |
... | ... | @@ -360,6 +362,7 @@ public class SysDepartController { |
360 | 362 | */ |
361 | 363 | // @RequiresRoles({"admin"}) |
362 | 364 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
365 | + @RequiresPermissions("sysDepart:import") | |
363 | 366 | @CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true) |
364 | 367 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
365 | 368 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
... | ... | @@ -439,6 +439,7 @@ public class SysDictController { |
439 | 439 | * @param request |
440 | 440 | */ |
441 | 441 | @RequestMapping(value = "/exportXls") |
442 | + @RequiresPermissions("dict:export") | |
442 | 443 | public ModelAndView exportXls(SysDict sysDict, HttpServletRequest request) { |
443 | 444 | // Step.1 组装查询条件 |
444 | 445 | QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, request.getParameterMap()); |
... | ... | @@ -476,6 +477,7 @@ public class SysDictController { |
476 | 477 | */ |
477 | 478 | // @RequiresRoles({"admin"}) |
478 | 479 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
480 | + @RequiresPermissions("dict:import") | |
479 | 481 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
480 | 482 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
481 | 483 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java
... | ... | @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation; |
9 | 9 | import lombok.extern.slf4j.Slf4j; |
10 | 10 | import org.apache.poi.ss.formula.functions.T; |
11 | 11 | import org.apache.shiro.SecurityUtils; |
12 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
12 | 13 | import org.jeecg.common.api.vo.Result; |
13 | 14 | import org.jeecg.common.aspect.annotation.AutoLog; |
14 | 15 | import org.jeecg.common.constant.CommonConstant; |
... | ... | @@ -83,6 +84,7 @@ public class SysPositionController { |
83 | 84 | * @return |
84 | 85 | */ |
85 | 86 | @AutoLog(value = "职务表-添加") |
87 | + @RequiresPermissions("position:add") | |
86 | 88 | @ApiOperation(value = "职务表-添加", notes = "职务表-添加") |
87 | 89 | @PostMapping(value = "/add") |
88 | 90 | public Result<SysPosition> add(@RequestBody SysPosition sysPosition) { |
... | ... | @@ -184,6 +186,7 @@ public class SysPositionController { |
184 | 186 | * @param response |
185 | 187 | */ |
186 | 188 | @RequestMapping(value = "/exportXls") |
189 | + @RequiresPermissions("position:export") | |
187 | 190 | public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { |
188 | 191 | // Step.1 组装查询条件 |
189 | 192 | QueryWrapper<SysPosition> queryWrapper = null; |
... | ... | @@ -217,6 +220,7 @@ public class SysPositionController { |
217 | 220 | * @return |
218 | 221 | */ |
219 | 222 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
223 | + @RequiresPermissions("position:import") | |
220 | 224 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) throws IOException { |
221 | 225 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
222 | 226 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
... | ... | @@ -12,6 +12,7 @@ import java.util.Map; |
12 | 12 | import javax.servlet.http.HttpServletRequest; |
13 | 13 | import javax.servlet.http.HttpServletResponse; |
14 | 14 | |
15 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
15 | 16 | import org.apache.shiro.authz.annotation.RequiresRoles; |
16 | 17 | import org.jeecg.common.api.vo.Result; |
17 | 18 | import org.jeecg.common.constant.CacheConstant; |
... | ... | @@ -247,6 +248,7 @@ public class SysRoleController { |
247 | 248 | * @param request |
248 | 249 | */ |
249 | 250 | @RequestMapping(value = "/exportXls") |
251 | + @RequiresPermissions("role:export") | |
250 | 252 | public ModelAndView exportXls(SysRole sysRole, HttpServletRequest request) { |
251 | 253 | // Step.1 组装查询条件 |
252 | 254 | QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(sysRole, request.getParameterMap()); |
... | ... | @@ -269,6 +271,7 @@ public class SysRoleController { |
269 | 271 | * @return |
270 | 272 | */ |
271 | 273 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
274 | + @RequiresPermissions("role:import") | |
272 | 275 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
273 | 276 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
274 | 277 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java
... | ... | @@ -139,6 +139,7 @@ public class AddressController extends JeecgController<Address, IAddressService> |
139 | 139 | * @param address |
140 | 140 | */ |
141 | 141 | @RequestMapping(value = "/exportXls") |
142 | + @RequiresPermissions("address:export") | |
142 | 143 | public ModelAndView exportXls(HttpServletRequest request, Address address) { |
143 | 144 | return super.exportXls(request, address, Address.class, "接口地址"); |
144 | 145 | } |
... | ... | @@ -149,6 +150,7 @@ public class AddressController extends JeecgController<Address, IAddressService> |
149 | 150 | * @param response |
150 | 151 | * @return |
151 | 152 | */ |
153 | + @RequiresPermissions("address:import") | |
152 | 154 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
153 | 155 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
154 | 156 | return super.importExcel(request, response, Address.class); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/agvPort/controller/AgvPortController.java
... | ... | @@ -138,6 +138,7 @@ public class AgvPortController extends JeecgController<AgvPort, IAgvPortService> |
138 | 138 | * @param agvPort |
139 | 139 | */ |
140 | 140 | @RequestMapping(value = "/exportXls") |
141 | + @RequiresPermissions("agvPort:export") | |
141 | 142 | public ModelAndView exportXls(HttpServletRequest request, AgvPort agvPort) { |
142 | 143 | return super.exportXls(request, agvPort, AgvPort.class, "AGV点位"); |
143 | 144 | } |
... | ... | @@ -149,6 +150,7 @@ public class AgvPortController extends JeecgController<AgvPort, IAgvPortService> |
149 | 150 | * @return |
150 | 151 | */ |
151 | 152 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
153 | + @RequiresPermissions("agvPort:import") | |
152 | 154 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
153 | 155 | return super.importExcel(request, response, AgvPort.class); |
154 | 156 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/bomHeader/controller/BomHeaderController.java
... | ... | @@ -141,6 +141,7 @@ public class BomHeaderController extends JeecgController<BomHeader, IBomHeaderSe |
141 | 141 | * @return |
142 | 142 | */ |
143 | 143 | @RequestMapping(value = "/exportXls") |
144 | + @RequiresPermissions("bomHeader:export") | |
144 | 145 | public ModelAndView exportXls(HttpServletRequest request, BomHeader bomHeader) { |
145 | 146 | return super.exportXls(request, bomHeader, BomHeader.class, "bom主表"); |
146 | 147 | } |
... | ... | @@ -150,6 +151,7 @@ public class BomHeaderController extends JeecgController<BomHeader, IBomHeaderSe |
150 | 151 | * @return |
151 | 152 | */ |
152 | 153 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
154 | + @RequiresPermissions("bomHeader:import") | |
153 | 155 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
154 | 156 | return super.importExcel(request, response, BomHeader.class); |
155 | 157 | } |
... | ... | @@ -234,6 +236,7 @@ public class BomHeaderController extends JeecgController<BomHeader, IBomHeaderSe |
234 | 236 | * @return |
235 | 237 | */ |
236 | 238 | @RequestMapping(value = "/exportBomDetail") |
239 | + @RequiresPermissions("bomDetail:export") | |
237 | 240 | public ModelAndView exportBomDetail(HttpServletRequest request, BomDetail bomDetail) { |
238 | 241 | // Step.1 组装查询条件 |
239 | 242 | QueryWrapper<BomDetail> queryWrapper = QueryGenerator.initQueryWrapper(bomDetail, request.getParameterMap()); |
... | ... | @@ -266,6 +269,7 @@ public class BomHeaderController extends JeecgController<BomHeader, IBomHeaderSe |
266 | 269 | * @return |
267 | 270 | */ |
268 | 271 | @RequestMapping(value = "/importBomDetail/{mainId}") |
272 | + @RequiresPermissions("bomDetail:import") | |
269 | 273 | public Result<?> importBomDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) { |
270 | 274 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
271 | 275 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/carrier/controller/CarrierController.java
... | ... | @@ -149,6 +149,7 @@ public class CarrierController extends JeecgController<Carrier, ICarrierService> |
149 | 149 | * @param carrier |
150 | 150 | */ |
151 | 151 | @RequestMapping(value = "/exportXls") |
152 | + @RequiresPermissions("carrier:export") | |
152 | 153 | public ModelAndView exportXls(HttpServletRequest request, Carrier carrier) { |
153 | 154 | return super.exportXls(request, carrier, Carrier.class, "承运商管理"); |
154 | 155 | } |
... | ... | @@ -160,6 +161,7 @@ public class CarrierController extends JeecgController<Carrier, ICarrierService> |
160 | 161 | * @return |
161 | 162 | */ |
162 | 163 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
164 | + @RequiresPermissions("carrier:import") | |
163 | 165 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
164 | 166 | return super.importExcel(request, response, Carrier.class); |
165 | 167 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/company/controller/CompanyController.java
... | ... | @@ -157,6 +157,7 @@ public class CompanyController extends JeecgController<Company, ICompanyService> |
157 | 157 | * @param company |
158 | 158 | */ |
159 | 159 | @RequestMapping(value = "/exportXls") |
160 | + @RequiresPermissions("company:export") | |
160 | 161 | public ModelAndView exportXls(HttpServletRequest request, Company company) { |
161 | 162 | return super.exportXls(request, company, Company.class, "货主"); |
162 | 163 | } |
... | ... | @@ -168,6 +169,7 @@ public class CompanyController extends JeecgController<Company, ICompanyService> |
168 | 169 | * @return |
169 | 170 | */ |
170 | 171 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
172 | + @RequiresPermissions("company:import") | |
171 | 173 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
172 | 174 | return super.importExcel(request, response, Company.class); |
173 | 175 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
... | ... | @@ -190,6 +190,7 @@ public class ContainerController extends JeecgController<Container, IContainerSe |
190 | 190 | * @param container |
191 | 191 | */ |
192 | 192 | @RequestMapping(value = "/exportXls") |
193 | + @RequiresPermissions("container:export") | |
193 | 194 | public ModelAndView exportXls(HttpServletRequest request, Container container) { |
194 | 195 | return super.exportXls(request, container, Container.class, "容器管理"); |
195 | 196 | } |
... | ... | @@ -201,6 +202,7 @@ public class ContainerController extends JeecgController<Container, IContainerSe |
201 | 202 | * @return |
202 | 203 | */ |
203 | 204 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
205 | + @RequiresPermissions("container:import") | |
204 | 206 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
205 | 207 | return super.importExcel(request, response, Container.class); |
206 | 208 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/containerCapacity/controller/ContainerCapacityController.java
... | ... | @@ -153,6 +153,7 @@ public class ContainerCapacityController extends JeecgController<ContainerCapaci |
153 | 153 | * @param containerCapacity |
154 | 154 | */ |
155 | 155 | @RequestMapping(value = "/exportXls") |
156 | + @RequiresPermissions("containerCapacity:export") | |
156 | 157 | public ModelAndView exportXls(HttpServletRequest request, ContainerCapacity containerCapacity) { |
157 | 158 | return super.exportXls(request, containerCapacity, ContainerCapacity.class, "容器容量管理"); |
158 | 159 | } |
... | ... | @@ -164,6 +165,7 @@ public class ContainerCapacityController extends JeecgController<ContainerCapaci |
164 | 165 | * @return |
165 | 166 | */ |
166 | 167 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
168 | + @RequiresPermissions("containerCapacity:import") | |
167 | 169 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
168 | 170 | return super.importExcel(request, response, ContainerCapacity.class); |
169 | 171 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/containerType/controller/ContainerTypeController.java
... | ... | @@ -157,6 +157,7 @@ public class ContainerTypeController extends JeecgController<ContainerType, ICon |
157 | 157 | * @param containerType |
158 | 158 | */ |
159 | 159 | @RequestMapping(value = "/exportXls") |
160 | + @RequiresPermissions("containerType:export") | |
160 | 161 | public ModelAndView exportXls(HttpServletRequest request, ContainerType containerType) { |
161 | 162 | return super.exportXls(request, containerType, ContainerType.class, "容器类型"); |
162 | 163 | } |
... | ... | @@ -168,6 +169,7 @@ public class ContainerTypeController extends JeecgController<ContainerType, ICon |
168 | 169 | * @return |
169 | 170 | */ |
170 | 171 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
172 | + @RequiresPermissions("containerType:import") | |
171 | 173 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
172 | 174 | return super.importExcel(request, response, ContainerType.class); |
173 | 175 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/customer/controller/CustomerController.java
... | ... | @@ -158,6 +158,7 @@ public class CustomerController extends JeecgController<Customer, ICustomerServi |
158 | 158 | * @param customer |
159 | 159 | */ |
160 | 160 | @RequestMapping(value = "/exportXls") |
161 | + @RequiresPermissions("customer:export") | |
161 | 162 | public ModelAndView exportXls(HttpServletRequest request, Customer customer) { |
162 | 163 | return super.exportXls(request, customer, Customer.class, "客户管理"); |
163 | 164 | } |
... | ... | @@ -169,6 +170,7 @@ public class CustomerController extends JeecgController<Customer, ICustomerServi |
169 | 170 | * @return |
170 | 171 | */ |
171 | 172 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
173 | + @RequiresPermissions("customer:import") | |
172 | 174 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
173 | 175 | return super.importExcel(request, response, Customer.class); |
174 | 176 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/cycleCountPreference/controller/CycleCountPreferenceController.java
... | ... | @@ -156,6 +156,7 @@ public class CycleCountPreferenceController extends JeecgController<CycleCountPr |
156 | 156 | * @param cycleCountPreference |
157 | 157 | */ |
158 | 158 | @RequestMapping(value = "/exportXls") |
159 | + @RequiresPermissions("cycleCountPreference:export") | |
159 | 160 | public ModelAndView exportXls(HttpServletRequest request, CycleCountPreference cycleCountPreference) { |
160 | 161 | return super.exportXls(request, cycleCountPreference, CycleCountPreference.class, "盘点首选项"); |
161 | 162 | } |
... | ... | @@ -167,6 +168,7 @@ public class CycleCountPreferenceController extends JeecgController<CycleCountPr |
167 | 168 | * @return |
168 | 169 | */ |
169 | 170 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
171 | + @RequiresPermissions("cycleCountPreference:import") | |
170 | 172 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
171 | 173 | return super.importExcel(request, response, CycleCountPreference.class); |
172 | 174 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
... | ... | @@ -206,6 +206,7 @@ public class LocationController extends JeecgController<Location, ILocationServi |
206 | 206 | * @param location |
207 | 207 | */ |
208 | 208 | @RequestMapping(value = "/exportXls") |
209 | + @RequiresPermissions("location:export") | |
209 | 210 | public ModelAndView exportXls(HttpServletRequest request, Location location) { |
210 | 211 | return super.exportXls(request, location, Location.class, "库位管理"); |
211 | 212 | } |
... | ... | @@ -217,6 +218,7 @@ public class LocationController extends JeecgController<Location, ILocationServi |
217 | 218 | * @return |
218 | 219 | */ |
219 | 220 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
221 | + @RequiresPermissions("location:import") | |
220 | 222 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
221 | 223 | return super.importExcel(request, response, Location.class); |
222 | 224 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationHigh/controller/LocationHighController.java
... | ... | @@ -157,6 +157,7 @@ public class LocationHighController extends JeecgController<LocationHigh, ILocat |
157 | 157 | * @param locationHigh |
158 | 158 | */ |
159 | 159 | @RequestMapping(value = "/exportXls") |
160 | + @RequiresPermissions("locationHigh:export") | |
160 | 161 | public ModelAndView exportXls(HttpServletRequest request, LocationHigh locationHigh) { |
161 | 162 | return super.exportXls(request, locationHigh, LocationHigh.class, "库位高度管理"); |
162 | 163 | } |
... | ... | @@ -168,6 +169,7 @@ public class LocationHighController extends JeecgController<LocationHigh, ILocat |
168 | 169 | * @return |
169 | 170 | */ |
170 | 171 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
172 | + @RequiresPermissions("locationHigh:import") | |
171 | 173 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
172 | 174 | return super.importExcel(request, response, LocationHigh.class); |
173 | 175 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationType/controller/LocationTypeController.java
... | ... | @@ -156,6 +156,7 @@ public class LocationTypeController extends JeecgController<LocationType, ILocat |
156 | 156 | * @param locationType |
157 | 157 | */ |
158 | 158 | @RequestMapping(value = "/exportXls") |
159 | + @RequiresPermissions("locationType:export") | |
159 | 160 | public ModelAndView exportXls(HttpServletRequest request, LocationType locationType) { |
160 | 161 | return super.exportXls(request, locationType, LocationType.class, "库位类型"); |
161 | 162 | } |
... | ... | @@ -167,6 +168,7 @@ public class LocationTypeController extends JeecgController<LocationType, ILocat |
167 | 168 | * @return |
168 | 169 | */ |
169 | 170 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
171 | + @RequiresPermissions("locationType:import") | |
170 | 172 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
171 | 173 | return super.importExcel(request, response, LocationType.class); |
172 | 174 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
... | ... | @@ -142,7 +142,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi |
142 | 142 | * @param material |
143 | 143 | */ |
144 | 144 | @RequestMapping(value = "/exportXls") |
145 | - @RequiresPermissions("material:exportXls") | |
145 | + @RequiresPermissions("material:export") | |
146 | 146 | public ModelAndView exportXls(HttpServletRequest request, Material material) { |
147 | 147 | return super.exportXls(request, material, Material.class, "物料管理"); |
148 | 148 | } |
... | ... | @@ -170,7 +170,7 @@ public class MaterialController extends JeecgController<Material, IMaterialServi |
170 | 170 | * @return |
171 | 171 | */ |
172 | 172 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
173 | - @RequiresPermissions("material:importExcel") | |
173 | + @RequiresPermissions("material:import") | |
174 | 174 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
175 | 175 | return super.importExcel(request, response, Material.class); |
176 | 176 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialArea/controller/MaterialAreaController.java
... | ... | @@ -153,6 +153,7 @@ public class MaterialAreaController extends JeecgController<MaterialArea, IMater |
153 | 153 | * @param materialArea |
154 | 154 | */ |
155 | 155 | @RequestMapping(value = "/exportXls") |
156 | + @RequiresPermissions("materialArea:export") | |
156 | 157 | public ModelAndView exportXls(HttpServletRequest request, MaterialArea materialArea) { |
157 | 158 | return super.exportXls(request, materialArea, MaterialArea.class, "物料分区"); |
158 | 159 | } |
... | ... | @@ -164,6 +165,7 @@ public class MaterialAreaController extends JeecgController<MaterialArea, IMater |
164 | 165 | * @return |
165 | 166 | */ |
166 | 167 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
168 | + @RequiresPermissions("materialArea:import") | |
167 | 169 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
168 | 170 | return super.importExcel(request, response, MaterialArea.class); |
169 | 171 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialMultiple/controller/MaterialMultipleController.java
... | ... | @@ -153,6 +153,7 @@ public class MaterialMultipleController extends JeecgController<MaterialMultiple |
153 | 153 | * @param materialMultiple |
154 | 154 | */ |
155 | 155 | @RequestMapping(value = "/exportXls") |
156 | + @RequiresPermissions("materialMultiple:export") | |
156 | 157 | public ModelAndView exportXls(HttpServletRequest request, MaterialMultiple materialMultiple) { |
157 | 158 | return super.exportXls(request, materialMultiple, MaterialMultiple.class, "物料单位换算"); |
158 | 159 | } |
... | ... | @@ -164,6 +165,7 @@ public class MaterialMultipleController extends JeecgController<MaterialMultiple |
164 | 165 | * @return |
165 | 166 | */ |
166 | 167 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
168 | + @RequiresPermissions("materialMultiple:import") | |
167 | 169 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
168 | 170 | return super.importExcel(request, response, MaterialMultiple.class); |
169 | 171 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialType/controller/MaterialTypeController.java
... | ... | @@ -153,6 +153,7 @@ public class MaterialTypeController extends JeecgController<MaterialType, IMater |
153 | 153 | * @param materialType |
154 | 154 | */ |
155 | 155 | @RequestMapping(value = "/exportXls") |
156 | + @RequiresPermissions("materialType:export") | |
156 | 157 | public ModelAndView exportXls(HttpServletRequest request, MaterialType materialType) { |
157 | 158 | return super.exportXls(request, materialType, MaterialType.class, "物料类别"); |
158 | 159 | } |
... | ... | @@ -164,6 +165,7 @@ public class MaterialTypeController extends JeecgController<MaterialType, IMater |
164 | 165 | * @return |
165 | 166 | */ |
166 | 167 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
168 | + @RequiresPermissions("materialType:import") | |
167 | 169 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
168 | 170 | return super.importExcel(request, response, MaterialType.class); |
169 | 171 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialUnit/controller/MaterialUnitController.java
... | ... | @@ -153,6 +153,7 @@ public class MaterialUnitController extends JeecgController<MaterialUnit, IMater |
153 | 153 | * @param materialUnit |
154 | 154 | */ |
155 | 155 | @RequestMapping(value = "/exportXls") |
156 | + @RequiresPermissions("materialUnit:export") | |
156 | 157 | public ModelAndView exportXls(HttpServletRequest request, MaterialUnit materialUnit) { |
157 | 158 | return super.exportXls(request, materialUnit, MaterialUnit.class, "物料单位"); |
158 | 159 | } |
... | ... | @@ -164,6 +165,7 @@ public class MaterialUnitController extends JeecgController<MaterialUnit, IMater |
164 | 165 | * @return |
165 | 166 | */ |
166 | 167 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
168 | + @RequiresPermissions("materialUnit:import") | |
167 | 169 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
168 | 170 | return super.importExcel(request, response, MaterialUnit.class); |
169 | 171 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/materialWarning/controller/MaterialWarningController.java
... | ... | @@ -153,6 +153,7 @@ public class MaterialWarningController extends JeecgController<MaterialWarning, |
153 | 153 | * @param materialWarning |
154 | 154 | */ |
155 | 155 | @RequestMapping(value = "/exportXls") |
156 | + @RequiresPermissions("materialWarning:export") | |
156 | 157 | public ModelAndView exportXls(HttpServletRequest request, MaterialWarning materialWarning) { |
157 | 158 | return super.exportXls(request, materialWarning, MaterialWarning.class, "物料预警"); |
158 | 159 | } |
... | ... | @@ -164,6 +165,7 @@ public class MaterialWarningController extends JeecgController<MaterialWarning, |
164 | 165 | * @return |
165 | 166 | */ |
166 | 167 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
168 | + @RequiresPermissions("materialWarning:import") | |
167 | 169 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
168 | 170 | return super.importExcel(request, response, MaterialWarning.class); |
169 | 171 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/parameterConfiguration/controller/ParameterConfigurationController.java
... | ... | @@ -152,6 +152,7 @@ public class ParameterConfigurationController extends JeecgController<ParameterC |
152 | 152 | * @param parameterConfiguration |
153 | 153 | */ |
154 | 154 | @RequestMapping(value = "/exportXls") |
155 | + @RequiresPermissions("parameterConfiguration:export") | |
155 | 156 | public ModelAndView exportXls(HttpServletRequest request, ParameterConfiguration parameterConfiguration) { |
156 | 157 | return super.exportXls(request, parameterConfiguration, ParameterConfiguration.class, "参数配置"); |
157 | 158 | } |
... | ... | @@ -163,6 +164,7 @@ public class ParameterConfigurationController extends JeecgController<ParameterC |
163 | 164 | * @return |
164 | 165 | */ |
165 | 166 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
167 | + @RequiresPermissions("parameterConfiguration:import") | |
166 | 168 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
167 | 169 | return super.importExcel(request, response, ParameterConfiguration.class); |
168 | 170 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/port/controller/PortController.java
... | ... | @@ -153,6 +153,7 @@ public class PortController extends JeecgController<Port, IPortService> { |
153 | 153 | * @param port |
154 | 154 | */ |
155 | 155 | @RequestMapping(value = "/exportXls") |
156 | + @RequiresPermissions("port:export") | |
156 | 157 | public ModelAndView exportXls(HttpServletRequest request, Port port) { |
157 | 158 | return super.exportXls(request, port, Port.class, "出入口"); |
158 | 159 | } |
... | ... | @@ -164,6 +165,7 @@ public class PortController extends JeecgController<Port, IPortService> { |
164 | 165 | * @return |
165 | 166 | */ |
166 | 167 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
168 | + @RequiresPermissions("port:import") | |
167 | 169 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
168 | 170 | return super.importExcel(request, response, Port.class); |
169 | 171 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/receiptType/controller/ReceiptTypeController.java
... | ... | @@ -156,6 +156,7 @@ public class ReceiptTypeController extends JeecgController<ReceiptType, IReceipt |
156 | 156 | * @param receiptType |
157 | 157 | */ |
158 | 158 | @RequestMapping(value = "/exportXls") |
159 | + @RequiresPermissions("receiptType:export") | |
159 | 160 | public ModelAndView exportXls(HttpServletRequest request, ReceiptType receiptType) { |
160 | 161 | return super.exportXls(request, receiptType, ReceiptType.class, "入库单类型"); |
161 | 162 | } |
... | ... | @@ -167,6 +168,7 @@ public class ReceiptTypeController extends JeecgController<ReceiptType, IReceipt |
167 | 168 | * @return |
168 | 169 | */ |
169 | 170 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
171 | + @RequiresPermissions("receiptType:import") | |
170 | 172 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
171 | 173 | return super.importExcel(request, response, ReceiptType.class); |
172 | 174 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/shipmentType/controller/ShipmentTypeController.java
... | ... | @@ -155,6 +155,7 @@ public class ShipmentTypeController extends JeecgController<ShipmentType, IShipm |
155 | 155 | * @param shipmentType |
156 | 156 | */ |
157 | 157 | @RequestMapping(value = "/exportXls") |
158 | + @RequiresPermissions("shipmentType:export") | |
158 | 159 | public ModelAndView exportXls(HttpServletRequest request, ShipmentType shipmentType) { |
159 | 160 | return super.exportXls(request, shipmentType, ShipmentType.class, "出库单类型"); |
160 | 161 | } |
... | ... | @@ -166,6 +167,7 @@ public class ShipmentTypeController extends JeecgController<ShipmentType, IShipm |
166 | 167 | * @return |
167 | 168 | */ |
168 | 169 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
170 | + @RequiresPermissions("shipmentType:import") | |
169 | 171 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
170 | 172 | return super.importExcel(request, response, ShipmentType.class); |
171 | 173 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/supplier/controller/SupplierController.java
... | ... | @@ -156,6 +156,7 @@ public class SupplierController extends JeecgController<Supplier, ISupplierServi |
156 | 156 | * @param supplier |
157 | 157 | */ |
158 | 158 | @RequestMapping(value = "/exportXls") |
159 | + @RequiresPermissions("supplier:export") | |
159 | 160 | public ModelAndView exportXls(HttpServletRequest request, Supplier supplier) { |
160 | 161 | return super.exportXls(request, supplier, Supplier.class, "供应商管理"); |
161 | 162 | } |
... | ... | @@ -167,6 +168,7 @@ public class SupplierController extends JeecgController<Supplier, ISupplierServi |
167 | 168 | * @return |
168 | 169 | */ |
169 | 170 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
171 | + @RequiresPermissions("supplier:import") | |
170 | 172 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
171 | 173 | return super.importExcel(request, response, Supplier.class); |
172 | 174 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/sysUserWarehouse/controller/SysUserWarehouseController.java
... | ... | @@ -8,6 +8,7 @@ import javax.annotation.Resource; |
8 | 8 | import javax.servlet.http.HttpServletRequest; |
9 | 9 | import javax.servlet.http.HttpServletResponse; |
10 | 10 | |
11 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
11 | 12 | import org.jeecg.common.api.vo.Result; |
12 | 13 | import org.jeecg.common.aspect.annotation.AutoLog; |
13 | 14 | import org.jeecg.common.system.base.controller.JeecgController; |
... | ... | @@ -138,6 +139,7 @@ public class SysUserWarehouseController extends JeecgController<SysUserWarehouse |
138 | 139 | * @param sysUserWarehouse |
139 | 140 | */ |
140 | 141 | @RequestMapping(value = "/exportXls") |
142 | + @RequiresPermissions("sysUserWarehouse:export") | |
141 | 143 | public ModelAndView exportXls(HttpServletRequest request, SysUserWarehouse sysUserWarehouse) { |
142 | 144 | return super.exportXls(request, sysUserWarehouse, SysUserWarehouse.class, "用户仓库关系表"); |
143 | 145 | } |
... | ... | @@ -149,6 +151,7 @@ public class SysUserWarehouseController extends JeecgController<SysUserWarehouse |
149 | 151 | * @return |
150 | 152 | */ |
151 | 153 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
154 | + @RequiresPermissions("sysUserWarehouse:import") | |
152 | 155 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
153 | 156 | return super.importExcel(request, response, SysUserWarehouse.class); |
154 | 157 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java
... | ... | @@ -155,6 +155,7 @@ public class ZoneController extends JeecgController<Zone, IZoneService> { |
155 | 155 | * @param zone |
156 | 156 | */ |
157 | 157 | @RequestMapping(value = "/exportXls") |
158 | + @RequiresPermissions("zone:export") | |
158 | 159 | public ModelAndView exportXls(HttpServletRequest request, Zone zone) { |
159 | 160 | return super.exportXls(request, zone, Zone.class, "库区管理"); |
160 | 161 | } |
... | ... | @@ -166,6 +167,7 @@ public class ZoneController extends JeecgController<Zone, IZoneService> { |
166 | 167 | * @return |
167 | 168 | */ |
168 | 169 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
170 | + @RequiresPermissions("zone:import") | |
169 | 171 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
170 | 172 | return super.importExcel(request, response, Zone.class); |
171 | 173 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java
... | ... | @@ -6,6 +6,7 @@ import javax.annotation.Resource; |
6 | 6 | import javax.servlet.http.HttpServletRequest; |
7 | 7 | import javax.servlet.http.HttpServletResponse; |
8 | 8 | |
9 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
9 | 10 | import org.jeecg.common.api.vo.Result; |
10 | 11 | import org.jeecg.common.system.base.controller.JeecgController; |
11 | 12 | import org.jeecg.common.system.query.QueryGenerator; |
... | ... | @@ -94,6 +95,7 @@ public class InventoryMaterialSummaryController extends JeecgController<Inventor |
94 | 95 | * @param inventoryMaterialSummary |
95 | 96 | */ |
96 | 97 | @RequestMapping(value = "/exportXls") |
98 | + @RequiresPermissions("inventoryMaterialSummary:export") | |
97 | 99 | public ModelAndView exportXls(HttpServletRequest request, InventoryDetail inventoryMaterialSummary) { |
98 | 100 | return super.exportXls(request, inventoryMaterialSummary, InventoryDetail.class, "物料汇总主表"); |
99 | 101 | } |
... | ... | @@ -105,6 +107,7 @@ public class InventoryMaterialSummaryController extends JeecgController<Inventor |
105 | 107 | * @return |
106 | 108 | */ |
107 | 109 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
110 | + @RequiresPermissions("inventoryMaterialSummary:import") | |
108 | 111 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
109 | 112 | return super.importExcel(request, response, InventoryDetail.class); |
110 | 113 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
... | ... | @@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest; |
10 | 10 | import javax.servlet.http.HttpServletResponse; |
11 | 11 | |
12 | 12 | import org.apache.shiro.SecurityUtils; |
13 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
13 | 14 | import org.jeecg.common.api.vo.Result; |
14 | 15 | import org.jeecg.common.aspect.annotation.AutoLog; |
15 | 16 | import org.jeecg.common.system.base.controller.JeecgController; |
... | ... | @@ -139,6 +140,7 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader, |
139 | 140 | * 导出 |
140 | 141 | * @return |
141 | 142 | */ |
143 | + @RequiresPermissions("inventoryHeader:export") | |
142 | 144 | @RequestMapping(value = "/exportXls") |
143 | 145 | public ModelAndView exportXls(HttpServletRequest request, InventoryHeader inventoryHeader) { |
144 | 146 | return super.exportXls(request, inventoryHeader, InventoryHeader.class, "库存表"); |
... | ... | @@ -148,6 +150,7 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader, |
148 | 150 | * 导入 |
149 | 151 | * @return |
150 | 152 | */ |
153 | + @RequiresPermissions("inventoryHeader:import") | |
151 | 154 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
152 | 155 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
153 | 156 | return super.importExcel(request, response, InventoryHeader.class); |
... | ... | @@ -229,6 +232,7 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader, |
229 | 232 | * @return |
230 | 233 | */ |
231 | 234 | @RequestMapping(value = "/exportInventoryDetail") |
235 | + @RequiresPermissions("inventoryDetail:export") | |
232 | 236 | public ModelAndView exportInventoryDetail(HttpServletRequest request, InventoryDetail inventoryDetail) { |
233 | 237 | // Step.1 组装查询条件 |
234 | 238 | QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, request.getParameterMap()); |
... | ... | @@ -246,7 +250,7 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader, |
246 | 250 | } else { |
247 | 251 | exportList = pageList; |
248 | 252 | } |
249 | - | |
253 | + | |
250 | 254 | // Step.3 AutoPoi 导出Excel |
251 | 255 | ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); |
252 | 256 | mv.addObject(NormalExcelConstants.FILE_NAME, "库存详情"); // 此处设置的filename无效 ,前端会重更新设置一下 |
... | ... | @@ -281,6 +285,7 @@ public class InventoryHeaderController extends JeecgController<InventoryHeader, |
281 | 285 | * @return |
282 | 286 | */ |
283 | 287 | @RequestMapping(value = "/importInventoryDetail/{mainId}") |
288 | + @RequiresPermissions("inventoryDetail:import") | |
284 | 289 | public Result<?> importInventoryDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) { |
285 | 290 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
286 | 291 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryTransaction/controller/InventoryTransactionController.java
... | ... | @@ -5,6 +5,7 @@ import java.util.Arrays; |
5 | 5 | import javax.servlet.http.HttpServletRequest; |
6 | 6 | import javax.servlet.http.HttpServletResponse; |
7 | 7 | |
8 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
8 | 9 | import org.jeecg.common.api.vo.Result; |
9 | 10 | import org.jeecg.common.aspect.annotation.AutoLog; |
10 | 11 | import org.jeecg.common.system.base.controller.JeecgController; |
... | ... | @@ -134,6 +135,7 @@ public class InventoryTransactionController extends JeecgController<InventoryTra |
134 | 135 | * @param inventoryTransaction |
135 | 136 | */ |
136 | 137 | @RequestMapping(value = "/exportXls") |
138 | + @RequiresPermissions("inventoryTransaction:export") | |
137 | 139 | public ModelAndView exportXls(HttpServletRequest request, InventoryTransaction inventoryTransaction) { |
138 | 140 | return super.exportXls(request, inventoryTransaction, InventoryTransaction.class, "库存交易记录"); |
139 | 141 | } |
... | ... | @@ -145,6 +147,7 @@ public class InventoryTransactionController extends JeecgController<InventoryTra |
145 | 147 | * @return |
146 | 148 | */ |
147 | 149 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
150 | + @RequiresPermissions("inventoryTransaction:import") | |
148 | 151 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
149 | 152 | return super.importExcel(request, response, InventoryTransaction.class); |
150 | 153 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/apiLog/controller/ApiLogController.java
... | ... | @@ -5,6 +5,7 @@ import java.util.Arrays; |
5 | 5 | import javax.servlet.http.HttpServletRequest; |
6 | 6 | import javax.servlet.http.HttpServletResponse; |
7 | 7 | |
8 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
8 | 9 | import org.jeecg.common.api.vo.Result; |
9 | 10 | import org.jeecg.common.aspect.annotation.AutoLog; |
10 | 11 | import org.jeecg.common.system.base.controller.JeecgController; |
... | ... | @@ -130,6 +131,7 @@ public class ApiLogController extends JeecgController<ApiLog, IApiLogService> { |
130 | 131 | * @param apiLog |
131 | 132 | */ |
132 | 133 | @RequestMapping(value = "/exportXls") |
134 | + @RequiresPermissions("apiLog:export") | |
133 | 135 | public ModelAndView exportXls(HttpServletRequest request, ApiLog apiLog) { |
134 | 136 | return super.exportXls(request, apiLog, ApiLog.class, "接口日志"); |
135 | 137 | } |
... | ... | @@ -141,6 +143,7 @@ public class ApiLogController extends JeecgController<ApiLog, IApiLogService> { |
141 | 143 | * @return |
142 | 144 | */ |
143 | 145 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
146 | + @RequiresPermissions("apiLog:import ") | |
144 | 147 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
145 | 148 | return super.importExcel(request, response, ApiLog.class); |
146 | 149 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/controller/OperationLogController.java
... | ... | @@ -5,6 +5,7 @@ import java.util.Arrays; |
5 | 5 | import javax.servlet.http.HttpServletRequest; |
6 | 6 | import javax.servlet.http.HttpServletResponse; |
7 | 7 | |
8 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
8 | 9 | import org.jeecg.common.api.vo.Result; |
9 | 10 | import org.jeecg.common.aspect.annotation.AutoLog; |
10 | 11 | import org.jeecg.common.system.base.controller.JeecgController; |
... | ... | @@ -138,6 +139,7 @@ public class OperationLogController extends JeecgController<OperationLog, IOpera |
138 | 139 | * @param operationLog |
139 | 140 | */ |
140 | 141 | @RequestMapping(value = "/exportXls") |
142 | + @RequiresPermissions("operationLog:export") | |
141 | 143 | public ModelAndView exportXls(HttpServletRequest request, OperationLog operationLog) { |
142 | 144 | return super.exportXls(request, operationLog, OperationLog.class, "操作记录表"); |
143 | 145 | } |
... | ... | @@ -149,6 +151,7 @@ public class OperationLogController extends JeecgController<OperationLog, IOpera |
149 | 151 | * @return |
150 | 152 | */ |
151 | 153 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
154 | + @RequiresPermissions("operationLog:import") | |
152 | 155 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
153 | 156 | return super.importExcel(request, response, OperationLog.class); |
154 | 157 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
... | ... | @@ -161,6 +161,7 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon |
161 | 161 | * @return |
162 | 162 | */ |
163 | 163 | @RequestMapping(value = "/exportXls") |
164 | + @RequiresPermissions("receiptContainerHeader:export") | |
164 | 165 | public ModelAndView exportXls(HttpServletRequest request, ReceiptContainerHeader receiptContainerHeader) { |
165 | 166 | return super.exportXls(request, receiptContainerHeader, ReceiptContainerHeader.class, "入库组盘"); |
166 | 167 | } |
... | ... | @@ -170,6 +171,7 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon |
170 | 171 | * @return |
171 | 172 | */ |
172 | 173 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
174 | + @RequiresPermissions("receiptContainerHeader:import") | |
173 | 175 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
174 | 176 | return super.importExcel(request, response, ReceiptContainerHeader.class); |
175 | 177 | } |
... | ... | @@ -253,6 +255,7 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon |
253 | 255 | * @return |
254 | 256 | */ |
255 | 257 | @RequestMapping(value = "/exportReceiptContainerDetail") |
258 | + @RequiresPermissions("receiptContainerDetail:export") | |
256 | 259 | public ModelAndView exportReceiptContainerDetail(HttpServletRequest request, ReceiptContainerDetail receiptContainerDetail) { |
257 | 260 | // Step.1 组装查询条件 |
258 | 261 | QueryWrapper<ReceiptContainerDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiptContainerDetail, request.getParameterMap()); |
... | ... | @@ -285,6 +288,7 @@ public class ReceiptContainerHeaderController extends JeecgController<ReceiptCon |
285 | 288 | * @return |
286 | 289 | */ |
287 | 290 | @RequestMapping(value = "/importReceiptContainerDetail/{mainId}") |
291 | + @RequiresPermissions("receiptContainerDetail:import") | |
288 | 292 | public Result<?> importReceiptContainerDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) { |
289 | 293 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
290 | 294 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
... | ... | @@ -175,6 +175,7 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec |
175 | 175 | * @return |
176 | 176 | */ |
177 | 177 | @RequestMapping(value = "/exportXls") |
178 | + @RequiresPermissions("receiptHeader:export") | |
178 | 179 | public ModelAndView exportXls(HttpServletRequest request, ReceiptHeader receiptHeader) { |
179 | 180 | return super.exportXls(request, receiptHeader, ReceiptHeader.class, "入库表主表"); |
180 | 181 | } |
... | ... | @@ -184,6 +185,7 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec |
184 | 185 | * @return |
185 | 186 | */ |
186 | 187 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
188 | + @RequiresPermissions("receiptHeader:export") | |
187 | 189 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
188 | 190 | return super.importExcel(request, response, ReceiptHeader.class); |
189 | 191 | } |
... | ... | @@ -286,6 +288,7 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec |
286 | 288 | * @return |
287 | 289 | */ |
288 | 290 | @RequestMapping(value = "/exportReceiptDetail") |
291 | + @RequiresPermissions("receiptDetail:export") | |
289 | 292 | public ModelAndView exportReceiptDetail(HttpServletRequest request, ReceiptDetail receiptDetail) { |
290 | 293 | // Step.1 组装查询条件 |
291 | 294 | QueryWrapper<ReceiptDetail> queryWrapper = QueryGenerator.initQueryWrapper(receiptDetail, request.getParameterMap()); |
... | ... | @@ -318,6 +321,7 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec |
318 | 321 | * @return |
319 | 322 | */ |
320 | 323 | @RequestMapping(value = "/importReceiptDetail/{mainId}") |
324 | + @RequiresPermissions("receiptDetail:import") | |
321 | 325 | public Result<?> importReceiptDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) { |
322 | 326 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
323 | 327 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
... | ... | @@ -145,6 +145,7 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC |
145 | 145 | * @return |
146 | 146 | */ |
147 | 147 | @RequestMapping(value = "/exportXls") |
148 | + @RequiresPermissions("shipmentContainerHeader:export") | |
148 | 149 | public ModelAndView exportXls(HttpServletRequest request, ShipmentContainerHeader shipmentContainerHeader) { |
149 | 150 | return super.exportXls(request, shipmentContainerHeader, ShipmentContainerHeader.class, "出库组盘"); |
150 | 151 | } |
... | ... | @@ -154,6 +155,7 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC |
154 | 155 | * @return |
155 | 156 | */ |
156 | 157 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
158 | + @RequiresPermissions("shipmentContainerHeader:import") | |
157 | 159 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
158 | 160 | return super.importExcel(request, response, ShipmentContainerHeader.class); |
159 | 161 | } |
... | ... | @@ -239,6 +241,7 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC |
239 | 241 | * @return |
240 | 242 | */ |
241 | 243 | @RequestMapping(value = "/exportShipmentContainerDetail") |
244 | + @RequiresPermissions("shipmentContainerDetail:export") | |
242 | 245 | public ModelAndView exportShipmentContainerDetail(HttpServletRequest request, ShipmentContainerDetail shipmentContainerDetail) { |
243 | 246 | // Step.1 组装查询条件 |
244 | 247 | QueryWrapper<ShipmentContainerDetail> queryWrapper = QueryGenerator.initQueryWrapper(shipmentContainerDetail, request.getParameterMap()); |
... | ... | @@ -271,6 +274,7 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC |
271 | 274 | * @return |
272 | 275 | */ |
273 | 276 | @RequestMapping(value = "/importShipmentContainerDetail/{mainId}") |
277 | + @RequiresPermissions("shipmentContainerDetail:import") | |
274 | 278 | public Result<?> importShipmentContainerDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) { |
275 | 279 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
276 | 280 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
... | ... | @@ -173,6 +173,7 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS |
173 | 173 | * @return |
174 | 174 | */ |
175 | 175 | @RequestMapping(value = "/exportXls") |
176 | + @RequiresPermissions("shipmentHeader:export") | |
176 | 177 | public ModelAndView exportXls(HttpServletRequest request, ShipmentHeader shipmentHeader) { |
177 | 178 | return super.exportXls(request, shipmentHeader, ShipmentHeader.class, "出库单"); |
178 | 179 | } |
... | ... | @@ -182,6 +183,7 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS |
182 | 183 | * @return |
183 | 184 | */ |
184 | 185 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
186 | + @RequiresPermissions("shipmentHeader:import") | |
185 | 187 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
186 | 188 | return super.importExcel(request, response, ShipmentHeader.class); |
187 | 189 | } |
... | ... | @@ -298,6 +300,7 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS |
298 | 300 | * @return |
299 | 301 | */ |
300 | 302 | @RequestMapping(value = "/exportShipmentDetail") |
303 | + @RequiresPermissions("shipmentDetail:export") | |
301 | 304 | public ModelAndView exportShipmentDetail(HttpServletRequest request, ShipmentDetail shipmentDetail) { |
302 | 305 | // Step.1 组装查询条件 |
303 | 306 | QueryWrapper<ShipmentDetail> queryWrapper = QueryGenerator.initQueryWrapper(shipmentDetail, request.getParameterMap()); |
... | ... | @@ -330,6 +333,7 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS |
330 | 333 | * @return |
331 | 334 | */ |
332 | 335 | @RequestMapping(value = "/importShipmentDetail/{mainId}") |
336 | + @RequiresPermissions("shipmentDetail:import") | |
333 | 337 | public Result<?> importShipmentDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") Integer mainId) { |
334 | 338 | MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest)request; |
335 | 339 | Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountHeader/controller/CycleCountHeaderController.java
... | ... | @@ -5,6 +5,7 @@ import java.util.Arrays; |
5 | 5 | import javax.servlet.http.HttpServletRequest; |
6 | 6 | import javax.servlet.http.HttpServletResponse; |
7 | 7 | |
8 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
8 | 9 | import org.jeecg.common.api.vo.Result; |
9 | 10 | import org.jeecg.common.aspect.annotation.AutoLog; |
10 | 11 | import org.jeecg.common.system.base.controller.JeecgController; |
... | ... | @@ -134,6 +135,7 @@ public class CycleCountHeaderController extends JeecgController<CycleCountHeader |
134 | 135 | * @param cycleCountHeader |
135 | 136 | */ |
136 | 137 | @RequestMapping(value = "/exportXls") |
138 | + @RequiresPermissions("cycleCountHeader:export") | |
137 | 139 | public ModelAndView exportXls(HttpServletRequest request, CycleCountHeader cycleCountHeader) { |
138 | 140 | return super.exportXls(request, cycleCountHeader, CycleCountHeader.class, "盘点主表"); |
139 | 141 | } |
... | ... | @@ -145,6 +147,7 @@ public class CycleCountHeaderController extends JeecgController<CycleCountHeader |
145 | 147 | * @return |
146 | 148 | */ |
147 | 149 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
150 | + @RequiresPermissions("cycleCountHeader:export") | |
148 | 151 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
149 | 152 | return super.importExcel(request, response, CycleCountHeader.class); |
150 | 153 | } |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/agvTask/controller/AgvTaskController.java
... | ... | @@ -132,6 +132,7 @@ public class AgvTaskController extends JeecgController<AgvTask, IAgvTaskService> |
132 | 132 | * @param agvTask |
133 | 133 | */ |
134 | 134 | @RequestMapping(value = "/exportXls") |
135 | + @RequiresPermissions("agvTask:export") | |
135 | 136 | public ModelAndView exportXls(HttpServletRequest request, AgvTask agvTask) { |
136 | 137 | return super.exportXls(request, agvTask, AgvTask.class, "AGV任务"); |
137 | 138 | } |
... | ... | @@ -143,6 +144,7 @@ public class AgvTaskController extends JeecgController<AgvTask, IAgvTaskService> |
143 | 144 | * @return |
144 | 145 | */ |
145 | 146 | @RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
147 | + @RequiresPermissions("agvTask:import") | |
146 | 148 | public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
147 | 149 | return super.importExcel(request, response, AgvTask.class); |
148 | 150 | } |
... | ... |