浏览代码

SceneProEntity添加了一下buildType字段,用来区分场景版本

wuweihao 5 年之前
父节点
当前提交
a584d6e2e6

+ 1 - 1
README.md

@@ -24,7 +24,7 @@ http://localhost:8085/xiaoan-web/#/login
 服务器	客户环境
 	218.17.126.170
 	root
-	1234
+	admin123
 	端口:9999
 	/root/user/java/tomcat-8011-xiaoan/webapps
 	url:

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

@@ -13,7 +13,7 @@ public class  SceneProvider {
 
     public String findAllBySearchKey(SceneProRequest param, Long userId){
         StringBuffer sql = new StringBuffer("SELECT a.id, a.thumb, a.view_count, " +
-                "a.scene_name, a.create_time, a.update_time, a.status, a.web_site, b.sn_code, c.real_name " +
+                "a.scene_name, a.create_time, a.update_time, a.status, a.web_site, a.build_type, b.sn_code, c.real_name " +
                 "FROM t_scene_pro a LEFT JOIN t_camera b ON a.camera_id = b.id " +
                 "LEFT JOIN tb_user c ON a.user_id = c.id where a.rec_status = 'A' ");
 

+ 6 - 0
xiaoan-domain/src/main/java/com/xiaoan/domain/backend/SceneProEntity.java

@@ -1,6 +1,9 @@
 package com.xiaoan.domain.backend;
 
 import com.xiaoan.common.model.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -138,4 +141,7 @@ public class SceneProEntity extends BaseModel implements Serializable {
      */
     @Column(name = "scene_logo")
     private String sceneLogo;
+
+    @ApiModelProperty(value = "调用V2还是V3的算法")
+    private String buildType;
 }

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

@@ -1,6 +1,7 @@
 package com.xiaoan.domain.dto.response;
 
 import com.xiaoan.common.model.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -25,4 +26,7 @@ public class SceneResponse extends BaseModel {
     private int status;
 
     private String webSite;
+
+    @ApiModelProperty(value = "调用V2还是V3的算法")
+    private String buildType;
 }

+ 0 - 1
xiaoan-web/src/main/java/com/xiaoan/web/backend/LogController.java

@@ -9,7 +9,6 @@ import com.xiaoan.service.backend.LogService;
 import com.xiaoan.web.aop.WebControllerLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

+ 9 - 3
xiaoan-web/src/main/java/com/xiaoan/web/backend/PersonalCenterController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Condition;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -101,11 +102,16 @@ public class PersonalCenterController extends BaseController {
         }
 
 
-        String webSite = proEntity.getWebSite();
-        webSite = webSite.replace("showProMobile", "editProMobile");
+//        String webSite = proEntity.getWebSite();
+//        webSite = webSite.replace("showProMobile", "editProMobile");
 
         saveLog("我的场景", "编辑场景:"+ proEntity.getSceneName());
-        return new ResultJson(MsgCode.SUCCESS_CODE, webSite);
+
+        HashMap<Object, Object> map = new HashMap<>();
+        map.put("webSite", proEntity.getWebSite());
+        map.put("buildType",  proEntity.getBuildType());
+
+        return new ResultJson(MsgCode.SUCCESS_CODE, map);
     }
 
     @RequiresPermissions("admin:camera:list")