修改相机显示的信息

xiaoan-dao/src/main/java/com/xiaoan/dao/backend/CameraDetailRepository.java

@@ -0,0 +1,21 @@
+package com.xiaoan.dao.backend;
+
+import com.xiaoan.domain.backend.CameraDetailEntity;
+import com.xiaoan.domain.backend.CameraEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+/**
+ * Created by Hb_zzZ on 2020/2/27.
+ */
+@Mapper
+@Component
+public interface CameraDetailRepository extends IBaseRepository<CameraDetailEntity, Long> {
+
+
+
+}

xiaoan-dao/src/main/java/com/xiaoan/dao/backend/CameraRepository.java

@@ -3,6 +3,7 @@ package com.xiaoan.dao.backend;
 import com.xiaoan.common.model.PageDto;
 import com.xiaoan.domain.backend.CameraEntity;
 import com.xiaoan.domain.backend.DepartmentEntity;
+import com.xiaoan.domain.dto.response.CameraResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
@@ -21,14 +22,13 @@ public interface CameraRepository extends IBaseRepository<CameraEntity, Long> {
     CameraEntity findByWifiName(String code);
 
 
-    @Select(value = "select * from t_camera z left join t_camera_detail d on z.id = d.camera_id where " +
+    @Select(value = "select z.id, z.sn_code, z.child_name, z.wifi_name, z.create_time, z.update_time, d.type from t_camera z left join t_camera_detail d on z.id = d.camera_id where " +
             "(z.sn_code like #{searchKey} or #{searchKey} is null)" +
-//            "(z.wifi_name like #{searchKey} or #{searchKey} is null)" +
+            " or ( z.wifi_name like #{searchKey} or #{searchKey} is null)" +
             " and (d.user_id = #{userId} or #{userId} is null) " +
             " order by z.create_time desc")
-    List<CameraEntity> findAllBySearchKey(String searchKey, Long userId);
+    List<CameraResponse> findAllBySearchKey(String searchKey, Long userId);
+
 
-//    @SelectProvider(type = SceneProvider.class, method = "findAllBySearchKey")
-//    List<SceneResponse> findAllBySearchKey(SceneProRequest param, Long userId);
 
 }

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/CameraRequest.java

@@ -0,0 +1,18 @@
+package com.xiaoan.domain.dto.request;
+
+import lombok.Data;
+
+/**
+ * Created by Hb_zzZ on 2020/2/27.
+ */
+@Data
+public class CameraRequest {
+
+    private Long id;
+    // Mac地址
+    private String childName;
+
+    // sn码
+    private String snCode;
+
+}

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/response/CameraResponse.java

@@ -0,0 +1,26 @@
+package com.xiaoan.domain.dto.response;
+
+import com.xiaoan.common.model.BaseModel;
+import lombok.Data;
+
+/**
+ * Created by Hb_zzZ on 2020/2/27.
+ */
+@Data
+public class CameraResponse extends BaseModel {
+
+
+    // Mac地址
+    private String childName;
+
+    // sn码
+    private String snCode;
+
+    // wifi名
+    private String wifiName;
+
+    // 设备类型
+    private int type;
+
+
+}

xiaoan-service/src/main/java/com/xiaoan/service/backend/CameraDetailService.java

@@ -0,0 +1,13 @@
+package com.xiaoan.service.backend;
+
+import com.xiaoan.domain.backend.CameraDetailEntity;
+import com.xiaoan.service.IBaseService;
+
+
+/**
+ * Created by owen on 2020/3/9 0009 15:53
+ */
+public interface CameraDetailService extends IBaseService<CameraDetailEntity, Long> {
+
+
+}

xiaoan-service/src/main/java/com/xiaoan/service/backend/CameraService.java

@@ -2,6 +2,7 @@ package com.xiaoan.service.backend;
 
 import com.xiaoan.common.model.PageDto;
 import com.xiaoan.domain.backend.CameraEntity;
+import com.xiaoan.domain.dto.response.CameraResponse;
 import com.xiaoan.service.IBaseService;
 
 import java.util.List;
@@ -13,5 +14,5 @@ public interface CameraService extends IBaseService<CameraEntity, Long> {
 
     CameraEntity findByWifiName(String code);
 
-    List<CameraEntity> findAllBySearchKey(PageDto param, Long userId);
+    List<CameraResponse> findAllBySearchKey(PageDto param, Long userId);
 }

xiaoan-service/src/main/java/com/xiaoan/service/backend/impl/CameraDetailServiceImpl.java

@@ -0,0 +1,30 @@
+package com.xiaoan.service.backend.impl;
+
+import com.xiaoan.dao.backend.CameraDetailRepository;
+import com.xiaoan.dao.backend.IBaseRepository;
+import com.xiaoan.domain.backend.CameraDetailEntity;
+import com.xiaoan.service.BaseServiceImpl;
+import com.xiaoan.service.backend.CameraDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * Created by Hb_zzZ on 2020/2/27.
+ */
+@Service
+@Transactional
+public class CameraDetailServiceImpl extends BaseServiceImpl<CameraDetailEntity, Long> implements CameraDetailService {
+
+    @Autowired
+    private CameraDetailRepository entityMapper;
+
+    @Override
+    public IBaseRepository<CameraDetailEntity, Long> getBaseMapper() {
+        return this.entityMapper;
+    }
+
+
+
+}

xiaoan-service/src/main/java/com/xiaoan/service/backend/impl/CameraServiceImpl.java

@@ -7,6 +7,7 @@ import com.xiaoan.dao.backend.DepartmentRepository;
 import com.xiaoan.dao.backend.IBaseRepository;
 import com.xiaoan.domain.backend.CameraEntity;
 import com.xiaoan.domain.backend.DepartmentEntity;
+import com.xiaoan.domain.dto.response.CameraResponse;
 import com.xiaoan.service.BaseServiceImpl;
 import com.xiaoan.service.backend.CameraService;
 import com.xiaoan.service.backend.DepartmentService;
@@ -38,7 +39,7 @@ public class CameraServiceImpl extends BaseServiceImpl<CameraEntity, Long> imple
     }
 
     @Override
-    public List<CameraEntity> findAllBySearchKey(PageDto param, Long userId) {
+    public List<CameraResponse> findAllBySearchKey(PageDto param, Long userId) {
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         String searchKey = param.getSearchKey();
         searchKey = "%" + searchKey + "%";

xiaoan-web/src/main/java/com/xiaoan/web/backend/PersonalCenterController.java

@@ -4,15 +4,15 @@ import com.github.pagehelper.PageInfo;
 import com.xiaoan.common.constant.MsgCode;
 import com.xiaoan.common.model.PageDto;
 import com.xiaoan.common.util.ResultJson;
+import com.xiaoan.domain.backend.CameraDetailEntity;
 import com.xiaoan.domain.backend.CameraEntity;
 import com.xiaoan.domain.backend.LogEntity;
 import com.xiaoan.domain.backend.SceneProEntity;
+import com.xiaoan.domain.dto.request.CameraRequest;
 import com.xiaoan.domain.dto.request.SceneProRequest;
+import com.xiaoan.domain.dto.response.CameraResponse;
 import com.xiaoan.domain.dto.response.SceneResponse;
-import com.xiaoan.service.backend.CameraService;
-import com.xiaoan.service.backend.LogService;
-import com.xiaoan.service.backend.SceneService;
-import com.xiaoan.service.backend.UserService;
+import com.xiaoan.service.backend.*;
 import com.xiaoan.web.aop.WebControllerLog;
 import com.xiaoan.web.shiro.JWTUtil;
 import com.xiaoan.web.shiro.JwtUtil2;
@@ -20,10 +20,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,7 +45,8 @@ public class PersonalCenterController extends BaseController {
     private CameraService cameraService;
 
     @Autowired
-    private LogService logService;
+    private CameraDetailService cameraDetailService;
+
 
     @RequiresPermissions("admin:scene:list")
     @WebControllerLog(description = "个人中心-我的场景/搜索")
@@ -109,7 +112,7 @@ public class PersonalCenterController extends BaseController {
     @PostMapping("camera/list")
     public ResultJson cameraList(@RequestBody PageDto param){
 
-        List<CameraEntity> list = null;
+        List<CameraResponse> list = null;
         List userRole = JwtUtil2.getUserRole(getToken());
         if (userRole.contains("admin")) {
             list = cameraService.findAllBySearchKey(param, null);
@@ -118,7 +121,7 @@ public class PersonalCenterController extends BaseController {
             list = cameraService.findAllBySearchKey(param, userId);
         }
 
-        PageInfo<CameraEntity> pageInfo = new PageInfo<>(list);
+        PageInfo<CameraResponse> pageInfo = new PageInfo<>(list);
 
         return new ResultJson(MsgCode.SUCCESS_CODE, pageInfo);
     }
@@ -133,24 +136,39 @@ public class PersonalCenterController extends BaseController {
     @RequiresPermissions("admin:camera:add")
     @ApiOperation("新增相机")
     @WebControllerLog(description = "设备管理-新增相机")
-    @GetMapping("camera/save/{code}")
-    public ResultJson save(@PathVariable String code){
-        if(StringUtils.isEmpty(code)){
-            return new ResultJson(MsgCode.e_COMMON_3001, MsgCode.msg_COMMON_3001);
-        }
+    @PostMapping("camera/save")
+    public ResultJson save(@RequestBody CameraRequest param){
 
-
-        CameraEntity cameraEntity = cameraService.findByWifiName(code);
-        if(cameraEntity == null){
+        CameraEntity cameraEntity = null;
+        if (param.getId() == null) {
             cameraEntity = new CameraEntity();
-            cameraEntity.setChildName(code);
-            cameraEntity.setWifiName(code);
+            cameraEntity.setChildName(param.getChildName());
+            cameraEntity.setWifiName(param.getChildName());
+            cameraEntity.setSnCode(param.getSnCode());
             cameraEntity.setWifiPassword("12345678");
+            cameraService.save(cameraEntity);
 
+            CameraDetailEntity cameraDetailEntity = new CameraDetailEntity();
+            // 1:表示专业八目
+            cameraDetailEntity.setType(1);
+            cameraDetailEntity.setCameraId(cameraEntity.getId());
+            cameraDetailService.save(cameraDetailEntity);
+        } else {
+            cameraEntity = cameraService.findById(param.getId());
+            if (cameraEntity == null) {
+                return new ResultJson(MsgCode.e_COMMON_3002, MsgCode.msg_COMMON_3002);
+            }
 
-            cameraService.save(cameraEntity);
+            BeanUtils.copyProperties(param, cameraEntity);
+            cameraEntity.setUpdateTime(new Date());
+            cameraService.update(cameraEntity);
+
+            // 目前cameraDetailEntity 是写死的，暂时不需要修改他
         }
 
+
+
+
         return new ResultJson(MsgCode.SUCCESS_CODE, MsgCode.msg_SUCCESS);
     }