我的相机有待完善

xiaoan-common/src/main/java/com/xiaoan/common/interceptor/CommonInterceptor.java

@@ -18,7 +18,7 @@ public class CommonInterceptor implements HandlerInterceptor {
         if(!request.getRequestURI().contains("/static/") && !request.getRequestURI().contains("/sendUserInfo")
                 && !request.getRequestURI().contains(".json") && !request.getRequestURI().contains(".png")
                 && !request.getRequestURI().contains(".html") && !request.getRequestURI().contains(".mp3")){
-            log.info(request.getRequestURI() + "，进入该请求！");
+            log.warn("start ： {}", request.getRequestURI());
         }
         return true;
     }
@@ -37,7 +37,7 @@ public class CommonInterceptor implements HandlerInterceptor {
         if(!request.getRequestURI().contains("/static/") && !request.getRequestURI().contains("/sendUserInfo")
                 && !request.getRequestURI().contains(".json") && !request.getRequestURI().contains(".png")
                 && !request.getRequestURI().contains(".html") && !request.getRequestURI().contains(".mp3")){
-            log.info(request.getRequestURI() + "，完成请求！");
+            log.warn("end ： {}", request.getRequestURI());
         }
     }
 

xiaoan-common/src/main/java/com/xiaoan/common/model/BaseModel.java

@@ -26,53 +26,10 @@ public abstract class BaseModel {
 
     /**
      * 用来批量操作的
-     * 0: 激活  1：禁用
+     * A: 激活  I：禁用
      */
     @JsonIgnore
     @JSONField(serialize = false)
-    @Column(length = 1)
-    private int recStatus; // 0: 激活  1：禁用
+    private String recStatus;
 
-//    @Column
-//    private String createBy;
-
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public void setId(Long id) {
-//        this.id = id;
-//    }
-//
-//    public Date getCreateTime() {
-//        return createTime;
-//    }
-//
-//    public void setCreateTime(Date createTime) {
-//        this.createTime = createTime;
-//    }
-//
-//    public Date getUpdateTime() {
-//        return updateTime;
-//    }
-//
-//    public void setUpdateTime(Date updateTime) {
-//        this.updateTime = updateTime;
-//    }
-//
-//    public int getRecStatus() {
-//        return recStatus;
-//    }
-//
-//    public void setRecStatus(int recStatus) {
-//        this.recStatus = recStatus;
-//    }
-
-//    public String getCreateBy() {
-//        return createBy;
-//    }
-//
-//    public void setCreateBy(String createBy) {
-//        this.createBy = createBy;
-//    }
 }

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
@@ -18,6 +19,7 @@ import java.util.Map;
 /**
  * Created by Hb_zzZ on 2020/3/2.
  */
+@Component
 @Mapper
 public interface SceneRepository extends IBaseRepository<SceneProEntity, Long> {
 
@@ -26,4 +28,7 @@ public interface SceneRepository extends IBaseRepository<SceneProEntity, Long> {
 
     @SelectProvider(type = SceneProvider.class, method = "findAllBySearchKey")
     List<SceneResponse> findAllBySearchKey(SceneProRequest param, List<Long> ids);
+
+    @SelectProvider(type = SceneProvider.class, method = "findAllBySearchKeyAndUserId")
+    List<SceneResponse> findAllBySearchKeyAndUserId(SceneProRequest param, List<Long> ids, Long userId);
 }

xiaoan-dao/src/main/java/com/xiaoan/dao/backend/provider/SceneProvider.java

@@ -8,13 +8,13 @@ import java.util.List;
 /**
  * Created by Hb_zzZ on 2020/3/3.
  */
-public class SceneProvider {
+public class  SceneProvider {
 
     public String findAllBySearchKey(SceneProRequest param, List<Long> ids){
         StringBuffer sql = new StringBuffer("SELECT a.id, a.thumb, a.view_count, " +
                 "a.scene_name, a.create_time, b.sn_code, c.real_name " +
                 "FROM tb_scene_pro a LEFT JOIN tb_camera b ON a.camera_id = b.id " +
-                "LEFT JOIN tb_user c ON a.user_id = c.id where a.rec_status = 0 ");
+                "LEFT JOIN tb_user c ON a.user_id = c.id where a.rec_status = 'A' ");
 
         if(param.getStartTime() != null && param.getEndTime() != null){
             sql.append(" and a.create_time >= ").append(param.getStartTime());
@@ -36,6 +36,50 @@ public class SceneProvider {
         if(param.getStatus() != null){
             sql.append(" and a.status = ").append(param.getStatus());
         }
+
+        sql.append(" order by create_time desc");
+        return sql.toString();
+    }
+
+
+    /**
+     * 根据用户模糊查询
+     * @param param
+     * @param ids
+     * @return
+     */
+    public String findAllBySearchKeyAndUserId(SceneProRequest param, List<Long> ids, Long userId){
+        StringBuffer sql = new StringBuffer("SELECT a.id, a.thumb, a.view_count, " +
+                "a.scene_name, a.create_time, b.sn_code, c.real_name " +
+                "FROM tb_scene_pro a LEFT JOIN tb_camera b ON a.camera_id = b.id " +
+                "LEFT JOIN tb_user c ON a.user_id = c.id where a.rec_status = 'A' ");
+
+        if (userId != null) {
+            sql.append(" and a.user_id = ").append(userId);
+        }
+
+        if(param.getStartTime() != null && param.getEndTime() != null){
+            sql.append(" and a.create_time >= ").append(param.getStartTime());
+            sql.append(" and a.create_time <= ").append(param.getEndTime());
+        }
+        if(StringUtils.isNotEmpty(param.getSearchKey())){
+            sql.append("and a.scene_name like '%").append(param.getSearchKey()).append("%'");
+        }
+        if(ids != null && ids.size() > 0){
+            sql.append(" and c.id in(");
+            for(int i = 0, len = ids.size(); i < len; i ++){
+                if(i == len){
+                    sql.append(ids.get(i));
+                }else {
+                    sql.append(ids.get(i)).append(",");
+                }
+            }
+        }
+        if(param.getStatus() != null){
+            sql.append(" and a.status = ").append(param.getStatus());
+        }
+
+        sql.append(" order by create_time desc");
         return sql.toString();
     }
 

xiaoan-domain/src/main/java/com/xiaoan/domain/backend/CameraDetailEntity.java

@@ -0,0 +1,75 @@
+package com.xiaoan.domain.backend;
+
+import com.xiaoan.common.model.BaseModel;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigInteger;
+
+/**
+ * 相机实体表
+ */
+@Data
+@Table(name = "tb_camera_detail")
+public class CameraDetailEntity extends BaseModel implements Serializable {
+
+    private static final long serialVersionUID = -122990405139092098L;
+    /**
+     * 余额
+     */
+    @Column(name = "balance")
+    private String balance;
+    /**
+     * 用户表t_user的id
+     */
+    @Column(name = "user_id")
+    private Long userId;
+    /**
+     * 0表示客户，1表示员工，2表示赠送，3表示其他
+     */
+    @Column(name = "own")
+    private int own;
+    /**
+     * 订单号
+     */
+    @Column(name = "order_sn")
+    private String orderSn;
+    /**
+     * 0表示本国，1表示国外
+     */
+    @Column(name = "country")
+    private int country;
+    /**
+     * 相机类型，0表示双目，1表示专业八目，2表示商业八目，3表示企业八目
+     */
+    @Column(name = "type")
+    private int type;
+    /**
+     * 总容量
+     */
+    @Column(name = "total_space")
+    private BigInteger totalSpace;
+    /**
+     * 已使用容量
+     */
+    @Column(name = "used_space")
+    private BigInteger usedSpace;
+    /**
+     * 代理商，t_agent表的agentId
+     */
+    @Column(name = "agency")
+    private String agency;
+    /**
+     * 主表id
+     */
+    @Column(name = "camera_id")
+    private Long cameraId;
+    /**
+     * 商品id
+     */
+    @Column(name = "goods_id")
+    private Long goodsId;
+
+}

xiaoan-domain/src/main/java/com/xiaoan/domain/backend/CameraEntity.java

@@ -0,0 +1,50 @@
+package com.xiaoan.domain.backend;
+
+import com.xiaoan.common.model.BaseModel;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 相机实体表
+ */
+@Data
+@Table(name = "tb_camera")
+public class CameraEntity extends BaseModel implements Serializable {
+
+    private static final long serialVersionUID = 6384935760157228272L;
+    /**
+     * 相机的Mac地址
+     */
+    @Column(name = "child_name")
+    private String childName;
+    /**
+     * 激活时间
+     */
+    @Column(name = "activated_time")
+    private Date activatedTime;
+    /**
+     * 相机密码
+     */
+    @Column(name = "child_password")
+    private String childPassword;
+    /**
+     * 相机sn码，扫码绑定
+     */
+    @Column(name = "sn_code")
+    private String snCode;
+    /**
+     * wifi名称
+     */
+    @Column(name = "wifi_name")
+    private String wifiName;
+    /**
+     * wifi密码
+     */
+    @Column(name = "wifi_password")
+    private String wifiPassword;
+
+}

xiaoan-domain/src/main/java/com/xiaoan/domain/backend/UserEntity.java

@@ -24,10 +24,6 @@ public class UserEntity extends BaseModel implements Serializable {
     @Column(length = 50)
     private String realName; // 真实姓名
 
-//    @Column(length = 1)
-//    private byte status;
-
-//    private String avatar;
 
     /**
      * 用户代号

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

@@ -10,6 +10,8 @@ import java.util.Date;
 @Data
 public class SceneResponse {
 
+    private Long id;
+
     private String thumb;
 
     private String sceneName;

xiaoan-service/src/main/java/com/xiaoan/service/BaseServiceImpl.java

@@ -37,7 +37,7 @@ public abstract class BaseServiceImpl<T extends BaseModel, ID extends Serializab
     public T findById(ID id){
         Condition condition = new Condition(entityClass);
         condition.createCriteria().andEqualTo("id", id);
-        condition.and().andEqualTo("recStatus", 0);
+        condition.and().andEqualTo("recStatus", "A");
         List<T> ts = getBaseMapper().selectByCondition(condition);
         if (ts != null && ts.size() > 0){
             return ts.get(0);
@@ -48,14 +48,14 @@ public abstract class BaseServiceImpl<T extends BaseModel, ID extends Serializab
 
     @Override
     public T findOne(T entity){
-        entity.setRecStatus(0);
+        entity.setRecStatus("A");
         return getBaseMapper().selectOne(entity);
     }
 
     @Override
     public List<T> findAll(){
         Condition condition = new Condition(entityClass);
-        condition.createCriteria().andEqualTo("recStatus", 0);
+        condition.createCriteria().andEqualTo("recStatus", "A");
         return getBaseMapper().selectByCondition(condition);
     }
 
@@ -93,7 +93,7 @@ public abstract class BaseServiceImpl<T extends BaseModel, ID extends Serializab
         if (entity.getUpdateTime() == null){
             entity.setUpdateTime(new Date());
         }
-        entity.setRecStatus(0);
+        entity.setRecStatus("A");
         return getBaseMapper().insertSelective(entity);
     }
 
@@ -131,12 +131,12 @@ public abstract class BaseServiceImpl<T extends BaseModel, ID extends Serializab
     }
 
     public List<T> findAll(Condition condition){
-        condition.and().andEqualTo("recStatus", 0);
+        condition.and().andEqualTo("recStatus", "A");
         return getBaseMapper().selectByCondition(condition);
     }
 
     public List<T> findAll(Condition condition, String orderBy){
-        condition.and().andEqualTo("recStatus", 0);
+        condition.and().andEqualTo("recStatus", "A");
         if (!StringUtils.isEmpty(orderBy)){
             PageHelper.orderBy(orderBy);
         }

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

@@ -1,5 +1,6 @@
 package com.xiaoan.service.backend;
 
+import com.xiaoan.common.model.PageDto;
 import com.xiaoan.domain.backend.LogEntity;
 import com.xiaoan.domain.dto.response.LogResponse;
 import com.xiaoan.service.IBaseService;
@@ -13,7 +14,7 @@ public interface LogService extends IBaseService<LogEntity, Long> {
 
     List<LogResponse> findAllToUserName();
 
-    List<LogResponse> search(String itemName);
+    List<LogResponse> search(PageDto param);
 
-    List<LogResponse> search(String itemName, Long userId);
+    List<LogResponse> search(PageDto param, Long userId);
 }

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

@@ -15,4 +15,6 @@ import java.util.Map;
 public interface SceneService extends IBaseService<SceneProEntity, Long> {
 
     List<SceneResponse> findAllBySearchKey(SceneProRequest param, List<Long> ids);
+
+    List<SceneResponse> findAllBySearchKey(SceneProRequest param, List<Long> ids, Long userId);
 }

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

@@ -1,8 +1,9 @@
 package com.xiaoan.service.backend.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.xiaoan.common.model.PageDto;
 import com.xiaoan.dao.backend.IBaseRepository;
 import com.xiaoan.dao.backend.LogRepository;
-import com.xiaoan.domain.backend.DepartmentEntity;
 import com.xiaoan.domain.backend.LogEntity;
 import com.xiaoan.domain.dto.response.LogResponse;
 import com.xiaoan.service.BaseServiceImpl;
@@ -35,13 +36,17 @@ public class LogServiceImpl extends BaseServiceImpl<LogEntity, Long> implements
     }
 
     @Override
-    public List<LogResponse> search(String itemName) {
+    public List<LogResponse> search(PageDto param) {
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        String itemName = param.getItemName();
         itemName = "%" + itemName + "%";
         return entityMapper.search(itemName);
     }
 
     @Override
-    public List<LogResponse> search(String itemName, Long userId) {
+    public List<LogResponse> search(PageDto param, Long userId) {
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        String itemName = param.getItemName();
         itemName = "%" + itemName + "%";
         return entityMapper.searchByUserId(itemName, userId);
     }

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

@@ -38,4 +38,10 @@ public class SceneServiceImpl extends BaseServiceImpl<SceneProEntity, Long> impl
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         return sceneRepository.findAllBySearchKey(param, ids);
     }
+
+    @Override
+    public List<SceneResponse> findAllBySearchKey(SceneProRequest param, List<Long> ids, Long userId) {
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        return sceneRepository.findAllBySearchKeyAndUserId(param, ids, userId);
+    }
 }

xiaoan-web/src/main/java/com/xiaoan/web/aop/WebLogAspect.java

@@ -40,10 +40,6 @@ public class WebLogAspect {
     @Before("controllerLog()") //在切入点的方法run之前要干的
     public void logBeforeController(JoinPoint joinPoint) throws Exception{
 
-
-//        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();//这个RequestContextHolder是Springmvc提供来获得请求的东西
-//        HttpServletRequest request = ((ServletRequestAttributes)requestAttributes).getRequest();
-
         // 获取token
         String token = request.getHeader("Authorization");
         Long userId = JWTUtil.getUserId(token);

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

@@ -37,7 +37,7 @@ public class IssueController extends BaseController {
     private IssueService issueService;
 
     /**
-     *
+     * 全部人都可以看
      * @param param
      * @return
      */
@@ -47,14 +47,14 @@ public class IssueController extends BaseController {
     public ResultJson search(@RequestBody PageDto param){
 
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<IssueResponse> list = null;
-        List userRole = JWTUtil.getUserRole(getToken());
-        if (userRole.contains("admin")) {
-            list = issueService.search(param.getItemName());
-        } else {
-            Long userId = JWTUtil.getUserId(getToken());
-            list = issueService.search(param.getItemName(), userId);
-        }
+        List<IssueResponse> list = issueService.search(param.getItemName());
+//        List userRole = JWTUtil.getUserRole(getToken());
+//        if (userRole.contains("admin")) {
+//            list = issueService.search(param.getItemName());
+//        } else {
+//            Long userId = JWTUtil.getUserId(getToken());
+//            list = issueService.search(param.getItemName(), userId);
+//        }
 
 
         PageInfo<IssueResponse> pageInfo = new PageInfo<>(list);

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

@@ -54,15 +54,15 @@ public class LogController extends BaseController {
     @ApiOperation("搜索/列表共用")
     @PostMapping("search")
     public ResultJson search(@RequestBody PageDto param){
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+
         List<LogResponse> list = null;
 
         List userRole = JWTUtil.getUserRole(getToken());
         if (userRole.contains("admin")) {
-            list = logService.search(param.getItemName());
+            list = logService.search(param);
         } else {
             Long userId = JWTUtil.getUserId(getToken());
-            list = logService.search(param.getItemName(), userId);
+            list = logService.search(param, userId);
         }
 
         PageInfo<LogResponse> pageInfo = new PageInfo<>(list);

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

@@ -0,0 +1,92 @@
+package com.xiaoan.web.backend;
+
+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.SceneProEntity;
+import com.xiaoan.domain.dto.request.SceneProRequest;
+import com.xiaoan.domain.dto.response.SceneResponse;
+import com.xiaoan.service.backend.SceneService;
+import com.xiaoan.service.backend.UserService;
+import com.xiaoan.web.aop.WebControllerLog;
+import com.xiaoan.web.shiro.JWTUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Created by Hb_zzZ on 2020/3/2.
+ */
+
+@Api(tags = "PersonalCenterController", description = "后台个人中心")
+@RestController
+@RequestMapping("api/manage/center")
+@Transactional
+public class PersonalCenterController extends BaseController {
+
+    @Autowired
+    private SceneService sceneService;
+
+    @Autowired
+    private UserService userService;
+
+    @WebControllerLog(description = "个人中心-我的场景/搜索")
+    @ApiOperation("获取场景列表/搜索")
+    @PostMapping("scene/list")
+    public ResultJson findSceneList(@RequestBody SceneProRequest param){
+        List<Long> ids = null;
+        if(StringUtils.isNotEmpty(param.getSearchKey())){
+            ids = userService.findUserIdByRealName(param.getSearchKey());
+        }
+
+        List<SceneResponse> list = null;
+        List userRole = JWTUtil.getUserRole(getToken());
+        if (userRole.contains("admin")) {
+            list = sceneService.findAllBySearchKey(param, ids);
+        } else {
+            Long userId = JWTUtil.getUserId(getToken());
+            list = sceneService.findAllBySearchKey(param, ids, userId);
+        }
+
+        PageInfo<SceneResponse> pageInfo = new PageInfo<SceneResponse>(list);
+        return new ResultJson(MsgCode.SUCCESS_CODE, pageInfo);
+    }
+
+
+    @WebControllerLog(description = "个人中心-我的场景/删除")
+    @ApiOperation("删除场景")
+    @PostMapping("scene/delete/{id}")
+    public ResultJson delete(@PathVariable Long id){
+        sceneService.deleteById(id);
+        return new ResultJson(MsgCode.SUCCESS_CODE, MsgCode.SUCCESS_MSG);
+    }
+
+    /**
+     * 编辑场景是把web_site字段的url的showProMobile替换成editProMobile
+     * @param id
+     * @return
+     */
+    @WebControllerLog(description = "个人中心-我的场景/编辑")
+    @ApiOperation("编辑场景")
+    @PostMapping("scene/edit/{id}")
+    public ResultJson edit(@PathVariable Long id){
+        SceneProEntity proEntity = sceneService.findById(id);
+        String webSite = proEntity.getWebSite();
+        webSite = webSite.replace("showProMobile", "editProMobile");
+        return new ResultJson(MsgCode.SUCCESS_CODE, webSite);
+    }
+
+    @WebControllerLog(description = "个人中心-我的相机/搜索")
+    @ApiOperation("获取相机列表/搜索")
+    @PostMapping("camera/list")
+    public ResultJson cameraList(@RequestBody PageDto param){
+
+        return new ResultJson(MsgCode.SUCCESS_CODE, "");
+    }
+}

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

@@ -9,6 +9,7 @@ import com.xiaoan.domain.dto.response.SceneResponse;
 import com.xiaoan.domain.dto.response.UserResponse;
 import com.xiaoan.service.backend.SceneService;
 import com.xiaoan.service.backend.UserService;
+import com.xiaoan.web.aop.WebControllerLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -37,6 +38,7 @@ public class SceneController {
     @Autowired
     private UserService userService;
 
+    @WebControllerLog(description = "场景管理-场景搜索/列表")
     @ApiOperation("获取场景列表")
     @PostMapping("/findSceneList")
     public ResultJson findSceneList(@RequestBody SceneProRequest param){
@@ -45,6 +47,8 @@ public class SceneController {
             ids = userService.findUserIdByRealName(param.getSearchKey());
         }
 
+
+
         PageInfo<SceneResponse> pageInfo = new PageInfo<SceneResponse>(sceneService.findAllBySearchKey(param, ids));
         return new ResultJson(MsgCode.SUCCESS_CODE, pageInfo);
     }