监听队列名从数据库中添加

.gitignore

@@ -1,5 +1,6 @@
  HELP.md
 /target/
+*/target/
 !.mvn/wrapper/maven-wrapper.jar
 
 ### STS ###
@@ -16,7 +17,6 @@
 *.iws
 *.iml
 *.ipr
-*.log
 
 ### NetBeans ###
 /nbproject/private/

4dkankan-base/src/main/java/com/fdkankan/base/config/PrimaryConfig.java

@@ -1,46 +1,46 @@
-package com.fdkankan.base.config;
-
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import tk.mybatis.spring.annotation.MapperScan;
-
-import javax.sql.DataSource;
-
-@Configuration
-@MapperScan(basePackages = PrimaryConfig.PACKAGE, sqlSessionFactoryRef = "masterSqlSessionFactory")
-public class PrimaryConfig {
-
-    static final String PACKAGE = "com.fdkankan.base.mapper,com.fdkankan.agent.mapper,com.fdkankan.user.mapper,com.fdkankan.backend.mapper,com.fdkankan.bbs.mapper,com.fdkankan.goods.mapper,com.fdkankan.order.mapper,com.fdkankan.scene.mapper,com.fdkankan.trade.mapper";
-    static final String MAPPER_LOCATION = "classpath:mapper/primary/*.xml";
-
-    @Autowired
-    @Qualifier("primaryDataSource")
-    private DataSource primaryDataSource;
-
-
-    @Bean(name = "masterTransactionManager")
-    @Primary
-    public DataSourceTransactionManager masterTransactionManager() {
-        return new DataSourceTransactionManager(primaryDataSource);
-    }
-
-    @Bean(name = "masterSqlSessionFactory")
-    @Primary
-    public SqlSessionFactory masterSqlSessionFactory(@Qualifier("primaryDataSource") DataSource primaryDataSource)
-            throws Exception {
-        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
-        sessionFactory.setDataSource(primaryDataSource);
-        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
-                .getResources(PrimaryConfig.MAPPER_LOCATION));
-        sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
-        return sessionFactory.getObject();
-    }
-
-}
+//package com.fdkankan.base.config;
+//
+//import org.apache.ibatis.session.SqlSessionFactory;
+//import org.mybatis.spring.SqlSessionFactoryBean;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+//import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+//import tk.mybatis.spring.annotation.MapperScan;
+//
+//import javax.sql.DataSource;
+//
+//@Configuration
+//@MapperScan(basePackages = PrimaryConfig.PACKAGE, sqlSessionFactoryRef = "masterSqlSessionFactory")
+//public class PrimaryConfig {
+//
+//    static final String PACKAGE = "com.fdkankan.base.mapper,com.fdkankan.agent.mapper,com.fdkankan.user.mapper,com.fdkankan.backend.mapper,com.fdkankan.bbs.mapper,com.fdkankan.goods.mapper,com.fdkankan.order.mapper,com.fdkankan.scene.mapper,com.fdkankan.trade.mapper,com.fdkankan.modeling.log.mapper";
+//    static final String MAPPER_LOCATION = "classpath:mapper/primary/*.xml";
+//
+//    @Autowired
+//    @Qualifier("primaryDataSource")
+//    private DataSource primaryDataSource;
+//
+//
+//    @Bean(name = "masterTransactionManager")
+//    @Primary
+//    public DataSourceTransactionManager masterTransactionManager() {
+//        return new DataSourceTransactionManager(primaryDataSource);
+//    }
+//
+//    @Bean(name = "masterSqlSessionFactory")
+//    @Primary
+//    public SqlSessionFactory masterSqlSessionFactory(@Qualifier("primaryDataSource") DataSource primaryDataSource)
+//            throws Exception {
+//        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+//        sessionFactory.setDataSource(primaryDataSource);
+//        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
+//                .getResources(PrimaryConfig.MAPPER_LOCATION));
+//        sessionFactory.getObject().getConfiguration().setMapUnderscoreToCamelCase(true);
+//        return sessionFactory.getObject();
+//    }
+//
+//}

4dkankan-base/src/main/java/com/fdkankan/base/sms/SmsService.java

@@ -34,8 +34,8 @@ public class SmsService {
     //初始化ascClient需要的几个参数
     private static final String product = "Dysmsapi";//短信API产品名称（短信产品名固定，无需修改）
     private static final String domain = "dysmsapi.aliyuncs.com";//短信API产品域名（接口地址固定，无需修改）
-    private static final String accessKeyId = "LTAIUrvuHqj8pvry";//你的accessKeyId,参考本文档步骤2
-    private static final String accessKeySecret = "JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4";//你的accessKeySecret，参考本文档步骤2
+    private static final String accessKeyId = "LTAI5tGnY312DY2r747Hpuie";//你的accessKeyId,参考本文档步骤2
+    private static final String accessKeySecret = "EUcsSXhHsp08tkZysQupLHSsnntqEp";//你的accessKeySecret，参考本文档步骤2
 
     private static final String EN_CODE_MSG = "Your vertification code is ${code}. Thank you for using 4DKanKan, please complete your identity verification by entering this code in 5 minutes. Please ignore this message if you don't operate by yourself.";
 
@@ -105,8 +105,8 @@ public class SmsService {
         final String product = "Dysmsapi";//短信API产品名称（短信产品名固定，无需修改）
         final String domain = "dysmsapi.aliyuncs.com";//短信API产品域名（接口地址固定，无需修改）
         //替换成你的AK
-        final String accessKeyId = "LTAIUrvuHqj8pvry";//你的accessKeyId,参考本文档步骤2
-        final String accessKeySecret = "JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4";//你的accessKeySecret，参考本文档步骤2
+        final String accessKeyId = "LTAI5tGnY312DY2r747Hpuie";//你的accessKeyId,参考本文档步骤2
+        final String accessKeySecret = "EUcsSXhHsp08tkZysQupLHSsnntqEp";//你的accessKeySecret，参考本文档步骤2
         //初始化ascClient,暂时不支持多region
         IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId,
                 accessKeySecret);

4dkankan-base/src/main/java/com/fdkankan/base/util/AliyunossUtil.java

@@ -9,8 +9,8 @@ import java.util.List;
 public class AliyunossUtil {
 
     public static String endpoint = "http://oss-cn-shenzhen.aliyuncs.com";
-    public static String accessKeyId = "LTAIUrvuHqj8pvry";
-    public static String accessKeySecret = "JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4";
+    public static String accessKeyId = "LTAI5tC5Ema4raGNCZYSNrkN";
+    public static String accessKeySecret = "BjqU1lSVnNUbJouGkq13JG9DmcpaDx";
 
     public static List<OSSObjectSummary> listBucketFiles(String bucketName, String prefix){
         OSSClient ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret);

4dkankan-goods/src/main/java/com/fdkankan/goods/mapper/ICameraDetailMapper.java

@@ -7,6 +7,7 @@ import com.fdkankan.goods.entity.CameraDetailEntity;
 import com.fdkankan.goods.provider.CameraProvider;
 import org.apache.ibatis.annotations.*;
 
+import java.math.BigInteger;
 import java.util.List;
 
 @Mapper
@@ -41,4 +42,6 @@ public interface ICameraDetailMapper extends IBaseMapper<CameraDetailEntity, Lon
 
     @Update("UPDATE tb_camera_detail SET company_id = NULL WHERE company_id = #{companyId}")
     int updateCompanyId(Long companyId);
+    @Update("UPDATE tb_camera_detail SET used_space = #{useSpace} WHERE id = #{detailId}")
+    void addUsedSpace(@Param("useSpace")BigInteger useSpace,@Param("detailId")Long detailId);
 }

4dkankan-goods/src/main/java/com/fdkankan/goods/service/ICameraDetailService.java

@@ -7,6 +7,7 @@ import com.fdkankan.common.vo.response.ResponseCamera;
 import com.fdkankan.goods.entity.CameraDetailEntity;
 import com.github.pagehelper.PageInfo;
 
+import java.math.BigInteger;
 import java.util.List;
 
 public interface ICameraDetailService extends IBaseService<CameraDetailEntity, Long> {
@@ -44,4 +45,5 @@ public interface ICameraDetailService extends IBaseService<CameraDetailEntity, L
     int updateCompanyId(Long companyId);
 
 
+    void addUsedSpace(BigInteger add,Long id);
 }

4dkankan-goods/src/main/java/com/fdkankan/goods/service/impl/CameraDetailServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Condition;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -214,4 +215,8 @@ public class CameraDetailServiceImpl extends BaseServiceImpl<CameraDetailEntity,
         return cameraDetailMapper.updateCompanyId(companyId);
     }
 
+    @Override
+    public void addUsedSpace(BigInteger spase,Long id) {
+         cameraDetailMapper.addUsedSpace(spase, id);
+    }
 }

4dkankan-modeling/pom.xml

@@ -8,7 +8,7 @@
     <groupId>com.fdkankan</groupId>
     <artifactId>4dkankan-modeling</artifactId>
     <version>1.0.0</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <repositories>
         <repository>
             <id>nexus-aliyun</id>
@@ -107,10 +107,11 @@
             <version>1479188381469-20211020</version>
         </dependency>
 
+
     </dependencies>
 
     <build>
-        <finalName>4dkankan_v2_modeling</finalName>
+        <finalName>zfb-modeling</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

4dkankan-modeling/src/main/java/com/fdkankan/ModelingApplication.java

@@ -1,5 +1,6 @@
 package com.fdkankan;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -7,15 +8,16 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.web.bind.annotation.RestController;
 
 @SpringBootApplication
 @EnableCaching
 @EnableScheduling
 @EnableAsync
-@RestController
+@ComponentScan(basePackages = {"com.fdkankan.*"})
+@MapperScan("com.fdkankan.**.mapper")
 //@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class ModelingApplication  extends SpringBootServletInitializer {
 

4dkankan-modeling/src/main/java/com/fdkankan/log/entity/MqEcs.java

@@ -0,0 +1,37 @@
+package com.fdkankan.log.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-07
+ */
+@Getter
+@Setter
+public class MqEcs implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 发送的队列
+     */
+    private String queueName;
+
+    private String ecsName;
+
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}

4dkankan-modeling/src/main/java/com/fdkankan/log/mapper/IModelingLogMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Update;
 
 @Mapper
-public interface IModelingLogMapper  {
+public interface IModelingLogMapper {
 
     @Insert({"INSERT INTO t_build_log (scene_num, data_source,queue_name,status, host_name,build_type," +
             "source,log_detail_path,duration,create_time,update_time) " +

4dkankan-modeling/src/main/java/com/fdkankan/log/mapper/IMqEcsMapper.java

@@ -0,0 +1,23 @@
+package com.fdkankan.log.mapper;
+
+import com.fdkankan.log.entity.MqEcs;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-07
+ */
+@Mapper
+public interface IMqEcsMapper {
+
+    @Select("select * from mq_ecs where ecs_name =#{ecsName} limit 1")
+    List<MqEcs> getByEcs(@Param("ecsName") String hostName);
+}

4dkankan-modeling/src/main/java/com/fdkankan/log/service/IMqEcsService.java

@@ -0,0 +1,19 @@
+package com.fdkankan.log.service;
+
+
+import com.fdkankan.log.entity.MqEcs;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-07
+ */
+public interface IMqEcsService {
+
+    List<MqEcs> getByEcs(String hostName);
+}

4dkankan-modeling/src/main/java/com/fdkankan/log/service/impl/MqEcsServiceImpl.java

@@ -0,0 +1,28 @@
+package com.fdkankan.log.service.impl;
+
+import com.fdkankan.log.entity.MqEcs;
+import com.fdkankan.log.mapper.IMqEcsMapper;
+import com.fdkankan.log.service.IMqEcsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-07
+ */
+@Service
+public class MqEcsServiceImpl implements IMqEcsService {
+
+    @Autowired
+    IMqEcsMapper mqEcsMapper;
+    @Override
+    public List<MqEcs> getByEcs(String hostName) {
+        return mqEcsMapper.getByEcs(hostName);
+    }
+}

4dkankan-modeling/src/main/java/com/fdkankan/modeling/message/BuildSceneReceiver.java

@@ -28,6 +28,7 @@ import com.rabbitmq.client.Channel;
 import com.taobao.api.ApiException;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.rabbit.annotation.Queue;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,8 +81,14 @@ public class BuildSceneReceiver {
     private String queueCad;
     @Autowired
     ModelingMsgProducer producer;
+    @Autowired
+    QueueNameService queueNameService;
+
 
-    @RabbitListener(queues = "${rabbitmq.queue}", containerFactory = "rabbitListenerContainerFactory",priority = "${mq.consumerPriority}")
+    @RabbitListener(
+            queuesToDeclare = @Queue("#{queueNameService.getQueueName()}"),
+            containerFactory = "rabbitListenerContainerFactory",
+            priority = "${mq.consumerPriority}")
     public void process(String content, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag, Channel channel) throws IOException {
         SysConstants.SYSTEM_BUILDING = true;
         if (SysConstants.SYSTEM_OFFING) {
@@ -467,7 +474,7 @@ public class BuildSceneReceiver {
 
             // 上传公元数据
             if (!ObjectUtils.isEmpty(scene.getUserId())) {
-                UserEntity sceneUser = userService.findById(scene.getUserId());
+                UserEntity sceneUser = userService.getById(scene.getUserId());
                 if (!ObjectUtils.isEmpty(sceneUser.getCompanyId()) && gyCompanyId.equals(sceneUser.getCompanyId()+"")) {
                     gYUploadToOssUtil.uploadMulFiles(map);
                     gYUploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "data/data" + scene.getNum() + File.separator + "scene.json",
@@ -544,12 +551,10 @@ public class BuildSceneReceiver {
     private void handFail(String reason, BuildLog buildLog){
         sceneService.updateStatus(buildLog.getSceneNum(), -1);
         sceneProService.updateStatus(buildLog.getSceneNum(), -1);
-        CompletableFuture.runAsync(() -> {
-            try {
-                DingDingUtils.sendMsgToDingRobot(reason,buildLog);
-            } catch (ApiException | UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException apiException) {
-                apiException.printStackTrace();
-            }
-        });
+        try {
+            //DingDingUtils.sendMsgToDingRobot(reason,buildLog);
+        } catch (Exception e) {
+            log.info("发送钉钉失败：",e);
+        }
     }
 }

4dkankan-modeling/src/main/java/com/fdkankan/modeling/message/QueueNameService.java

@@ -0,0 +1,39 @@
+package com.fdkankan.modeling.message;
+
+import com.fdkankan.constants.SysConstants;
+import com.fdkankan.log.entity.MqEcs;
+import com.fdkankan.log.service.IMqEcsService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@Slf4j
+public class QueueNameService {
+
+    @Value("${rabbitmq.queue}")
+    private String queue;
+    @Autowired
+    IMqEcsService mqEcsService;
+
+
+    public String getQueueName(){
+        String queueName = queue;
+        if(StringUtils.isBlank(SysConstants.hostName)){
+            log.info("获取hostName失败,监听队列名为：{}",queueName);
+            return queueName;
+        }
+        List<MqEcs> list = mqEcsService.getByEcs(SysConstants.hostName);
+        if(list != null && list.size() >0){
+            queueName = list.get(0).getQueueName();
+            log.info("获取hostNam成功,监听队列名为：{}",queueName);
+            return queueName;
+        }
+        log.info("获取hostName失败,监听队列名为：{}",queueName);
+        return queueName;
+    }
+}

4dkankan-modeling/src/main/java/com/fdkankan/modeling/message/RabbitConfig.java

@@ -1,6 +1,5 @@
 package com.fdkankan.modeling.message;
 
-import com.fdkankan.base.mq.ModelingMsgProducer;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
@@ -70,9 +69,5 @@ public class RabbitConfig {
         return new BuildSceneReceiver();
     }
 
-    @Bean
-    public ModelingMsgProducer modelingMsgProducer() {
-        return new ModelingMsgProducer(rabbitTemplate());
-    }
 
 }

4dkankan-modeling/src/main/java/com/fdkankan/utils/DingDingUtils.java

@@ -11,6 +11,7 @@ import com.google.api.client.util.Lists;
 import com.taobao.api.ApiException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 

4dkankan-modeling/src/main/resources/application.properties

@@ -1,10 +1,10 @@
-server.port=8080
+server.port=8089
 server.servlet.context-path=/4dkankan_v2
 server.file.location=/mnt/4Dkankan/
 
 spring.mvc.async.request-timeout=1800000
 #log
-logging.path=/4Dkankan/logs/
+logging.path=/home/data-zfb/logs/zfb-modeling/
 logging.config=classpath:logback-spring.xml
 logging.level.com.fdkankan=debug
 #mybatis
@@ -19,18 +19,14 @@ pagehelper.params=count=countSql
 pagehelper.reasonable=false
 pagehelper.support-methods-arguments=true
 #DB (new)
-spring.datasource.primary.url=jdbc:mysql://120.25.146.52:3306/4dkankan_v2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.url=jdbc:mysql://127.0.0.1:3306/zhi_house?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.primary.username=root
-spring.datasource.primary.password=4dkk2020test%
+spring.datasource.primary.password=zfb@20210727%
 spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
 #DB (old)
-spring.datasource.secondary.url=jdbc:mysql://120.25.146.52:3306/4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.secondary.username=root
-spring.datasource.secondary.password=4dkk2020test%
-spring.datasource.secondary.driverClassName=com.mysql.jdbc.Driver
-#连接泄露  开启影响性能
+#????  ??????
 #spring.datasource.druid.remove-abandoned=true
-#如果连接超过10分钟未关闭，就会被强行回收 单位秒
+#??????10????????????? ???
 #spring.datasource.druid.remove-abandoned-timeout=600
 #spring.datasource.druid.log-abandoned=true
 
@@ -42,18 +38,18 @@ spring.servlet.multipart.enabled=true
 spring.servlet.multipart.location=/mnt/data/
 #redis
 spring.redis.database=0
-spring.redis.host=120.25.146.52
+spring.redis.host=120.0.0.1
 spring.redis.port=6379
 spring.redis.password=
-# 连接超时时间 单位 ms（毫秒）
+# ?????? ?? ms????
 spring.redis.timeout=3000ms
-# 连接池中的最大空闲连接，默认值也是8。
+# ?????????????????8?
 spring.redis.jedis.pool.max-idle=50
-# 连接池中的最小空闲连接，默认值也是0。
+# ?????????????????0?
 spring.redis.jedis.pool.min-idle=8
-# 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
+# ?????-1??????????pool?????maxActive?jedis??????pool????exhausted(??)?
 spring.redis.jedis.pool.max-active=8
-# 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
+# ?????????????????????-1??????????????????????JedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 # file route
 file.route.hardDisk=/mnt/data/
@@ -68,15 +64,15 @@ file.route.musicType=[".mp3", ".wma", ".wav", ".mod", ".ra", ".cd", ".md", ".asf
 file.route.IPs=["0:0:0:0:0:0:0:1","192.168.0.100"]
 #swagger
 swagger.basePackage=com.fdkankan.web.controller
-swagger.title=四维看看2.0单机版
-swagger.description=api文档
+swagger.title=????2.0???
+swagger.description=api??
 swagger.serviceUrl=http://39.108.220.65:8080
 swagger.version=2.0
 #rabbitmq
-spring.rabbitmq.host=120.25.146.52
+spring.rabbitmq.host=127.0.0.1
 spring.rabbitmq.port=5672
-spring.rabbitmq.username=guest
-spring.rabbitmq.password=guest
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=admin123
 
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/, classpath:/static/, classpath:/web/, file:${server.file.location}
@@ -90,13 +86,13 @@ spring.http.encoding.enabled=true
 spring.http.encoding.force=true
 
 oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
-oss.key=LTAIUrvuHqj8pvry
-oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
-oss.bucket=4dkankan
-#oss类型为oss（阿里云）或s3（亚马逊）
+oss.key=LTAI5tC5Ema4raGNCZYSNrkN
+oss.secrey=BjqU1lSVnNUbJouGkq13JG9DmcpaDx
+oss.bucket=zfb-4dkankan
+#oss???oss??????s3?????
 oss.type=oss
-oss.s3key=AKIAWCV5QFZ3ZNELKYUY
-oss.s3secrey=epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
+oss.s3key=LTAI5tC5Ema4raGNCZYSNrkN
+oss.s3secrey=BjqU1lSVnNUbJouGkq13JG9DmcpaDx
 oss.s3bucket=4dkankan
 
 main.url=https://test.4dkankan.com/
@@ -104,40 +100,39 @@ scene.url=show.html?m=
 scene.pro.url=showProMobile.html?m=
 scene.pro.new.url=smobile.html?m=
 
-prefix.ali=https://4dkk.4dage.com/
+prefix.ali=https://zfb.4dage.com/
 
 #shop.goods.url=http://192.168.0.83:8089/goods/getGoodsListByScene
 #shop.category.url=http://192.168.0.83:8089/goods/getCategoryListByScene
 
-#服务器环境，dev为测试环境，formal为正式环境
-environment=dev
+#??????dev??????formal?????
+environment=formal
 
-#国内阿里云服务器
+#????????
 phone.code.cn=SMS_179150247
 phone.code.en=SMS_139242688
-phone.sign=四维看看
+phone.sign=????
 
-#海外s3服务器
+#??s3???
 #phone.code.cn=SMS_190720510
 #phone.code.en=SMS_190780147
 #phone.sign=4Dkankan
 
-#mq的任务key
-rabbitmq.queue=QUEUE_MODELING_A_QX
+#mq???key
+rabbitmq.queue=QUEUE_MODELING_A
+rabbitmq.queue.enable=true
 rabbitmq.queue.video=QUEUE_VIDEO_A
-#mq当排队任务超过这个数量时启用弹性升缩
+#mq??????????????????
 mq.base.num=300
-#弹性伸缩组id
+#?????id
 scaling.group.id=asg-wz92989gdhgek3ktdlsw
-#弹性伸缩规则id
+#??????id
 scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
 
 
-#获取含有热点的领域路径列表
+#?????????????
 hot.domain.list=https://testopen.4dkankan.com/domainList/hot
-#删除领域中的热点数据
+#??????????
 hot.delete=/deleteHot
 
-gy.company.id=1058
-
-
+gy.company.id=1058

4dkankan-scene/src/main/java/com/fdkankan/scene/feign/SceneFeignClient.java

@@ -650,19 +650,18 @@ public class SceneFeignClient {
     }
 
     // 临时存储空间
-    public void tempScenes(List<Long> lockedIds) {
+    public void tempScenes(List<Long> lockedIds,String sceneNum) {
         if (lockedIds == null || lockedIds.size() == 0){
             return;
         }
         for (Long id : lockedIds){
-            SceneProEntity sceneProEntity = sceneProService.findById(id);
-            sceneProEntity.setPayStatus(-2);
-            sceneProService.update(sceneProEntity);
+            //SceneProEntity sceneProEntity = sceneProService.getById(id);
+            sceneProService.updatePayStatus(id,-2);
 
             try{
                 Map<String, Object> map = new HashMap<>();
                 map.put("payStatus", -2);
-                FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + sceneProEntity.getNum() + "/scene.json", map);
+                FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + sceneNum + "/scene.json", map);
             }catch (Exception e){
                 e.printStackTrace();
             }

4dkankan-scene/src/main/java/com/fdkankan/scene/mapper/ISceneProMapper.java

@@ -111,6 +111,9 @@ public interface ISceneProMapper extends IBaseMapper<SceneProEntity, Long> {
     Integer findFolderIdScence(@Param("folderId")Long folderId, @Param("userId")Long userId);
 
 
+    @Update("UPDATE tb_scene_pro SET pay_status = #{status} where id = #{id}")
+    void updatePayStatus(@Param("id")Long id, @Param("payStatus")Integer status);
 
-
+    @Select("select * from tb_scene_pro where rec_status = 'A' and id = #{id} ")
+    SceneProEntity getById(@Param("id")Long  id);
 }

4dkankan-scene/src/main/java/com/fdkankan/scene/service/ISceneProService.java

@@ -163,4 +163,7 @@ public interface ISceneProService extends IBaseService<SceneProEntity, Long> {
 
     Integer findFolderIdScence(Long folderId, Long userId);
 
+    void updatePayStatus(Long id, Integer i);
+
+    SceneProEntity getById(Long id);
 }

4dkankan-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -4340,6 +4340,15 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
         return sceneProMapper.findFolderIdScence(folderId,userId);
     }
 
+    @Override
+    public void updatePayStatus(Long id, Integer status) {
+        sceneProMapper.updatePayStatus(id,status);
+    }
+
+    @Override
+    public SceneProEntity getById(Long id) {
+        return sceneProMapper.getById(id);
+    }
 
     public static void main(String[] args) {
         try {

4dkankan-user/src/main/java/com/fdkankan/user/mapper/IUserMapper.java

@@ -40,4 +40,7 @@ public interface IUserMapper extends IBaseMapper<UserEntity, Long> {
 
     @Select(" SELECT nick_name FROM tb_user WHERE id = #{userId} AND REC_STATUS = 'A' ")
     String getNickNameByUserId(@Param("userId") Long userId);
+
+    @Select(" SELECT * FROM tb_user WHERE id = #{userId} AND REC_STATUS = 'A' ")
+    UserEntity getById(@Param("userId")Long userId);
 }

4dkankan-user/src/main/java/com/fdkankan/user/service/IUserService.java

@@ -161,4 +161,5 @@ public interface IUserService extends IBaseService<UserEntity, Long> {
 
     Result getSceneDownloadProcess(Long userId,String sceneNum) throws Exception;
 
+    UserEntity getById(Long userId);
 }

4dkankan-user/src/main/java/com/fdkankan/user/service/impl/UserServiceImpl.java

@@ -155,6 +155,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserEntity, Long> implement
     }
 
     @Override
+    public UserEntity getById(Long userId) {
+        return  userMapper.getById(userId);
+    }
+
+    @Override
     public List<UserEntity> findByUserNameList(String userName) {
         return userMapper.findByUserNameLike(userName);
     }
@@ -1481,8 +1486,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserEntity, Long> implement
         BigInteger usedSpace = detailEntity.getUsedSpace() == null ? new BigInteger("0") : detailEntity.getUsedSpace();
         BigInteger sapce = sceneProEntity.getSpace() == null ? new BigInteger("0") : sceneProEntity.getSpace();
 
-        detailEntity.setUsedSpace(usedSpace.add(sapce));
-        cameraDetailService.update(detailEntity);
+        cameraDetailService.addUsedSpace(usedSpace.add(sapce),detailEntity.getId());
         if(ObjectUtils.isEmpty(detailEntity.getTotalSpace())){
             return 1;
         }
@@ -1492,7 +1496,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserEntity, Long> implement
         if (detailEntity.getTotalSpace().compareTo(detailEntity.getUsedSpace()) == -1){
             List<Long> ids = new ArrayList<>();
             ids.add(sceneProEntity.getId());
-            sceneService.tempScenes(ids);
+            sceneService.tempScenes(ids,sceneNum);
 //            return 0;
         }
 //        sceneProEntity.setPayStatus(1);