创建项目

musk/src/main/java/com/huimv/farm/musk/config/ApiPrefixAutoConfiguration.java

@@ -1,14 +1,14 @@
-package com.huimv.farm.musk.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
-
+//package com.huimv.farm.musk.config;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+//@Configuration
+//public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
+//
 //    @Override
 //    public void configurePathMatch(PathMatchConfigurer configurer) {
 //        configurer.addPathPrefix("/huatongApi",  c -> c.isAnnotationPresent(RestController.class));
 //    }
-
-}
+//
+//}

musk/src/main/java/com/huimv/farm/musk/controller/DevEnergyController.java

@@ -3,7 +3,6 @@ package com.huimv.farm.musk.controller;
 
 import com.huimv.farm.musk.common.utils.Result;
 import com.huimv.farm.musk.common.utils.ResultCode;
-import com.huimv.farm.musk.entity.BaseBuilding;
 import com.huimv.farm.musk.entity.DevEnergy;
 import com.huimv.farm.musk.service.IDevEnergyService;
 import org.springframework.beans.factory.annotation.Autowired;

musk/src/main/java/com/huimv/farm/musk/controller/LoginController.java

@@ -73,11 +73,13 @@ public class LoginController {
 
         String accountName = map.get("accountName");
         String password = map.get("password");
+        String type = map.get("type");
+
 
         String remoteHost = req.getRemoteHost();
 
         // 未对密码加密
-        Result result = iLoginService.loginMultilevel(accountName, password);
+        Result result = iLoginService.loginMultilevel(accountName, password,type);
         if (result.getCode() == 10000) {
 
             SysAccountMultilevel accountEntity = (SysAccountMultilevel) result.getData();
@@ -89,6 +91,7 @@ public class LoginController {
             accessToken.setFarmId(accountEntity.getFarmIds());
             String token = TokenSign.sign(accountName, id, accountEntity.getFarmIds());
             accessToken.setToken(token);
+            accessToken.setCameraIds(accountEntity.getCameraIds());
 
             accessToken.setId(id);
             accessToken.setLoginIp(remoteHost);
@@ -115,8 +118,9 @@ public class LoginController {
     public Result logoutClient(HttpServletRequest req, @RequestBody Map<String, String> map) {
         String accountName = map.get("accountName");
         String password = map.get("password");
+        String type = map.get("type");
         String remoteHost = req.getRemoteHost();
-        Result result = iLoginService.loginMultilevel(accountName, password);
+        Result result = iLoginService.loginMultilevel(accountName, password,type);
         if (result.getCode() == 10000) {
             SysAccountMultilevel data = (SysAccountMultilevel) result.getData();
             AccessToken accessToken = new AccessToken();
@@ -143,7 +147,8 @@ public class LoginController {
     public Result logoutOne(HttpServletRequest req, @RequestBody Map<String, String> map) {
         String accountName = map.get("accountName");
         String password = map.get("password");
-        Result result = iLoginService.loginMultilevel(accountName, password);
+        String type = map.get("type");
+        Result result = iLoginService.loginMultilevel(accountName, password,type);
         if (result.getCode() == 10000) {
             SysAccountMultilevel data = (SysAccountMultilevel) result.getData();
             AccessToken accessToken = new AccessToken();

musk/src/main/java/com/huimv/farm/musk/controller/SysCameraController.java

@@ -1,15 +1,18 @@
 package com.huimv.farm.musk.controller;
 
 
+import com.huimv.farm.musk.common.token.TokenSign;
 import com.huimv.farm.musk.common.utils.Result;
 import com.huimv.farm.musk.common.utils.ResultCode;
 import com.huimv.farm.musk.entity.SysCamera;
 import com.huimv.farm.musk.entity.vo.CameraListVo;
 import com.huimv.farm.musk.entity.vo.CameraListsVo;
 import com.huimv.farm.musk.service.ISysCameraService;
+import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -29,8 +32,9 @@ public class SysCameraController {
     private ISysCameraService cameraService;
 
     @PostMapping("/list")
-    public Result list(@RequestBody CameraListVo cameraListVo) {
-        return cameraService.listPage(cameraListVo);
+    public Result list(HttpServletRequest request, @RequestBody CameraListVo cameraListVo) {
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        return cameraService.listPage(cameraListVo,userId);
     }
 
     @PostMapping("/add")
@@ -64,9 +68,9 @@ public class SysCameraController {
     }
 
     @PostMapping("/getCameraDetails")
-    private Result getCameraDetails(@RequestBody CameraListsVo cameraListsVo) throws InterruptedException {
-
-        List list = cameraService.getCameraDetails(cameraListsVo);
+    private Result getCameraDetails(HttpServletRequest request,@RequestBody CameraListsVo cameraListsVo) throws InterruptedException {
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        List list = cameraService.getCameraDetails(cameraListsVo,userId);
         return new Result(ResultCode.SUCCESS, list);
     }
 

musk/src/main/java/com/huimv/farm/musk/entity/SysAccountMultilevel.java

@@ -50,4 +50,6 @@ public class SysAccountMultilevel extends Model {
 
     private String phone;
     private String imgUrl;
+    private String accountType;
+    private String cameraIds;
 }

musk/src/main/java/com/huimv/farm/musk/service/ILoginService.java

@@ -8,5 +8,5 @@ public interface ILoginService {
 
     Result logout();
 
-    Result loginMultilevel(String accountName, String password);
+    Result loginMultilevel(String accountName, String password,String type);
 }

musk/src/main/java/com/huimv/farm/musk/service/ISysCameraService.java

@@ -17,9 +17,9 @@ import java.util.List;
  * @since 2023-06-01
  */
 public interface ISysCameraService extends IService<SysCamera> {
-    Result listPage(CameraListVo cameraListVo);
+    Result listPage(CameraListVo cameraListVo,Integer userId);
 
-    List getCameraDetails(CameraListsVo cameraListsVo) throws InterruptedException;
+    List getCameraDetails(CameraListsVo cameraListsVo,Integer userId) throws InterruptedException;
 
     Result add(SysCamera camera);
 

musk/src/main/java/com/huimv/farm/musk/service/impl/LoginServiceImpl.java

@@ -23,10 +23,11 @@ public class LoginServiceImpl implements ILoginService {
     private SysAccountMultilevelMapper accountMultilevelMapper;
 
     @Override
-    public Result loginMultilevel(String accountName, String password) {
+    public Result loginMultilevel(String accountName, String password,String type) {
 
         QueryWrapper<SysAccountMultilevel> wrapper = new QueryWrapper<>();
         wrapper.eq("account",accountName).eq("password",password);
+        wrapper.like("account_type",type);
         SysAccountMultilevel accountMultilevel = accountMultilevelMapper.selectOne(wrapper);
 
         if (ObjectUtil.isEmpty(accountMultilevel)){

musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraServiceImpl.java

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.farm.musk.common.utils.Result;
 import com.huimv.farm.musk.common.utils.ResultCode;
+import com.huimv.farm.musk.entity.SysAccountMultilevel;
 import com.huimv.farm.musk.entity.SysCamera;
 import com.huimv.farm.musk.entity.SysCameraBrand;
 import com.huimv.farm.musk.entity.vo.*;
+import com.huimv.farm.musk.mapper.SysAccountMultilevelMapper;
 import com.huimv.farm.musk.mapper.SysCameraAreaMapper;
 import com.huimv.farm.musk.mapper.SysCameraBrandMapper;
 import com.huimv.farm.musk.mapper.SysCameraMapper;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -34,6 +37,8 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
     @Autowired
     private SysCameraMapper cameraBaseMapper;
     @Autowired
+    private SysAccountMultilevelMapper sysAccountMultilevelMapper;
+    @Autowired
     private SysCameraAreaMapper cameraAreaMapper;
     @Autowired
     private SysCameraBrandMapper cameraBrandMapper;
@@ -42,7 +47,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
 //    private BaseScreenCameraAccountMapper cameraAccountMapper;
 
     @Override
-    public Result listPage(CameraListVo cameraListVo) {
+    public Result listPage(CameraListVo cameraListVo,Integer userId) {
         Integer current = cameraListVo.getCurrent();
         String strchStr = cameraListVo.getStrchStr();
         Integer size = cameraListVo.getSize();
@@ -57,6 +62,15 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
             wrapper.and(i -> i.like("camera_name", strchStr)
                     .or().like("camera_ip", strchStr));
         }
+        if (userId != 1){
+            SysAccountMultilevel sysAccountMultilevel = sysAccountMultilevelMapper.selectById(userId);
+            String cameraIds = sysAccountMultilevel.getCameraIds();
+            List<String> list = new ArrayList();
+            if (StringUtils.isNotBlank(cameraIds)){
+                list  = Arrays.asList(cameraIds);
+            }
+            wrapper.in("id",list);
+        }
 
         if (farmId != null) {
             wrapper.eq("farm_id", farmId);
@@ -85,8 +99,9 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
         return new Result(ResultCode.SUCCESS, page(new Page<>(current, size), wrapper));
     }
 
+
     @Override
-    public List getCameraDetails(CameraListsVo cameraListsVo) throws InterruptedException {
+    public List getCameraDetails(CameraListsVo cameraListsVo,Integer userId) throws InterruptedException {
         List<Integer> cameraIds = cameraListsVo.getCameraIds();
         CameraListVo cameraListVo = new CameraListsVo();
         cameraListVo.setCurrent(1);
@@ -100,7 +115,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
             return null;
         }
         List cameraDetailsList = new ArrayList();
-        IPage<SysCamera> page = (IPage<SysCamera>) this.listPage(cameraListVo).getData();
+        IPage<SysCamera> page = (IPage<SysCamera>) this.listPage(cameraListVo, userId).getData();
         List<SysCamera> list = page.getRecords();
         int i = 0;
         final String farmAppPort = "8081";

musk/src/main/java/com/huimv/farm/musk/session/AccessToken.java

@@ -19,6 +19,15 @@ public class AccessToken {
     private String message;
     private Integer lastFarmId;
     private String userName;
+    private String cameraIds;
+
+    public String getCameraIds() {
+        return cameraIds;
+    }
+
+    public void setCameraIds(String cameraIds) {
+        this.cameraIds = cameraIds;
+    }
 
     public SysAccountMultilevel getSysAccountMultilevel() {
         return sysAccountMultilevel;