|
|
@@ -1,28 +1,22 @@
|
|
|
package com.jjt.biz.controller;
|
|
|
|
|
|
-import java.util.List;
|
|
|
-import javax.annotation.Resource;
|
|
|
-import javax.servlet.http.HttpServletResponse;
|
|
|
-
|
|
|
-import io.swagger.annotations.Api;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
-import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.PutMapping;
|
|
|
-import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import com.jjt.biz.domain.HouseConfig;
|
|
|
+import com.jjt.biz.service.IHouseConfigService;
|
|
|
import com.jjt.common.annotation.Log;
|
|
|
import com.jjt.common.core.controller.BaseController;
|
|
|
import com.jjt.common.core.domain.AjaxResult;
|
|
|
+import com.jjt.common.core.page.TableDataInfo;
|
|
|
import com.jjt.common.enums.BusinessType;
|
|
|
-import com.jjt.biz.domain.HouseConfig;
|
|
|
-import com.jjt.biz.service.IHouseConfigService;
|
|
|
+import com.jjt.common.utils.SecurityUtils;
|
|
|
import com.jjt.common.utils.poi.ExcelUtil;
|
|
|
-import com.jjt.common.core.page.TableDataInfo;
|
|
|
+import com.jjt.system.service.ISysDeptService;
|
|
|
+import io.swagger.annotations.Api;
|
|
|
+import io.swagger.annotations.ApiOperation;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
+
|
|
|
+import javax.annotation.Resource;
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* 仓库配置Controller
|
|
|
@@ -30,12 +24,14 @@ import com.jjt.common.core.page.TableDataInfo;
|
|
|
* @author wukai
|
|
|
* @date 2025-10-11
|
|
|
*/
|
|
|
-@Api(tags="仓库配置")
|
|
|
+@Api(tags = "仓库配置")
|
|
|
@RestController
|
|
|
@RequestMapping("/biz/houseConfig")
|
|
|
-public class HouseConfigController extends BaseController{
|
|
|
+public class HouseConfigController extends BaseController {
|
|
|
@Resource
|
|
|
private IHouseConfigService houseConfigService;
|
|
|
+ @Resource
|
|
|
+ private ISysDeptService deptService;
|
|
|
|
|
|
/**
|
|
|
* 查询仓库配置列表
|
|
|
@@ -43,8 +39,7 @@ public class HouseConfigController extends BaseController{
|
|
|
@ApiOperation("查询仓库配置列表")
|
|
|
//@PreAuthorize("@ss.hasPermi('biz:houseConfig:list')")
|
|
|
@GetMapping("/list")
|
|
|
- public TableDataInfo list(HouseConfig houseConfig)
|
|
|
- {
|
|
|
+ public TableDataInfo list(HouseConfig houseConfig) {
|
|
|
startPage();
|
|
|
List<HouseConfig> list = houseConfigService.selectHouseConfigList(houseConfig);
|
|
|
return getDataTable(list);
|
|
|
@@ -57,8 +52,7 @@ public class HouseConfigController extends BaseController{
|
|
|
//@PreAuthorize("@ss.hasPermi('biz:houseConfig:export')")
|
|
|
@Log(title = "仓库配置", businessType = BusinessType.EXPORT)
|
|
|
@PostMapping("/export")
|
|
|
- public void export(HttpServletResponse response, HouseConfig houseConfig)
|
|
|
- {
|
|
|
+ public void export(HttpServletResponse response, HouseConfig houseConfig) {
|
|
|
List<HouseConfig> list = houseConfigService.selectHouseConfigList(houseConfig);
|
|
|
ExcelUtil<HouseConfig> util = new ExcelUtil<HouseConfig>(HouseConfig.class);
|
|
|
util.exportExcel(response, list, "仓库配置数据");
|
|
|
@@ -70,8 +64,7 @@ public class HouseConfigController extends BaseController{
|
|
|
@ApiOperation("获取仓库配置详细信息")
|
|
|
//@PreAuthorize("@ss.hasPermi('biz:houseConfig:query')")
|
|
|
@GetMapping(value = "/{houseId}")
|
|
|
- public AjaxResult getInfo(@PathVariable("houseId") Long houseId)
|
|
|
- {
|
|
|
+ public AjaxResult getInfo(@PathVariable("houseId") Long houseId) {
|
|
|
return success(houseConfigService.selectHouseConfigByHouseId(houseId));
|
|
|
}
|
|
|
|
|
|
@@ -82,8 +75,7 @@ public class HouseConfigController extends BaseController{
|
|
|
//@PreAuthorize("@ss.hasPermi('biz:houseConfig:add')")
|
|
|
@Log(title = "仓库配置", businessType = BusinessType.INSERT)
|
|
|
@PostMapping
|
|
|
- public AjaxResult add(@RequestBody HouseConfig houseConfig)
|
|
|
- {
|
|
|
+ public AjaxResult add(@RequestBody HouseConfig houseConfig) {
|
|
|
return toAjax(houseConfigService.insertHouseConfig(houseConfig));
|
|
|
}
|
|
|
|
|
|
@@ -94,8 +86,7 @@ public class HouseConfigController extends BaseController{
|
|
|
//@PreAuthorize("@ss.hasPermi('biz:houseConfig:edit')")
|
|
|
@Log(title = "仓库配置", businessType = BusinessType.UPDATE)
|
|
|
@PutMapping
|
|
|
- public AjaxResult edit(@RequestBody HouseConfig houseConfig)
|
|
|
- {
|
|
|
+ public AjaxResult edit(@RequestBody HouseConfig houseConfig) {
|
|
|
return toAjax(houseConfigService.updateHouseConfig(houseConfig));
|
|
|
}
|
|
|
|
|
|
@@ -105,9 +96,14 @@ public class HouseConfigController extends BaseController{
|
|
|
@ApiOperation("删除仓库配置")
|
|
|
//@PreAuthorize("@ss.hasPermi('biz:houseConfig:remove')")
|
|
|
@Log(title = "仓库配置", businessType = BusinessType.DELETE)
|
|
|
- @DeleteMapping("/{houseIds}")
|
|
|
- public AjaxResult remove(@PathVariable Long[] houseIds)
|
|
|
- {
|
|
|
+ @DeleteMapping("/{houseIds}")
|
|
|
+ public AjaxResult remove(@PathVariable Long[] houseIds) {
|
|
|
return toAjax(houseConfigService.deleteHouseConfigByHouseIds(houseIds));
|
|
|
}
|
|
|
+
|
|
|
+ @GetMapping("/deptTree")
|
|
|
+ public AjaxResult deptTree() {
|
|
|
+ Long deptId = SecurityUtils.getLoginUser().getDeptId();
|
|
|
+ return success(deptService.selectDeptTreeList(deptId));
|
|
|
+ }
|
|
|
}
|