部署修改

ktg-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ktg-admin</artifactId>
+    <artifactId>iscs-server</artifactId>
 
     <description>
         web服务入口

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsJobCardController.java

@@ -46,7 +46,7 @@ public class IsJobCardController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isJobCard", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:card:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:card:list')")
     @GetMapping("/getIsJobCardPage")
     public CommonResult<Page<IsJobCard>> getIsJobCardPage(Page<IsJobCard> page, IsJobCard isJobCard)
     {
@@ -63,7 +63,7 @@ public class IsJobCardController extends BaseController
      */
     @ApiOperation("导出工作卡列表")
     @Parameter(name = "isJobCard", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('iscs:card:export')")
+    // @PreAuthorize("@ss.hasPermi('iscs:card:export')")
     @Log(title = "工作卡", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsJobCard")
     public void exportIsJobCard(HttpServletResponse response, IsJobCard isJobCard)
@@ -78,7 +78,7 @@ public class IsJobCardController extends BaseController
      */
     @ApiOperation("获取工作卡详细信息")
     @Parameter(name = "cardId", description = "cardId")
-    @PreAuthorize("@ss.hasPermi('iscs:card:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:card:query')")
     @GetMapping(value = "/selectIsJobCardById")
     public CommonResult<IsJobCard> selectIsJobCardById(Long cardId)
     {
@@ -95,7 +95,7 @@ public class IsJobCardController extends BaseController
      * 新增工作卡
      */
     @ApiOperation("新增工作卡")
-    @PreAuthorize("@ss.hasPermi('iscs:card:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:card:add')")
     @Log(title = "工作卡", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsJobCard")
     public CommonResult<Boolean> insertIsJobCard(@RequestBody @Parameter(name = "isJobCard", description = "新增数据类,放到body") IsJobCard isJobCard)
@@ -119,7 +119,7 @@ public class IsJobCardController extends BaseController
      * 删除工作卡
      */
     @ApiOperation("删除工作卡")
-    @PreAuthorize("@ss.hasPermi('iscs:card:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:card:remove')")
     @Log(title = "工作卡", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsJobCardByCardIds")
     public CommonResult<Boolean> deleteIsJobCardByCardIds(String cardIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsKeyController.java

@@ -42,7 +42,7 @@ public class IsKeyController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isKey", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:key:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:key:list')")
     @GetMapping("/getIsKeyPage")
     public CommonResult<Page<IsKeyVO>> getIsKeyPage(Page<IsKey> page, IsKey isKey)
     {
@@ -73,7 +73,7 @@ public class IsKeyController extends BaseController
      */
     @ApiOperation("获取钥匙详细信息")
     @Parameter(name = "keyId", description = "keyId")
-    @PreAuthorize("@ss.hasPermi('iscs:key:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:key:query')")
     @GetMapping(value = "/selectIsKeyById")
     public CommonResult<IsKey> selectIsKeyById(Long keyId)
     {
@@ -91,7 +91,7 @@ public class IsKeyController extends BaseController
      * 新增钥匙
      */
     @ApiOperation("新增钥匙")
-    @PreAuthorize("@ss.hasPermi('iscs:key:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:key:add')")
     @Log(title = "钥匙", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsKey")
     public CommonResult<Boolean> insertIsKey(@RequestBody @Parameter(name = "isKey", description = "新增数据类,放到body") IsKey isKey)
@@ -103,7 +103,7 @@ public class IsKeyController extends BaseController
      * 修改钥匙
      */
     @ApiOperation("修改钥匙")
-    @PreAuthorize("@ss.hasPermi('iscs:key:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:key:edit')")
     @Log(title = "钥匙", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsKey")
     public CommonResult<Boolean> updateIsKey(@RequestBody @Parameter(name = "isKey", description = "修改数据类,放到body") IsKey isKey)
@@ -115,7 +115,7 @@ public class IsKeyController extends BaseController
      * 删除钥匙
      */
     @ApiOperation("删除钥匙")
-    @PreAuthorize("@ss.hasPermi('iscs:key:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:key:remove')")
     @Log(title = "钥匙", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsKeyByKeyIds")
     public CommonResult<Boolean> deleteIsKeyByKeyIds(String keyIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLockController.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -42,7 +41,7 @@ public class IsLockController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isLock", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:lock:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lock:list')")
     @GetMapping("/getIsLockPage")
     public CommonResult<Page<IsLockVO>> getIsLockPage(Page<IsLock> page, IsLock isLock)
     {
@@ -57,7 +56,7 @@ public class IsLockController extends BaseController
      */
     @ApiOperation("导出挂锁列表")
     @Parameter(name = "isLock", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('iscs:lock:export')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lock:export')")
     @Log(title = "挂锁", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsLock")
     public void exportIsLock(HttpServletResponse response, IsLock isLock)
@@ -72,7 +71,7 @@ public class IsLockController extends BaseController
      */
     @ApiOperation("获取挂锁详细信息")
     @Parameter(name = "lockId", description = "lockId")
-    @PreAuthorize("@ss.hasPermi('iscs:lock:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lock:query')")
     @GetMapping(value = "/selectIsLockById")
     public CommonResult<IsLock> selectIsLockById(Long lockId)
     {
@@ -90,7 +89,7 @@ public class IsLockController extends BaseController
      * 新增挂锁
      */
     @ApiOperation("新增挂锁")
-    @PreAuthorize("@ss.hasPermi('iscs:lock:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lock:add')")
     @Log(title = "挂锁", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsLock")
     public CommonResult<Boolean> insertIsLock(@RequestBody @Parameter(name = "isLock", description = "新增数据类,放到body") IsLock isLock)
@@ -102,7 +101,7 @@ public class IsLockController extends BaseController
      * 修改挂锁
      */
     @ApiOperation("修改挂锁")
-    @PreAuthorize("@ss.hasPermi('iscs:lock:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lock:edit')")
     @Log(title = "挂锁", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsLock")
     public CommonResult<Boolean> updateIsLock(@RequestBody @Parameter(name = "isLock", description = "修改数据类,放到body") IsLock isLock)
@@ -114,7 +113,7 @@ public class IsLockController extends BaseController
      * 删除挂锁
      */
     @ApiOperation("删除挂锁")
-    @PreAuthorize("@ss.hasPermi('iscs:lock:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lock:remove')")
     @Log(title = "挂锁", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsLockByLockIds")
     public CommonResult<Boolean> deleteIsLockByLockIds(String lockIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLockTypeController.java

@@ -42,7 +42,7 @@ public class IsLockTypeController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isLockType", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:type:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:list')")
     @GetMapping("/getIsLockTypePage")
     public CommonResult<Page<IsLockTypeVO>> getIsLockTypePage(Page<IsLockType> page, IsLockType isLockType)
     {
@@ -74,7 +74,7 @@ public class IsLockTypeController extends BaseController
      */
     @ApiOperation("获取物资类型详细信息")
     @Parameter(name = "lockTypeId", description = "lockTypeId")
-    @PreAuthorize("@ss.hasPermi('iscs:type:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:query')")
     @GetMapping(value = "/selectIsLockTypeById")
     public CommonResult<IsLockType> selectIsLockTypeById(Long lockTypeId)
     {
@@ -85,7 +85,7 @@ public class IsLockTypeController extends BaseController
      * 新增物资类型
      */
     @ApiOperation("新增物资类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:add')")
     @Log(title = "物资类型", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsLockType")
     public CommonResult<Boolean> insertIsLockType(@RequestBody @Parameter(name = "isLockType", description = "新增数据类,放到body") IsLockType isLockType)
@@ -97,7 +97,7 @@ public class IsLockTypeController extends BaseController
      * 修改物资类型
      */
     @ApiOperation("修改物资类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:edit')")
     @Log(title = "物资类型", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsLockType")
     public CommonResult<Boolean> updateIsLockType(@RequestBody @Parameter(name = "isLockType", description = "修改数据类,放到body") IsLockType isLockType)
@@ -109,7 +109,7 @@ public class IsLockTypeController extends BaseController
      * 删除物资类型
      */
     @ApiOperation("删除物资类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:remove')")
     @Log(title = "物资类型", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsLockTypeByLockTypeIds")
     public CommonResult<Boolean> deleteIsLockTypeByLockTypeIds(String lockTypeIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLocksetController.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -42,7 +41,7 @@ public class IsLocksetController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isLockset", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:lockset:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lockset:list')")
     @GetMapping("/getIsLocksetPage")
     public CommonResult<Page<IsLocksetVO>> getIsLocksetPage(Page<IsLockset> page, IsLockset isLockset)
     {
@@ -59,7 +58,7 @@ public class IsLocksetController extends BaseController
      */
     @ApiOperation("导出锁具列表")
     @Parameter(name = "isLockset", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('iscs:lockset:export')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lockset:export')")
     @Log(title = "锁具", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsLockset")
     public void exportIsLockset(HttpServletResponse response, IsLockset isLockset)
@@ -74,7 +73,7 @@ public class IsLocksetController extends BaseController
      */
     @ApiOperation("获取锁具详细信息")
     @Parameter(name = "locksetId", description = "locksetId")
-    @PreAuthorize("@ss.hasPermi('iscs:lockset:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lockset:query')")
     @GetMapping(value = "/selectIsLocksetById")
     public CommonResult<IsLockset> selectIsLocksetById(Long locksetId)
     {
@@ -85,7 +84,7 @@ public class IsLocksetController extends BaseController
      * 新增锁具
      */
     @ApiOperation("新增锁具")
-    @PreAuthorize("@ss.hasPermi('iscs:lockset:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lockset:add')")
     @Log(title = "锁具", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsLockset")
     public CommonResult<Boolean> insertIsLockset(@RequestBody @Parameter(name = "isLockset", description = "新增数据类,放到body") IsLockset isLockset)
@@ -97,7 +96,7 @@ public class IsLocksetController extends BaseController
      * 修改锁具
      */
     @ApiOperation("修改锁具")
-    @PreAuthorize("@ss.hasPermi('iscs:lockset:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lockset:edit')")
     @Log(title = "锁具", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsLockset")
     public CommonResult<Boolean> updateIsLockset(@RequestBody @Parameter(name = "isLockset", description = "修改数据类,放到body") IsLockset isLockset)
@@ -109,7 +108,7 @@ public class IsLocksetController extends BaseController
      * 删除锁具
      */
     @ApiOperation("删除锁具")
-    @PreAuthorize("@ss.hasPermi('iscs:lockset:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:lockset:remove')")
     @Log(title = "锁具", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsLocksetByLocksetIds")
     public CommonResult<Boolean> deleteIsLocksetByLocksetIds(String locksetIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsLocksetTypeController.java

@@ -42,7 +42,7 @@ public class IsLocksetTypeController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isLocksetType", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:type:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:list')")
     @GetMapping("/getIsLocksetTypePage")
     public CommonResult<Page<IsLocksetTypeVO>> getIsLocksetTypePage(Page<IsLocksetType> page, IsLocksetType isLocksetType)
     {
@@ -72,7 +72,7 @@ public class IsLocksetTypeController extends BaseController
      */
     @ApiOperation("获取锁具类型详细信息")
     @Parameter(name = "locksetTypeId", description = "locksetTypeId")
-    @PreAuthorize("@ss.hasPermi('iscs:type:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:query')")
     @GetMapping(value = "/selectIsLocksetTypeById")
     public CommonResult<IsLocksetType> selectIsLocksetTypeById(Long locksetTypeId)
     {
@@ -83,7 +83,7 @@ public class IsLocksetTypeController extends BaseController
      * 新增锁具类型
      */
     @ApiOperation("新增锁具类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:add')")
     @Log(title = "锁具类型", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsLocksetType")
     public CommonResult<Boolean> insertIsLocksetType(@RequestBody @Parameter(name = "isLocksetType", description = "新增数据类,放到body") IsLocksetType isLocksetType)
@@ -95,7 +95,7 @@ public class IsLocksetTypeController extends BaseController
      * 修改锁具类型
      */
     @ApiOperation("修改锁具类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:edit')")
     @Log(title = "锁具类型", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsLocksetType")
     public CommonResult<Boolean> updateIsLocksetType(@RequestBody @Parameter(name = "isLocksetType", description = "修改数据类,放到body") IsLocksetType isLocksetType)
@@ -107,7 +107,7 @@ public class IsLocksetTypeController extends BaseController
      * 删除锁具类型
      */
     @ApiOperation("删除锁具类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:remove')")
     @Log(title = "锁具类型", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsLocksetTypeByLocksetTypeIds")
     public CommonResult<Boolean> deleteIsLocksetTypeByLocksetTypeIds(String locksetTypeIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsCabinetController.java

@@ -42,7 +42,7 @@ public class IsMaterialsCabinetController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isMaterialsCabinet", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:cabinet:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:list')")
     @GetMapping("/getIsMaterialsCabinetPage")
     public CommonResult<Page<IsMaterialsCabinet>> getIsMaterialsCabinetPage(Page<IsMaterialsCabinet> page, IsMaterialsCabinet isMaterialsCabinet)
     {
@@ -71,7 +71,7 @@ public class IsMaterialsCabinetController extends BaseController
      */
     @ApiOperation("获取物资柜详细信息")
     @Parameter(name = "cabinetId", description = "cabinetId")
-    @PreAuthorize("@ss.hasPermi('iscs:cabinet:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:query')")
     @GetMapping(value = "/selectIsMaterialsCabinetById")
     public CommonResult<IsMaterialsCabinet> selectIsMaterialsCabinetById(Long cabinetId)
     {
@@ -82,7 +82,7 @@ public class IsMaterialsCabinetController extends BaseController
      * 新增物资柜
      */
     @ApiOperation("新增物资柜")
-    @PreAuthorize("@ss.hasPermi('iscs:cabinet:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:add')")
     @Log(title = "物资柜", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterialsCabinet")
     public CommonResult<Boolean> insertIsMaterialsCabinet(@RequestBody @Parameter(name = "isMaterialsCabinet", description = "新增数据类,放到body") IsMaterialsCabinet isMaterialsCabinet)
@@ -94,7 +94,7 @@ public class IsMaterialsCabinetController extends BaseController
      * 修改物资柜
      */
     @ApiOperation("修改物资柜")
-    @PreAuthorize("@ss.hasPermi('iscs:cabinet:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:edit')")
     @Log(title = "物资柜", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialsCabinet")
     public CommonResult<Boolean> updateIsMaterialsCabinet(@RequestBody @Parameter(name = "isMaterialsCabinet", description = "修改数据类,放到body") IsMaterialsCabinet isMaterialsCabinet)
@@ -106,7 +106,7 @@ public class IsMaterialsCabinetController extends BaseController
      * 删除物资柜
      */
     @ApiOperation("删除物资柜")
-    @PreAuthorize("@ss.hasPermi('iscs:cabinet:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:cabinet:remove')")
     @Log(title = "物资柜", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsMaterialsCabinetByCabinetIds")
     public CommonResult<Boolean> deleteIsMaterialsCabinetByCabinetIds(String cabinetIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsController.java

@@ -7,8 +7,8 @@ import com.ktg.common.enums.BusinessType;
 import com.ktg.common.pojo.CommonResult;
 import com.ktg.common.utils.poi.ExcelUtil;
 import com.ktg.iscs.domain.IsMaterials;
-import com.ktg.iscs.domain.dto.materials.MaterialsPageDTO;
 import com.ktg.iscs.domain.dto.materials.LoanMaterialDTO;
+import com.ktg.iscs.domain.dto.materials.MaterialsPageDTO;
 import com.ktg.iscs.domain.vo.materials.MaterialsPageVO;
 import com.ktg.iscs.service.IIsMaterialsService;
 import io.swagger.annotations.Api;
@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -44,7 +43,7 @@ public class IsMaterialsController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:materials:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:materials:list')")
     @GetMapping("/getIsMaterialsPage")
     public CommonResult<Page<MaterialsPageVO>> getIsMaterialsPage(Page<IsMaterials> page, MaterialsPageDTO dto)
     {
@@ -57,7 +56,7 @@ public class IsMaterialsController extends BaseController
      */
     @ApiOperation("导出物资列表")
     @Parameter(name = "isMaterials", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('iscs:materials:export')")
+    // @PreAuthorize("@ss.hasPermi('iscs:materials:export')")
     @Log(title = "物资", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsMaterials")
     public void exportIsMaterials(HttpServletResponse response, IsMaterials isMaterials)
@@ -72,7 +71,7 @@ public class IsMaterialsController extends BaseController
      */
     @ApiOperation("获取物资详细信息")
     @Parameter(name = "materialsId", description = "materialsId")
-    @PreAuthorize("@ss.hasPermi('iscs:materials:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:materials:query')")
     @GetMapping(value = "/selectIsMaterialsById")
     public CommonResult<IsMaterials> selectIsMaterialsById(Long materialsId)
     {
@@ -83,7 +82,7 @@ public class IsMaterialsController extends BaseController
      * 新增物资
      */
     @ApiOperation("新增物资")
-    @PreAuthorize("@ss.hasPermi('iscs:materials:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:materials:add')")
     @Log(title = "物资", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterials")
     public CommonResult<Boolean> insertIsMaterials(@RequestBody @Parameter(name = "isMaterials", description = "新增数据类,放到body") IsMaterials isMaterials)
@@ -95,7 +94,7 @@ public class IsMaterialsController extends BaseController
      * 修改物资
      */
     @ApiOperation("修改物资")
-    @PreAuthorize("@ss.hasPermi('iscs:materials:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:materials:edit')")
     @Log(title = "物资", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterials")
     public CommonResult<Boolean> updateIsMaterials(@RequestBody @Parameter(name = "isMaterials", description = "修改数据类,放到body") IsMaterials isMaterials)
@@ -104,7 +103,7 @@ public class IsMaterialsController extends BaseController
     }
 
     @ApiOperation("借出/归还物资")
-    @PreAuthorize("@ss.hasPermi('iscs:materials:loan')")
+    // @PreAuthorize("@ss.hasPermi('iscs:materials:loan')")
     @Log(title = "借出/归还物资", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialById")
     public CommonResult<Boolean> updateIsMaterialById(@RequestBody @Parameter(name = "isMaterials", description = "修改数据类,放到body") LoanMaterialDTO dto)
@@ -116,7 +115,7 @@ public class IsMaterialsController extends BaseController
      * 删除物资
      */
     @ApiOperation("删除物资")
-    @PreAuthorize("@ss.hasPermi('iscs:materials:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:materials:remove')")
     @Log(title = "物资", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsMaterialsByMaterialsIds")
     public CommonResult<Boolean> deleteIsMaterialsByMaterialsIds(String materialsIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsLoanController.java

@@ -19,7 +19,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -47,7 +46,7 @@ public class IsMaterialsLoanController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
     @GetMapping("/getIsMaterialsLoanPage")
     public CommonResult<Page<MaterialsLoanPageVO>> getIsMaterialsLoanPage(Page<IsMaterialsLoan> page, MaterialsLoanPageDTO dto)
     {
@@ -60,7 +59,7 @@ public class IsMaterialsLoanController extends BaseController
      */
     @ApiOperation("导出物资借出列表")
     @Parameter(name = "isMaterialsLoan", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('iscs:loan:export')")
+    // @PreAuthorize("@ss.hasPermi('iscs:loan:export')")
     @Log(title = "物资借出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsMaterialsLoan")
     public void exportIsMaterialsLoan(HttpServletResponse response, IsMaterialsLoan isMaterialsLoan)
@@ -75,7 +74,7 @@ public class IsMaterialsLoanController extends BaseController
      */
     @ApiOperation("获取物资借出详细信息")
     @Parameter(name = "materialsLoanId", description = "materialsLoanId")
-    @PreAuthorize("@ss.hasPermi('iscs:loan:query')")
+    // @PreAuthorize("@ss.hasPermi('iscs:loan:query')")
     @GetMapping(value = "/selectIsMaterialsLoanById")
     public CommonResult<IsMaterialsLoan> selectIsMaterialsLoanById(Long materialsLoanId)
     {
@@ -86,7 +85,7 @@ public class IsMaterialsLoanController extends BaseController
      * 新增物资借出
      */
     @ApiOperation("新增物资借出")
-    @PreAuthorize("@ss.hasPermi('iscs:loan:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:loan:add')")
     @Log(title = "物资借出", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterialsLoan")
     public CommonResult<Boolean> insertIsMaterialsLoan(@RequestBody @Parameter(name = "dto", description = "新增数据类,放到body") AddLoanDTO dto)
@@ -95,7 +94,7 @@ public class IsMaterialsLoanController extends BaseController
     }
 
     @ApiOperation("物资归还")
-    @PreAuthorize("@ss.hasPermi('iscs:loan:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:loan:add')")
     @Log(title = "物资归还", businessType = BusinessType.INSERT)
     @PostMapping("/returnIsMaterialsLoan")
     public CommonResult<Boolean> returnIsMaterialsLoan(@RequestBody @Parameter(name = "dto", description = "新增数据类,放到body") ReturnLoanDTO dto)
@@ -107,7 +106,7 @@ public class IsMaterialsLoanController extends BaseController
      * 修改物资借出
      */
     @ApiOperation("修改物资借出")
-    @PreAuthorize("@ss.hasPermi('iscs:loan:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:loan:edit')")
     @Log(title = "物资借出", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialsLoan")
     public CommonResult<Boolean> updateIsMaterialsLoan(@RequestBody @Parameter(name = "isMaterialsLoan", description = "修改数据类,放到body") IsMaterialsLoan isMaterialsLoan)
@@ -119,7 +118,7 @@ public class IsMaterialsLoanController extends BaseController
      * 删除物资借出
      */
     @ApiOperation("删除物资借出")
-    @PreAuthorize("@ss.hasPermi('iscs:loan:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:loan:remove')")
     @Log(title = "物资借出", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsMaterialsLoanByMaterialsLoanIds")
     public CommonResult<Boolean> deleteIsMaterialsLoanByMaterialsLoanIds(String materialsLoanIds)
@@ -132,7 +131,7 @@ public class IsMaterialsLoanController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
+    //  @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
     @GetMapping("/getReturnReminderPage")
     public CommonResult<Page<ReminderPageVO>> getReturnReminderPage(Page<IsMaterialsLoan> page, ReminderPageDTO dto)
     {
@@ -145,7 +144,7 @@ public class IsMaterialsLoanController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "dto", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:loan:list')")
     @GetMapping("/getExpiredReminderPage")
     public CommonResult<Page<ReminderPageVO>> getReminderPage(Page<IsMaterialsLoan> page, ReminderPageDTO dto)
     {

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsReminderController.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -36,7 +35,7 @@ public class IsMaterialsReminderController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isMaterialsReminder", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:reminder:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:reminder:list')")
     @GetMapping("/getIsMaterialsReminderPage")
     public CommonResult<Page<MaterialsReminderVO>> getIsMaterialsReminderPage(Page<IsMaterialsReminder> page, MaterialsReminderPageDTO dto)
     {
@@ -45,7 +44,7 @@ public class IsMaterialsReminderController extends BaseController
     }
 
     @ApiOperation("修改物资借出提醒")
-    @PreAuthorize("@ss.hasPermi('iscs:reminder:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:reminder:edit')")
     @Log(title = "物资借出提醒", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialsReminder")
     public CommonResult<Boolean> updateIsMaterialsReminder(@RequestBody @Parameter(name = "isMaterialsReminder", description = "修改数据类,放到body") IsMaterialsReminder isMaterialsReminder)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsRestitutionRulesController.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -42,7 +41,7 @@ public class IsMaterialsRestitutionRulesController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isMaterialsRestitutionRules", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:rules:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:rules:list')")
     @GetMapping("/getIsMaterialsRestitutionRulesPage")
     public CommonResult<Page<IsMaterialsRestitutionRules>> getIsMaterialsRestitutionRulesPage(Page<IsMaterialsRestitutionRules> page, IsMaterialsRestitutionRules isMaterialsRestitutionRules)
     {
@@ -56,7 +55,7 @@ public class IsMaterialsRestitutionRulesController extends BaseController
      */
     @ApiOperation("导出物资借出规则列表")
     @Parameter(name = "isMaterialsRestitutionRules", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('iscs:rules:export')")
+    // @PreAuthorize("@ss.hasPermi('iscs:rules:export')")
     @Log(title = "物资借出规则", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsMaterialsRestitutionRules")
     public void exportIsMaterialsRestitutionRules(HttpServletResponse response, IsMaterialsRestitutionRules isMaterialsRestitutionRules)
@@ -71,7 +70,7 @@ public class IsMaterialsRestitutionRulesController extends BaseController
      */
     @ApiOperation("获取物资借出规则详细信息")
     @Parameter(name = "ruleId", description = "ruleId")
-    @PreAuthorize("@ss.hasPermi('iscs:rules:query')")
+    //  @PreAuthorize("@ss.hasPermi('iscs:rules:query')")
     @GetMapping(value = "/selectIsMaterialsRestitutionRulesById")
     public CommonResult<IsMaterialsRestitutionRules> selectIsMaterialsRestitutionRulesById(Long ruleId)
     {
@@ -82,7 +81,7 @@ public class IsMaterialsRestitutionRulesController extends BaseController
      * 新增物资借出规则
      */
     @ApiOperation("新增物资借出规则")
-    @PreAuthorize("@ss.hasPermi('iscs:rules:add')")
+    // @PreAuthorize("@ss.hasPermi('iscs:rules:add')")
     @Log(title = "物资借出规则", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterialsRestitutionRules")
     public CommonResult<Boolean> insertIsMaterialsRestitutionRules(@RequestBody @Parameter(name = "isMaterialsRestitutionRules", description = "新增数据类,放到body") IsMaterialsRestitutionRules isMaterialsRestitutionRules)
@@ -94,7 +93,7 @@ public class IsMaterialsRestitutionRulesController extends BaseController
      * 修改物资借出规则
      */
     @ApiOperation("修改物资借出规则")
-    @PreAuthorize("@ss.hasPermi('iscs:rules:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:rules:edit')")
     @Log(title = "物资借出规则", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialsRestitutionRules")
     public CommonResult<Boolean> updateIsMaterialsRestitutionRules(@RequestBody @Parameter(name = "isMaterialsRestitutionRules", description = "修改数据类,放到body") IsMaterialsRestitutionRules isMaterialsRestitutionRules)
@@ -106,7 +105,7 @@ public class IsMaterialsRestitutionRulesController extends BaseController
      * 删除物资借出规则
      */
     @ApiOperation("删除物资借出规则")
-    @PreAuthorize("@ss.hasPermi('iscs:rules:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:rules:remove')")
     @Log(title = "物资借出规则", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsMaterialsRestitutionRulesByRuleIds")
     public CommonResult<Boolean> deleteIsMaterialsRestitutionRulesByRuleIds(String ruleIds)

ktg-iscs/src/main/java/com/ktg/iscs/controller/IsMaterialsTypeController.java

@@ -15,7 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -43,7 +42,7 @@ public class IsMaterialsTypeController extends BaseController
             @Parameter(name = "page", description = "Page"),
             @Parameter(name = "isMaterialsType", description = "实体参数")
     })
-    @PreAuthorize("@ss.hasPermi('iscs:type:list')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:list')")
     @GetMapping("/getIsMaterialsTypePage")
     public CommonResult<Page<MaterialsTypePageVO>> getIsMaterialsTypePage(Page<IsMaterialsType> page, IsMaterialsType isMaterialsType)
     {
@@ -56,7 +55,7 @@ public class IsMaterialsTypeController extends BaseController
      */
     @ApiOperation("导出物资类型列表")
     @Parameter(name = "isMaterialsType", description = "实体参数")
-    @PreAuthorize("@ss.hasPermi('iscs:type:export')")
+    //  @PreAuthorize("@ss.hasPermi('iscs:type:export')")
     @Log(title = "物资类型", businessType = BusinessType.EXPORT)
     @PostMapping("/exportIsMaterialsType")
     public void exportIsMaterialsType(HttpServletResponse response, IsMaterialsType isMaterialsType)
@@ -71,7 +70,7 @@ public class IsMaterialsTypeController extends BaseController
      */
     @ApiOperation("获取物资类型详细信息")
     @Parameter(name = "materialsTypeId", description = "materialsTypeId")
-    @PreAuthorize("@ss.hasPermi('iscs:type:query')")
+    //  @PreAuthorize("@ss.hasPermi('iscs:type:query')")
     @GetMapping(value = "/selectIsMaterialsTypeById")
     public CommonResult<MaterialsTypePageVO> selectIsMaterialsTypeById(Long materialsTypeId)
     {
@@ -82,7 +81,7 @@ public class IsMaterialsTypeController extends BaseController
      * 新增物资类型
      */
     @ApiOperation("新增物资类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:add')")
+    //  @PreAuthorize("@ss.hasPermi('iscs:type:add')")
     @Log(title = "物资类型", businessType = BusinessType.INSERT)
     @PostMapping("/insertIsMaterialsType")
     public CommonResult<Boolean> insertIsMaterialsType(@RequestBody @Parameter(name = "dto", description = "新增数据类,放到body") MaterialsTypePageDTO dto)
@@ -94,7 +93,7 @@ public class IsMaterialsTypeController extends BaseController
      * 修改物资类型
      */
     @ApiOperation("修改物资类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:edit')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:edit')")
     @Log(title = "物资类型", businessType = BusinessType.UPDATE)
     @PostMapping("/updateIsMaterialsType")
     public CommonResult<Boolean> updateIsMaterialsType(@RequestBody @Parameter(name = "dto", description = "修改数据类,放到body") MaterialsTypePageDTO dto)
@@ -106,7 +105,7 @@ public class IsMaterialsTypeController extends BaseController
      * 删除物资类型
      */
     @ApiOperation("删除物资类型")
-    @PreAuthorize("@ss.hasPermi('iscs:type:remove')")
+    // @PreAuthorize("@ss.hasPermi('iscs:type:remove')")
     @Log(title = "物资类型", businessType = BusinessType.DELETE)
 	@PostMapping("/deleteIsMaterialsTypeByMaterialsTypeIds")
     public CommonResult<Boolean> deleteIsMaterialsTypeByMaterialsTypeIds(String materialsTypeIds)