瀏覽代碼

创建项目

523096025 8 月之前
父節點
當前提交
0dc1985451

+ 13 - 3
musk/src/main/java/com/huimv/farm/musk/controller/LoginController.java

@@ -9,17 +9,18 @@ import com.huimv.farm.musk.common.utils.*;
 import com.huimv.farm.musk.entity.SysAccountMultilevel;
 import com.huimv.farm.musk.service.ILoginService;
 import com.huimv.farm.musk.service.ISysAccountMultilevelService;
+import com.huimv.farm.musk.service.ISysCameraService;
 import com.huimv.farm.musk.session.AccessToken;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Date;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 @RestController
@@ -31,6 +32,8 @@ public class LoginController {
     ILoginService iLoginService;
     @Autowired
     private ISysAccountMultilevelService accountMultilevelService;
+    @Autowired
+    private ISysCameraService sysCameraService;
 
     @RequestMapping("/test")
     public String logout() {
@@ -91,7 +94,12 @@ public class LoginController {
             accessToken.setFarmId(accountEntity.getFarmIds());
             String token = TokenSign.sign(accountName, id, accountEntity.getFarmIds());
             accessToken.setToken(token);
-            accessToken.setCameraIds(accountEntity.getCameraIds());
+            if (id !=1){
+                accessToken.setCameraIds(accountEntity.getCameraIds());
+            }else {
+                accessToken.setCameraIds(String.join(",",sysCameraService.listIds()));
+            }
+
 
             accessToken.setId(id);
             accessToken.setLoginIp(remoteHost);
@@ -107,6 +115,8 @@ public class LoginController {
         return result;
     }
 
+
+
     //测试-token
     @PostMapping(value = "/getToken")
     public String getToken(HttpServletRequest req) {

+ 4 - 0
musk/src/main/java/com/huimv/farm/musk/mapper/SysCameraMapper.java

@@ -9,6 +9,8 @@ import com.huimv.farm.musk.entity.SysCamera;
 import com.huimv.farm.musk.entity.vo.CameraBaseVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -22,4 +24,6 @@ public interface SysCameraMapper extends BaseMapper<SysCamera> {
 
     IPage<CameraBaseVo> listPage(Page<SysCamera> page, @Param(Constants.WRAPPER) QueryWrapper<SysCamera> wrapper);
 
+    List<String> listIds();
+
 }

+ 2 - 0
musk/src/main/java/com/huimv/farm/musk/service/ISysCameraService.java

@@ -25,5 +25,7 @@ public interface ISysCameraService extends IService<SysCamera> {
 
     Result updates(SysCamera camera);
 
+    List<String> listIds();
+
 //    Result initCamera(Integer farmId, Integer userId);
 }

+ 5 - 0
musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraServiceImpl.java

@@ -209,6 +209,11 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
         return new Result(10000, "修改成功", true);
     }
 
+    @Override
+    public List<String> listIds() {
+        return cameraBaseMapper.listIds();
+    }
+
 //    @Override
 //    public Result initCamera(Integer farmId, Integer userId) {
 //        BaseScreenCameraAccount cameraAccount = cameraAccountMapper.selectOne(new QueryWrapper<BaseScreenCameraAccount>().eq("farm_id", farmId).eq("account_id", userId));

+ 3 - 0
musk/src/main/resources/com/huimv/farm/musk/mapper/SysCameraMapper.xml

@@ -27,4 +27,7 @@
         select cb.*,ca.public_url as ip from sys_camera cb left join sys_camera_area ca on cb.region_uuid =ca.region_uuid
         ${ew.customSqlSegment}
     </select>
+    <select id="listIds" resultType="java.lang.String">
+        select id from sys_camera
+    </select>
 </mapper>