部署local-kj

src/main/java/com/fdkankan/manage/ManageApplication.java

@@ -1,6 +1,9 @@
 package com.fdkankan.manage;
 
+import com.fdkankan.manage.common.CacheUtil;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -14,10 +17,18 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @ComponentScan(basePackages = {"com.fdkankan.*"})
 @MapperScan("com.fdkankan.**.mapper")
-public class ManageApplication {
+public class ManageApplication implements CommandLineRunner {
+
+    @Value("${fyun.type}")
+    private String uploadType;
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
     }
 
+    @Override
+    public void run(String... args) throws Exception {
+        CacheUtil.uploadType = uploadType;
+
+    }
 }

src/main/java/com/fdkankan/manage/common/CacheUtil.java

@@ -5,6 +5,8 @@ import com.fdkankan.manage.vo.request.OrderParam;
 
 public class CacheUtil {
 
+    public static String uploadType;
+
     public static OrderParam orderParam = new OrderParam();
     public static AgentNewLogParam agentParam = new AgentNewLogParam();
 }

src/main/java/com/fdkankan/manage/controller/UserController.java

@@ -122,5 +122,11 @@ public class UserController {
         cameraService.unbindCamera(cameraId);
         return ResultData.ok();
     }
+
+    @PostMapping("/addUcenterUser")
+    public ResultData addUcenterUser(@RequestBody UserParam userParam){
+        userService.addUcenterUser(userParam);
+        return ResultData.ok();
+    }
 }
 

src/main/java/com/fdkankan/manage/service/IUserService.java

@@ -31,4 +31,6 @@ public interface IUserService extends IService<User> {
     List<User> getByUserName(String userName);
 
     Boolean checkUserName(String userName);
+
+    void addUcenterUser(UserParam userParam);
 }

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

@@ -7,13 +7,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.util.MD5;
-import com.fdkankan.manage.common.ExcelErrorUtil;
-import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.common.*;
 import com.fdkankan.manage.entity.Order;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
-import com.fdkankan.manage.common.CameraTypeEnum;
 import com.fdkankan.manage.constant.CameraConstant;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.CameraDetail;
@@ -149,9 +146,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             cameraDetail.setAgency(CameraConstant.DEFAULT_AGENT);
             cameraDetail.setCameraId(camera.getId());
             cameraDetail.setCountry(0);//默认中国
-            if("aws".equals(ossType)){
-                cameraDetail.setCountry(1);//1-国外
-            }
             cameraDetail.setType(type);
             if (1 == cameraDetail.getType() || 9 == cameraDetail.getType() || 10 == cameraDetail.getType()){
                 cameraDetail.setTotalSpace(Long.valueOf(Constant.CAMERA_BASE_SPACE_VALUE));
@@ -160,7 +154,15 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             if(type != 9 && type != 10){
                 type = type == 0 ? 1: 4;
             }
+            if("aws".equals(CacheUtil.uploadType)){
+                cameraDetail.setCountry(1);//1-国外
+            }
             cameraDetail.setGoodsId(Long.valueOf(type));
+            if("local".equals(CacheUtil.uploadType)) { //本地版本 ,入库即出库，并且添加无限期会员权限
+                cameraDetail.setCountry(2);
+                cameraDetail.setOwn(2);
+                cameraDetail.setOutTime(Dateutils.getDate(new Date()));
+            }
             cameraDetailList.add(cameraDetail);
         }
         return  cameraDetailService.saveBatch(cameraDetailList) ? cameraList.size() : 0;

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

@@ -150,4 +150,17 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         }
         return true;
     }
+
+    @Override
+    public void addUcenterUser(UserParam userParam) {
+        if(StringUtils.isBlank(userParam.getUserName()) || StringUtils.isBlank(userParam.getNickName()) || StringUtils.isBlank(userParam.getPassword())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        Boolean ubo = this.checkUserName(userParam.getUserName());
+        if(ubo){
+            throw new BusinessException(ResultCode.USER_EXIST);
+        }
+
+
+    }
 }

src/main/java/com/fdkankan/manage/vo/request/UserParam.java

@@ -8,4 +8,8 @@ public class UserParam extends RequestBase {
     private Long id;
     private String userName;
     private String email;
+
+    private String nickName;
+
+    private String password;
 }