Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/FactoryUserController.java

@@ -115,7 +115,7 @@ public class FactoryUserController {
     @GetMapping("/get")
     @Operation(summary = "获得工厂用户详情")
     @Parameter(name = "id", description = "编号", required = true, example = "146")
-    @PreAuthorize("@ss.hasPermission('system:user:query')")
+    @PreAuthorize("@ss.hasPermission('system:factory-user:query')")
     public CommonResult<FactoryUserRespVO> getUser(@RequestParam("id") Long id) {
 
         AdminUserDO user = userService.getUser(id);
@@ -137,7 +137,7 @@ public class FactoryUserController {
 
     @GetMapping("/page")
     @Operation(summary = "获得工厂用户分页列表")
-    @PreAuthorize("@ss.hasPermission('system:user:list')")
+    @PreAuthorize("@ss.hasPermission('system:factory-user:query')")
     public CommonResult<PageResult<FactoryUserRespVO>> getUserPage(@Valid FactoryUserPageReqVO pageReqVO) {
 
         // 获得用户分页列表

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/factoryinfo/FactoryInfoController.java

@@ -7,11 +7,11 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.smartfactory.controller.admin.device.cameradevice.vo.CameraUpdateStatusReqVO;
 import cn.iocoder.yudao.module.smartfactory.controller.admin.factoryinfo.vo.*;
 import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryInfoDO;
 import cn.iocoder.yudao.module.smartfactory.service.factoryinfo.FactoryInfoService;
-import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -40,6 +40,9 @@ public class FactoryInfoController {
     @Resource
     private FactoryInfoService factoryInfoService;
 
+    @Resource
+    private DeptApi deptApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建工厂信息")
     @PreAuthorize("@ss.hasPermission('smartfactory:factory-info:create')")
@@ -77,9 +80,19 @@ public class FactoryInfoController {
     @Operation(summary = "获得工厂信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('smartfactory:factory-info:query')")
-    public CommonResult<FactoryInfoDO> getFactoryInfo(@RequestParam("id") Long id) {
+    public CommonResult<FactoryInfoRespVO> getFactoryInfo(@RequestParam("id") Long id) {
+
         FactoryInfoDO factoryInfo = factoryInfoService.getFactoryInfo(id);
-        return success(factoryInfo);
+        FactoryInfoRespVO respVO = BeanUtils.toBean(factoryInfo, FactoryInfoRespVO.class);
+
+        // 获取部门信息
+        DeptRespDTO respDTO = deptApi.getDeptByFactoryId(factoryInfo.getId()).getCheckedData();
+        if (respDTO != null) {
+            // 设置负责人信息
+            respVO.setLeaderUserId(respDTO.getLeaderUserId());
+        }
+
+        return success(respVO);
     }
 
     @GetMapping("/simple-list")

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/hik/HikController.java

@@ -7,12 +7,12 @@ import cn.iocoder.yudao.module.smartfactory.controller.admin.hik.vo.CameraReplay
 import cn.iocoder.yudao.module.smartfactory.service.hik.HikService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.annotation.security.PermitAll;
 
 /**
  * 工厂管理-工厂列表
@@ -29,7 +29,8 @@ public class HikController {
 
     @GetMapping("/getCameraUrl")
     @Operation(summary = "视频播放->查询播放地址")
-    @PermitAll
+    @PreAuthorize("@ss.hasPermission('smartfactory:camera:view')")
+//    @PermitAll
     public CommonResult<String> getCameraUrl(String cameraCode) {
         String url = hikService.getPreviewUrlsApi(cameraCode, 0);
         return CommonResult.success(url);
@@ -37,6 +38,7 @@ public class HikController {
 
     @GetMapping("/m-getCameraUrl")
     @Operation(summary = "视频播放->查询播放地址(微信用)")
+    @PreAuthorize("@ss.hasPermission('smartfactory:camera:view')")
     public CommonResult<String> getMCameraUrl(String cameraCode) {
 
         String url = hikService.getPreviewUrlsApiHttps(cameraCode);
@@ -46,7 +48,8 @@ public class HikController {
 
     @GetMapping("/replayUrl")
     @Operation(summary = "视频播放->回放流")
-    @PermitAll
+    @PreAuthorize("@ss.hasPermission('smartfactory:camera:view')")
+//    @PermitAll
     public CommonResult<JSONObject> getReplayUrl(CameraReplayDTO cameraReplayDTO) {
         JSONObject replayUrl = hikService.getReplayUrl(cameraReplayDTO);
         return CommonResult.success(replayUrl);
@@ -54,7 +57,8 @@ public class HikController {
 
     @GetMapping("/operate")
     @Operation(summary = "视频->云台操作")
-    @PermitAll
+    @PreAuthorize("@ss.hasPermission('smartfactory:camera:view')")
+//    @PermitAll
     public CommonResult<String> operate(CameraOperateDTO dto) {
 
         String msg = hikService.operateCamera(dto);