Просмотр исходного кода

后端接口权限设置取消

lamphua 1 год назад
Родитель
Сommit
0726458f60
17 измененных файлов: 19 добавлений и 115 удалений
  1. 4
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetCarController.java
  2. 1
    8
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetController.java
  3. 4
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetDeviceController.java
  4. 4
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetSettleController.java
  5. 4
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetStaffController.java
  6. 1
    6
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarController.java
  7. 0
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarExpenseController.java
  8. 0
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java
  9. 0
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceController.java
  10. 0
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPostSalaryController.java
  11. 0
    8
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPriceController.java
  12. 0
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java
  13. 0
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectProgressController.java
  14. 0
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectWorkerController.java
  15. 0
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSafeController.java
  16. 0
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTechnicalController.java
  17. 1
    8
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTenderController.java

+ 4
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetCarController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
5
+
6
+import com.ruoyi.common.utils.SnowFlake;
7
+
6
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
9
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
10
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
39
     /**
38
      * 查询cmc车辆预算列表
40
      * 查询cmc车辆预算列表
39
      */
41
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:list')")
41
     @GetMapping("/list")
42
     @GetMapping("/list")
42
     public TableDataInfo list(CmcBudgetCar cmcBudgetCar)
43
     public TableDataInfo list(CmcBudgetCar cmcBudgetCar)
43
     {
44
     {
49
     /**
50
     /**
50
      * 导出cmc车辆预算列表
51
      * 导出cmc车辆预算列表
51
      */
52
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:export')")
53
     @Log(title = "cmc车辆预算", businessType = BusinessType.EXPORT)
53
     @Log(title = "cmc车辆预算", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
54
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcBudgetCar cmcBudgetCar)
55
     public void export(HttpServletResponse response, CmcBudgetCar cmcBudgetCar)
62
     /**
62
     /**
63
      * 获取cmc车辆预算详细信息
63
      * 获取cmc车辆预算详细信息
64
      */
64
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:query')")
66
     @GetMapping(value = "/{budgetCarId}")
65
     @GetMapping(value = "/{budgetCarId}")
67
     public AjaxResult getInfo(@PathVariable("budgetCarId") String budgetCarId)
66
     public AjaxResult getInfo(@PathVariable("budgetCarId") String budgetCarId)
68
     {
67
     {
72
     /**
71
     /**
73
      * 新增cmc车辆预算
72
      * 新增cmc车辆预算
74
      */
73
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:add')")
76
     @Log(title = "cmc车辆预算", businessType = BusinessType.INSERT)
74
     @Log(title = "cmc车辆预算", businessType = BusinessType.INSERT)
77
     @PostMapping
75
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcBudgetCar cmcBudgetCar)
76
     public AjaxResult add(@RequestBody CmcBudgetCar cmcBudgetCar)
79
     {
77
     {
78
+        cmcBudgetCar.setBudgetCarId(new SnowFlake().generateId());
80
         return toAjax(cmcBudgetCarService.insertCmcBudgetCar(cmcBudgetCar));
79
         return toAjax(cmcBudgetCarService.insertCmcBudgetCar(cmcBudgetCar));
81
     }
80
     }
82
 
81
 
83
     /**
82
     /**
84
      * 修改cmc车辆预算
83
      * 修改cmc车辆预算
85
      */
84
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:edit')")
87
     @Log(title = "cmc车辆预算", businessType = BusinessType.UPDATE)
85
     @Log(title = "cmc车辆预算", businessType = BusinessType.UPDATE)
88
     @PutMapping
86
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcBudgetCar cmcBudgetCar)
87
     public AjaxResult edit(@RequestBody CmcBudgetCar cmcBudgetCar)
94
     /**
92
     /**
95
      * 删除cmc车辆预算
93
      * 删除cmc车辆预算
96
      */
94
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:budgetCar:remove')")
98
     @Log(title = "cmc车辆预算", businessType = BusinessType.DELETE)
95
     @Log(title = "cmc车辆预算", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{budgetCarIds}")
96
 	@DeleteMapping("/{budgetCarIds}")
100
     public AjaxResult remove(@PathVariable String[] budgetCarIds)
97
     public AjaxResult remove(@PathVariable String[] budgetCarIds)

+ 1
- 8
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetController.java Просмотреть файл

3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
 
5
 
6
-import com.ruoyi.common.utils.SnowFlake;
7
-import org.springframework.security.access.prepost.PreAuthorize;
6
+
8
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.beans.factory.annotation.Autowired;
9
 import org.springframework.web.bind.annotation.*;
8
 import org.springframework.web.bind.annotation.*;
10
 import com.ruoyi.common.annotation.Log;
9
 import com.ruoyi.common.annotation.Log;
32
     /**
31
     /**
33
      * 查询cmc预算管理列表
32
      * 查询cmc预算管理列表
34
      */
33
      */
35
-    @PreAuthorize("@ss.hasPermi('oa:budget:list')")
36
     @GetMapping("/list")
34
     @GetMapping("/list")
37
     public TableDataInfo list(CmcBudget cmcBudget)
35
     public TableDataInfo list(CmcBudget cmcBudget)
38
     {
36
     {
44
     /**
42
     /**
45
      * 导出cmc预算管理列表
43
      * 导出cmc预算管理列表
46
      */
44
      */
47
-    @PreAuthorize("@ss.hasPermi('oa:budget:export')")
48
     @Log(title = "cmc预算管理", businessType = BusinessType.EXPORT)
45
     @Log(title = "cmc预算管理", businessType = BusinessType.EXPORT)
49
     @PostMapping("/export")
46
     @PostMapping("/export")
50
     public void export(HttpServletResponse response, CmcBudget cmcBudget)
47
     public void export(HttpServletResponse response, CmcBudget cmcBudget)
57
     /**
54
     /**
58
      * 获取cmc预算管理详细信息
55
      * 获取cmc预算管理详细信息
59
      */
56
      */
60
-    @PreAuthorize("@ss.hasPermi('oa:budget:query')")
61
     @GetMapping(value = "/{budgetId}")
57
     @GetMapping(value = "/{budgetId}")
62
     public AjaxResult getInfo(@PathVariable("budgetId") String budgetId)
58
     public AjaxResult getInfo(@PathVariable("budgetId") String budgetId)
63
     {
59
     {
67
     /**
63
     /**
68
      * 新增cmc预算管理
64
      * 新增cmc预算管理
69
      */
65
      */
70
-    @PreAuthorize("@ss.hasPermi('oa:budget:add')")
71
     @Log(title = "cmc预算管理", businessType = BusinessType.INSERT)
66
     @Log(title = "cmc预算管理", businessType = BusinessType.INSERT)
72
     @PostMapping
67
     @PostMapping
73
     public AjaxResult add(@RequestBody CmcBudget cmcBudget)
68
     public AjaxResult add(@RequestBody CmcBudget cmcBudget)
79
     /**
74
     /**
80
      * 修改cmc预算管理
75
      * 修改cmc预算管理
81
      */
76
      */
82
-    @PreAuthorize("@ss.hasPermi('oa:budget:edit')")
83
     @Log(title = "cmc预算管理", businessType = BusinessType.UPDATE)
77
     @Log(title = "cmc预算管理", businessType = BusinessType.UPDATE)
84
     @PutMapping
78
     @PutMapping
85
     public AjaxResult edit(@RequestBody CmcBudget cmcBudget)
79
     public AjaxResult edit(@RequestBody CmcBudget cmcBudget)
91
     /**
85
     /**
92
      * 删除cmc预算管理
86
      * 删除cmc预算管理
93
      */
87
      */
94
-    @PreAuthorize("@ss.hasPermi('oa:budget:remove')")
95
     @Log(title = "cmc预算管理", businessType = BusinessType.DELETE)
88
     @Log(title = "cmc预算管理", businessType = BusinessType.DELETE)
96
 	@DeleteMapping("/{budgetIds}")
89
 	@DeleteMapping("/{budgetIds}")
97
     public AjaxResult remove(@PathVariable String[] budgetIds)
90
     public AjaxResult remove(@PathVariable String[] budgetIds)

+ 4
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetDeviceController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
5
+
6
+import com.ruoyi.common.utils.SnowFlake;
7
+
6
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
9
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
10
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
39
     /**
38
      * 查询cmc设备预算列表
40
      * 查询cmc设备预算列表
39
      */
41
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:list')")
41
     @GetMapping("/list")
42
     @GetMapping("/list")
42
     public TableDataInfo list(CmcBudgetDevice cmcBudgetDevice)
43
     public TableDataInfo list(CmcBudgetDevice cmcBudgetDevice)
43
     {
44
     {
49
     /**
50
     /**
50
      * 导出cmc设备预算列表
51
      * 导出cmc设备预算列表
51
      */
52
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:export')")
53
     @Log(title = "cmc设备预算", businessType = BusinessType.EXPORT)
53
     @Log(title = "cmc设备预算", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
54
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcBudgetDevice cmcBudgetDevice)
55
     public void export(HttpServletResponse response, CmcBudgetDevice cmcBudgetDevice)
62
     /**
62
     /**
63
      * 获取cmc设备预算详细信息
63
      * 获取cmc设备预算详细信息
64
      */
64
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:query')")
66
     @GetMapping(value = "/{budgetDeviceId}")
65
     @GetMapping(value = "/{budgetDeviceId}")
67
     public AjaxResult getInfo(@PathVariable("budgetDeviceId") String budgetDeviceId)
66
     public AjaxResult getInfo(@PathVariable("budgetDeviceId") String budgetDeviceId)
68
     {
67
     {
72
     /**
71
     /**
73
      * 新增cmc设备预算
72
      * 新增cmc设备预算
74
      */
73
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:add')")
76
     @Log(title = "cmc设备预算", businessType = BusinessType.INSERT)
74
     @Log(title = "cmc设备预算", businessType = BusinessType.INSERT)
77
     @PostMapping
75
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcBudgetDevice cmcBudgetDevice)
76
     public AjaxResult add(@RequestBody CmcBudgetDevice cmcBudgetDevice)
79
     {
77
     {
78
+        cmcBudgetDevice.setBudgetDeviceId(new SnowFlake().generateId());
80
         return toAjax(cmcBudgetDeviceService.insertCmcBudgetDevice(cmcBudgetDevice));
79
         return toAjax(cmcBudgetDeviceService.insertCmcBudgetDevice(cmcBudgetDevice));
81
     }
80
     }
82
 
81
 
83
     /**
82
     /**
84
      * 修改cmc设备预算
83
      * 修改cmc设备预算
85
      */
84
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:edit')")
87
     @Log(title = "cmc设备预算", businessType = BusinessType.UPDATE)
85
     @Log(title = "cmc设备预算", businessType = BusinessType.UPDATE)
88
     @PutMapping
86
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcBudgetDevice cmcBudgetDevice)
87
     public AjaxResult edit(@RequestBody CmcBudgetDevice cmcBudgetDevice)
94
     /**
92
     /**
95
      * 删除cmc设备预算
93
      * 删除cmc设备预算
96
      */
94
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:budgetDevice:remove')")
98
     @Log(title = "cmc设备预算", businessType = BusinessType.DELETE)
95
     @Log(title = "cmc设备预算", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{budgetDeviceIds}")
96
 	@DeleteMapping("/{budgetDeviceIds}")
100
     public AjaxResult remove(@PathVariable String[] budgetDeviceIds)
97
     public AjaxResult remove(@PathVariable String[] budgetDeviceIds)

+ 4
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetSettleController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
5
+
6
+import com.ruoyi.common.utils.SnowFlake;
7
+
6
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
9
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
10
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
39
     /**
38
      * 查询cmc预结算列表
40
      * 查询cmc预结算列表
39
      */
41
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:list')")
41
     @GetMapping("/list")
42
     @GetMapping("/list")
42
     public TableDataInfo list(CmcBudgetSettle cmcBudgetSettle)
43
     public TableDataInfo list(CmcBudgetSettle cmcBudgetSettle)
43
     {
44
     {
49
     /**
50
     /**
50
      * 导出cmc预结算列表
51
      * 导出cmc预结算列表
51
      */
52
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:export')")
53
     @Log(title = "cmc预结算", businessType = BusinessType.EXPORT)
53
     @Log(title = "cmc预结算", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
54
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcBudgetSettle cmcBudgetSettle)
55
     public void export(HttpServletResponse response, CmcBudgetSettle cmcBudgetSettle)
62
     /**
62
     /**
63
      * 获取cmc预结算详细信息
63
      * 获取cmc预结算详细信息
64
      */
64
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:query')")
66
     @GetMapping(value = "/{budgetSettleId}")
65
     @GetMapping(value = "/{budgetSettleId}")
67
     public AjaxResult getInfo(@PathVariable("budgetSettleId") String budgetSettleId)
66
     public AjaxResult getInfo(@PathVariable("budgetSettleId") String budgetSettleId)
68
     {
67
     {
72
     /**
71
     /**
73
      * 新增cmc预结算
72
      * 新增cmc预结算
74
      */
73
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:add')")
76
     @Log(title = "cmc预结算", businessType = BusinessType.INSERT)
74
     @Log(title = "cmc预结算", businessType = BusinessType.INSERT)
77
     @PostMapping
75
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcBudgetSettle cmcBudgetSettle)
76
     public AjaxResult add(@RequestBody CmcBudgetSettle cmcBudgetSettle)
79
     {
77
     {
78
+        cmcBudgetSettle.setBudgetSettleId(new SnowFlake().generateId());
80
         return toAjax(cmcBudgetSettleService.insertCmcBudgetSettle(cmcBudgetSettle));
79
         return toAjax(cmcBudgetSettleService.insertCmcBudgetSettle(cmcBudgetSettle));
81
     }
80
     }
82
 
81
 
83
     /**
82
     /**
84
      * 修改cmc预结算
83
      * 修改cmc预结算
85
      */
84
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:edit')")
87
     @Log(title = "cmc预结算", businessType = BusinessType.UPDATE)
85
     @Log(title = "cmc预结算", businessType = BusinessType.UPDATE)
88
     @PutMapping
86
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcBudgetSettle cmcBudgetSettle)
87
     public AjaxResult edit(@RequestBody CmcBudgetSettle cmcBudgetSettle)
94
     /**
92
     /**
95
      * 删除cmc预结算
93
      * 删除cmc预结算
96
      */
94
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:budgetSettle:remove')")
98
     @Log(title = "cmc预结算", businessType = BusinessType.DELETE)
95
     @Log(title = "cmc预结算", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{budgetSettleIds}")
96
 	@DeleteMapping("/{budgetSettleIds}")
100
     public AjaxResult remove(@PathVariable String[] budgetSettleIds)
97
     public AjaxResult remove(@PathVariable String[] budgetSettleIds)

+ 4
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBudgetStaffController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
5
+
6
+import com.ruoyi.common.utils.SnowFlake;
7
+
6
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
9
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
10
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
39
     /**
38
      * 查询cmc人员预算列表
40
      * 查询cmc人员预算列表
39
      */
41
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:list')")
41
     @GetMapping("/list")
42
     @GetMapping("/list")
42
     public TableDataInfo list(CmcBudgetStaff cmcBudgetStaff)
43
     public TableDataInfo list(CmcBudgetStaff cmcBudgetStaff)
43
     {
44
     {
49
     /**
50
     /**
50
      * 导出cmc人员预算列表
51
      * 导出cmc人员预算列表
51
      */
52
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:export')")
53
     @Log(title = "cmc人员预算", businessType = BusinessType.EXPORT)
53
     @Log(title = "cmc人员预算", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
54
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcBudgetStaff cmcBudgetStaff)
55
     public void export(HttpServletResponse response, CmcBudgetStaff cmcBudgetStaff)
62
     /**
62
     /**
63
      * 获取cmc人员预算详细信息
63
      * 获取cmc人员预算详细信息
64
      */
64
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:query')")
66
     @GetMapping(value = "/{budgetStaffId}")
65
     @GetMapping(value = "/{budgetStaffId}")
67
     public AjaxResult getInfo(@PathVariable("budgetStaffId") String budgetStaffId)
66
     public AjaxResult getInfo(@PathVariable("budgetStaffId") String budgetStaffId)
68
     {
67
     {
72
     /**
71
     /**
73
      * 新增cmc人员预算
72
      * 新增cmc人员预算
74
      */
73
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:add')")
76
     @Log(title = "cmc人员预算", businessType = BusinessType.INSERT)
74
     @Log(title = "cmc人员预算", businessType = BusinessType.INSERT)
77
     @PostMapping
75
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcBudgetStaff cmcBudgetStaff)
76
     public AjaxResult add(@RequestBody CmcBudgetStaff cmcBudgetStaff)
79
     {
77
     {
78
+        cmcBudgetStaff.setBudgetStaffId(new SnowFlake().generateId());
80
         return toAjax(cmcBudgetStaffService.insertCmcBudgetStaff(cmcBudgetStaff));
79
         return toAjax(cmcBudgetStaffService.insertCmcBudgetStaff(cmcBudgetStaff));
81
     }
80
     }
82
 
81
 
83
     /**
82
     /**
84
      * 修改cmc人员预算
83
      * 修改cmc人员预算
85
      */
84
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:edit')")
87
     @Log(title = "cmc人员预算", businessType = BusinessType.UPDATE)
85
     @Log(title = "cmc人员预算", businessType = BusinessType.UPDATE)
88
     @PutMapping
86
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcBudgetStaff cmcBudgetStaff)
87
     public AjaxResult edit(@RequestBody CmcBudgetStaff cmcBudgetStaff)
94
     /**
92
     /**
95
      * 删除cmc人员预算
93
      * 删除cmc人员预算
96
      */
94
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:budgetStaff:remove')")
98
     @Log(title = "cmc人员预算", businessType = BusinessType.DELETE)
95
     @Log(title = "cmc人员预算", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{budgetStaffIds}")
96
 	@DeleteMapping("/{budgetStaffIds}")
100
     public AjaxResult remove(@PathVariable String[] budgetStaffIds)
97
     public AjaxResult remove(@PathVariable String[] budgetStaffIds)

+ 1
- 6
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarController.java Просмотреть файл

8
 import com.ruoyi.common.utils.DateUtils;
8
 import com.ruoyi.common.utils.DateUtils;
9
 import com.ruoyi.system.service.ISysUserService;
9
 import com.ruoyi.system.service.ISysUserService;
10
 import org.springframework.beans.factory.annotation.Autowired;
10
 import org.springframework.beans.factory.annotation.Autowired;
11
-import org.springframework.security.access.prepost.PreAuthorize;
11
+
12
 import org.springframework.web.bind.annotation.GetMapping;
12
 import org.springframework.web.bind.annotation.GetMapping;
13
 import org.springframework.web.bind.annotation.PostMapping;
13
 import org.springframework.web.bind.annotation.PostMapping;
14
 import org.springframework.web.bind.annotation.PutMapping;
14
 import org.springframework.web.bind.annotation.PutMapping;
55
     /**
55
     /**
56
      * 导出cmc车辆信息列表
56
      * 导出cmc车辆信息列表
57
      */
57
      */
58
-    @PreAuthorize("@ss.hasPermi('oa:car:export')")
59
     @Log(title = "cmc车辆信息", businessType = BusinessType.EXPORT)
58
     @Log(title = "cmc车辆信息", businessType = BusinessType.EXPORT)
60
     @PostMapping("/export")
59
     @PostMapping("/export")
61
     public void export(HttpServletResponse response, CmcCar cmcCar)
60
     public void export(HttpServletResponse response, CmcCar cmcCar)
68
     /**
67
     /**
69
      * 获取cmc车辆信息详细信息
68
      * 获取cmc车辆信息详细信息
70
      */
69
      */
71
-    @PreAuthorize("@ss.hasPermi('oa:car:query')")
72
     @GetMapping(value = "/{carId}")
70
     @GetMapping(value = "/{carId}")
73
     public AjaxResult getInfo(@PathVariable("carId") Integer carId)
71
     public AjaxResult getInfo(@PathVariable("carId") Integer carId)
74
     {
72
     {
78
     /**
76
     /**
79
      * 新增cmc车辆信息
77
      * 新增cmc车辆信息
80
      */
78
      */
81
-    @PreAuthorize("@ss.hasPermi('oa:car:add')")
82
     @Log(title = "cmc车辆信息", businessType = BusinessType.INSERT)
79
     @Log(title = "cmc车辆信息", businessType = BusinessType.INSERT)
83
     @PostMapping
80
     @PostMapping
84
     public AjaxResult add(@RequestBody CmcCar cmcCar)
81
     public AjaxResult add(@RequestBody CmcCar cmcCar)
103
     /**
100
     /**
104
      * 修改cmc车辆信息
101
      * 修改cmc车辆信息
105
      */
102
      */
106
-    @PreAuthorize("@ss.hasPermi('oa:car:edit')")
107
     @Log(title = "cmc车辆信息", businessType = BusinessType.UPDATE)
103
     @Log(title = "cmc车辆信息", businessType = BusinessType.UPDATE)
108
     @PutMapping
104
     @PutMapping
109
     public AjaxResult edit(@RequestBody CmcCar cmcCar)
105
     public AjaxResult edit(@RequestBody CmcCar cmcCar)
114
     /**
110
     /**
115
      * 删除cmc车辆信息
111
      * 删除cmc车辆信息
116
      */
112
      */
117
-    @PreAuthorize("@ss.hasPermi('oa:car:remove')")
118
     @Log(title = "cmc车辆信息", businessType = BusinessType.DELETE)
113
     @Log(title = "cmc车辆信息", businessType = BusinessType.DELETE)
119
 	@DeleteMapping("/{carIds}")
114
 	@DeleteMapping("/{carIds}")
120
     public AjaxResult remove(@PathVariable Long[] carIds)
115
     public AjaxResult remove(@PathVariable Long[] carIds)

+ 0
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarExpenseController.java Просмотреть файл

4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
 
5
 
6
 import com.ruoyi.common.utils.SnowFlake;
6
 import com.ruoyi.common.utils.SnowFlake;
7
-import org.springframework.security.access.prepost.PreAuthorize;
8
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.beans.factory.annotation.Autowired;
9
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.GetMapping;
10
 import org.springframework.web.bind.annotation.PostMapping;
9
 import org.springframework.web.bind.annotation.PostMapping;
39
     /**
38
     /**
40
      * 查询cmc车辆费用列表
39
      * 查询cmc车辆费用列表
41
      */
40
      */
42
-    @PreAuthorize("@ss.hasPermi('oa:expense:list')")
43
     @GetMapping("/list")
41
     @GetMapping("/list")
44
     public TableDataInfo list(CmcCarExpense cmcCarExpense)
42
     public TableDataInfo list(CmcCarExpense cmcCarExpense)
45
     {
43
     {
51
     /**
49
     /**
52
      * 导出cmc车辆费用列表
50
      * 导出cmc车辆费用列表
53
      */
51
      */
54
-    @PreAuthorize("@ss.hasPermi('oa:expense:export')")
55
     @Log(title = "cmc车辆费用", businessType = BusinessType.EXPORT)
52
     @Log(title = "cmc车辆费用", businessType = BusinessType.EXPORT)
56
     @PostMapping("/export")
53
     @PostMapping("/export")
57
     public void export(HttpServletResponse response, CmcCarExpense cmcCarExpense)
54
     public void export(HttpServletResponse response, CmcCarExpense cmcCarExpense)
64
     /**
61
     /**
65
      * 获取cmc车辆费用详细信息
62
      * 获取cmc车辆费用详细信息
66
      */
63
      */
67
-    @PreAuthorize("@ss.hasPermi('oa:expense:query')")
68
     @GetMapping(value = "/{carExpenseId}")
64
     @GetMapping(value = "/{carExpenseId}")
69
     public AjaxResult getInfo(@PathVariable("carExpenseId") String carExpenseId)
65
     public AjaxResult getInfo(@PathVariable("carExpenseId") String carExpenseId)
70
     {
66
     {
74
     /**
70
     /**
75
      * 新增cmc车辆费用
71
      * 新增cmc车辆费用
76
      */
72
      */
77
-    @PreAuthorize("@ss.hasPermi('oa:expense:add')")
78
     @Log(title = "cmc车辆费用", businessType = BusinessType.INSERT)
73
     @Log(title = "cmc车辆费用", businessType = BusinessType.INSERT)
79
     @PostMapping
74
     @PostMapping
80
     public AjaxResult add(@RequestBody CmcCarExpense cmcCarExpense)
75
     public AjaxResult add(@RequestBody CmcCarExpense cmcCarExpense)
86
     /**
81
     /**
87
      * 修改cmc车辆费用
82
      * 修改cmc车辆费用
88
      */
83
      */
89
-    @PreAuthorize("@ss.hasPermi('oa:expense:edit')")
90
     @Log(title = "cmc车辆费用", businessType = BusinessType.UPDATE)
84
     @Log(title = "cmc车辆费用", businessType = BusinessType.UPDATE)
91
     @PutMapping
85
     @PutMapping
92
     public AjaxResult edit(@RequestBody CmcCarExpense cmcCarExpense)
86
     public AjaxResult edit(@RequestBody CmcCarExpense cmcCarExpense)
97
     /**
91
     /**
98
      * 删除cmc车辆费用
92
      * 删除cmc车辆费用
99
      */
93
      */
100
-    @PreAuthorize("@ss.hasPermi('oa:expense:remove')")
101
     @Log(title = "cmc车辆费用", businessType = BusinessType.DELETE)
94
     @Log(title = "cmc车辆费用", businessType = BusinessType.DELETE)
102
 	@DeleteMapping("/{carExpenseIds}")
95
 	@DeleteMapping("/{carExpenseIds}")
103
     public AjaxResult remove(@PathVariable String[] carExpenseIds)
96
     public AjaxResult remove(@PathVariable String[] carExpenseIds)

+ 0
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcContractController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
7
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
36
     /**
38
      * 查询cmc合同评审列表
37
      * 查询cmc合同评审列表
39
      */
38
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:contract:list')")
41
     @GetMapping("/list")
39
     @GetMapping("/list")
42
     public TableDataInfo list(CmcContract cmcContract)
40
     public TableDataInfo list(CmcContract cmcContract)
43
     {
41
     {
49
     /**
47
     /**
50
      * 导出cmc合同评审列表
48
      * 导出cmc合同评审列表
51
      */
49
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:contract:export')")
53
     @Log(title = "cmc合同评审", businessType = BusinessType.EXPORT)
50
     @Log(title = "cmc合同评审", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
51
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcContract cmcContract)
52
     public void export(HttpServletResponse response, CmcContract cmcContract)
62
     /**
59
     /**
63
      * 获取cmc合同评审详细信息
60
      * 获取cmc合同评审详细信息
64
      */
61
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:contract:query')")
66
     @GetMapping(value = "/{contractId}")
62
     @GetMapping(value = "/{contractId}")
67
     public AjaxResult getInfo(@PathVariable("contractId") String contractId)
63
     public AjaxResult getInfo(@PathVariable("contractId") String contractId)
68
     {
64
     {
72
     /**
68
     /**
73
      * 新增cmc合同评审
69
      * 新增cmc合同评审
74
      */
70
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:contract:add')")
76
     @Log(title = "cmc合同评审", businessType = BusinessType.INSERT)
71
     @Log(title = "cmc合同评审", businessType = BusinessType.INSERT)
77
     @PostMapping
72
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcContract cmcContract)
73
     public AjaxResult add(@RequestBody CmcContract cmcContract)
83
     /**
78
     /**
84
      * 修改cmc合同评审
79
      * 修改cmc合同评审
85
      */
80
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:contract:edit')")
87
     @Log(title = "cmc合同评审", businessType = BusinessType.UPDATE)
81
     @Log(title = "cmc合同评审", businessType = BusinessType.UPDATE)
88
     @PutMapping
82
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcContract cmcContract)
83
     public AjaxResult edit(@RequestBody CmcContract cmcContract)
94
     /**
88
     /**
95
      * 删除cmc合同评审
89
      * 删除cmc合同评审
96
      */
90
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:contract:remove')")
98
     @Log(title = "cmc合同评审", businessType = BusinessType.DELETE)
91
     @Log(title = "cmc合同评审", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{contractIds}")
92
 	@DeleteMapping("/{contractIds}")
100
     public AjaxResult remove(@PathVariable String[] contractIds)
93
     public AjaxResult remove(@PathVariable String[] contractIds)

+ 0
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceController.java Просмотреть файл

6
 import javax.servlet.http.HttpServletResponse;
6
 import javax.servlet.http.HttpServletResponse;
7
 
7
 
8
 import com.ruoyi.common.utils.DateUtils;
8
 import com.ruoyi.common.utils.DateUtils;
9
-import org.springframework.security.access.prepost.PreAuthorize;
10
 import org.springframework.beans.factory.annotation.Autowired;
9
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.web.bind.annotation.GetMapping;
10
 import org.springframework.web.bind.annotation.GetMapping;
12
 import org.springframework.web.bind.annotation.PostMapping;
11
 import org.springframework.web.bind.annotation.PostMapping;

+ 0
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPostSalaryController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
7
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
36
     /**
38
      * 查询cmc岗位工资列表
37
      * 查询cmc岗位工资列表
39
      */
38
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:salary:list')")
41
     @GetMapping("/list")
39
     @GetMapping("/list")
42
     public TableDataInfo list(CmcPostSalary cmcPostSalary)
40
     public TableDataInfo list(CmcPostSalary cmcPostSalary)
43
     {
41
     {
49
     /**
47
     /**
50
      * 导出cmc岗位工资列表
48
      * 导出cmc岗位工资列表
51
      */
49
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:salary:export')")
53
     @Log(title = "cmc岗位工资", businessType = BusinessType.EXPORT)
50
     @Log(title = "cmc岗位工资", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
51
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcPostSalary cmcPostSalary)
52
     public void export(HttpServletResponse response, CmcPostSalary cmcPostSalary)
62
     /**
59
     /**
63
      * 获取cmc岗位工资详细信息
60
      * 获取cmc岗位工资详细信息
64
      */
61
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:salary:query')")
66
     @GetMapping(value = "/{salaryId}")
62
     @GetMapping(value = "/{salaryId}")
67
     public AjaxResult getInfo(@PathVariable("salaryId") Integer salaryId)
63
     public AjaxResult getInfo(@PathVariable("salaryId") Integer salaryId)
68
     {
64
     {
72
     /**
68
     /**
73
      * 新增cmc岗位工资
69
      * 新增cmc岗位工资
74
      */
70
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:salary:add')")
76
     @Log(title = "cmc岗位工资", businessType = BusinessType.INSERT)
71
     @Log(title = "cmc岗位工资", businessType = BusinessType.INSERT)
77
     @PostMapping
72
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcPostSalary cmcPostSalary)
73
     public AjaxResult add(@RequestBody CmcPostSalary cmcPostSalary)
83
     /**
78
     /**
84
      * 修改cmc岗位工资
79
      * 修改cmc岗位工资
85
      */
80
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:salary:edit')")
87
     @Log(title = "cmc岗位工资", businessType = BusinessType.UPDATE)
81
     @Log(title = "cmc岗位工资", businessType = BusinessType.UPDATE)
88
     @PutMapping
82
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcPostSalary cmcPostSalary)
83
     public AjaxResult edit(@RequestBody CmcPostSalary cmcPostSalary)
94
     /**
88
     /**
95
      * 删除cmc岗位工资
89
      * 删除cmc岗位工资
96
      */
90
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:salary:remove')")
98
     @Log(title = "cmc岗位工资", businessType = BusinessType.DELETE)
91
     @Log(title = "cmc岗位工资", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{salaryIds}")
92
 	@DeleteMapping("/{salaryIds}")
100
     public AjaxResult remove(@PathVariable Integer[] salaryIds)
93
     public AjaxResult remove(@PathVariable Integer[] salaryIds)

+ 0
- 8
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPriceController.java Просмотреть файл

1
 package com.ruoyi.web.controller.oa;
1
 package com.ruoyi.web.controller.oa;
2
 
2
 
3
-import java.math.BigDecimal;
4
 import java.util.ArrayList;
3
 import java.util.ArrayList;
5
 import java.util.List;
4
 import java.util.List;
6
 
5
 
7
 import com.alibaba.fastjson2.JSONObject;
6
 import com.alibaba.fastjson2.JSONObject;
8
 import org.apache.ibatis.annotations.Param;
7
 import org.apache.ibatis.annotations.Param;
9
-import org.springframework.security.access.prepost.PreAuthorize;
10
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.beans.factory.annotation.Autowired;
11
 import org.springframework.web.bind.annotation.GetMapping;
9
 import org.springframework.web.bind.annotation.GetMapping;
12
 import org.springframework.web.bind.annotation.PostMapping;
10
 import org.springframework.web.bind.annotation.PostMapping;
43
     /**
41
     /**
44
      * 查询单价表列表
42
      * 查询单价表列表
45
      */
43
      */
46
-    @PreAuthorize("@ss.hasPermi('oa:price:list')")
47
     @GetMapping("/list")
44
     @GetMapping("/list")
48
     public TableDataInfo list(CmcPrice cmcPrice)
45
     public TableDataInfo list(CmcPrice cmcPrice)
49
     {
46
     {
55
     /**
52
     /**
56
      * 导出单价表列表
53
      * 导出单价表列表
57
      */
54
      */
58
-    @PreAuthorize("@ss.hasPermi('oa:price:export')")
59
     @Log(title = "单价表", businessType = BusinessType.EXPORT)
55
     @Log(title = "单价表", businessType = BusinessType.EXPORT)
60
     @PostMapping("/export")
56
     @PostMapping("/export")
61
     public void export(HttpServletResponse response, CmcPrice cmcPrice)
57
     public void export(HttpServletResponse response, CmcPrice cmcPrice)
68
     /**
64
     /**
69
      * 获取单价表详细信息
65
      * 获取单价表详细信息
70
      */
66
      */
71
-    @PreAuthorize("@ss.hasPermi('oa:price:query')")
72
     @GetMapping(value = "/{id}")
67
     @GetMapping(value = "/{id}")
73
     public AjaxResult getInfo(@PathVariable("id") Long id)
68
     public AjaxResult getInfo(@PathVariable("id") Long id)
74
     {
69
     {
147
     /**
142
     /**
148
      * 新增单价表
143
      * 新增单价表
149
      */
144
      */
150
-    @PreAuthorize("@ss.hasPermi('oa:price:add')")
151
     @Log(title = "单价表", businessType = BusinessType.INSERT)
145
     @Log(title = "单价表", businessType = BusinessType.INSERT)
152
     @PostMapping
146
     @PostMapping
153
     public AjaxResult add(@RequestBody CmcPrice cmcPrice)
147
     public AjaxResult add(@RequestBody CmcPrice cmcPrice)
158
     /**
152
     /**
159
      * 修改单价表
153
      * 修改单价表
160
      */
154
      */
161
-    @PreAuthorize("@ss.hasPermi('oa:price:edit')")
162
     @Log(title = "单价表", businessType = BusinessType.UPDATE)
155
     @Log(title = "单价表", businessType = BusinessType.UPDATE)
163
     @PutMapping
156
     @PutMapping
164
     public AjaxResult edit(@RequestBody CmcPrice cmcPrice)
157
     public AjaxResult edit(@RequestBody CmcPrice cmcPrice)
169
     /**
162
     /**
170
      * 删除单价表
163
      * 删除单价表
171
      */
164
      */
172
-    @PreAuthorize("@ss.hasPermi('oa:price:remove')")
173
     @Log(title = "单价表", businessType = BusinessType.DELETE)
165
     @Log(title = "单价表", businessType = BusinessType.DELETE)
174
     @DeleteMapping("/{ids}")
166
     @DeleteMapping("/{ids}")
175
     public AjaxResult remove(@PathVariable Long[] ids)
167
     public AjaxResult remove(@PathVariable Long[] ids)

+ 0
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
7
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
36
     /**
38
      * 查询cmc项目审批列表
37
      * 查询cmc项目审批列表
39
      */
38
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:list')")
41
     @GetMapping("/list")
39
     @GetMapping("/list")
42
     public TableDataInfo list(CmcProjectComment cmcProjectComment)
40
     public TableDataInfo list(CmcProjectComment cmcProjectComment)
43
     {
41
     {
49
     /**
47
     /**
50
      * 导出cmc项目审批列表
48
      * 导出cmc项目审批列表
51
      */
49
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:export')")
53
     @Log(title = "cmc项目审批", businessType = BusinessType.EXPORT)
50
     @Log(title = "cmc项目审批", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
51
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcProjectComment cmcProjectComment)
52
     public void export(HttpServletResponse response, CmcProjectComment cmcProjectComment)
62
     /**
59
     /**
63
      * 获取cmc项目审批详细信息
60
      * 获取cmc项目审批详细信息
64
      */
61
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:query')")
66
     @GetMapping(value = "/{projectId}")
62
     @GetMapping(value = "/{projectId}")
67
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
63
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
68
     {
64
     {
72
     /**
68
     /**
73
      * 新增cmc项目审批
69
      * 新增cmc项目审批
74
      */
70
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:add')")
76
     @Log(title = "cmc项目审批", businessType = BusinessType.INSERT)
71
     @Log(title = "cmc项目审批", businessType = BusinessType.INSERT)
77
     @PostMapping
72
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcProjectComment cmcProjectComment)
73
     public AjaxResult add(@RequestBody CmcProjectComment cmcProjectComment)
83
     /**
78
     /**
84
      * 修改cmc项目审批
79
      * 修改cmc项目审批
85
      */
80
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:edit')")
87
     @Log(title = "cmc项目审批", businessType = BusinessType.UPDATE)
81
     @Log(title = "cmc项目审批", businessType = BusinessType.UPDATE)
88
     @PutMapping
82
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcProjectComment cmcProjectComment)
83
     public AjaxResult edit(@RequestBody CmcProjectComment cmcProjectComment)
94
     /**
88
     /**
95
      * 删除cmc项目审批
89
      * 删除cmc项目审批
96
      */
90
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:projectComment:remove')")
98
     @Log(title = "cmc项目审批", businessType = BusinessType.DELETE)
91
     @Log(title = "cmc项目审批", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{projectIds}")
92
 	@DeleteMapping("/{projectIds}")
100
     public AjaxResult remove(@PathVariable String[] projectIds)
93
     public AjaxResult remove(@PathVariable String[] projectIds)

+ 0
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectProgressController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
7
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
36
     /**
38
      * 查询cmc项目进度列表
37
      * 查询cmc项目进度列表
39
      */
38
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:list')")
41
     @GetMapping("/list")
39
     @GetMapping("/list")
42
     public TableDataInfo list(CmcProjectProgress cmcProjectProgress)
40
     public TableDataInfo list(CmcProjectProgress cmcProjectProgress)
43
     {
41
     {
49
     /**
47
     /**
50
      * 导出cmc项目进度列表
48
      * 导出cmc项目进度列表
51
      */
49
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:export')")
53
     @Log(title = "cmc项目进度", businessType = BusinessType.EXPORT)
50
     @Log(title = "cmc项目进度", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
51
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcProjectProgress cmcProjectProgress)
52
     public void export(HttpServletResponse response, CmcProjectProgress cmcProjectProgress)
62
     /**
59
     /**
63
      * 获取cmc项目进度详细信息
60
      * 获取cmc项目进度详细信息
64
      */
61
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:query')")
66
     @GetMapping(value = "/{progressId}")
62
     @GetMapping(value = "/{progressId}")
67
     public AjaxResult getInfo(@PathVariable("progressId") String progressId)
63
     public AjaxResult getInfo(@PathVariable("progressId") String progressId)
68
     {
64
     {
72
     /**
68
     /**
73
      * 新增cmc项目进度
69
      * 新增cmc项目进度
74
      */
70
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:add')")
76
     @Log(title = "cmc项目进度", businessType = BusinessType.INSERT)
71
     @Log(title = "cmc项目进度", businessType = BusinessType.INSERT)
77
     @PostMapping
72
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
73
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
83
     /**
78
     /**
84
      * 修改cmc项目进度
79
      * 修改cmc项目进度
85
      */
80
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:edit')")
87
     @Log(title = "cmc项目进度", businessType = BusinessType.UPDATE)
81
     @Log(title = "cmc项目进度", businessType = BusinessType.UPDATE)
88
     @PutMapping
82
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcProjectProgress cmcProjectProgress)
83
     public AjaxResult edit(@RequestBody CmcProjectProgress cmcProjectProgress)
94
     /**
88
     /**
95
      * 删除cmc项目进度
89
      * 删除cmc项目进度
96
      */
90
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:projectProgress:remove')")
98
     @Log(title = "cmc项目进度", businessType = BusinessType.DELETE)
91
     @Log(title = "cmc项目进度", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{progressIds}")
92
 	@DeleteMapping("/{progressIds}")
100
     public AjaxResult remove(@PathVariable String[] progressIds)
93
     public AjaxResult remove(@PathVariable String[] progressIds)

+ 0
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectWorkerController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
7
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
36
     /**
38
      * 查询cmc项目人员列表
37
      * 查询cmc项目人员列表
39
      */
38
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:list')")
41
     @GetMapping("/list")
39
     @GetMapping("/list")
42
     public TableDataInfo list(CmcProjectWorker cmcProjectWorker)
40
     public TableDataInfo list(CmcProjectWorker cmcProjectWorker)
43
     {
41
     {
49
     /**
47
     /**
50
      * 导出cmc项目人员列表
48
      * 导出cmc项目人员列表
51
      */
49
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:export')")
53
     @Log(title = "cmc项目人员", businessType = BusinessType.EXPORT)
50
     @Log(title = "cmc项目人员", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
51
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcProjectWorker cmcProjectWorker)
52
     public void export(HttpServletResponse response, CmcProjectWorker cmcProjectWorker)
62
     /**
59
     /**
63
      * 获取cmc项目人员详细信息
60
      * 获取cmc项目人员详细信息
64
      */
61
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:query')")
66
     @GetMapping(value = "/{id}")
62
     @GetMapping(value = "/{id}")
67
     public AjaxResult getInfo(@PathVariable("id") String id)
63
     public AjaxResult getInfo(@PathVariable("id") String id)
68
     {
64
     {
72
     /**
68
     /**
73
      * 新增cmc项目人员
69
      * 新增cmc项目人员
74
      */
70
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:add')")
76
     @Log(title = "cmc项目人员", businessType = BusinessType.INSERT)
71
     @Log(title = "cmc项目人员", businessType = BusinessType.INSERT)
77
     @PostMapping
72
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcProjectWorker cmcProjectWorker)
73
     public AjaxResult add(@RequestBody CmcProjectWorker cmcProjectWorker)
83
     /**
78
     /**
84
      * 修改cmc项目人员
79
      * 修改cmc项目人员
85
      */
80
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:edit')")
87
     @Log(title = "cmc项目人员", businessType = BusinessType.UPDATE)
81
     @Log(title = "cmc项目人员", businessType = BusinessType.UPDATE)
88
     @PutMapping
82
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcProjectWorker cmcProjectWorker)
83
     public AjaxResult edit(@RequestBody CmcProjectWorker cmcProjectWorker)
94
     /**
88
     /**
95
      * 删除cmc项目人员
89
      * 删除cmc项目人员
96
      */
90
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:projectWorker:remove')")
98
     @Log(title = "cmc项目人员", businessType = BusinessType.DELETE)
91
     @Log(title = "cmc项目人员", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{ids}")
92
 	@DeleteMapping("/{ids}")
100
     public AjaxResult remove(@PathVariable String[] ids)
93
     public AjaxResult remove(@PathVariable String[] ids)

+ 0
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcSafeController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
7
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
36
     /**
38
      * 查询cmc安全交底列表
37
      * 查询cmc安全交底列表
39
      */
38
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:safe:list')")
41
     @GetMapping("/list")
39
     @GetMapping("/list")
42
     public TableDataInfo list(CmcSafe cmcSafe)
40
     public TableDataInfo list(CmcSafe cmcSafe)
43
     {
41
     {
49
     /**
47
     /**
50
      * 导出cmc安全交底列表
48
      * 导出cmc安全交底列表
51
      */
49
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:safe:export')")
53
     @Log(title = "cmc安全交底", businessType = BusinessType.EXPORT)
50
     @Log(title = "cmc安全交底", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
51
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcSafe cmcSafe)
52
     public void export(HttpServletResponse response, CmcSafe cmcSafe)
62
     /**
59
     /**
63
      * 获取cmc安全交底详细信息
60
      * 获取cmc安全交底详细信息
64
      */
61
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:safe:query')")
66
     @GetMapping(value = "/{safeId}")
62
     @GetMapping(value = "/{safeId}")
67
     public AjaxResult getInfo(@PathVariable("safeId") String safeId)
63
     public AjaxResult getInfo(@PathVariable("safeId") String safeId)
68
     {
64
     {
72
     /**
68
     /**
73
      * 新增cmc安全交底
69
      * 新增cmc安全交底
74
      */
70
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:safe:add')")
76
     @Log(title = "cmc安全交底", businessType = BusinessType.INSERT)
71
     @Log(title = "cmc安全交底", businessType = BusinessType.INSERT)
77
     @PostMapping
72
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcSafe cmcSafe)
73
     public AjaxResult add(@RequestBody CmcSafe cmcSafe)
83
     /**
78
     /**
84
      * 修改cmc安全交底
79
      * 修改cmc安全交底
85
      */
80
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:safe:edit')")
87
     @Log(title = "cmc安全交底", businessType = BusinessType.UPDATE)
81
     @Log(title = "cmc安全交底", businessType = BusinessType.UPDATE)
88
     @PutMapping
82
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcSafe cmcSafe)
83
     public AjaxResult edit(@RequestBody CmcSafe cmcSafe)
94
     /**
88
     /**
95
      * 删除cmc安全交底
89
      * 删除cmc安全交底
96
      */
90
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:safe:remove')")
98
     @Log(title = "cmc安全交底", businessType = BusinessType.DELETE)
91
     @Log(title = "cmc安全交底", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{safeIds}")
92
 	@DeleteMapping("/{safeIds}")
100
     public AjaxResult remove(@PathVariable String[] safeIds)
93
     public AjaxResult remove(@PathVariable String[] safeIds)

+ 0
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTechnicalController.java Просмотреть файл

2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
7
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
36
     /**
38
      * 查询cmc技术方案列表
37
      * 查询cmc技术方案列表
39
      */
38
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:technical:list')")
41
     @GetMapping("/list")
39
     @GetMapping("/list")
42
     public TableDataInfo list(CmcTechnical cmcTechnical)
40
     public TableDataInfo list(CmcTechnical cmcTechnical)
43
     {
41
     {
49
     /**
47
     /**
50
      * 导出cmc技术方案列表
48
      * 导出cmc技术方案列表
51
      */
49
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:technical:export')")
53
     @Log(title = "cmc技术方案", businessType = BusinessType.EXPORT)
50
     @Log(title = "cmc技术方案", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
51
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcTechnical cmcTechnical)
52
     public void export(HttpServletResponse response, CmcTechnical cmcTechnical)
62
     /**
59
     /**
63
      * 获取cmc技术方案详细信息
60
      * 获取cmc技术方案详细信息
64
      */
61
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:technical:query')")
66
     @GetMapping(value = "/{technicalId}")
62
     @GetMapping(value = "/{technicalId}")
67
     public AjaxResult getInfo(@PathVariable("technicalId") String technicalId)
63
     public AjaxResult getInfo(@PathVariable("technicalId") String technicalId)
68
     {
64
     {
72
     /**
68
     /**
73
      * 新增cmc技术方案
69
      * 新增cmc技术方案
74
      */
70
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:technical:add')")
76
     @Log(title = "cmc技术方案", businessType = BusinessType.INSERT)
71
     @Log(title = "cmc技术方案", businessType = BusinessType.INSERT)
77
     @PostMapping
72
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcTechnical cmcTechnical)
73
     public AjaxResult add(@RequestBody CmcTechnical cmcTechnical)
83
     /**
78
     /**
84
      * 修改cmc技术方案
79
      * 修改cmc技术方案
85
      */
80
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:technical:edit')")
87
     @Log(title = "cmc技术方案", businessType = BusinessType.UPDATE)
81
     @Log(title = "cmc技术方案", businessType = BusinessType.UPDATE)
88
     @PutMapping
82
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
83
     public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
94
     /**
88
     /**
95
      * 删除cmc技术方案
89
      * 删除cmc技术方案
96
      */
90
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:technical:remove')")
98
     @Log(title = "cmc技术方案", businessType = BusinessType.DELETE)
91
     @Log(title = "cmc技术方案", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{technicalIds}")
92
 	@DeleteMapping("/{technicalIds}")
100
     public AjaxResult remove(@PathVariable String[] technicalIds)
93
     public AjaxResult remove(@PathVariable String[] technicalIds)

+ 1
- 8
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTenderController.java Просмотреть файл

1
-package com.ruoyi.oa.controller;
1
+package com.ruoyi.web.controller.oa;
2
 
2
 
3
 import java.util.List;
3
 import java.util.List;
4
 import javax.servlet.http.HttpServletResponse;
4
 import javax.servlet.http.HttpServletResponse;
5
-import org.springframework.security.access.prepost.PreAuthorize;
6
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.web.bind.annotation.GetMapping;
6
 import org.springframework.web.bind.annotation.GetMapping;
8
 import org.springframework.web.bind.annotation.PostMapping;
7
 import org.springframework.web.bind.annotation.PostMapping;
37
     /**
36
     /**
38
      * 查询投标管理列表
37
      * 查询投标管理列表
39
      */
38
      */
40
-    @PreAuthorize("@ss.hasPermi('oa:tender:list')")
41
     @GetMapping("/list")
39
     @GetMapping("/list")
42
     public TableDataInfo list(CmcTender cmcTender)
40
     public TableDataInfo list(CmcTender cmcTender)
43
     {
41
     {
49
     /**
47
     /**
50
      * 导出投标管理列表
48
      * 导出投标管理列表
51
      */
49
      */
52
-    @PreAuthorize("@ss.hasPermi('oa:tender:export')")
53
     @Log(title = "投标管理", businessType = BusinessType.EXPORT)
50
     @Log(title = "投标管理", businessType = BusinessType.EXPORT)
54
     @PostMapping("/export")
51
     @PostMapping("/export")
55
     public void export(HttpServletResponse response, CmcTender cmcTender)
52
     public void export(HttpServletResponse response, CmcTender cmcTender)
62
     /**
59
     /**
63
      * 获取投标管理详细信息
60
      * 获取投标管理详细信息
64
      */
61
      */
65
-    @PreAuthorize("@ss.hasPermi('oa:tender:query')")
66
     @GetMapping(value = "/{tenderId}")
62
     @GetMapping(value = "/{tenderId}")
67
     public AjaxResult getInfo(@PathVariable("tenderId") String tenderId)
63
     public AjaxResult getInfo(@PathVariable("tenderId") String tenderId)
68
     {
64
     {
72
     /**
68
     /**
73
      * 新增投标管理
69
      * 新增投标管理
74
      */
70
      */
75
-    @PreAuthorize("@ss.hasPermi('oa:tender:add')")
76
     @Log(title = "投标管理", businessType = BusinessType.INSERT)
71
     @Log(title = "投标管理", businessType = BusinessType.INSERT)
77
     @PostMapping
72
     @PostMapping
78
     public AjaxResult add(@RequestBody CmcTender cmcTender)
73
     public AjaxResult add(@RequestBody CmcTender cmcTender)
83
     /**
78
     /**
84
      * 修改投标管理
79
      * 修改投标管理
85
      */
80
      */
86
-    @PreAuthorize("@ss.hasPermi('oa:tender:edit')")
87
     @Log(title = "投标管理", businessType = BusinessType.UPDATE)
81
     @Log(title = "投标管理", businessType = BusinessType.UPDATE)
88
     @PutMapping
82
     @PutMapping
89
     public AjaxResult edit(@RequestBody CmcTender cmcTender)
83
     public AjaxResult edit(@RequestBody CmcTender cmcTender)
94
     /**
88
     /**
95
      * 删除投标管理
89
      * 删除投标管理
96
      */
90
      */
97
-    @PreAuthorize("@ss.hasPermi('oa:tender:remove')")
98
     @Log(title = "投标管理", businessType = BusinessType.DELETE)
91
     @Log(title = "投标管理", businessType = BusinessType.DELETE)
99
 	@DeleteMapping("/{tenderIds}")
92
 	@DeleteMapping("/{tenderIds}")
100
     public AjaxResult remove(@PathVariable String[] tenderIds)
93
     public AjaxResult remove(@PathVariable String[] tenderIds)

Загрузка…
Отмена
Сохранить