修改配置

fdkanfang-application/src/main/resources/application-prod.properties

@@ -55,7 +55,7 @@ spring.redis.jedis.pool.max-wait=-1ms
 output.file.path=/mnt/data_sk/kanfang/
 
 #\u7F16\u8F91\u9875\u9762
-server.domain=http://120.24.64.23:8084/fdkanfang/spc.html
+server.domain=http://4dkankan.com/spc.html
 
 #log
 logging.path=${output.file.path}fdkanfang_log

fdkanfang-application/src/main/resources/application-test.properties

@@ -55,17 +55,25 @@ spring.redis.jedis.pool.max-wait=-1ms
 output.file.path=/root/data/kanfang/
 
 #\u7F16\u8F91\u9875\u9762
-server.domain=http://39.108.220.65:8084/fdkanfang/spc.html
+server.domain=http://test.4dkankan.com/spc.html
 
 #log
 logging.path=${output.file.path}fdkanfang_log
 logging.config=classpath:logback-spring.xml
 logging.level.com.fdkanfang=debug
 
-
+#rabbit MQ
+spring.rabbitmq.host=127.0.0.1
+#spring.rabbitmq.host=localhost
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=guest 
+spring.rabbitmq.password=guest
 
 #四维看看的登录域名
-4dkankan.host=https://4dkankan.com/
+4dkankan.host=https://test.4dkankan.com/
 
 #queue
-verticle.queue=verticalQueue
+verticle.queue=verticalQueue
+
+#垂直校验远程调用脚本路径
+verticle.remote.call.path=bash /home/algorithm/HorizonNet.sh 

fdkanfang-application/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8084
 
-spring.profiles.active=sit
+spring.profiles.active=test
 
 # \u8BBF\u95EE\u9759\u6001\u8D44\u6E90\u8BBE\u7F6E
 spring.resources.static-locations=classpath:templates/,classpath:static/,classpath:web/

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/HouseController.java

@@ -376,6 +376,7 @@ public class HouseController extends BaseController {
         if(houseAuditDto.getResult().compareTo(1) != 0 && houseAuditDto.getResult().compareTo(0) != 0){
             throw  new CommonBaseException(ResultCodeEnum.D101  , "审批结果格式不正确");
         }
+
         houseEntity.setAuditResult(houseAuditDto.getResult());
         houseEntity.setAuditDesc(houseAuditDto.getDesc());
         houseEntity.setUpdateTime(new Date());
@@ -554,7 +555,18 @@ public class HouseController extends BaseController {
         houseEntity.setHandler(userId);
         houseEntity.setUpdateTime(new Date());
 
-        houseService2.update(houseEntity);
+        if(null != houseEntity.getAuditResult() && houseEntity.getAuditResult().compareTo(0) == 0){
+            //重新分配制作人，前面不通过的审批，需要擦除,TODO:需要添加一个上一状态，用于追踪
+            houseEntity.setAuditResult(null);
+            houseEntity.setAuditDesc(null);
+            houseEntity.setCanNotEdit(1);
+            houseEntity.setCanNotEditDesc(null);
+        }
+
+        int update = houseService2.updateAll(houseEntity);
+        if(update != 1){
+            throw new CommonBaseException(ResultCodeEnum.D101 , "更新房源数据失败");
+        }
         return new R(MsgCode.SUCCESS_CODE, MsgCode.msg_SUCCESS);
     }