日本相机

src/main/java/com/fdkankan/ucenter/controller/CompanyController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.ucenter.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 客户企业logo信息 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+@RestController
+@RequestMapping("/ucenter/company")
+public class CompanyController {
+
+}
+

src/main/java/com/fdkankan/ucenter/entity/Company.java

@@ -0,0 +1,159 @@
+package com.fdkankan.ucenter.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 客户企业logo信息
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+@Getter
+@Setter
+@TableName("t_company")
+public class Company implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 公司名称
+     */
+    @TableField("company_name")
+    private String companyName;
+
+    /**
+     * 顶部logo
+     */
+    @TableField("top_logo")
+    private String topLogo;
+
+    /**
+     * 地面点位标志Logo
+     */
+    @TableField("marker_logo")
+    private String markerLogo;
+
+    /**
+     * 地面logo
+     */
+    @TableField("floor_logo")
+    private String floorLogo;
+
+    /**
+     * 二维码logo
+     */
+    @TableField("qr_logo")
+    private String qrLogo;
+
+    /**
+     * 是否显示初始logo，0隐藏，1显示
+     */
+    @TableField("show_logo")
+    private Integer showLogo;
+
+    /**
+     * t_manager表的id
+     */
+    @TableField("manager_id")
+    private Long managerId;
+
+    /**
+     * 新增的相机是否删除，0否，1删
+     */
+    @TableField("camera_delete")
+    private Integer cameraDelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("area")
+    private String area;
+
+    @TableField("address")
+    private String address;
+
+    @TableField("website")
+    private String website;
+
+    @TableField("logo")
+    private String logo;
+
+    @TableField("scene_logo")
+    private String sceneLogo;
+
+    @TableField("bg_music")
+    private String bgMusic;
+
+    @TableField("qualification")
+    private String qualification;
+
+    @TableField("code")
+    private String code;
+
+    @TableField("introduce")
+    private String introduce;
+
+    @TableField("point")
+    private Integer point;
+
+    @TableField("sub_num")
+    private Integer subNum;
+
+    /**
+     * 企业认证审核状态：0未审核，1审核通过，2审核拒绝
+     */
+    @TableField("state")
+    private Integer state;
+
+    @TableField("type")
+    private Integer type;
+
+    @TableField("audit_time")
+    private Date auditTime;
+
+    @TableField("expiration_time")
+    private Date expirationTime;
+
+    /**
+     * 数据同步类型
+     */
+    @TableField("data_sync")
+    private String dataSync;
+
+    @TableField("calculate_flexibility")
+    private Boolean calculateFlexibility;
+
+    @TableField("scene_version")
+    private String sceneVersion;
+
+
+}

src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"ucenter", getTables(new String[]{
-                "t_mail_template",
+                "t_company",
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -46,8 +46,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://120.24.144.164:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true",
-                "root","4Dage@4Dage#@168")
+        FastAutoGenerator.create("jdbc:mysql://47.106.180.58:13306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true",
+                "root","JK20220120%JIK")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

src/main/java/com/fdkankan/ucenter/mapper/ICompanyMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.Company;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户企业logo信息 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+@Mapper
+public interface ICompanyMapper extends BaseMapper<Company> {
+
+}

src/main/java/com/fdkankan/ucenter/service/ICameraDetailService.java

@@ -25,7 +25,7 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     void unbindCamera(List<Long> cameraIds);
 
-    void bindCamera(List<Long> cameraIds,Long userId);
+    void bindCamera(List<Long> cameraIds,Long userId,Long companyId);
 
     HashMap<Long, CameraDetail> getByCameraIds(List<Long> cameraIds);
 

src/main/java/com/fdkankan/ucenter/service/ICompanyService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.Company;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 客户企业logo信息 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+public interface ICompanyService extends IService<Company> {
+
+}

src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -1,7 +1,9 @@
 package com.fdkankan.ucenter.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.common.constant.AppConstant;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileSizeUtil;
 import com.fdkankan.ucenter.constant.CameraConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
@@ -19,10 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.math.BigInteger;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -77,17 +76,22 @@ public class AppCameraService {
         if(cameraDetail == null){
             throw new BusinessException(AppConstant.FAILURE_CODE_4010, AppConstant.FAILURE_MSG_4010);
         }
-        Set<Long> roleIds = userRoleService.getByUser(user);
+//        Set<Long> roleIds = userRoleService.getByUser(user);
 //        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
 //            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
 //        }
-        if(!user.getCompanyId().equals(cameraDetail.getCompanyId())){
+        if(cameraDetail.getCompanyId()!=null){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
         }
         List<Long> cameraIds = Collections.singletonList(camera.getId());
 
+        LambdaUpdateWrapper<Camera> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(Camera::getId,camera.getId());
+        wrapper.set(Camera::getActivatedTime, DateUtil.date2String(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        cameraService.update(wrapper);
+
         cameraDetail.setUserId(user.getId());
-        cameraDetailService.bindCamera(cameraIds,user.getId());
+        cameraDetailService.bindCamera(cameraIds,user.getId(),user.getCompanyId());
         sceneProService.bindOrUnCamera(cameraIds,user.getId());
         scenePlusService.bindOrUnCamera(cameraIds,user.getId());
         CameraAppVo responseCamera = new CameraAppVo();
@@ -114,7 +118,7 @@ public class AppCameraService {
             throw new BusinessException(AppConstant.FAILURE_CODE_4010, AppConstant.FAILURE_MSG_4010);
         }
 
-        Set<Long> roleIds = userRoleService.getByUser(user);
+ //       Set<Long> roleIds = userRoleService.getByUser(user);
 //        if(!roleIds.contains(5L) && !roleIds.contains(6L) && !roleIds.contains(1L)){
 //            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
 //        }

src/main/java/com/fdkankan/ucenter/service/impl/CameraDetailServiceImpl.java

@@ -108,13 +108,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
             LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(CameraDetail::getId,cameraDetail.getId());
             wrapper.set(CameraDetail::getUserId,null);
+            wrapper.set(CameraDetail::getCompanyId,null);
             wrapper.set(CameraDetail::getCooperationUser,null);
-            wrapper.set(CameraDetail::getTotalSpace,Long.parseLong(Constant.EXPANSION_SPACE_VALUE_1G ) * 10L);
             this.update(wrapper);
-            cameraDetail.setTotalSpace(Long.parseLong(Constant.EXPANSION_SPACE_VALUE_1G ) * 10L);
-            if(!"local".equals(NacosProperty.uploadType)){
-                //sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),-2);     //封存场景
-            }
         }
         //恢复10G基本容量
 
@@ -126,11 +122,12 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
-    public void bindCamera(List<Long> cameraIds,Long userId) {
+    public void bindCamera(List<Long> cameraIds,Long userId,Long companyId) {
         if(cameraIds.size() >0){
             LambdaUpdateWrapper<CameraDetail> wrapper = new LambdaUpdateWrapper<>();
             wrapper.in(CameraDetail::getCameraId,cameraIds)
-                    .set(CameraDetail::getUserId,userId);
+                    .set(CameraDetail::getUserId,userId)
+                    .set(CameraDetail::getCompanyId,companyId);
             this.update(wrapper);
         }
     }

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -296,7 +296,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             }
         }
 
-        cameraDetailService.bindCamera(cameraIds,user.getId());
+        cameraDetailService.bindCamera(cameraIds,user.getId(),user.getCompanyId());
         sceneService.bindOrUnCamera(cameraIds,user.getId());
         sceneProService.bindOrUnCamera(cameraIds,user.getId());
         scenePlusService.bindOrUnCamera(cameraIds,user.getId());

src/main/java/com/fdkankan/ucenter/service/impl/CompanyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.fdkankan.ucenter.entity.Company;
+import com.fdkankan.ucenter.mapper.ICompanyMapper;
+import com.fdkankan.ucenter.service.ICompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户企业logo信息 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-12
+ */
+@Service
+public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> implements ICompanyService {
+
+}

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -68,6 +68,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     ICameraService cameraService;
     @Autowired
     ICameraSpaceService cameraSpaceService;
+    @Autowired
+    ICompanyService companyService;
 
     private User getByEmail(String email){
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
@@ -92,6 +94,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public void register(RegisterParam param) {
+        Company company = new Company();
+        company.setState(1);
+        company.setCompanyName(param.getEmail());
+        companyService.save(company);
+
         User userEntity = new User();
         userEntity.setPassword(SecurityUtil.MD5(param.getPassword()));
         userEntity.setEmail(param.getEmail());
@@ -102,6 +109,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         userEntity.setStatus(1);
         userEntity.setIsNotice(1);
         userEntity.setRecStatus("A");
+        userEntity.setRegisterTime(DateUserUtil.getDate(new Date()));
+        userEntity.setCompanyId(company.getId());
         userEntity.setCreateTime(DateUserUtil.getDate(new Date()));
         userEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
         this.save(userEntity);

src/main/resources/mapper/ucenter/CompanyMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.ucenter.mapper.ICompanyMapper">
+
+</mapper>