inint from eur branch of http://192.168.0.115:3000/4dkankan_back/4dkankan_v2-mini.git

at version 87c86c3f

4dkankan-agent/4dkankan-agent.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -44,7 +44,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-agent/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-application/4dkankan-application.iml

@@ -505,7 +505,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -514,7 +514,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-application/pom.xml

@@ -18,7 +18,7 @@
     <description>程序入口</description>
 
     <parent>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <groupId>com.fdkankan</groupId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
@@ -137,7 +137,7 @@
     </dependencies>
 
     <build>
-        <finalName>4dkankan_v2_mini</finalName>
+        <finalName>4dkankan_japan</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

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

@@ -19,12 +19,12 @@ 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://35.157.124.143:3306/4dkankan_v2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
 spring.datasource.primary.username=root
 spring.datasource.primary.password=4dkk2020test%
 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.url=jdbc:mysql://35.157.124.143: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
@@ -57,7 +57,6 @@ spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-wait=-1ms
 # file route
 file.route.hardDisk=/mnt/data/
-file.route.hardDiskLaser=/mnt-laser/data/
 file.route.imageFolder=IMAGE
 file.route.documentFolder=VIDEO
 file.route.videoFolder=DOCUMENT
@@ -94,22 +93,19 @@ oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
 oss.key=LTAIUrvuHqj8pvry
 oss.secrey=JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4
 oss.bucket=4dkankan
-oss.bucket.sdk=4dscene
 #oss类型为oss（阿里云）或s3（亚马逊）
-oss.type=oss
+oss.type=s3
 oss.s3key=AKIAWCV5QFZ3ZNELKYUY
 oss.s3secrey=epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws
 oss.s3bucket=4dkankan
 
-main.url=https://test.4dkankan.com/
+main.url=https://testeur.4dkankan.com/
 scene.url=show.html?m=
 scene.pro.url=showProMobile.html?m=
 scene.pro.new.url=smobile.html?m=
-scene.maxkk=https://testlaser.4dkankan.com/maxkk/
 
 prefix.ali=https://4dkk.4dage.com/
-
-prefix.ali.sdk=https://4dscene.4dage.com/
+prefix.s3=https://4dkk.4dage.com/
 
 #获取含有热点的领域路径列表
 hot.domain.list=https://testopen.4dkankan.com/domainList/hot
@@ -141,11 +137,6 @@ scaling.group.id=asg-wz92989gdhgek3ktdlsw
 #弹性伸缩规则id
 scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
 
-
-#mq当排队任务超过这个数量时启用弹性升缩
-mq.base.num.laser=2
-
-
 #服务器类型，aliyun或hqyun
 ecs.type=hqyun
 
@@ -160,9 +151,5 @@ expected.time=2021-09-01 00:00:00
 
 copyScene-account-id=152
 
-scene.code=t-
-
-3d.family=39f195a813de5a5bb5a015dc371aa9b1
-
 
 

4dkankan-application/src/test/java/com/fdkankan/FileUtilsTest.java

@@ -10,8 +10,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest(classes = App.class)
 public class FileUtilsTest {
 
-    private final String _old = "d://old2/";
-    private final String _new = "e://new1/";
+    private final String _old = "d://old/";
+    private final String _new = "e://new/";
 
     @Test
     public void copyLocalTest() throws Exception {
@@ -21,7 +21,6 @@ public class FileUtilsTest {
     @Test
     public void copyLocalTest2() throws Exception {
         FileUtils.copyFolderAllFiles(_old, _new, true);
-        System.out.println(".................");
     }
 
 }

4dkankan-backend/4dkankan-backend.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -44,7 +44,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-backend/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-backend/src/main/java/com/fdkankan/backend/job/ScheduleJob.java

@@ -49,9 +49,6 @@ public class ScheduleJob {
     @Value("${mq.base.num}")
     private String baseNum;
 
-    @Value("${mq.base.num.laser}")
-    private String baseNumLaser;
-
     @Value("${environment}")
     private String environment;
 
@@ -202,29 +199,6 @@ public class ScheduleJob {
         }
     }
 
-    /**
-     * 判断激光相机
-     */
-    @Scheduled(cron = "0 0/1 * * * ? ")
-    public void job9() {
-        if("hq".equals(environment)){
-            return;
-        }
-        try {
-            //当mq排队数大于指定数量时使用弹性升缩
-            int mqNum = producer.getLaserMessageCount();
-            log.info("每1分钟查询一次激光排队队列,mqNum:" + mqNum);
-            if(mqNum - Integer.parseInt(baseNumLaser) > 0){
-
-                log.info("使用激光弹性升缩开启一台ECS");
-                log.info(rubberSheetingUtil.createEcs());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error(e.getMessage());
-        }
-    }
-
 //    @Scheduled(cron = "0 0/1 * * * ? ")
 //    public void job9() {
 //        try {
@@ -267,4 +241,19 @@ public class ScheduleJob {
             log.error(e.getMessage());
         }
     }
+
+//   @Scheduled(cron = "0 */10 * * * ?")
+    @Scheduled(cron = "0 0 12 * * ?")
+    public void job12() {
+        if("hq".equals(environment)){
+            return;
+        }
+        log.warn("每天12:00开始执行定时任务：短信提醒增值权益准备到期 月会员");
+        try {
+            userService.incrementExpireSeSendSms();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage());
+        }
+    }
 }

4dkankan-backend/src/main/java/com/fdkankan/backend/service/IManagerService.java

@@ -128,7 +128,7 @@ public interface IManagerService extends IBaseService<ManagerEntity, Long> {
 
     Result moveScene(RequestScene param) throws Exception;
 
-    Result copyScene(String sceneNum,String sceneName) throws Exception;
+    Result copyScene(String sceneNum, String sceneName) throws Exception;
 
     Result managerList() throws Exception;
 
@@ -148,6 +148,6 @@ public interface IManagerService extends IBaseService<ManagerEntity, Long> {
 
     Result importCompanyCamera(MultipartFile file) throws Exception;
 
-    Result insertIncrementls(String username,Date endTime,Integer incrementNum,Integer downloadNum,String managerName) throws Exception;
+    Result insertIncrementls(RequestUserIncrement requestUserIncrement,String managerName) throws Exception;
 
 }

4dkankan-backend/src/main/java/com/fdkankan/backend/service/impl/ManagerSdkServiceImpl.java

@@ -50,7 +50,7 @@ public class ManagerSdkServiceImpl extends BaseServiceImpl<ManagerSdkEntity, Lon
     @Value("${oss.type}")
     private String ossType;
 
-    @Value("${prefix.ali.sdk}")
+    @Value("${prefix.s3}")
     private String prefixAli;
 
 
@@ -176,7 +176,9 @@ public class ManagerSdkServiceImpl extends BaseServiceImpl<ManagerSdkEntity, Lon
             if(managerSdkEntity.getPublishTime()!=null){
                 return Result.success(iManagerSdkMapper.updateBySdkId(param.getId(),param.getStatus()));
             }else{
-                return Result.success(iManagerSdkMapper.updateBySdkIdPublish(param.getId(),param.getStatus()));
+                managerSdkEntity.setStatus(param.getStatus());
+                managerSdkEntity.setPublishTime(new Date());
+                return Result.success(this.update(managerSdkEntity));
             }
         }
         return Result.failure("获取记录为空");

4dkankan-backend/src/main/java/com/fdkankan/backend/service/impl/ManagerServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fdkankan.backend.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fdkankan.agent.entity.AgentEntity;
@@ -23,7 +22,6 @@ import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.exception.BaseRuntimeException;
 import com.fdkankan.common.jedis.JedisUtil;
 import com.fdkankan.common.model.Result;
-import com.fdkankan.common.model.SSOUser;
 import com.fdkankan.common.util.*;
 import com.fdkankan.common.validation.Variable;
 import com.fdkankan.common.vo.request.*;
@@ -34,7 +32,10 @@ import com.fdkankan.goods.feign.GoodsFeignClient;
 import com.fdkankan.goods.mapper.ICameraMapper;
 import com.fdkankan.goods.service.ICameraDetailService;
 import com.fdkankan.goods.service.ICameraService;
-import com.fdkankan.order.entity.*;
+import com.fdkankan.order.entity.ExpansionOrderEntity;
+import com.fdkankan.order.entity.OrderEntity;
+import com.fdkankan.order.entity.TradeLogEntity;
+import com.fdkankan.order.entity.VirtualOrderEntity;
 import com.fdkankan.order.feign.OrderFeignClient;
 import com.fdkankan.scene.entity.Scene3dNumNewEntity;
 import com.fdkankan.scene.entity.SceneEntity;
@@ -136,9 +137,6 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
     private IUserService iUserService;
 
     @Autowired
-    private IReceiverInfoService iReceiverInfoService;
-
-    @Autowired
     private IAgentFrameworkService agentFrameworkService;
 
     @Autowired
@@ -610,20 +608,6 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
                 if(expansionOrder != null){
                     param.setOrderId(expansionOrder.getId());
                     param.setConsumeType(1);
-                }else{
-                    IncrementOrderEntity incrementOrderEntity = orderService.findEntityIncrementOrderByOrderSn(param.getOrderSn());
-                    if(incrementOrderEntity!=null){
-                        param.setIncrementId(incrementOrderEntity.getId());
-                        param.setConsumeType(2);
-                    }else{
-                        DownloadOrderEntity downloadOrderEntity = orderService.findEntityDownloadOrderByOrderSn(param.getOrderSn());
-                        if(downloadOrderEntity!=null){
-                            param.setDownloadId(downloadOrderEntity.getId());
-                            param.setConsumeType(3);
-                        }else{
-                            param.setOrderId(9999999999999L);
-                        }
-                    }
                 }
             }
         }
@@ -631,11 +615,9 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
         ResponseOrder orderDetail = new ResponseOrder();
         ResponseVirtualOrder virtualOrderDetail = new ResponseVirtualOrder();
         ResponseIncrementOrder incrementDetail = new ResponseIncrementOrder();
-        ResponseDownloadOrder downloadDetail = new ResponseDownloadOrder();
         List<ResponseOrderItem> orderItems = null;
         ResponseOrderItem orderItem = null;
         StringBuilder goodsName = null;
-        ReceiverInfoEntity receiverInfoEntity = new ReceiverInfoEntity();
         for(ResponseInvoice invoice : pageInfo.getList()){
             //购买相机的订单
             if(invoice.getConsumeType() == 0){
@@ -657,27 +639,11 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
             if(invoice.getConsumeType() == 2){
                 Result orderResul = orderService.findByIncrementOrderId(invoice.getIncrementOrderId());
                 incrementDetail = mapper.convertValue(orderResul.getData(), ResponseIncrementOrder.class);
-                if(incrementDetail!=null){
+                if(orderDetail!=null){
                     invoice.setResponseIncrementOrder(incrementDetail);
                 }
             }
 
-            //会员权益
-            if(invoice.getConsumeType() == 3){
-                Result orderResul = orderService.findByDownloadOrderId(invoice.getDownloadOrderId());
-                downloadDetail = mapper.convertValue(orderResul.getData(), ResponseDownloadOrder.class);
-                if(downloadDetail!=null){
-                    invoice.setResponseDownloadOrder(downloadDetail);
-                }
-            }
-
-            receiverInfoEntity = iReceiverInfoService.findDefaultByUserId(invoice.getUserId());
-            if(receiverInfoEntity!=null){
-                invoice.setShipName(receiverInfoEntity.getShipName() == null?"" : receiverInfoEntity.getShipName());
-                invoice.setShipMobile(receiverInfoEntity.getShipMobile() == null?"" : receiverInfoEntity.getShipMobile());
-                invoice.setShipAreaPath( receiverInfoEntity.getShipAreaPath()== null?"" : receiverInfoEntity.getShipAreaPath());
-                invoice.setShipAddress(receiverInfoEntity.getShipAddress()== null?"" : receiverInfoEntity.getShipAddress());
-            }
             //相机充值的订单
 //            if(invoice.getConsumeType() == 1){
 //                ExpansionOrderEntity expansionOrderEntity = orderService.findEntityExpansionOrderByOrderId(invoice.getOrderId());
@@ -719,299 +685,114 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
 
     @Override
     public void exportInvoiceList(RequestTrade param, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        param.setPageSize(9999);
-
+        if(StringUtils.isNotEmpty(param.getOrderSn())){
+            OrderEntity orderEntity = orderService.findByOrderSn(param.getOrderSn());
+            if(orderEntity != null){
+                param.setOrderId(orderEntity.getId());
+                param.setConsumeType(0);
+            }else {
+                ExpansionOrderEntity expansionOrder = orderService.findEntityExpansionOrderByOrderSn(param.getOrderSn());
+                if(expansionOrder != null){
+                    param.setOrderId(expansionOrder.getId());
+                    param.setConsumeType(1);
+                }
+            }
+        }
         List<ResponseInvoice> list = tradeService.findInvoiceAll(param);
         ResponseOrder orderDetail = new ResponseOrder();
         ExpansionOrderEntity expansionOrderEntity = new ExpansionOrderEntity();
         List<ResponseOrderItem> orderItems = null;
         StringBuilder goodsName = null;
-        ResponseIncrementOrder incrementDetail = new ResponseIncrementOrder();
-        ResponseDownloadOrder downloadDetail = new ResponseDownloadOrder();
-        ReceiverInfoEntity receiverInfoEntity = new ReceiverInfoEntity();
 
         //导出的数据
         int serNum = 1;
         Map<String, Object> item = null;
         List<Map> dataList = new ArrayList<Map>();
         for(ResponseInvoice invoice : list){
-
-            if(invoice.getOrderId()==null && invoice.getVirtualOrderId()==null &&
-                    invoice.getIncrementOrderId() == null && invoice.getDownloadOrderId() == null){
-                continue;
-            }
-
             //购买相机的订单
             item = new HashMap();
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[0], String.valueOf(serNum));
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[0], String.valueOf(serNum));
             if(invoice.getType() == 2){
-                item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[7], "增值税普通发票");
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[2], "增值税普通发票");
             }
             if(invoice.getType() == 3){
-                item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[7], "增值税专用发票");
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[2], "增值税专用发票");
             }
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[4], invoice.getExpressNumber()== null?"" : invoice.getExpressNumber());
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[5], invoice.getMoney()== null?"" : String.valueOf(invoice.getMoney()));
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[3], invoice.getMoney());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[4], invoice.getTitle());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[5], invoice.getCode());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[6], invoice.getOrganizedName());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[7], invoice.getRegisterPhone());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[8], invoice.getBankName());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[9], invoice.getBankAccount());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[10], invoice.getShipAreaPath() + " " + invoice.getShipAddress());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[11], invoice.getEmailAddress());
+            item.put(ConstantExcel.INVOICEEXCELCOLENNAME[12], invoice.getShipMobile());
 
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[8], invoice.getTitle() == null?"" : invoice.getTitle());
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[9], invoice.getCode() == null?"" : invoice.getCode());
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[10], invoice.getOrganizedAddress() == null?"" : invoice.getOrganizedAddress());
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[11], invoice.getRegisterPhone() == null?"" : invoice.getRegisterPhone());
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[12], invoice.getBankName() == null?"" : invoice.getBankName());
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[13], invoice.getBankAccount() == null?"" : invoice.getBankAccount());
-
-            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[17], invoice.getEmailAddress() == null?"" : invoice.getEmailAddress());
 
             if(invoice.getConsumeType() == 0){
                 Result orderResul = orderService.findByOrderId(invoice.getOrderId());
                 orderDetail = mapper.convertValue(orderResul.getData(), ResponseOrder.class);
 
-                item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[1], orderDetail.getOrderSn() == null?"" : orderDetail.getOrderSn());
-//                item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[2], orderDetail.getUserName() == null?"" : orderDetail.getUserName());
-
-                if(orderDetail.getUserId()!=null){
-                    UserEntity userEntity = iUserService.findById(orderDetail.getUserId());
-                    if(userEntity!=null){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[2], userEntity.getUserName() == null?"" : userEntity.getUserName());
-
-                        if(invoice.getType() == 3){
-                            //获取默认地址
-                            receiverInfoEntity = iReceiverInfoService.findDefaultByUserId(orderDetail.getUserId());
-                            if(receiverInfoEntity!=null){
-                                item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[14], receiverInfoEntity.getShipName() == null?"" : receiverInfoEntity.getShipName());
-                                item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[15], receiverInfoEntity.getShipMobile() == null?"" : receiverInfoEntity.getShipMobile());
-                                item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[16], receiverInfoEntity.getShipAreaPath()== null?"" : receiverInfoEntity.getShipAreaPath()
-                                        + " " + receiverInfoEntity.getShipAddress()== null?"" : receiverInfoEntity.getShipAddress());
-                            }
-                        }
-                    }
-                }
-
-                if( orderDetail.getOrderTime() == null){
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[3], "");
-                }else{
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[3], DateUtil.date2String(orderDetail.getOrderTime(),null));
-                }
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[1], orderDetail.getOrderSn());
 
-                if (orderDetail.getPaymentTypeName() ==null || orderDetail.getPaymentTypeName() == -1) {
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[6], "未支付");
-                    continue;
-                } else {
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[6], ConstantExcel.PAYFORM[orderDetail.getPaymentTypeName()]);
-                }
-
-                if(orderDetail.getOrderStatus()!=null){
-                    if(orderDetail.getOrderStatus().equals("unprocessed")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[18], "未处理");
-                    }else if(orderDetail.getOrderStatus().equals("processed")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[18], "已确认");
-                    }else if(orderDetail.getOrderStatus().equals("completed")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[18], "已完成");
-                    }else if(orderDetail.getOrderStatus().equals("invalid")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[18], "已取消");
-                    }
-                }else{
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[18], "");
-                }
-
-                if(orderDetail.getShippingStatus()!=null){
-                    if(orderDetail.getShippingStatus().equals("unshipped")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "未发货");
-                    }else if(orderDetail.getShippingStatus().equals("partShipped")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "部分发货");
-                    }else if(orderDetail.getShippingStatus().equals("shipped")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "已发货");
-                    }else if(orderDetail.getShippingStatus().equals("partReshiped")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "部分退货");
-                    }else if(orderDetail.getShippingStatus().equals("reshiped")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "已退货");
-                    }else if(orderDetail.getShippingStatus().equals("received")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "已收货");
-                    }
-                }else{
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "");
-                }
-
-                if(orderDetail.getPaymentStatus()!=null){
-                    if(orderDetail.getPaymentStatus().equals("unpaid")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "未付款");
-                        continue;
-                    }else if(orderDetail.getPaymentStatus().equals("paid")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "已付款");
-                    }else if(orderDetail.getPaymentStatus().equals("cancel")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "已取消");
-                    }else if(orderDetail.getPaymentStatus().equals("partPayment")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "部分支付");
-                    }else if(orderDetail.getPaymentStatus().equals("partRefund")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "部分退款");
-                    }else if(orderDetail.getPaymentStatus().equals("refunded")){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "全额退款");
-                    }
-                }else{
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "");
-                }
-            }else if(invoice.getConsumeType() == 1){
-                expansionOrderEntity = orderService.findEntityExpansionOrderByOrderId(invoice.getOrderId());
-
-                if(expansionOrderEntity!=null){
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[1], expansionOrderEntity.getOrderSn() == null?"" : expansionOrderEntity.getOrderSn());
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[5], expansionOrderEntity.getAmount()== null?"" : String.valueOf(expansionOrderEntity.getAmount()));
-                    if(expansionOrderEntity.getUserId()!=null){
-                        UserEntity userEntity = iUserService.findById(expansionOrderEntity.getUserId());
-                        if(userEntity!=null){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[2], userEntity.getUserName() == null?"" : userEntity.getUserName());
-                            if(invoice.getType() == 3){
-                                //获取默认地址
-                                receiverInfoEntity = iReceiverInfoService.findDefaultByUserId(expansionOrderEntity.getUserId());
-                                if(receiverInfoEntity!=null){
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[14], receiverInfoEntity.getShipName() == null?"" : receiverInfoEntity.getShipName());
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[15], receiverInfoEntity.getShipMobile() == null?"" : receiverInfoEntity.getShipMobile());
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[16], receiverInfoEntity.getShipAreaPath()== null?"" : receiverInfoEntity.getShipAreaPath()
-                                            + " " + receiverInfoEntity.getShipAddress()== null?"" : receiverInfoEntity.getShipAddress());
-                                }
-                            }
-                        }
+                if(orderDetail.getOrderItems() != null){
+                    if(orderDetail.getOrderItems().size() >= 1){
+                        ResponseOrderItem responseOrderItem = orderDetail.getOrderItems().get(1);
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[13], responseOrderItem.getGoodsName());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[14], responseOrderItem.getGoodsCount());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[15], responseOrderItem.getGoodsPrice());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[16], responseOrderItem.getGoodsPrice());
                     }
 
-                    if( expansionOrderEntity.getTradeTime() == null){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[3], "");
-                    }else{
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[3], DateUtil.date2String(expansionOrderEntity.getTradeTime(),null));
+                    if(orderDetail.getOrderItems().size() >= 2){
+                        ResponseOrderItem responseOrderItem = orderDetail.getOrderItems().get(2);
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[17], responseOrderItem.getGoodsName());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[18], responseOrderItem.getGoodsCount());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[19], responseOrderItem.getGoodsPrice());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[20], responseOrderItem.getGoodsPrice());
                     }
 
-                    if (expansionOrderEntity.getPayType() == -1) {
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[6], "未支付");
-                        continue;
-                    } else {
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[6], ConstantExcel.PAYFORM[expansionOrderEntity.getPayType()]);
+                    if(orderDetail.getOrderItems().size() >= 3){
+                        ResponseOrderItem responseOrderItem = orderDetail.getOrderItems().get(3);
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[21], responseOrderItem.getGoodsName());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[22], responseOrderItem.getGoodsCount());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[23], responseOrderItem.getGoodsPrice());
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[24], responseOrderItem.getGoodsPrice());
                     }
 
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[18], "");
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "");
-
-                    try{
-                        if(expansionOrderEntity.getPayStatus() == 0 || expansionOrderEntity.getPayStatus() ==-1 ){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "未付款");
-                            continue;
-                        }else if(expansionOrderEntity.getPayStatus() == -2 ){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "已退款");
-                        }else if(expansionOrderEntity.getPayStatus() == 1){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "已付款");
-                        }
-                    }catch (Exception e){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "");
+                    if(orderDetail.getOrderItems().size() >= 4){
+                        ResponseOrderItem responseOrderItem = orderDetail.getOrderItems().get(3);
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[25], "是");
+                    }else {
+                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME[25], "否");
                     }
                 }
+            }
 
-            }else if(invoice.getConsumeType() == 2){
-                Result orderResul = orderService.findByIncrementOrderId(invoice.getIncrementOrderId());
-                incrementDetail = mapper.convertValue(orderResul.getData(), ResponseIncrementOrder.class);
-
-                if(incrementDetail!=null){
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[1], incrementDetail.getOrderSn() == null?"" : incrementDetail.getOrderSn());
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[5], incrementDetail.getAmount()== null?"" : String.valueOf(incrementDetail.getAmount()));
-                    if(incrementDetail.getUserId()!=null){
-                        UserEntity userEntity = iUserService.findById(incrementDetail.getUserId());
-                        if(userEntity!=null){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[2], userEntity.getUserName() == null?"" : userEntity.getUserName());
-
-                            if(invoice.getType() == 3){
-                                //获取默认地址
-                                receiverInfoEntity = iReceiverInfoService.findDefaultByUserId(incrementDetail.getUserId());
-                                if(receiverInfoEntity!=null){
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[14], receiverInfoEntity.getShipName() == null?"" : receiverInfoEntity.getShipName());
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[15], receiverInfoEntity.getShipMobile() == null?"" : receiverInfoEntity.getShipMobile());
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[16], receiverInfoEntity.getShipAreaPath()== null?"" : receiverInfoEntity.getShipAreaPath()
-                                            + " " + receiverInfoEntity.getShipAddress()== null?"" : receiverInfoEntity.getShipAddress());
-                                }
-                            }
-                        }
-                    }
-
-                    if( incrementDetail.getTradeTime() == null){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[3], "");
-                    }else{
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[3], DateUtil.date2String(incrementDetail.getTradeTime(),null));
-                    }
-
-                    if (incrementDetail.getPayType() == null || incrementDetail.getPayType() == -1) {
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[6], "未支付");
-                        continue;
-                    } else {
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[6], ConstantExcel.PAYFORM[incrementDetail.getPayType()]);
-                    }
-
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[18], "");
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "");
-
-                    if(incrementDetail.getPayStatus()!=null){
-                        if(incrementDetail.getPayStatus().equals(0) || incrementDetail.getPayStatus().equals(-1)){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "未付款");
-                            continue;
-                        }else if(incrementDetail.getPayStatus().equals(-2)){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "已退款");
-                        }else if(incrementDetail.getPayStatus().equals(1)){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "已付款");
-                        }
-                    }else{
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "");
-                    }
+            //相机充值的订单
+            if(invoice.getConsumeType() == 1){
+                expansionOrderEntity = orderService.findEntityExpansionOrderByOrderId(invoice.getOrderId());
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[1], expansionOrderEntity.getOrderSn());
+
+                goodsName = new StringBuilder();
+                if(expansionOrderEntity.getUnitSize() >= 1024){
+                    goodsName.append(expansionOrderEntity.getUnitSize() / 1024);
+                    goodsName.append("TB * ");
+                    goodsName.append(expansionOrderEntity.getMonth());
+                    goodsName.append("月");
+                }else {
+                    goodsName.append(expansionOrderEntity.getUnitSize());
+                    goodsName.append("GB * ");
+                    goodsName.append(expansionOrderEntity.getMonth());
+                    goodsName.append("月");
                 }
 
-            }else if(invoice.getConsumeType() == 3){
-                Result orderResul = orderService.findByDownloadOrderId(invoice.getDownloadOrderId());
-                downloadDetail = mapper.convertValue(orderResul.getData(), ResponseDownloadOrder.class);
-
-                if(downloadDetail!=null){
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[1], downloadDetail.getOrderSn() == null?"" : downloadDetail.getOrderSn());
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[5], downloadDetail.getAmount()== null?"" : String.valueOf(downloadDetail.getAmount()));
-                    if(downloadDetail.getUserId()!=null){
-                        UserEntity userEntity = iUserService.findById(downloadDetail.getUserId());
-                        if(userEntity!=null){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[2], userEntity.getUserName() == null?"" : userEntity.getUserName());
-
-                            if(invoice.getType() == 3){
-                                //获取默认地址
-                                receiverInfoEntity = iReceiverInfoService.findDefaultByUserId(downloadDetail.getUserId());
-                                if(receiverInfoEntity!=null){
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[14], receiverInfoEntity.getShipName() == null?"" : receiverInfoEntity.getShipName());
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[15], receiverInfoEntity.getShipMobile() == null?"" : receiverInfoEntity.getShipMobile());
-                                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[16], receiverInfoEntity.getShipAreaPath()== null?"" : receiverInfoEntity.getShipAreaPath()
-                                            + " " + receiverInfoEntity.getShipAddress()== null?"" : receiverInfoEntity.getShipAddress());
-                                }
-                            }
-                        }
-                    }
-
-                    if( downloadDetail.getTradeTime() == null){
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[3], "");
-                    }else{
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[3], DateUtil.date2String(downloadDetail.getTradeTime(),null));
-                    }
-
-                    if (downloadDetail.getPayType() == null || downloadDetail.getPayType() == -1) {
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[6], "未支付");
-                        continue;
-                    } else {
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[6], ConstantExcel.PAYFORM[downloadDetail.getPayType()]);
-                    }
-
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[18], "");
-                    item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[19], "");
-
-                    if(downloadDetail.getPayStatus()!=null){
-                        if(downloadDetail.getPayStatus().equals(0) || downloadDetail.getPayStatus().equals(-1)){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "未付款");
-                            continue;
-                        }else if(downloadDetail.getPayStatus().equals(-2)){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "已退款");
-                        }else if(downloadDetail.getPayStatus().equals(1)){
-                            item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "已付款");
-                        }
-                    }else{
-                        item.put(ConstantExcel.INVOICEEXCELCOLENNAME2[20], "");
-                    }
-                }
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[13], goodsName.toString());
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[14], 1);
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[15], expansionOrderEntity.getAmount());
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[16], expansionOrderEntity.getAmount());
+                item.put(ConstantExcel.INVOICEEXCELCOLENNAME[25], "否");
 
             }
 
@@ -1019,10 +800,12 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
             dataList.add(item);
         }
 
-        String fileName = "发票数据-" + String.valueOf(System.currentTimeMillis()) + ".xls";
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String dateStr = dateFormat.format(new Date());
+        String fileName = "发票数据-" + dateStr + ".xls";
         File file = new File(ConstantFilePath.EXCEL_PATH + fileName + ".xls");
 
-        ExcelUtil.writeExcel(dataList, ConstantExcel.INVOICEEXCELCOLENNAME2.length, ConstantFilePath.EXCEL_PATH + fileName + ".xls", 6);
+        ExcelUtil.writeExcel(dataList, ConstantExcel.INVOICEEXCELCOLENNAME.length, ConstantFilePath.EXCEL_PATH + fileName + ".xls", 5);
 
         String agent = request.getHeader("User-Agent");
         if (agent != null && (agent.contains("MSIE")||agent.contains("Trident"))) {
@@ -1704,56 +1487,27 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
 
     @Override
     public Result sendEInvoice(Long invoiceId, String remarks, String filePath) throws Exception {
+        String subject = SendMailAcceUtils.subject;
         Result invoiceResult = tradeService.sendEInvoice(invoiceId, remarks, filePath);
         InvoiceEntity invoice = mapper.convertValue(invoiceResult.getData(), InvoiceEntity.class);
-
-        String ordersn = "";
-        Long userId = null;
         if(invoice != null){
             if(StringUtils.isEmpty(invoice.getEmailAddress())){
                 throw new BaseRuntimeException(LoginConstant.FAILURE_CODE_3019, LoginConstant.FAILURE_MSG_3019);
             }
-            if(invoice.getOrderId() != null){
-                Result orderResult = orderService.findByOrderId(invoice.getOrderId());
-                ResponseOrder order = mapper.convertValue(orderResult.getData(), ResponseOrder.class);
-                if(order == null) {
-                    ExpansionOrderEntity expansionOrderEntity = orderService.findEntityExpansionOrderByOrderId(invoice.getOrderId());
-                    if(expansionOrderEntity != null){
-                        ordersn = expansionOrderEntity.getOrderSn();
-                        userId = expansionOrderEntity.getUserId();
-                    }
-                }else {
-                    ordersn = order.getOrderSn();
-                    userId = order.getUserId();
-                }
-            }else if (invoice.getIncrementOrderId()!=null){
-                IncrementOrderEntity incrementOrderEntity = orderService.findByIncrementOrderByOrderId(invoice.getIncrementOrderId());
-                if(incrementOrderEntity!=null ){
-                    ordersn = incrementOrderEntity.getOrderSn();
-                    userId = incrementOrderEntity.getUserId();
-                }
-            }else if(invoice.getDownloadOrderId()!=null){
-                DownloadOrderEntity downloadOrderEntity = orderService.findByDownloadOrderByOrderId(invoice.getDownloadOrderId());
-                if(downloadOrderEntity!=null){
-                    ordersn = downloadOrderEntity.getOrderSn();
-                    userId = downloadOrderEntity.getUserId();
+            Result orderResult = orderService.findByOrderId(invoice.getOrderId());
+            ResponseOrder order = mapper.convertValue(orderResult.getData(), ResponseOrder.class);
+            if(order == null){
+                ExpansionOrderEntity expansionOrderEntity = orderService.findEntityExpansionOrderByOrderId(invoice.getOrderId());
+                if(expansionOrderEntity != null){
+                    subject += "订单号：" + expansionOrderEntity.getOrderSn();
                 }
+            }else {
+                subject += "订单号：" + order.getOrderSn();
             }
         }
 
-        String subject = SendMailAcceUtils.subjectinvoice.replace("${ordernum}", ordersn);
-        String msg = SendMailAcceUtils.msg;
-        msg = msg.replace("${ordernum}", ordersn);
-        UserEntity userEntity = iUserService.findById(userId);
-        if(userEntity!=null){
-            msg = msg.replace("${username}", userEntity.getUserName() == null?"":userEntity.getUserName());
-        }else{
-            msg = msg.replace("${username}", "");
-        }
-
-        //TODO aa
         //发送电子邮件
-        boolean falg = SendMailAcceUtils.sendMail(invoice.getEmailAddress(), subject, msg, ConstantFilePath.BASE_PATH + invoice.getEInvoice());
+        boolean falg = SendMailAcceUtils.sendMail(invoice.getEmailAddress(), subject, invoice.getShipName() + SendMailAcceUtils.msg, ConstantFilePath.BASE_PATH + invoice.getEInvoice());
         log.info("邮件发送状态：{}", falg);
         return Result.success();
     }
@@ -1794,15 +1548,9 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
             }
             goodsService.updateCameraDetail(oldCameraDetail);
 
-            // 判断相机是否绑定权益
-            UserIncrementEntity incrementEntity = userIncrementService.findByCameraId(oldCameraDetail.getCameraId());
-            if (!ObjectUtils.isEmpty(incrementEntity) && incrementEntity.getIsExpired() == 0) {
-                //解封旧相机欠费的场景
-                sceneService.unlockBeyondSpaceScenes(null, null, oldCameraDetail.getCameraId());
-            } else {
-                //解封旧相机欠费的场景
-                sceneService.unlockBeyondSpaceScenes(sceneProEntity.getSpace(), null, oldCameraDetail.getCameraId());
-            }
+            //解封旧相机欠费的场景
+            sceneService.unlockBeyondSpaceScenes(sceneProEntity.getSpace(), null, oldCameraDetail.getCameraId());
+
             //修改场景的归属相机id和用户id,先将场景设置成封存，迁移完后看是否有空间恢复
             sceneProEntity.setCameraId(cameraEntity.getId());
             sceneProEntity.setUserId(cameraDetailEntity.getUserId());
@@ -1820,14 +1568,10 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
         goodsService.updateCameraDetail(cameraDetailEntity);
 
         //解封欠费的场景
-        UserIncrementEntity incrementEntity = userIncrementService.findByCameraId(oldCameraDetail.getCameraId());
-        if (!ObjectUtils.isEmpty(incrementEntity) && incrementEntity.getIsExpired() == 0) {
-            //解封旧相机欠费的场景
-            sceneService.unlockBeyondSpaceScenes(null, null, oldCameraDetail.getCameraId());
-        } else {
-            //解封旧相机欠费的场景
+        if(usableSpace.signum() > 0){
             sceneService.unlockBeyondSpaceScenes(usableSpace, null, cameraEntity.getId());
         }
+
         return Result.success();
     }
 
@@ -1854,22 +1598,12 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
         numService.update(numEntity);
 
         String oldnum = oldScene.getNum();
-        //复制数据库数据
-        oldScene.setId(null);
-        oldScene.setNum(newNum);
-        if(StringUtils.isNotEmpty(sceneName)){
-            oldScene.setSceneName(sceneName);
-        }
-        oldScene.setWebSite(oldScene.getWebSite().replace(sceneNum, newNum));
-//        oldScene.setUserId(Long.valueOf(kankanMiniConfig.getCopySceneAccountId()));
-        oldScene.setThumb(oldScene.getThumb().replace(sceneNum, newNum));
-        oldScene.setSpace(new BigInteger("0"));
-
         //更新video
+
         Map map = new HashMap();
         JSONObject object = new JSONObject();
         if(StringUtils.isNotEmpty(oldScene.getVideos())){
-             object = JSONObject.parseObject(oldScene.getVideos());
+            object = JSONObject.parseObject(oldScene.getVideos());
             if(object.containsKey("upPath")){
                 String upPath = object.getString("upPath");
 
@@ -1882,9 +1616,19 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
 
             map.put("videos",oldScene.getVideos());
 
+        }
 
+        //复制数据库数据
+        oldScene.setId(null);
+        oldScene.setNum(newNum);
+        if(StringUtils.isNotEmpty(sceneName)){
+            oldScene.setSceneName(sceneName);
         }
 
+        oldScene.setWebSite(oldScene.getWebSite().replace(sceneNum, newNum));
+//        oldScene.setUserId(Long.valueOf(kankanMiniConfig.getCopySceneAccountId()));
+        oldScene.setThumb(oldScene.getThumb().replace(sceneNum, newNum));
+        oldScene.setSpace(new BigInteger("0"));
         sceneProService.save(oldScene);
 
         oldEditScene.setId(null);
@@ -1897,7 +1641,6 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
         oldEditScene.setFloorPlanPng(oldEditScene.getFloorPlanPng() == null ? null : oldEditScene.getFloorPlanPng().replace(sceneNum, newNum));
         sceneProEditService.save(oldEditScene);
 
-
         new Thread(){
             //重写run方法
             @Override
@@ -1935,7 +1678,7 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
     private void copyOldSceneLocalToNew(String sceneNum, String newNum) throws IOException {
         FileUtils.copyFolderAllFiles(ConstantFilePath.SCENE_PATH + "data/data" + sceneNum + "/",
                 ConstantFilePath.SCENE_PATH + "data/data" + newNum + "/", true);
-//        log.info("成功拷贝完data文件夹-{}", sceneNum);
+        log.info("成功拷贝完data文件夹-{}", sceneNum);
 
         // 复制本地视频
         FileUtils.copyFolderAllFiles(ConstantFilePath.SCENE_PATH + "video/video" + sceneNum + "/",
@@ -1955,7 +1698,7 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
         copySucc = FileUtils.copyFile(ConstantFilePath.SCENE_QR_CODE_PATH + sceneNum + "_en.png",
                 ConstantFilePath.SCENE_QR_CODE_PATH + newNum + "_en.png", true);
 //        log.info("成功拷贝完国际二维码文件-{}", sceneNum);
-
+//
 //        log.info("旧的场景码-{}", ConstantFilePath.SCENE_QR_CODE_PATH + sceneNum + "_en.png");
 //        log.info("新的场景码-{}", ConstantFilePath.SCENE_QR_CODE_PATH + newNum + "_en.png");
 //        if (!copySucc) {
@@ -2409,56 +2152,62 @@ public class ManagerServiceImpl extends BaseServiceImpl<ManagerEntity, Long> imp
     }
 
     @Override
-    public Result insertIncrementls(String username,Date endTime,Integer incrementNum,Integer downloadNum, String managerName) throws Exception {
-
+    public Result insertIncrementls(RequestUserIncrement increment,String managerName){
         TmIncrementLogEntity tmIncrementLogEntity = new TmIncrementLogEntity();
+        Integer incrementNum = increment.getIncrementNum();
+        Integer downloadNum = increment.getDownloadNum();
         //获取用户id
-        UserEntity userEntity = userService.findUserByUserName(username);
-        if(userEntity!=null && userEntity.getId()!=null){
-
-            if(incrementNum!=null && incrementNum>0 && endTime != null){
-                tmIncrementLogEntity.setType("2");
-                for(int i=1;i<=incrementNum;i++){
-                    //增加一条会员权益
-                    UserIncrementEntity userIncrementEntity = new UserIncrementEntity();
-                    userIncrementEntity.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
-                    userIncrementEntity.setUserId(userEntity.getId());
-                    userIncrementEntity.setIncrementStartTime(new Date());
-                    userIncrementEntity.setIncrementEndTime(endTime);
-                    userIncrementEntity.setIsExpired(0);
-                    userIncrementService.save(userIncrementEntity);
-
-                    userEntity.setDownloadNumTotal(userEntity.getDownloadNumTotal() + 10);
-                    userService.update(userEntity);
-
-                }
-                tmIncrementLogEntity.setDownloadNum(10 * incrementNum);
-            }
-
-            if(downloadNum!=null && downloadNum > 0){
-                //增加下载次数
-                userEntity.setDownloadNumTotal(userEntity.getDownloadNumTotal() + downloadNum);
+        UserEntity userEntity = userService.findUserByUserName(increment.getUserName());
+        if(ObjectUtils.isEmpty(userEntity)){
+            return Result.failure("用户不存在");
+        }
+        Date endTime = increment.getIncrementEndTime();
+        if(!ObjectUtils.isEmpty(downloadNum)){
+            //增加下载次数
+            userEntity.setDownloadNumTotal(userEntity.getDownloadNumTotal() + downloadNum);
+            userService.update(userEntity);
+            tmIncrementLogEntity.setType("3");
+            tmIncrementLogEntity.setDownloadNum(downloadNum);
+        }else{
+            if(ObjectUtils.isEmpty(incrementNum) || incrementNum <=0){
+                return Result.failure("会员数量有误！");
+            }
+            endTime = increment.getIncrementEndTime();
+            if(ObjectUtils.isEmpty(endTime)){
+                return Result.failure("权益到期时间有误！");
+            }
+            UserIncrementEntity userIncrementEntity = new UserIncrementEntity();
+            for (int i = 1; i <= incrementNum; i++) {
+                userIncrementEntity.setId(null);
+                //增加一条会员权益
+                userIncrementEntity.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
+                userIncrementEntity.setUserId(userEntity.getId());
+                userIncrementEntity.setIncrementStartTime(new Date());
+                userIncrementEntity.setIncrementEndTime(endTime);
+                userIncrementEntity.setIsExpired(0);
+                userIncrementEntity.setMemberLevels(increment.getMemberLevels());
+                userIncrementService.save(userIncrementEntity);
+            }
+            if(increment.getMemberLevels().equals("PR")){
+                userEntity.setDownloadNumTotal(userEntity.getDownloadNumTotal() + 10 * incrementNum);
                 userService.update(userEntity);
-                tmIncrementLogEntity.setType("3");
-                tmIncrementLogEntity.setDownloadNum(downloadNum);
+                tmIncrementLogEntity.setDownloadNum(10 * incrementNum);
             }
+        }
 
-            //操作记录log
-            managerName = managerName.substring(managerName.indexOf(":")+1,managerName.length());
-            tmIncrementLogEntity.setUserId(userEntity.getId());
-            tmIncrementLogEntity.setUserName(userEntity.getUserName());
-            tmIncrementLogEntity.setOperateUesr(managerName);
-            tmIncrementLogEntity.setIncrementNum(incrementNum == null ? 0:incrementNum);
-
-            if(endTime!=null){
-                tmIncrementLogEntity.setIncrementEndtime(endTime);
-            }
-            iIncrementDownloadLogService.save(tmIncrementLogEntity);
+        //操作记录log
+        managerName = managerName.substring(managerName.indexOf(":") + 1);
+        tmIncrementLogEntity.setUserId(userEntity.getId());
+        tmIncrementLogEntity.setUserName(userEntity.getUserName());
+        tmIncrementLogEntity.setOperateUesr(managerName);
+        tmIncrementLogEntity.setIncrementNum(incrementNum);
 
-            return Result.success();
-        }else{
-            return Result.failure("用户不存在");
+        if(!ObjectUtils.isEmpty(endTime)){
+            tmIncrementLogEntity.setIncrementEndtime(endTime);
         }
+        iIncrementDownloadLogService.save(tmIncrementLogEntity);
+        return Result.success();
+
     }
 
 

4dkankan-base/4dkankan-base.iml

@@ -397,7 +397,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -406,7 +406,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-base/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

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

@@ -12,8 +12,6 @@ public class FileRouteConfig {
      */
     //保存硬盘地址
     private String hardDisk;
-	//保存硬盘地址(激光相机)
-	private String hardDiskLaser;
     //默认图片类型文件夹
     private String imageFolder;
     //默认文件类型文件夹
@@ -38,9 +36,6 @@ public class FileRouteConfig {
 	public String getHardDisk() {
 		return hardDisk;
 	}
-	public String getHardDiskLaser() {
-		return hardDiskLaser;
-	}
 	public String getImageFolder() {
 		return imageFolder;
 	}
@@ -69,13 +64,8 @@ public class FileRouteConfig {
 		return musicType;
 	}
 	public void setHardDisk(String hardDisk) {
-
 		this.hardDisk = hardDisk;
 	}
-	public void setHardDiskLaser(String hardDiskLaser) {
-
-		this.hardDiskLaser = hardDiskLaser;
-	}
 	public void setImageFolder(String imageFolder) {
 		this.imageFolder = imageFolder;
 	}

4dkankan-base/src/main/java/com/fdkankan/base/constant/SceneConstant.java

@@ -94,12 +94,6 @@ public class SceneConstant {
     public static final int FAILURE_CODE_5030 = 5030;
     public static final String FAILURE_MSG_5030 = "同级文件夹名称不能重复";
 
-    public static final int FAILURE_CODE_5031 = 5031;
-    public static final String FAILURE_MSG_5031 = "场景打包中不能重复操作";
-
-    public static final int FAILURE_CODE_5032 = 5032;
-    public static final String FAILURE_MSG_5032 = "三维家打包记录不存在";
-
     public static final int FAILURE_CODE_5033 = 5033;
     public static final String FAILURE_MSG_5033 = "该场景正在计算中";
 

4dkankan-base/src/main/java/com/fdkankan/base/mq/ModelingMsgProducer.java

@@ -51,12 +51,6 @@ public class ModelingMsgProducer implements RabbitTemplate.ConfirmCallback {
 
     }
 
-    public void sendMsgLaser(String content) {
-        CorrelationData correlationId = new CorrelationData(UUID.randomUUID().toString());
-        rabbitTemplate.convertAndSend("QUEUE_LASER_A", (Object) content, correlationId);
-
-    }
-
     /**
      * 获取mq的数量
      * @return
@@ -70,18 +64,4 @@ public class ModelingMsgProducer implements RabbitTemplate.ConfirmCallback {
 
         return declareOk.getMessageCount();
     }
-
-    /**
-     * 获取 机光相机 消息数量
-     *
-     */
-    public int getLaserMessageCount() {
-        AMQP.Queue.DeclareOk declareOk = rabbitTemplate.execute(new ChannelCallback<AMQP.Queue.DeclareOk>() {
-            public AMQP.Queue.DeclareOk doInRabbit(Channel channel) throws Exception {
-                return channel.queueDeclarePassive("QUEUE_LASER_A");
-            }
-        });
-
-        return declareOk.getMessageCount();
-    }
 }

4dkankan-bbs/4dkankan-bbs.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -44,7 +44,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-bbs/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-common/pom.xml

@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-common/src/main/java/com/fdkankan/common/constant/Constant.java

@@ -38,5 +38,9 @@ public class Constant {
     public static String CAMERA_BASE_SPACE_VALUE = "10737418240";
     // 八目相机商业会员容量15G
     public static String DEADLINE_SPACE_VALUE_YEAR = "16106127360";
+
+    //月会员权益50G
+    public static String CAMERA_SE_SPACE_VALUE = "53687091200";
+
 }
 

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantCmd.java

@@ -44,9 +44,4 @@ public class ConstantCmd {
 
 	public static final String MATTERPRO_CUT_IMG = "node /opt/4dkankan_scene/index.js ";
 
-	//激光相机 extra迁移
-	public static final String CP_JG_EXTRA = "bash /opt/ossutil/laser-copy.sh ";
-
-	public static final String CP_JG_ALL = "bash /opt/ossutil/laser-cp-r.sh ";
-
 }

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantExcel.java

@@ -7,11 +7,7 @@ public class ConstantExcel {
 	  public static final String[] RECHARGEEXCELCOLENNAME = {"时间","订单号","手机号/用户名","设备ID","充值点数","订单金额（元）","支付方式","类型","交易号"};
 	  public static final String[] CONSUMEEXCELCOLENNAME = {"时间","订单号","手机号/用户名","设备ID","商品名称","消费点数"};
 	  public static final String[] INVOICEEXCELCOLENNAME = {"序号","订单编号","发票类型","开票金额","发票抬头","18位税号","注册地址","注册电话","开户银行","银行账户","收件地址","电子邮箱","手机号码","商品1","数量","价格","金额","商品2","数量","价格","金额","商品3","数量","价格","金额","更多商品"};
-	  public static final String[] INVOICEEXCELCOLENNAME2 ={"序号","订单编号","用户名","支付时间","快递单号","订单金额","支付方式","发票类型（两种类型）","发票抬头","纳税人识别号","注册地址",
-			                                                "注册电话","开户银行","银行账户","收件人姓名","收件人电话","收货地址","电子邮箱","订单状态","配送状态","付款状态"};
-
-
-	public static final String[] CAMEREXCELCOLENAME = {"设备ID","SN号","入库时间","出库时间","订单编号","经销商","出库时间","地区","手机号码/用户名","激活时间"};
+	  public static final String[] CAMEREXCELCOLENAME = {"设备ID","SN号","入库时间","出库时间","订单编号","经销商","出库时间","地区","手机号码/用户名","激活时间"};
 	  //public static final String[] AGENT_CAMERACOLENNAME = {"设备ID","期初点数","赠送点数","已用点数","剩余点数","充值金额","兑换为点数","消耗点数","提成金额"};
 	  public static final String[] AGENT_CAMERACOLENNAME = {"设备ID","赠送点数","已用点数","剩余点数","充值金额","兑换为点数","消耗点数","提成金额"};
 	  public static final String[] AGENT_DETAILCHARGECOLENNAME = {"时间","充值金额","兑换成点数","状态","订单编号"};
@@ -22,7 +18,7 @@ public class ConstantExcel {
 	  public static final String[] MANAGEAGENTDETAILQUERY = {"设备ID","初始点数","已用点数","剩余点数","充值金额","兑换为点数","消耗点数","提成金额"};
 	  
 	  public static final String[] ORDERSTATUS = {"未支付","待发货","已发货","已完成"};
-	  public static final String[] PAYFORM = {"微信","支付宝","Paypal","其他","货到付款"};
+	  public static final String[] PAYFORM = {"微信","支付宝","Paypal","其他"};
 	  public static final String[] INVOICE = {"不需要发票","增值税普通发票","增值税专用发票"};
 	  public static final String[] INVOICETYPE1 = {"发票抬头","纳税人识别号"};
 	  public static final String[] INVOICETYPE2 = {"发票抬头","纳税人识别号","注册地址","注册电话","开户银行","银行账户"};

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantFilePath.java

@@ -18,7 +18,6 @@ public class ConstantFilePath {
     public static final String SCENE_QR_CODE_PATH = "/mnt/4Dkankan/sceneQRcode/";
     // excel
     public static final String EXCEL_PATH = "/mnt/4Dkankan/excel/";
-//    public static final String EXCEL_PATH = "F:\\excel\\";
     // medias
     public static final String MEDIAS_PATH = "/mnt/4Dkankan/medias/";
     // logo
@@ -34,8 +33,6 @@ public class ConstantFilePath {
     public static final String CREATE_BIG_SCENE_PATH = PREFIX + "/photo_data/bigscene/";
     //生成模型的路径
     public static final String BUILD_MODEL_PATH = "/mnt/data/";
-    //生成模型的路径
-    public static final String BUILD_MODEL_LASER_PATH = "/mnt-laser/data/";
 
     //支付二维码图片存放路径
     public static final String ALI_QRCODE_FOLDER = "/mnt/4Dkankan/alicode/";

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantUrl.java

@@ -1,5 +1,10 @@
 package com.fdkankan.common.constant;
 
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
 public class ConstantUrl {
 
 //	public static final String MAIN_URL = "https://www.4dkankan.com/";
@@ -16,7 +21,7 @@ public class ConstantUrl {
 //	public static final String PRO_SCENE_URL = MAIN_URL + "showProMobile.html?m=";
 	public static final String PREFIX_ALI = "https://4dkk.4dage.com/";
 	//亚马逊S3
-	public static final String PREFIX_AWS = "https://testeurs3.4dkankan.com/";
+	public static String PREFIX_AWS;
 	public static final String PREFIX_QINIU = "https://scene3d.4dage.com/";
 	public static final String PREFIX_QINIU2 = "https://creator.4dkankan.com/";
 	public static final String WEIXIN_PAYURL = "https://www.4dkankan.com/weixinmobilepay/weixinInfo?orderId=";
@@ -26,4 +31,9 @@ public class ConstantUrl {
 	public static final String WEIXIN_NOTIFY_URL = "https://www.4dkankan.com/weixinpay/Notify";
 	public static final String WEIXIN_ORDER_URL="https://api.mch.weixin.qq.com/pay/unifiedorder";
 
+	@Value("${prefix.s3}")
+	private void setPrefixAws(String prefixAws){
+		PREFIX_AWS = prefixAws;
+	}
+
 }

4dkankan-common/src/main/java/com/fdkankan/common/jedis/JedisUtil.java

@@ -212,6 +212,17 @@ public class JedisUtil {
     }
 
     /**
+     * Set Object (默认存活时间, 2H)
+     *
+     * @param key
+     * @param obj
+     * @return
+     */
+    public static String setObjectValue(String key, Object obj) {
+        return setObjectValue(key, obj, DEFAULT_EXPIRE_TIME);
+    }
+
+    /**
      * Set Object
      *
      * @param key
@@ -228,16 +239,6 @@ public class JedisUtil {
         }
     }
 
-    /**
-     * Set Object (默认存活时间, 2H)
-     *
-     * @param key
-     * @param obj
-     * @return
-     */
-    public static String setObjectValue(String key, Object obj) {
-        return setObjectValue(key, obj, DEFAULT_EXPIRE_TIME);
-    }
 
     /**
      * Get String

4dkankan-common/src/main/java/com/fdkankan/common/push/Demo.java

@@ -22,12 +22,6 @@ public class Demo {
 	public static final String IOS_KEY = "5ee71ca9978eea081640f22a";
 	public static final String IOS_SECRET = "tpuhyojch16pcha2qmpidlbnzkielv9w";
 
-	//转台双目使用
-	public static final String ANDROID_KEY_Z = "60efd777a6f90557b7b97c25";
-	public static final String ANDROID_SECRET_Z = "ll85ov3qzeuas0ig7cw0v5bgzq1bdl07";
-	public static final String IOS_KEY_Z = "60efd7c9a6f90557b7b97d10";
-	public static final String IOS_SECRET_Z = "li62b5f3d9kn8idvy6qva3c5gyidmqwl";
-
 	public Demo(String key, String secret) {
 		try {
 			appkey = key;
@@ -75,27 +69,6 @@ public class Demo {
 
 		client.send(unicast);
 	}
-
-	//转台相机
-	public void sendAndroidUnicast2(String token, String ticker, String title, String text, String url) throws Exception {
-		AndroidUnicast unicast = new AndroidUnicast(appkey,appMasterSecret);
-		// TODO Set your device token
-		unicast.setDeviceToken(token);
-		unicast.setTicker(ticker);
-		unicast.setTitle(title);
-		unicast.setText(text);
-		unicast.goUrlAfterOpen(url);
-		unicast.setDisplayType(AndroidNotification.DisplayType.NOTIFICATION);
-		// TODO Set 'production_mode' to 'false' if it's a test device.
-		// For how to register a test device, please see the developer doc.
-		unicast.setProductionMode();
-		// Set customized fields
-		unicast.setExtraField("test", "helloworld");
-		unicast.setChannelActivity("io.github.zileyuan.umeng_analytics_push.OfflineNotifyClickActivity");
-//		unicast.setChannelProperties("abc");
-
-		client.send(unicast);
-	}
 	
 	public void sendAndroidGroupcast() throws Exception {
 		AndroidGroupcast groupcast = new AndroidGroupcast(appkey,appMasterSecret);

4dkankan-common/src/main/java/com/fdkankan/common/util/ExcelUtil.java

@@ -71,12 +71,6 @@ public class ExcelUtil {
                     cell.setCellValue(ConstantExcel.INVOICEEXCELCOLENNAME[i]);
                     cell.setCellStyle(cellstyle);
                 }
-            }else if (type == 6) {
-                for (int i = 0; i < ConstantExcel.INVOICEEXCELCOLENNAME2.length; ++i) {
-                    HSSFCell cell = hssfRow.createCell((short)i);
-                    cell.setCellValue(ConstantExcel.INVOICEEXCELCOLENNAME2[i]);
-                    cell.setCellStyle(cellstyle);
-                }
             }
             // 创建文件输出流，输出电子表格：这个必须有，否则你在sheet上做的任何操作都不会有效
             out = new FileOutputStream(xlsxPath);
@@ -149,19 +143,6 @@ public class ExcelUtil {
                         cell.setCellValue(value);
                     }
                 }
-            }else if (type == 6) {
-                for (int j = 0; j < dataList.size(); j++) {
-                    // 创建一行：从第二行开始，跳过属性列
-                    Row row = sheet.createRow(j + 1);
-                    // 得到要插入的每一条记录
-                    Map<String, String> dataMap = dataList.get(j);
-
-                    for (int i = 0; i < ConstantExcel.INVOICEEXCELCOLENNAME2.length; ++i) {
-                        String value = dataMap.get(ConstantExcel.INVOICEEXCELCOLENNAME2[i]);
-                        Cell cell = row.createCell(i);
-                        cell.setCellValue(value);
-                    }
-                }
             } else {
                 log.error("writeExcel出错：" + type);
             }

4dkankan-common/src/main/java/com/fdkankan/common/util/FileUtils.java

@@ -21,7 +21,6 @@ import org.bytedeco.javacv.FFmpegFrameGrabber;
 import org.bytedeco.javacv.Frame;
 import org.bytedeco.javacv.Java2DFrameConverter;
 import org.bytedeco.javacv.OpenCVFrameConverter;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ResourceUtils;
 import sun.misc.BASE64Decoder;
 

4dkankan-common/src/main/java/com/fdkankan/common/util/PasswordUtils.java

@@ -168,9 +168,8 @@ public class PasswordUtils {
 
     public static void main(String[] args) {
 
-        //管理后台密码加解密
-        String userName = "admin6";
-        String password = "123456";
+        String userName = "hongwei01";
+        String password = "1234.abcd";
 
         try {
             byte[] salt = PasswordUtils.getStaticSalt();

4dkankan-common/src/main/java/com/fdkankan/common/util/RandomUtil.java

@@ -1,9 +1,6 @@
 package com.fdkankan.common.util;
 
-import java.util.HashSet;
-import java.util.Random;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 public class RandomUtil {
 
@@ -18,7 +15,7 @@ public class RandomUtil {
         StringBuffer shortBuffer = new StringBuffer();
         String uuid = UUID.randomUUID().toString().replace("-", "");
         int index = 0;
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 9; i++) {
             index = i;
             if(index >= 8){
                 index = i % 8;
@@ -33,7 +30,7 @@ public class RandomUtil {
     }
 
     /**
-     * 获取随机字符串(相机sn码)
+     * 获取随机字符串
      *
      * @param num
      * @return
@@ -50,21 +47,37 @@ public class RandomUtil {
     }
 
     public static void main(String[] args) {
-        Set<String> set = new HashSet<>();
+//        Set<String> set = new HashSet<>();
+//
+//        while(true){
+//            if(set.size() == 650){
+//                break;
+//            }
+//            set.add("4DKKPRO_07" + getRandomNum(7));
+////            set.add("4DKKLITE_11" + getRandomNum(7));
+//        }
+//
+//        for(String s : set){
+//            System.out.println(s);
+//        }
 
-        while(true){
-            if(set.size() == 1000){
-                break;
-            }
-            set.add("4DKKPRO_08" + getRandomNum(7));
-//            set.add("4DKKLITE_11" + getRandomNum(7));
-        }
 
-        for(String s : set){
-            System.out.println(s);
-        }
 
 
+//        String[] nums = num.split(",");
+//
+//        List arrayList = new ArrayList();
+//        for(String a:nums){
+//            arrayList.add(a);
+//        }
+//
+//        for(int i = 0;i<100;i++ ){
+//            String numss = "07"+getRandomNum(7);
+//            if(!arrayList.contains(numss)){
+//                System.out.println("07"+getRandomNum(7));
+//            }
+//
+//        }
 //        System.out.println(generateShortUuid());
     }
 }

4dkankan-common/src/main/java/com/fdkankan/common/util/SecurityUtil.java

@@ -63,8 +63,7 @@ public class SecurityUtil {
 //        }catch (Exception e){
 //            e.printStackTrace();
 //        }
-        //用户解密
-    	System.out.println(SecurityUtil.MD5("@0\u0015\u0013\u0011EBL"));
+    	System.out.println(SecurityUtil.MD5("6\u0011\u0015MM\u001B\u001F\u001D"));
 
 	}
 }

4dkankan-common/src/main/java/com/fdkankan/common/util/UploadToOssUtil.java

@@ -161,6 +161,7 @@ public class UploadToOssUtil {
 		}
 
 		if("s3".equals(type)){
+
 			try{
 				uploadS3File(filePath, key1);
 			}catch (Exception e){
@@ -607,37 +608,42 @@ public class UploadToOssUtil {
 	 * @throws IOException
      */
 	private void uploadS3File(String filePath, String key1) throws IOException {
-		File file = new File(filePath);
-		if(!file.exists()){
-			log.info("要上传s3的文件不存在");
-			return;
-		}
+		try {
+			File file = new File(filePath);
+			if(!file.exists()){
+				log.info("要上传s3的文件不存在");
+				return;
+			}
+			/**
+			 * 创建s3对象
+			 */
+			BasicAWSCredentials awsCreds = new BasicAWSCredentials(s3key, s3secrey);
+			AmazonS3 s3 = AmazonS3ClientBuilder.standard()
+					.withCredentials(new AWSStaticCredentialsProvider(awsCreds))
+					.withRegion(Regions.EU_WEST_2)
+					.build();
 
-		/**
-		 * 创建s3对象
-		 */
-		BasicAWSCredentials awsCreds = new BasicAWSCredentials(s3key, s3secrey);
-		AmazonS3 s3 = AmazonS3ClientBuilder.standard()
-				.withCredentials(new AWSStaticCredentialsProvider(awsCreds))
-				.withRegion(Regions.EU_WEST_2)
-				.build();
 
-		// 设置文件并设置公读
-		com.amazonaws.services.s3.model.ObjectMetadata metadata = new com.amazonaws.services.s3.model.ObjectMetadata();
-		if(filePath.contains(".jpg")){
-			metadata.setContentType("image/jpeg");
-		}
-		if(filePath.contains(".png")){
-			metadata.setContentType("image/png");
-		}
-		PutObjectRequest request = new PutObjectRequest(s3bucket, key1, file);
-		request.withCannedAcl(CannedAccessControlList.PublicRead);
-		request.withMetadata(metadata);
-
-		// 上传文件
-		com.amazonaws.services.s3.model.PutObjectResult putObjectResult = s3.putObject(request);
-		if (StringUtils.isNotEmpty(putObjectResult.getETag())) {
-			log.info("s3上传文件成功：" + key1);
+			// 设置文件并设置公读
+			com.amazonaws.services.s3.model.ObjectMetadata metadata = new com.amazonaws.services.s3.model.ObjectMetadata();
+			if(filePath.contains(".jpg")){
+				metadata.setContentType("image/jpeg");
+			}
+			if(filePath.contains(".png")){
+				metadata.setContentType("image/png");
+			}
+
+			PutObjectRequest request = new PutObjectRequest(s3bucket, key1, file);
+			request.withCannedAcl(CannedAccessControlList.PublicRead);
+			request.withMetadata(metadata);
+
+			// 上传文件
+			com.amazonaws.services.s3.model.PutObjectResult putObjectResult = s3.putObject(request);
+			if (StringUtils.isNotEmpty(putObjectResult.getETag())) {
+				log.info("s3上传文件成功：" + key1);
+			}
+		}catch (Exception e){
+			e.printStackTrace();
 		}
 	}
 

4dkankan-common/src/main/java/com/fdkankan/common/vo/request/RequestCamera.java

@@ -82,4 +82,7 @@ public class RequestCamera extends RequestBase implements Serializable {
 
     private String selecttype;
 
+    //月份 权益
+    private Integer monthQy;
+
 }

4dkankan-common/src/main/java/com/fdkankan/common/vo/request/RequestIncrementOrder.java

@@ -28,16 +28,6 @@ public class RequestIncrementOrder extends RequestBase implements Serializable {
      */
     private Long incrementId;
 
-    /**
-     * 场景码
-     */
-    private String sceneNum;
-
-    /**
-     * 场景名
-     */
-    private String sceneName;
-
-
-
+    //月份 权益
+    private Integer monthQy;
 }

4dkankan-common/src/main/java/com/fdkankan/common/vo/request/RequestTrade.java

@@ -23,9 +23,5 @@ public class RequestTrade extends RequestBase implements Serializable {
 
     private Long orderId;
 
-    private Long downloadId;
-
-    private Long incrementId;
-
     private Integer consumeType;
 }

4dkankan-common/src/main/java/com/fdkankan/common/vo/request/RequestUser.java

@@ -24,6 +24,8 @@ public class RequestUser extends RequestBase implements Serializable {
 
     private String phoneNum;
 
+    private String username;
+
     private String msgAuthCode;
 
     private String imgdata;
@@ -87,5 +89,4 @@ public class RequestUser extends RequestBase implements Serializable {
     private String downloadUrl;
 
     private Boolean isTiles;
-
 }

4dkankan-common/src/main/java/com/fdkankan/common/vo/request/RequestUserIncrement.java

@@ -36,4 +36,12 @@ public class RequestUserIncrement extends RequestBase{
 
     //下载次数
     private Integer downloadNum;
+
+    /**
+     * 权益类型：PR 年会员  SE 月会员
+     */
+    private String memberLevels;
+
+    //月份 权益
+    private Integer monthQy;
 }

4dkankan-common/src/main/java/com/fdkankan/common/vo/response/ResponseCamera.java

@@ -60,7 +60,7 @@ public class ResponseCamera implements Serializable {
     private String cameraType;
 
     @ApiModelProperty(value = "容量到期时间", name = "spaceEndTime")
-    private String spaceEndTime;
+    private Date spaceEndTime;
 
     private String spaceContent;
 
@@ -133,4 +133,11 @@ public class ResponseCamera implements Serializable {
     private Long userIncrementId;
 
     private  ResponseUserIncrement responseUserIncrement;
+
+
+    //权益级别  PR 年会员  SE 月会员
+    private String memberLevels;
+
+    //权益级别  PR 年会员  SE 月会员
+    private Integer monthQy;
 }

4dkankan-common/src/main/java/com/fdkankan/common/vo/response/ResponseIncrementOrder.java

@@ -67,4 +67,10 @@ public class ResponseIncrementOrder extends RequestBase implements Serializable
     @ApiModelProperty(value = "发票", name = "invoice")
     private ResponseInvoice invoice;
 
+    //权益级别  PR 年会员  SE 月会员
+    private String memberLevels;
+
+    //权益级别  PR 年会员  SE 月会员
+    private Integer monthQy;
+
 }

4dkankan-common/src/main/java/com/fdkankan/common/vo/response/ResponseInvoice.java

@@ -27,12 +27,6 @@ public class ResponseInvoice implements Serializable {
     @ApiModelProperty(value = "会员权益订单表的id", name = "increment_order_id")
     private Long incrementOrderId;
 
-    /**
-     * 会员权益订单表的id
-     */
-    @ApiModelProperty(value = "下载订单表的id", name = "download_order_id")
-    private Long downloadOrderId;
-
     @ApiModelProperty(value = "用户id", name = "userId")
     private Long userId;
 
@@ -145,9 +139,4 @@ public class ResponseInvoice implements Serializable {
      */
     private ResponseIncrementOrder responseIncrementOrder;
 
-    /**
-     * 下载订单
-     */
-    private ResponseDownloadOrder responseDownloadOrder;
-
 }

4dkankan-common/src/main/java/com/fdkankan/common/vo/response/ResponseOrder.java

@@ -74,7 +74,5 @@ public class ResponseOrder implements Serializable {
     private int orderCount;
 
     private int abroad;
-
-    private Long userId;
 }
 

4dkankan-common/src/main/java/com/fdkankan/common/vo/response/ResponseScene.java

@@ -142,7 +142,6 @@ public class ResponseScene implements Serializable {
 
     @ApiModelProperty(value = "vr模式", name = "vrVisi")
     private int vrVisi;
-    
 
     /**
      * 普通录屏文件地址

4dkankan-common/src/main/java/com/fdkankan/common/vo/response/ResponseUserIncrement.java

@@ -50,4 +50,12 @@ public class ResponseUserIncrement extends RequestBase{
     private String keyWord;
 
     private Integer isExpired;
+
+    /**
+     * 状态，1表示新增值权益，2表示续费增值权益，3表示新增值权益1月
+     */
+//    private String status;
+
+    //权益级别  PR 年会员  SE 月会员
+    private String memberLevels;
 }

4dkankan-goods/4dkankan-goods.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -44,7 +44,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-goods/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-goods/src/main/java/com/fdkankan/goods/entity/CameraDetailEntity.java

@@ -44,7 +44,7 @@ public class CameraDetailEntity extends BaseEntity implements Serializable {
     private int country;
     /**
      * 相机类型，0表示双目，1表示专业八目，2表示新双目
-     * 相机类型，0表示双目，1四维看看pro，2 四维看看lite，9 双目转台，10 激光转台
+     * 相机类型，0表示双目，1四维看看pro，2 四维看看lite，3 双目转台，4 激光转台
      */
     @Column(name = "type")
     private int type;
@@ -90,5 +90,4 @@ public class CameraDetailEntity extends BaseEntity implements Serializable {
     private Long agentFrameworkId;
 
 
-
 }

4dkankan-goods/src/main/java/com/fdkankan/goods/feign/GoodsFeignClient.java

@@ -58,6 +58,7 @@ public class GoodsFeignClient {
         skusMap.put("4", "U15604126369780033,U15604126369840034,U15609161655710032,U15604132404280103");
         skusMap.put("5", "U15604132404280203");
         skusMap.put("6", "U15604132404280303");
+        skusMap.put("7", "U15604132404280503");
     }
 
     public Result saveCameraByAgent(String childName,
@@ -140,7 +141,7 @@ public class GoodsFeignClient {
     public Result findSSOApp(String appUserName, String appPassword) throws Exception{
         CameraEntity dbCameraEntity = cameraService.findByChildNameAndChildPassword(appUserName, appPassword);
         if (dbCameraEntity == null){
-            throw new BaseRuntimeException(CameraConstant.FAILURE_CODE_6003, CameraConstant.FAILURE_MSG_6003);
+            throw new BaseRuntimeException(AppConstant.FAILURE_CODE_4012, AppConstant.FAILURE_MSG_4012);
         }
         CameraDetailEntity entity = cameraDetailService.findByCameraId(dbCameraEntity.getId());
         if (entity == null ){

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

@@ -16,10 +16,10 @@ public interface ICameraDetailMapper extends IBaseMapper<CameraDetailEntity, Lon
     @Select(" SELECT * FROM t_camera_detail WHERE camera_id = #{cameraId} AND REC_STATUS = 'A' ")
     CameraDetailEntity findByCameraId(@Param("cameraId") Long cameraId);
 
-    @Select(" SELECT * FROM t_camera_detail WHERE user_id = #{userId} AND goods_id = #{goodsId} AND REC_STATUS = 'A' order by update_time desc")
+    @Select(" SELECT * FROM t_camera_detail WHERE user_id = #{userId} AND goods_id = #{goodsId} AND REC_STATUS = 'A' ")
     List<CameraDetailEntity> findByUserIdAndGoodId(@Param("userId") Long userId, @Param("goodsId") Long goodsId);
 
-    @Select(" SELECT * FROM t_camera_detail WHERE user_id = #{userId} AND goods_id != 4 AND REC_STATUS = 'A' order by update_time desc")
+    @Select(" SELECT * FROM t_camera_detail WHERE user_id = #{userId} AND goods_id != 4 AND REC_STATUS = 'A' ")
     List<CameraDetailEntity> findByUserId(@Param("userId") Long userId);
 
     @Update(" UPDATE t_camera_detail SET user_id = #{userId} WHERE camera_id = #{cameraId} ")

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

@@ -3,10 +3,12 @@ package com.fdkankan.goods.mapper;
 import com.fdkankan.base.mapper.base.IBaseMapper;
 import com.fdkankan.common.vo.request.RequestCamera;
 import com.fdkankan.common.vo.response.ResponseCamera;
-import com.fdkankan.goods.entity.CameraDetailEntity;
 import com.fdkankan.goods.entity.CameraEntity;
 import com.fdkankan.goods.provider.CameraProvider;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
 
 import java.util.List;
 
@@ -40,11 +42,6 @@ public interface ICameraMapper extends IBaseMapper<CameraEntity, Long> {
     @Select(" SELECT COUNT(a.id) FROM `t_camera` a LEFT JOIN `t_camera_detail` b ON a.id = b.camera_id WHERE a.rec_status = 'A' AND b.user_id = #{userId} AND b.goods_id = #{cameraType}")
     int findCameraNumByUserId(@Param("userId") Long userId, @Param("cameraType") Integer cameraType);
 
-    @Update("UPDATE t_camera_detail SET own = #{cm.own} and balance = #{cm.balance} , balance = #{cm.balance} " +
-            " , type = #{cm.type} , goods_id =#{cm.goodsId} , total_space = #{cm.totalSpace} , used_space = #{cm.usedSpace}" +
-            " , company_id = #{cm.companyId} WHERE camera_id = #{cm.cameraId} ")
-    int updateCameraDetail(@Param("cm") CameraDetailEntity cameraDetailEntity);
-
     @Select(" <script> " +
             " SELECT a.id, a.sn_code as snCode, a.activated_time as activatedTime, b.own, b.type," +
             " b.agent_framework_id as agentFrameworkId, b.camera_id as cameraId, b.total_space as totalSpace" +

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

@@ -183,9 +183,9 @@ public class CameraVersionServiceImpl extends BaseServiceImpl<CameraVersionEntit
         log.info("upload success");
 
         String url = prefixAli + ALIYUN_SSO_PATH + fileName;
-        if("s3".equals(ossType)){
-            url = YAMAXUN_S3_PATH + fileName;
-        }
+//        if("s3".equals(ossType)){
+//            url = YAMAXUN_S3_PATH + fileName;
+//        }
         log.info("upload url: {}" + url);
 
         // 添加对象信息

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

@@ -12,7 +12,6 @@ import com.fdkankan.common.vo.request.RequestCamera;
 import com.fdkankan.goods.entity.CameraDetailEntity;
 import com.fdkankan.goods.entity.CameraEntity;
 import com.fdkankan.goods.entity.GoodsEntity;
-import com.fdkankan.goods.mapper.ICameraMapper;
 import com.fdkankan.goods.mapper.IGoodsMapper;
 import com.fdkankan.goods.service.ICameraDetailService;
 import com.fdkankan.goods.service.ICameraService;
@@ -32,9 +31,6 @@ public class GoodsServiceImpl extends BaseServiceImpl<GoodsEntity, Long> impleme
 
     @Autowired
     private IGoodsMapper goodsMapper;
-
-    @Autowired
-    private ICameraMapper cameraMapper;
     @Autowired
     private ICameraService cameraService;
     @Autowired
@@ -175,13 +171,8 @@ public class GoodsServiceImpl extends BaseServiceImpl<GoodsEntity, Long> impleme
             detailEntity.setCountry(1);//1-国外
         }
         detailEntity.setType(param.getType());
-        //商品类型，type：1为8目，type：2为双目 3:为转台
-        if(param.getType().equals(3)){
-            detailEntity.setGoodsId(9L);
-        }else {
-            detailEntity.setGoodsId(param.getType() == 1 ? 4L : 8L);
-        }
-
+        //商品类型，type：1为8目，type：2为双目
+        detailEntity.setGoodsId(param.getType() == 1 ? 4L : 8L);
         detailEntity.setTotalSpace(new BigInteger(Constant.CAMERA_BASE_SPACE_VALUE));
         detailEntity.setUsedSpace(new BigInteger("0"));
         cameraDetailService.save(detailEntity);

4dkankan-modeling/4dkankan-modeling.iml

@@ -58,7 +58,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -67,7 +67,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -544,6 +544,5 @@
     <orderEntry type="library" name="Maven: com.alipay:alipay-trade-sdk:20161215" level="project" />
     <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.10" level="project" />
     <orderEntry type="library" name="Maven: com.paypal.sdk:rest-api-sdk:1.14.0" level="project" />
-    <orderEntry type="library" name="Maven: com.dingtalk.open:taobao-sdk-java-auto:1479188381469-20211020" level="project" />
   </component>
 </module>

4dkankan-modeling/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -93,12 +93,6 @@
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-user</artifactId>
         </dependency>
-        <!-- 钉钉sdk -->
-        <dependency>
-            <groupId>com.dingtalk.open</groupId>
-            <artifactId>taobao-sdk-java-auto</artifactId>
-            <version>1479188381469-20211020</version>
-        </dependency>
     </dependencies>
 
     <build>

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

@@ -1,103 +0,0 @@
-package com.fdkankan.modeling;
-
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
-import com.dingtalk.api.request.OapiRobotSendRequest;
-import com.dingtalk.api.response.OapiRobotSendResponse;
-import com.fdkankan.common.util.FileUtils;
-import com.google.api.client.util.Base64;
-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.Value;
-import org.springframework.stereotype.Component;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-@Component
-public class DingDingUtils {
-
-    private static final Logger log = LoggerFactory.getLogger(DingDingUtils.class);
-
-    private static String environment;
-
-    private static String token;
-
-    private static String secret;
-
-    private static String hostName;
-
-    @Value("${hostName.filePath:/opt/hosts/hosts.txt}")
-    public void setHostName(String filePath){
-        try {
-            hostName = FileUtils.readFile(filePath);
-            log.error("从文件({})中获取服务器名称:{}", filePath,hostName);
-        } catch (Exception e) {
-            log.error("从文件中获取服务器名称失败,文件路径{}", filePath);
-            e.printStackTrace();
-        }
-    }
-
-    @Value("${environment:dev}")
-    public void setEnvironment(String environment){
-        DingDingUtils.environment = environment;
-    }
-
-    @Value("${dingtalk.token:e712c41d917b303e21c1550ad9966b33dad874043f2f73fb347dce67a0a201bc}")
-    public void setToken(String token) {
-        DingDingUtils.token = token;
-    }
-
-    @Value("${dingtalk.secret:SECca5af660ed882a67d8bda469095bf8454831528bd25bc7b1a3ff5f686109b9e5}")
-    public void setSign(String secret) {
-        DingDingUtils.secret = secret;
-    }
-
-    private static String msgPattern = "**环境**: %s\n\n" +
-            "**服务器名称**: %s\n\n" +
-            "**失败原因**: %s\n\n" +
-            "**num**: %s\n\n" +
-            "**server-path**: %s\n\n" +
-            "**algorithm-log**: [https://4dkk.4dage.com/build_log/%s/console.log](https://4dkk.4dage.com/build_log/%s/console.log)";
-
-
-    public static void sendMsgToDingRobot(String reason,String serverPath,String num) throws ApiException, UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException {
-        String content = String.format(msgPattern,environment,hostName,reason,num,serverPath,num,num);
-        sendMsgToDingRobot(content);
-    }
-
-    public static void sendMsgToDingRobot(String content) throws ApiException, UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException {
-        Long timestamp = System.currentTimeMillis();
-        String sign = getSign(timestamp);
-        DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?" +
-                "access_token="+token +
-                "&timestamp=".concat(String.valueOf(timestamp)).concat("&sign=").concat(sign));
-        OapiRobotSendRequest request = new OapiRobotSendRequest();
-        request.setMsgtype("actionCard");
-        OapiRobotSendRequest.Actioncard actioncard = new OapiRobotSendRequest.Actioncard();
-        actioncard.setTitle("场景计算失败");
-        actioncard.setText(content);
-        request.setActionCard(actioncard);
-        OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
-        at.setAtMobiles(Lists.newArrayList());
-        // isAtAll类型如果不为Boolean，请升级至最新SDK
-        at.setIsAtAll(true);
-        request.setAt(at);
-        OapiRobotSendResponse re = client.execute(request);
-        System.out.println(re.getBody());
-    }
-
-    public static String getSign(Long timestamp) throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
-        String stringToSign = timestamp + "\n" + secret;
-        Mac mac = Mac.getInstance("HmacSHA256");
-        mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
-        byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
-        return URLEncoder.encode(new String(Base64.encodeBase64(signData)),"UTF-8");
-    }
-}

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

@@ -3,11 +3,11 @@ package com.fdkankan.modeling.message;
 import com.alibaba.fastjson.JSONArray;
 import com.fdkankan.base.sms.SmsService;
 import com.fdkankan.base.util.FileUtil;
+import com.fdkankan.common.constant.Constant;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.push.Demo;
 import com.fdkankan.common.util.*;
-import com.fdkankan.modeling.DingDingUtils;
 import com.fdkankan.scene.entity.SceneFileBuildEntity;
 import com.fdkankan.scene.entity.SceneProEditEntity;
 import com.fdkankan.scene.entity.SceneProEntity;
@@ -19,7 +19,6 @@ import com.fdkankan.scene.util.ComputerUtil;
 import com.fdkankan.scene.util.CreateObjUtil;
 import com.fdkankan.user.entity.UserEntity;
 import com.fdkankan.user.service.IUserService;
-import com.taobao.api.ApiException;
 import lombok.extern.log4j.Log4j2;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
@@ -29,9 +28,10 @@ import org.springframework.amqp.rabbit.support.CorrelationData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
-import java.io.*;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -95,51 +95,33 @@ public class BuildSceneReceiver {
         Callable<String> call = new Callable<String>() {
             @Override
             public String call() throws Exception {
-                if("panoQueue".equals(queue)){
-                    kanfangBuild(content);
-                }else{
-                    //开始执行耗时操作
-                    String[] strs  = content.split(":;");
-
-                    try {
-                        //休眠2秒等待数据入库
-                        Thread.sleep(2000L);
-
-                        if(content == null||content.trim().equals("")){
-                            return "执行失败，mq消息缺失";
-                        }
-
-                        try {
-                            FileUtils.writeFile("/opt/hosts/running.txt", DateUtil.date2String(new Date(), null));
-                            String tomcatLog = "scenenum:" + content + "\ntime:" + DateUtil.date2String(new Date(), null) +
-                                    " action:create hostname:" + FileUtils.readFile("/opt/hosts/hosts.txt");
-                            //打开一个写文件器，构造函数中的第二个参数true表示以追加形式写文件
-                            FileWriter writer = new FileWriter("/mnt/elastic_log/tomcat" + "_" + strs[4] +".log", true);
-                            writer.write(tomcatLog);
-                            writer.close();
-                        }catch (Exception e){
-                            e.printStackTrace();
-                        }
+                //开始执行耗时操作
+                if("QUEUE_MODELING_A".equals(queue)){
+                    //休眠2秒等待数据入库
+                    Thread.sleep(2000L);
+                        
+                    FileUtils.writeFile("/opt/hosts/running.txt", DateUtil.date2String(new Date(), null));
+                    String tomcatLog = "scenenum:" + content + "\ntime:" + DateUtil.date2String(new Date(), null) +
+                            " action:create hostname:" + FileUtils.readFile("/opt/hosts/hosts.txt");
+                    //打开一个写文件器，构造函数中的第二个参数true表示以追加形式写文件
+                    FileWriter writer = new FileWriter("/mnt/elastic_log/tomcat.log", true);
+                    writer.write(tomcatLog);
+                    writer.close();
+
+                    buildScene(content);
+
+                    FileUtils.deleteFile("/opt/hosts/running.txt");
+                    tomcatLog = "scenenum:" + content + "\ntime:" + DateUtil.date2String(new Date(), null) +
+                            " action:delete hostname:" + FileUtils.readFile("/opt/hosts/hosts.txt");
+                    //打开一个写文件器，构造函数中的第二个参数true表示以追加形式写文件
+                    writer = new FileWriter("/mnt/elastic_log/tomcat.log", true);
+                    writer.write(tomcatLog);
+                    writer.close();
 
+                }
 
-                        buildScene(content);
-
-                        try {
-                            FileUtils.deleteFile("/opt/hosts/running.txt");
-                            String tomcatLog = "scenenum:" + content + "\ntime:" + DateUtil.date2String(new Date(), null) +
-                                    " action:delete hostname:" + FileUtils.readFile("/opt/hosts/hosts.txt");
-                            //打开一个写文件器，构造函数中的第二个参数true表示以追加形式写文件
-                            FileWriter writer = new FileWriter("/mnt/elastic_log/tomcat" + "_" + strs[4] +"log", true);
-                            writer.write(tomcatLog);
-                            writer.close();
-                        }catch (Exception e){
-                            e.printStackTrace();
-                        }
-                    }catch (Exception e){
-                        e.printStackTrace();
-                        sceneProService.updateStatus(strs[4], -1);
-                        handFail("计算失败",content);
-                    }
+                if("panoQueue".equals(queue)){
+                    kanfangBuild(content);
                 }
                 log.info("场景生成好了***");
                 return "执行完成!";
@@ -148,7 +130,7 @@ public class BuildSceneReceiver {
 
         Future<String> future = exec.submit(call);
         try {
-            String obj = future.get(1000 * 60 * 60 * 24, TimeUnit.MILLISECONDS); //任务处理超时时间设为 24个小时
+            String obj = future.get(1000 * 60 * 60 * 12, TimeUnit.MILLISECONDS); //任务处理超时时间设为 24个小时
             //String obj = future.get(1000 * 60, TimeUnit.MILLISECONDS); //任务处理超时时间设为 2个小时
             log.info("任务成功返回:" + obj);
         } catch (TimeoutException ex) {
@@ -159,7 +141,6 @@ public class BuildSceneReceiver {
             log.error(trace.toString());
             FileUtils.deleteFile("/opt/hosts/running.txt");
             future.cancel(true);
-            handFail("计算超时",content);
         } catch (Exception e) {
             e.printStackTrace();
             StringWriter trace=new StringWriter();
@@ -167,9 +148,8 @@ public class BuildSceneReceiver {
             log.error(trace.toString());
             FileUtils.deleteFile("/opt/hosts/running.txt");
             future.cancel(true);
-            handFail("计算失败",content);
         }
-
+        
     }
 
     private void buildScene(String content){
@@ -210,11 +190,6 @@ public class BuildSceneReceiver {
             if(strs.length >= 13){
                 buildType = strs[12];
             }
-
-            String rebuild = "0";
-            if(strs.length >= 14){
-                rebuild = strs[13];
-            }
             log.info("执行数据库操作--前");
             sceneFileBuildEntity = sceneFileBuildService.findByFileId(fileId);
             log.info("执行数据库操作--后");
@@ -298,7 +273,6 @@ public class BuildSceneReceiver {
                 scene = sceneProService.findBySceneNum(projectNum);
                 if(scene == null){
                     log.info(projectNum + ":场景不存在");
-                    handFail("场景不存在",content);
                     return;
                 }
 
@@ -318,15 +292,8 @@ public class BuildSceneReceiver {
                     FileUtils.decompress(path + File.separator + "capture" + File.separator + imgsName,
                             path + File.separator + "capture") ;
                     FileUtil.delFile(path + File.separator + "capture" + File.separator + imgsName);
-                }else if(Integer.parseInt(cameraType) == 14 ) {
-                    CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + cameraName.replace("4DKKPRO_", "")
-                                    .replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator
-                                    + unicode + File.separator,
-                            ConstantFilePath.BUILD_MODEL_LASER_PATH + cameraName.replace("4DKKPRO_", "")
-                                    .replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator
-                                    + unicode + File.separator + "capture");
-                    path = ConstantFilePath.BUILD_MODEL_LASER_PATH + cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator + unicode;
-                } else if(Integer.parseInt(cameraType) >= 4 ) {
+                }
+                else if(Integer.parseInt(cameraType) >= 4 ) {
                     CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + cameraName.replace("4DKKPRO_", "")
                             .replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator
                             + unicode + File.separator,
@@ -335,12 +302,10 @@ public class BuildSceneReceiver {
                                     + unicode + File.separator + "capture");
                     path = ConstantFilePath.BUILD_MODEL_PATH + cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator + fileId + File.separator + unicode;
                 }
-                if (rebuild.equals("0") && new File(path + File.separator + ".lockdirectory").exists()) {
+
+                if(new File(path + File.separator + ".lockdirectory").exists()){
                     log.info(path + "，该路径正在计算中，不能再次计算");
-                    handFail("该路径正在计算中，不能再次计算", content);
                     return;
-                } else if(new File(path + File.separator + ".lockdirectory").exists()){
-                    FileUtils.deleteFile(path + File.separator + ".lockdirectory");
                 }
                 String data = FileUtils.readFile(path + File.separator + "capture" +File.separator+"data.fdage");
                 //获取data.fdage的内容
@@ -549,41 +514,20 @@ public class BuildSceneReceiver {
                         if(!"s3".equals(ossType)){
                             Demo demo = null;
                             if(dataJson.getInt("pushChannel") == 0){
-
-                                if(Integer.parseInt(cameraType) == 10 || Integer.parseInt(cameraType) == 13){
-                                    //ios
-                                    log.info("IOS_KEY:{}, IOS_SECRET:{}", IOS_KEY_Z, IOS_SECRET_Z);
-                                    demo = new Demo(IOS_KEY_Z, IOS_SECRET_Z);
-                                    demo.sendIOSUnicast(dataJson.getString("pushToken"),
-                                            "四维看看Minion", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成，点击查看",
-                                            scene.getWebSite());
-                                }else {
-                                    //ios
-                                    log.info("IOS_KEY:{}, IOS_SECRET:{}", IOS_KEY, IOS_SECRET);
-                                    demo = new Demo(IOS_KEY, IOS_SECRET);
-                                    demo.sendIOSUnicast(dataJson.getString("pushToken"),
-                                            "四维看看Pro", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成，点击查看",
-                                            scene.getWebSite());
-                                }
-
+                                //ios
+                                log.info("IOS_KEY:{}, IOS_SECRET:{}", IOS_KEY, IOS_SECRET);
+                                demo = new Demo(IOS_KEY, IOS_SECRET);
+                                demo.sendIOSUnicast(dataJson.getString("pushToken"),
+                                        "四维看看Pro", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成，点击查看",
+                                        scene.getWebSite());
 //                        log.info(PushMsgUtil.txPushMsgIos(dataJson.getString("pushToken"), scene.getSceneName(), scene.getWebSite()));
                             }else {
-                                if(Integer.parseInt(cameraType) == 10 || Integer.parseInt(cameraType) == 13){
-                                    //ios
-                                    //安卓
-                                    log.info("ANDROID_KEY:{}, ANDROID_SECRET:{}", ANDROID_KEY_Z, ANDROID_SECRET_Z);
-                                    demo = new Demo(ANDROID_KEY_Z, ANDROID_SECRET_Z);
-                                    demo.sendAndroidUnicast2(dataJson.getString("pushToken"),
-                                            "四维看看Minion", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成，点击查看",
-                                            scene.getWebSite());
-                                }else {
-                                    //安卓
-                                    log.info("ANDROID_KEY:{}, ANDROID_SECRET:{}", ANDROID_KEY, ANDROID_SECRET);
-                                    demo = new Demo(ANDROID_KEY, ANDROID_SECRET);
-                                    demo.sendAndroidUnicast(dataJson.getString("pushToken"),
-                                            "四维看看Pro", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成，点击查看",
-                                            scene.getWebSite());
-                                }
+                                //安卓
+                                log.info("ANDROID_KEY:{}, ANDROID_SECRET:{}", ANDROID_KEY, ANDROID_SECRET);
+                                demo = new Demo(ANDROID_KEY, ANDROID_SECRET);
+                                demo.sendAndroidUnicast(dataJson.getString("pushToken"),
+                                        "四维看看Pro", scene.getSceneName() + "计算完成", "您上传的" + scene.getSceneName() + "计算完成，点击查看",
+                                        scene.getWebSite());
 //                        log.info(PushMsgUtil.txPushMsgAndroid(dataJson.getString("pushToken"), scene.getSceneName(), scene.getWebSite()));
                             }
 
@@ -597,61 +541,10 @@ public class BuildSceneReceiver {
                         log.info("推送消息失败：");
                         e.printStackTrace();
                     }
-                }
-
-                //计算成功  激光转台相机推送
-                log.info("激光转台相机 同步 请求 ");
-                if(Integer.parseInt(cameraType) == 14){
-                    try {
-                        String title = "";
-                        if(StringUtils.isNotEmpty(scene.getSceneName())){
-                            title = scene.getSceneName();
-                        }
-                        String jgPath = scene.getDataSource();
-                        //创建目录
-                        if(scene.getDataSource().lastIndexOf("/")!=-1){
-                            jgPath = jgPath + "_laserData";
-                        }else{
-                            jgPath = jgPath.substring(0,jgPath.length()-1) + "_laserData";
-                        }
-
-                        FileUtils.createDir(jgPath+"/extras");
-
-                        log.info("生成 激光相机目录 " + jgPath);
-                        //生成data.json
-                        JSONObject jgDataJson = new JSONObject();
-                        jgDataJson.put("split_type", "SPLIT_V15");
-                        jgDataJson.put("skybox_type", "SKYBOX_V5");
-                        jgDataJson.put("extras", null);
-                        FileUtils.writeFile(jgPath + File.separator + "data.json", jgDataJson.toString());
-
-                        CreateObjUtil.cpfile(scene.getDataSource()  + "/results/laserData/cover", jgPath+"/extras/");
-                        CreateObjUtil.cplaserfile(scene.getDataSource()  + "/results/laserData", jgPath+File.separator);
 
-                        //激光相机
-                        String url = "https://testlaser.4dkankan.com/indoor/{sceneCode}/api/init?path="
-                                        + jgPath + File.separator + "laserData" + "&title="+ title
-                                        + "&childName=" + cameraName + "&createTime=" + scene.getCreateTime()
-                                        + "&snCode="+ cameraName;
 
-                        if(scene.getUserId()!=null){
-                            url = url + "&userId=" + scene.getUserId();
-                        }
-
-                        if(StringUtils.isNotEmpty(userName)){
-                            url = url + "&phone=" + userName;
-                        }
-
-                        url = url.replace("{sceneCode}",scene.getNum());
-                        log.info("激光转台相机 同步 ：" + url);
-                        com.alibaba.fastjson.JSONObject hotListJson =
-                                com.alibaba.fastjson.JSONObject.parseObject(OkHttpUtils.httpGet(url));
-                        log.info("激光转台相机 同步结束 ：" + hotListJson);
-                    }catch (Exception e){
-                        e.printStackTrace();
-                        handFail("激光转台相机同步失败",content);
-                    }
                 }
+
             }
 
             if(!userName.equals("noMan"))
@@ -696,21 +589,13 @@ public class BuildSceneReceiver {
             }catch (Exception e1){
                 e1.printStackTrace();
             }
-            handFail("计算失败",content);
         }finally {
             try{
                 scene = sceneProService.findBySceneNum(projectNum);
                 if(scene != null){
                     com.alibaba.fastjson.JSONObject statusJson = new com.alibaba.fastjson.JSONObject();
                     //临时将-2改成1，app还没完全更新
-                    int status = scene.getStatus();
-                    if(status == -2){
-                        status = 1;
-                    }else if(status == -1){
-                        // 失败状态不予显示到客户端
-                        status = 0;
-                    }
-                    statusJson.put("status", status);
+                    statusJson.put("status", scene.getStatus() == -2? 1 : scene.getStatus());
                     statusJson.put("webSite", scene.getWebSite());
                     statusJson.put("sceneNum", scene.getNum());
                     statusJson.put("thumb", scene.getThumb());
@@ -718,12 +603,6 @@ public class BuildSceneReceiver {
                     FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"status.json", statusJson.toString());
                     uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"status.json",
                             "data/data"+projectNum+File.separator+"status.json");
-
-                    //上送日志
-                    uploadToOssUtil.upload(scene.getDataSource()+File.separator+"console.log",
-                            "build_log/"+scene.getNum()+File.separator+"console.log");
-
-
                 }
             }catch (Exception e){
                 e.printStackTrace();
@@ -857,35 +736,9 @@ public class BuildSceneReceiver {
 
             rabbitTemplate.convertAndSend(queue, (Object) result.toString(), correlationId);
             e.printStackTrace();
-            handFail("看房场景计算失败",dataSource,sceneNum);
         }finally {
 
         }
 
     }
-
-    private void handFail(String reason,String content){
-        String serverPath = "";
-        String num = "";
-        if(content.contains(":;")){
-            String[] strs  = content.split(":;");
-            serverPath = strs[1].substring(0,strs[1].lastIndexOf("/")+1).concat(strs[2]);
-            num = strs[4];
-        }else{
-            JSONObject json = JSONObject.fromObject(content);
-            num = json.getString("sceneNum");
-            serverPath = json.getString("dataSource");
-        }
-        handFail(reason,serverPath,num);
-    }
-
-    private void handFail(String reason,String serverPath,String num){
-        CompletableFuture.runAsync(() -> {
-            try {
-                DingDingUtils.sendMsgToDingRobot(reason,serverPath,num);
-            } catch (ApiException | UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException apiException) {
-                apiException.printStackTrace();
-            }
-        });
-    }
 }

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

@@ -46,10 +46,10 @@ public class RabbitConfig {
     private ISceneFileBuildService sceneFileBuildService;
     @Autowired
     private UploadToOssUtil uploadToOssUtil;
+
     @Autowired
     private ISceneProEditService sceneProEditService;
 
-
     @Autowired
     private IRebuildVideoProgressService rebuildVideoProgressService;
 
@@ -145,7 +145,7 @@ public class RabbitConfig {
 //    @Bean
 //    public ReBuildVideoSceneReceiver reBuildVideoSceneReceiver() {
 //        return new ReBuildVideoSceneReceiver("Receiver2", sceneProService, smsService,
-//                uploadToOssUtil, rebuildVideoProgressService,queue,mainUrl + sceneProNewUrl,prefixAli,sceneProEditService);
+//                uploadToOssUtil, rebuildVideoProgressService,queue,mainUrl + sceneProNewUrl);
 //    }
 
 //    @Bean

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

@@ -1,36 +1,47 @@
 package com.fdkankan.modeling.message;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.base.sms.SmsService;
+import com.fdkankan.base.util.FileUtil;
 import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.UploadToOssUtil;
+import com.fdkankan.common.constant.ConstantUrl;
+import com.fdkankan.common.push.Demo;
+import com.fdkankan.common.util.*;
+import com.fdkankan.scene.entity.SceneFileBuildEntity;
 import com.fdkankan.scene.entity.SceneProEditEntity;
 import com.fdkankan.scene.entity.SceneProEntity;
 import com.fdkankan.scene.entity.VideoSceneProgressEntity;
-import com.fdkankan.scene.service.IRebuildVideoProgressService;
-import com.fdkankan.scene.service.ISceneProEditService;
-import com.fdkankan.scene.service.ISceneProService;
+import com.fdkankan.scene.service.*;
 import com.fdkankan.scene.util.ComputerUtil;
 import com.fdkankan.scene.util.CreateObjUtil;
+import com.fdkankan.user.entity.UserEntity;
+import com.fdkankan.user.service.IUserService;
 import lombok.extern.log4j.Log4j2;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.rabbit.support.CorrelationData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.io.File;
+import java.io.FileWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.*;
+
+import static com.fdkankan.common.push.Demo.*;
 
 @Log4j2
 public class ReBuildVideoSceneReceiver {
 
     private String receiverInstance;
     private ISceneProService sceneProService;
-    private ISceneProEditService sceneProEditService;
     private IRebuildVideoProgressService rebuildVideoProgressService;
     private SmsService smsService;
     private UploadToOssUtil uploadToOssUtil;
@@ -39,20 +50,16 @@ public class ReBuildVideoSceneReceiver {
 
     private String webUrl;
 
-    private String prefixAli;
-
     public ReBuildVideoSceneReceiver(String receiverInstance, ISceneProService sceneProService, SmsService smsService,
                                      UploadToOssUtil uploadToOssUtil, IRebuildVideoProgressService rebuildVideoProgressService,
-                                     String queue, String webUrl, String prefixAli,ISceneProEditService sceneProEditService){
+                                     String queue, String webUrl){
         this.receiverInstance = receiverInstance;
         this.sceneProService = sceneProService;
-        this.sceneProEditService = sceneProEditService;
         this.smsService = smsService;
         this.uploadToOssUtil = uploadToOssUtil;
         this.rebuildVideoProgressService = rebuildVideoProgressService;
         this.queue = queue;
         this.webUrl = webUrl;
-        this.prefixAli = prefixAli;
     }
 
 //    @RabbitListener(queues = "${rabbitmq.queue.video}", containerFactory = "rabbitListenerContainerFactory")
@@ -130,127 +137,8 @@ public class ReBuildVideoSceneReceiver {
             map = ComputerUtil.computerRebuildVideo(projectNum, path);
             log.info("上传内容 ===== + " + map);
             uploadToOssUtil.uploadMulFiles(map);
-
-            log.info("结束计算 =====");
-
-
-            Map map2 = new HashMap();
-
-            JSONArray uploadarray = null;
-            JSONArray hdrArray = null;
-            JSONObject fileJson = null;
-            String fileName = "";
-
-            //读取videos_hdr_param.json, 保存点位视频的value
-            String videosHdr = FileUtils.readFile(path + File.separator + "results/videos/videos_hdr_param.json");
-            String uploadData = FileUtils.readFile(path + File.separator + "results" +File.separator+"upload.json");
-            String strsceneInfos = FileUtils.readFile(ConstantFilePath.SCENE_PATH + "data/data" + projectNum + File.separator + "scene.json");
-            JSONObject scenejson = new JSONObject();
-            log.info("strsceneInfos =====" + strsceneInfos);
-
-            if(strsceneInfos!=null){
-                scenejson = JSONObject.parseObject(strsceneInfos);
-                log.info("scenejson =====" + scenejson);
-            }
-
-            JSONObject videoJsonNew = new JSONObject();
-            JSONArray dataarray = new JSONArray();
-
-            SceneProEntity sceneProEntity = sceneProService.findBySceneNum(projectNum);
-            //获取 videos
-            if(StringUtils.isNotEmpty(sceneProEntity.getVideos())){
-                JSONObject videosjson = JSONObject.parseObject(sceneProEntity.getVideos());
-                log.info("videosjson =====" + videosjson);
-
-                if (videosjson.containsKey("data")) {
-                    JSONArray dataArray = new JSONArray();
-                    dataArray = (JSONArray) videosjson.get("data");
-                    JSONObject uploadJson = null;
-                    if(uploadData!=null) {
-                        uploadJson = com.alibaba.fastjson.JSONObject.parseObject(uploadData);
-                        uploadarray = uploadJson.getJSONArray("upload");
-                        log.info("uploadarray =====" + uploadarray);
-                    }
-                    JSONObject hdrObject = new JSONObject();
-                    for(int i = 0, len = uploadarray.size(); i < len; i++) {
-                        fileJson = uploadarray.getJSONObject(i);
-                        fileName = fileJson.getString("file");
-                        if (fileJson.getIntValue("clazz") == 20 && fileName.contains(".mp4") && !fileName.contains("-ios.mp4")) {
-                            String id =fileName.substring( 0, fileName.lastIndexOf(".")).replace("videos/", "");
-
-                            log.info("id :" + id);
-
-                            //生成objet
-                            if(StringUtils.isNotEmpty(videosHdr)){
-                                hdrArray = JSONObject.parseObject(videosHdr).getJSONArray("hdr_param");
-                                log.info("hdrArray :" + hdrArray);
-                            }
-                            if(hdrArray != null){
-                                for(int z = 0, lenq = hdrArray.size(); z< lenq; z++) {
-                                    JSONObject obj = (JSONObject) hdrArray.get(z);
-                                    String name = (String) obj.get("name");
-                                    if(name.equals(id)){
-                                        String fov =  obj.get("fov").toString();
-                                        String name1 = obj.get("name").toString();
-                                        String value =  obj.get("value").toString();
-                                        hdrObject.put("blend_fov",String.valueOf(fov));
-                                        hdrObject.put("id",name1);
-                                        hdrObject.put("value",String.valueOf(value));
-                                        log.info("hdrObject :" + hdrObject);
-                                        dataarray.add(hdrObject);
-                                    }
-                                }
-                            }
-
-                            log.info("dataArray 2  =====" + dataArray);
-                            for(int x = 0; x < dataArray.size(); x++) {
-                                JSONObject obj = (JSONObject) dataArray.get(x);
-                                String id2 = (String) obj.get("id");
-                                if(!id2.equals(id)){
-                                    dataarray.add(obj);
-                                    log.info("data obj =====" + obj);
-                                }
-                            }
-                        }
-                    }
-                }
-                log.info("dataarray =====" + dataarray);
-                videoJsonNew.put("data",dataarray);
-                videoJsonNew.put("upPath",videosjson.get("upPath"));
-                videoJsonNew.put("version",videosjson.get("version"));
-            }
-            map2.put("videos",videoJsonNew.toJSONString());
-
-            long start = System.currentTimeMillis();
-            long computeTime = (System.currentTimeMillis() - start) / 1000;
-            sceneProService.updateTime2(projectNum,  videoJsonNew.toJSONString(), computeTime);
-            Integer imagesVersion = 50;
-            if(strsceneInfos!=null){
-                scenejson = JSONObject.parseObject(strsceneInfos);
-                if(scenejson.containsKey("imagesVersion")){
-                    log.error("imagesVersion ============" + imagesVersion);
-                    imagesVersion = (Integer) scenejson.get("imagesVersion");
-                    imagesVersion = imagesVersion + 50;
-//                    map2.put("imagesVersion", imagesVersion + 50);
-                }
-
-                log.error("imagesVersion2 ============" + imagesVersion);
-                map2.put("imagesVersion",  imagesVersion);
-                log.error("map2 ============" + map2);
-                FileUtils.writeJsonFile(ConstantFilePath.SCENE_PATH + "data/data" + projectNum + File.separator + "scene.json", map2);
-            }else{
-                log.error("更新 scene.json 文件失败");
-            }
-
-
-
-            SceneProEditEntity sceneProEditEntity = sceneProEditService.findByProId(sceneProEntity.getId());
-            sceneProEditEntity.setImagesVersion(imagesVersion);
-//            sceneProEditEntity.setFloorEditVer(sceneProEditEntity.getFloorEditVer() + 1);
-//            sceneProEditEntity.setFloorPublishVer(sceneProEditEntity.getFloorPublishVer() + 1);
-            sceneProEditService.update(sceneProEditEntity);
-
             rebuildVideoProgressService.updateProgress(projectNum, panId,1);
+            log.info("结束计算 =====");
 
         }catch(Exception e){
             log.error("视频失败"+projectNum);

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

@@ -123,7 +123,7 @@ phone.sign=四维看看
 #phone.sign=4Dkankan
 
 #mq的任务key
-rabbitmq.queue=QUEUE_MODELING_A
+rabbitmq.queue=QUEUE_MODELING_A_QX
 rabbitmq.queue.video=QUEUE_VIDEO_A
 #mq当排队任务超过这个数量时启用弹性升缩
 mq.base.num=300

4dkankan-modeling/src/main/resources/mapper/primary/AgentMapper.xml

@@ -1,7 +0,0 @@
-<?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.agent.mapper.IAgentMapper">
-
-
-</mapper>

4dkankan-order/4dkankan-order.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -44,7 +44,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-order/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-order/src/main/java/com/fdkankan/order/entity/DownloadOrderEntity.java

@@ -69,18 +69,6 @@ public class DownloadOrderEntity extends BaseEntity implements Serializable {
      */
     @Column(name = "count")
     private Integer count;
-
-    /**
-     * 场景码
-     */
-    @Column(name = "scene_num")
-    private String sceneNum;
-
-    /**
-     * 场景名
-     */
-    @Column(name = "scene_name")
-    private String sceneName;
 }
 
 

4dkankan-order/src/main/java/com/fdkankan/order/entity/IncrementOrderEntity.java

@@ -74,6 +74,12 @@ public class IncrementOrderEntity extends BaseEntity implements Serializable {
      */
     @Column(name = "count")
     private Integer count;
+
+    //权益级别  PR 年会员  SE 月会员
+    private String memberLevels;
+
+    //月份 权益
+    private Integer monthQy;
 }
 
 

4dkankan-order/src/main/java/com/fdkankan/order/feign/OrderFeignClient.java

@@ -656,7 +656,9 @@ public class OrderFeignClient {
     }
 
     public Result insertIncrementOrder(Long userId, RequestIncrementOrder order, BigDecimal price) throws Exception{
-        BigDecimal total = price.multiply(new BigDecimal(order.getCount()));
+
+        Integer num = order.getCount() * order.getMonthQy();
+        BigDecimal total = price.multiply(new BigDecimal(num));
 
         IncrementOrderEntity incrementOrderEntity = new IncrementOrderEntity();
         incrementOrderEntity.setOrderSn(NumberUtils.getOrderSn());
@@ -666,7 +668,18 @@ public class OrderFeignClient {
         incrementOrderEntity.setUserId(userId);
         incrementOrderEntity.setCount(order.getCount());
         incrementOrderEntity.setAbroad(order.getAbroad());
+        if(order.getMonthQy()!=null){
+            incrementOrderEntity.setMonthQy(order.getMonthQy());
+        }
+
         incrementOrderEntity.setStatus(order.getIncrementId() == null ? 1 : 2);
+
+        if(order.getSkuSn()!=null && order.getSkuSn().equals("U15604132404280503")){
+            incrementOrderEntity.setMemberLevels("SE");
+        }else{
+            incrementOrderEntity.setMemberLevels("PR");
+        }
+
         incrementOrderEntity.setIncrementId(order.getIncrementId());
         incrementOrderService.save(incrementOrderEntity);
         ResponseIncrementOrder incrementOrder = new ResponseIncrementOrder();
@@ -686,8 +699,6 @@ public class OrderFeignClient {
         downloadOrderEntity.setCount(order.getCount());
         downloadOrderEntity.setAbroad(order.getAbroad());
         downloadOrderEntity.setStatus(1);
-        downloadOrderEntity.setSceneNum(order.getSceneNum());
-        downloadOrderEntity.setSceneName(order.getSceneName());
         downloadOrderService.save(downloadOrderEntity);
         ResponseDownloadOrder downloadOrder = new ResponseDownloadOrder();
         BeanUtils.copyProperties(downloadOrderEntity, downloadOrder);
@@ -714,11 +725,6 @@ public class OrderFeignClient {
         return Result.success(responseIncrementOrder);
     }
 
-    public IncrementOrderEntity findEntityIncrementOrderByOrderSn(String orderSn) throws Exception {
-        IncrementOrderEntity incrementOrderEntity = incrementOrderService.findByOrderSn(orderSn);
-        return incrementOrderEntity;
-    }
-
     public Result findDownloadOrderByOrderSn(String orderSn) throws Exception {
         DownloadOrderEntity downloadOrderEntity = downloadOrderService.findByOrderSn(orderSn);
         if (downloadOrderEntity == null){
@@ -729,11 +735,6 @@ public class OrderFeignClient {
         return Result.success(responseDownloadOrder);
     }
 
-    public DownloadOrderEntity findEntityDownloadOrderByOrderSn(String orderSn) throws Exception {
-        DownloadOrderEntity downloadOrderEntity = downloadOrderService.findByOrderSn(orderSn);
-        return downloadOrderEntity;
-    }
-
     public ExpansionOrderEntity findEntityExpansionOrderByOrderSn(String orderSn) throws Exception {
         ExpansionOrderEntity expansionOrderEntity = expansionOrderService.findByOrderSn(orderSn);
         return expansionOrderEntity;
@@ -867,20 +868,8 @@ public class OrderFeignClient {
         return Result.success(incrementOrderService.findByIncrementOrderId(orderId));
     }
 
-    public IncrementOrderEntity findByIncrementOrderByOrderId(Long orderId) throws Exception {
-        return incrementOrderService.findById(orderId);
-    }
-
     public Result findByVirtualOrderId(Long orderId) throws Exception {
         return Result.success(virtualOrderService.findByVirtualOrderId(orderId));
 
     }
-
-    public Result findByDownloadOrderId(Long orderId) throws Exception {
-        return Result.success(downloadOrderService.findByDownloadOrderId(orderId));
-    }
-
-    public DownloadOrderEntity findByDownloadOrderByOrderId(Long orderId) throws Exception {
-        return downloadOrderService.findById(orderId);
-    }
 }

4dkankan-order/src/main/java/com/fdkankan/order/mapper/IIncrementOrderMapper.java

@@ -7,6 +7,9 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
+
 /**
  * Created by Hb_zzZ on 2021/3/15.
  */
@@ -16,6 +19,7 @@ public interface IIncrementOrderMapper extends IBaseMapper<IncrementOrderEntity,
     @Select(" SELECT * FROM t_increment_order WHERE order_sn = #{orderSn} AND REC_STATUS = 'A' LIMIT 1 ")
     IncrementOrderEntity findByOrderSn(@Param("orderSn")String orderSn);
 
-    @Update(" UPDATE t_increment_order SET pay_type = #{paymentTypeName}, number = #{tradeNo}, pay_status = 1, trade_time = NOW() where order_sn = #{orderSn} ")
-    int paySuccessIncrementOrder(@Param("orderSn")String orderSn, @Param("tradeNo")String tradeNo, @Param("paymentTypeName")int paymentTypeName);
+    @Update(" UPDATE t_increment_order SET pay_type = #{paymentTypeName}, number = #{tradeNo}, pay_status = 1, trade_time = #{date} where order_sn = #{orderSn} ")
+    int paySuccessIncrementOrder(@Param("orderSn")String orderSn, @Param("tradeNo")String tradeNo,
+                                 @Param("paymentTypeName")int paymentTypeName, @Param("date") Date date);
 }

4dkankan-order/src/main/java/com/fdkankan/order/service/impl/IncrementOrderServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -49,7 +50,9 @@ public class IncrementOrderServiceImpl extends BaseServiceImpl<IncrementOrderEnt
 
     @Override
     public int paySuccessIncrementOrder(String orderSn, String tradeNo, int paymentTypeName) {
-        return mapper.paySuccessIncrementOrder(orderSn, tradeNo, paymentTypeName);
+
+        Date date = new Date();
+        return mapper.paySuccessIncrementOrder(orderSn, tradeNo, paymentTypeName,date);
     }
 
     @Override

4dkankan-order/src/main/java/com/fdkankan/order/service/impl/OrderServiceImpl.java

@@ -115,7 +115,6 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderEntity, Long> impleme
             responseOrder.setOrderSn(order.getOrderSn());
             responseOrder.setOrderStatus(order.getOrderStatus().name());
             responseOrder.setPaymentStatus(order.getPaymentStatus().name());
-            responseOrder.setPaymentTypeName(order.getPaymentTypeName());
             responseOrder.setShippingStatus(order.getShippingStatus().name());
             responseOrder.setGoodsAmount(order.getGoodsAmount());
             responseOrder.setExpressAmount(order.getExpressAmount());
@@ -126,7 +125,6 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderEntity, Long> impleme
             responseOrder.setShipAddress(order.getShipAddress());
             responseOrder.setShipAreaPath(order.getShipAreaPath());
             responseOrder.setShipMobile(order.getShipMobile());
-            responseOrder.setUserId(order.getUserId());
             //查找订单子表
             List<ResponseOrderItem> responseOrderItems = orderItemService.findOrderItemsByOrderId(orderId);
             responseOrder.setOrderItems(responseOrderItems);

4dkankan-pay/pom.xml

@@ -22,7 +22,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-scene/4dkankan-scene.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -44,7 +44,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -490,6 +490,5 @@
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.0.2" level="project" />
     <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
-    <orderEntry type="module" module-name="4dkankan-goods" />
   </component>
 </module>

4dkankan-scene/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -56,10 +56,6 @@
             <artifactId>thumbnailator</artifactId>
             <version>0.4.8</version>
         </dependency>
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-goods</artifactId>
-        </dependency>
     </dependencies>
 
     <distributionManagement>

4dkankan-scene/src/main/java/com/fdkankan/scene/entity/Scene3dFamilyEntity.java

@@ -1,60 +0,0 @@
-package com.fdkankan.scene.entity;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fdkankan.base.entity.BaseEntity;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.Date;
-
-/**
- * 场景表
- */
-@Data
-@Table(name = "t_scene_3dfamily")
-public class Scene3dFamilyEntity extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 661912133849676944L;
-
-    /**
-     * 大场景序号
-     */
-    @Column(name = "scene_num")
-    private String sceneNum;
-
-    /**
-     * zip包存放路径
-     */
-    @Column(name = "zip_link")
-    private String zipLink;
-
-    /**
-     * 创建人
-     */
-    @Column(name = "create_uesr")
-    private long createUesr;
-
-    /**
-     * 更新人
-     */
-    @Column(name = "update_uesr")
-    private long updateuesr;
-
-    /**
-     * 状态 1 - 打包完成  0 - 打包中  2-打包失败 3 - 不存在下载任务
-     */
-    @Column(name = "status")
-    private Integer status;
-
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "zip_start_time")
-    private Date zipStartTime;
-
-    @Temporal(TemporalType.TIMESTAMP)
-    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "zip_end_time")
-    private Date zipEndTime;
-}

4dkankan-scene/src/main/java/com/fdkankan/scene/entity/SceneProEditEntity.java

@@ -201,10 +201,4 @@ public class SceneProEditEntity extends BaseEntity implements Serializable {
 
     @Column(name = "videos_user")
     private String videosUser;
-
-    /**
-     * 随心装场景码
-     */
-    @Column(name = "vr_num")
-    private String vrNum;
 }

4dkankan-scene/src/main/java/com/fdkankan/scene/entity/SceneProEntity.java

@@ -148,7 +148,7 @@ public class SceneProEntity extends BaseEntity implements Serializable {
     private String buildType;
 
     /**
-     * 场景来源，相机拍摄10以内表示， 1表示八目，2双目，3转台，4 激光
+     * 场景来源，相机拍摄10以内表示，1表示八目，
      * 其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景
      */
     @Column(name = "scene_source")
@@ -162,10 +162,4 @@ public class SceneProEntity extends BaseEntity implements Serializable {
      */
     @Transient
     private String mqMsg;
-
-    /**
-     * 随心装场景码
-     */
-    @Column(name = "vrnum")
-    private String vrnum;
 }

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

@@ -8,25 +8,25 @@ import com.fdkankan.common.model.Result;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.UploadToOssUtil;
+import com.fdkankan.common.vo.request.RequestBase;
 import com.fdkankan.common.vo.request.RequestCamera;
 import com.fdkankan.common.vo.request.RequestScene;
 import com.fdkankan.common.vo.response.ResponseFolder;
 import com.fdkankan.common.vo.response.ResponseScene;
 import com.fdkankan.common.vo.response.ResponseSceneFeedback;
-import com.fdkankan.goods.entity.CameraEntity;
-import com.fdkankan.goods.service.ICameraService;
 import com.fdkankan.scene.entity.*;
 import com.fdkankan.scene.service.*;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.util.StringUtil;
+import javafx.scene.Scene;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 import tk.mybatis.mapper.entity.Condition;
 
 import java.io.File;
@@ -38,7 +38,6 @@ public class SceneFeignClient {
 
     @Autowired
     private ISceneFileBuildService sceneFileBuildService;
-
     @Autowired
     private ISceneService sceneService;
 
@@ -46,9 +45,6 @@ public class SceneFeignClient {
     private ISceneProService sceneProService;
 
     @Autowired
-    private ISceneCooperationService sceneCooperationService;
-
-    @Autowired
     private ISceneProEditService sceneProEditService;
     @Autowired
     private ISceneFeedbackService sceneFeedbackService;
@@ -61,8 +57,6 @@ public class SceneFeignClient {
 
     @Autowired
     private UploadToOssUtil uploadToOssUtil;
-    @Autowired
-    private ICameraService iCameraService;
 
     public int getSceneCount(Long cameraId){
         return sceneProService.getSceneCount(cameraId);
@@ -131,18 +125,6 @@ public class SceneFeignClient {
         Page<ResponseScene> a = new Page<ResponseScene>(param.getPageNum(), param.getPageSize());
         a.setTotal(total);
         PageInfo<ResponseScene> result = a.toPageInfo();
-        if (responseOrders != null) {
-            responseOrders.parallelStream().forEach(scene->{
-                // 当计算时，返回给前端的状态为计算中
-                if (!ObjectUtils.isEmpty(scene)) {
-                    if (scene.getStatus() == -1) {
-                        scene.setStatus(0);
-                    } else if (scene.getStatus() == 500) {
-                        scene.setStatus(-1);
-                    }
-                }
-            });
-        }
         result.setList(responseOrders);
         return Result.success(result);
     }
@@ -310,18 +292,7 @@ public class SceneFeignClient {
 
         List<SceneProEntity> sceneEntityList = new ArrayList<>();
         List<FolderEntity> folderEntityList = new ArrayList<>();
-
 //        Integer scencenum = 0;//非八目相机数量记录
-        CameraEntity cameraEntity = new CameraEntity();
-
-        String sceneName = "";
-        if(StringUtils.isNotEmpty(param.getKeywordType())){
-            if(param.getKeywordType().equals("sceneName")){
-                sceneName = param.getSearchKey();
-            }else if(param.getKeywordType().equals("snCode")){
-                cameraEntity = iCameraService.findBySnCode(param.getSearchKey());
-            }
-        }
 
         //根目录时，需要排除已经归类的场景
         if(param.getFolderId() == null){
@@ -371,30 +342,12 @@ public class SceneFeignClient {
             if(sceneIdList.size() > 0){
                 sceneCondition.and().andNotIn("id", sceneIdList);
             }
-
-            //协作者 检索
-            if(param.getKeywordType().equals("userName") && StringUtils.isNotEmpty(param.getSearchKey()) ){
-                if( param.getSceneNumList()!=null &&  param.getSceneNumList().size()>0) {
-                    sceneCondition.and().andIn("num", param.getSceneNumList());
-                }else{
-                    sceneCondition.and().andEqualTo("num","");
-                }
-            }
-
             if(param.getSceneSource() != null){
                 sceneCondition.and().andEqualTo("sceneSource", param.getSceneSource());
             }
             if(StringUtil.isNotEmpty(param.getSceneType())){
                 sceneCondition.and().andEqualTo("sceneType", param.getSceneType());
             }
-            if(cameraEntity!=null && cameraEntity.getId()!=null){
-                sceneCondition.and().andEqualTo("cameraId", cameraEntity.getId());
-            }
-            if(StringUtils.isNotEmpty(sceneName)){
-//                sceneCondition.and().andEqualTo("sceneName", sceneName);
-                sceneCondition.and().andLike("sceneName", "%" + sceneName + "%");
-            }
-
             if(param.getStartTime() != null){
                 sceneCondition.and().andGreaterThanOrEqualTo("createTime", param.getStartTime());
             }
@@ -420,39 +373,18 @@ public class SceneFeignClient {
             if(sceneIdList.size() > 0){
                 Condition sceneCondition = new Condition(SceneProEntity.class);
                 sceneCondition.and().andEqualTo("userId", userId).andNotEqualTo("sceneSource", "11").andIn("id", sceneIdList);
-
                 if(param.getSceneSource() != null){
                     sceneCondition.and().andEqualTo("sceneSource", param.getSceneSource());
                 }
-
-                //协作者 检索
-                if(param.getKeywordType().equals("userName") && StringUtils.isNotEmpty(param.getSearchKey()) ){
-                    if( param.getSceneNumList()!=null &&  param.getSceneNumList().size()>0) {
-                        sceneCondition.and().andIn("num", param.getSceneNumList());
-                    }else{
-                        sceneCondition.and().andEqualTo("num","");
-                    }
-                }
-
                 if(StringUtil.isNotEmpty(param.getSceneType())){
                     sceneCondition.and().andEqualTo("sceneType", param.getSceneType());
                 }
-
-                if(cameraEntity!=null && cameraEntity.getId()!=null){
-                    sceneCondition.and().andEqualTo("cameraId", cameraEntity.getId());
-                }
-                if(StringUtils.isNotEmpty(sceneName)){
-                    sceneCondition.and().andLike("sceneName", "%" + sceneName + "%");
-                }
-
                 if(param.getStartTime() != null){
                     sceneCondition.and().andGreaterThanOrEqualTo("createTime", param.getStartTime());
                 }
-
                 if(param.getEndTime() != null){
                     sceneCondition.and().andLessThanOrEqualTo("createTime", param.getEndTime());
                 }
-
                 sceneEntityList = sceneProService.findAll(sceneCondition, "create_time desc");
             }
 

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

@@ -1,21 +0,0 @@
-package com.fdkankan.scene.mapper;
-
-import com.fdkankan.base.mapper.base.IBaseMapper;
-import com.fdkankan.scene.entity.Scene3dFamilyEntity;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-
-@Mapper
-public interface IScene3dFamilyMapper extends IBaseMapper<Scene3dFamilyEntity, Long> {
-
-    @Select(" select * from t_scene_3dfamily  where scene_num = #{num} AND status = #{status}  AND rec_status = 'A' limit 1")
-    Scene3dFamilyEntity findSceneNumByNum(@Param("num")String num, @Param("status")Integer status);
-
-    @Select(" select * from t_scene_3dfamily  where scene_num = #{num} AND rec_status = 'A' limit 1")
-    Scene3dFamilyEntity findSceneNumByNum2(@Param("num")String num);
-
-    @Update(" UPDATE t_scene_3dfamily  set rec_status = 'I' where scene_num = #{num} ")
-    int updateSceneNumByNum(@Param("num")String num);
-}

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

@@ -5,15 +5,14 @@ import com.fdkankan.scene.entity.Scene3dNumNewEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 @Mapper
 public interface IScene3dNumNewMapper extends IBaseMapper<Scene3dNumNewEntity, Long> {
 
-    @Select(" select * from t_scene_3d_num_new  where used = 0 AND rec_status = 'A' limit 1 FOR UPDATE ")
+    @Select(" select * from t_scene_3d_num_new  where used = 0 AND rec_status = 'A' limit 1")
     Scene3dNumNewEntity findSceneNum();
 
-
-    @Select(" select * from t_scene_3d_num_new where  code = #{sceneNum} AND rec_status = 'A' limit 1 ")
-    Scene3dNumNewEntity findByNum(@Param("sceneNum") String sceneNum);
-
+    @Update("UPDATE `t_scene_3d_num_new` SET used = 1 ,folder_name = #{unicode} WHERE code = #{code}")
+    int updateUsed(@Param("id") Long id,@Param("unicode") String unicode,@Param("code") String code);
 }

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

@@ -144,9 +144,6 @@ public interface ISceneMapper extends IBaseMapper<SceneEntity, Long> {
             " <if test= 'nums != null'> " +
             "   and a.num in (${nums})" +
             " </if> " +
-            " <if test= 'calculated  != null and calculated == true'> " +
-            "   and (a.status = 1 or a.status = -2)" +
-            " </if> " +
             " <if test= 'cameraIds != null'> " +
             "   and a.camera_id in (${cameraIds})" +
             " </if> " +

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

@@ -43,9 +43,6 @@ public interface ISceneProMapper extends IBaseMapper<SceneProEntity, Long> {
     @Update("UPDATE t_scene_pro SET create_time = NOW(),status=-2, space = #{space}, pay_status = #{payStatus}, videos = #{videos}, compute_time = #{computeTime} WHERE num = #{sceneNum}")
     int updateTime(@Param("sceneNum") String sceneNum, @Param("space") Long space,@Param("payStatus") int payStatus,@Param("videos") String videos, @Param("computeTime") long computeTime);
 
-    @Update("UPDATE t_scene_pro SET create_time = NOW(),status=-2,  videos = #{videos}, compute_time = #{computeTime} WHERE num = #{sceneNum}")
-    int updateTime2(@Param("sceneNum") String sceneNum, @Param("videos") String videos, @Param("computeTime") long computeTime);
-
     @Select(" SELECT * FROM t_scene_pro WHERE user_id = #{userId} AND rec_status = 'A' and camera_id is not null order by create_time desc LIMIT 1 ")
     ResponseScene findLatestOneByUserId(@Param("userId")Long userId);
 
@@ -113,9 +110,6 @@ public interface ISceneProMapper extends IBaseMapper<SceneProEntity, Long> {
     @Select("SELECT count(id) FROM t_scene_pro WHERE id in (SELECT scene_id from t_folder_scene WHERE folder_id = #{folderId}) and user_id = #{userId}")
     Integer findFolderIdScence(@Param("folderId")Long folderId, @Param("userId")Long userId);
 
-    @Update("UPDATE t_scene_pro_edit SET images_version = images_version + 1 WHERE pro_id = (SELECT id FROM t_scene_pro WHERE num=#{num} and rec_status = 'A' ) ")
-    int updateimageVersion(@Param("num")String num);
-
 
 
 

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

@@ -1,22 +0,0 @@
-package com.fdkankan.scene.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.base.service.IBaseService;
-import com.fdkankan.common.model.Result;
-import com.fdkankan.scene.entity.Scene3dFamilyEntity;
-import com.fdkankan.scene.entity.SceneProEntity;
-
-/**
- * Created by Hb_zzZ on 2019/7/23.
- */
-public interface IScene3dFamilyService extends IBaseService<Scene3dFamilyEntity, Long> {
-
-    Result createZip (SceneProEntity sceneProEntity,long userId) throws Exception;
-
-    Scene3dFamilyEntity findSceneNumByNum(SceneProEntity sceneProEntity,Integer status);
-
-    JSONObject findSceneNumByNum2(SceneProEntity sceneProEntity);
-
-    int updateSceneNumByNum (SceneProEntity sceneProEntity);
-
-}

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

@@ -7,5 +7,5 @@ public interface IScene3dNumNewService extends IBaseService<Scene3dNumNewEntity,
 
     Scene3dNumNewEntity findSceneNum();
 
-    Scene3dNumNewEntity findByNum(String num);
+    int updateUsed(Long id,String unicode,String code);
 }

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

@@ -6,7 +6,6 @@ import com.fdkankan.common.vo.request.RequestScene;
 import com.fdkankan.common.vo.request.RequestSceneEdit;
 import com.fdkankan.common.vo.response.ResponseScene;
 import com.fdkankan.scene.entity.SceneEntity;
-import com.fdkankan.scene.entity.SceneProEditEntity;
 import com.fdkankan.scene.entity.SceneProEntity;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.multipart.MultipartFile;
@@ -101,8 +100,6 @@ public interface ISceneProService extends IBaseService<SceneProEntity, Long> {
 
     int updateTime(String sceneNum, Long space, int payStatus, String videos, long computeTime);
 
-    int updateTime2(String sceneNum, String videos, long computeTime);
-
     ResponseScene findLatestOneByUserId(Long userId);
 
     void updateUserIdByCameraId(Long userId, Long cameraId);
@@ -166,11 +163,4 @@ public interface ISceneProService extends IBaseService<SceneProEntity, Long> {
 
     Integer findFolderIdScence(Long folderId, Long userId);
 
-    Result updateimageVersion(String sceneNum) throws Exception;
-
-    SceneProEditEntity findEdit(SceneProEntity sceneProEntity);
-
-    Result updateEdit(SceneProEditEntity sceneProEditEntity);
-
-
 }

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

@@ -1,172 +0,0 @@
-package com.fdkankan.scene.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.base.constant.SceneConstant;
-import com.fdkankan.base.mapper.base.IBaseMapper;
-import com.fdkankan.base.service.impl.BaseServiceImpl;
-import com.fdkankan.base.util.ConvertUtils;
-import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.exception.BaseRuntimeException;
-import com.fdkankan.common.model.Result;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.UploadToOssUtil;
-import com.fdkankan.common.vo.response.ResponseScene;
-import com.fdkankan.scene.entity.Scene3dFamilyEntity;
-import com.fdkankan.scene.entity.SceneProEntity;
-import com.fdkankan.scene.mapper.IScene3dFamilyMapper;
-import com.fdkankan.scene.service.IScene3dFamilyService;
-import com.fdkankan.scene.service.ISceneProService;
-import com.fdkankan.scene.util.CreateObjUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.util.Date;
-
-/**
- * Created by Hb_zzZ on 2019/6/28.
- */
-@Slf4j
-@Service
-public class Scene3dFamilyServiceImpl extends BaseServiceImpl<Scene3dFamilyEntity, Long> implements IScene3dFamilyService {
-
-    private static String DIR_NAME = "downloads/furnished/";
-
-    @Autowired
-    private IScene3dFamilyMapper Scene3dFamilyMapper;
-
-    @Autowired
-    private ISceneProService sceneProService;
-
-    @Autowired
-    private UploadToOssUtil uploadToOssUtil;
-
-    @Value("${prefix.ali}")
-    private String prefixAli;
-
-    @Override
-    public IBaseMapper<Scene3dFamilyEntity, Long> getBaseMapper() {
-        return this.Scene3dFamilyMapper;
-    }
-
-    @Override
-    public Result createZip(SceneProEntity sceneProEntity,long userId) throws Exception{
-
-        Scene3dFamilyEntity scene3dFamilyEntity = Scene3dFamilyMapper.findSceneNumByNum(sceneProEntity.getNum(),0);
-        String path = sceneProEntity.getDataSource() + "_3df" + File.separator + sceneProEntity.getNum();
-        try {
-            if(scene3dFamilyEntity == null){
-                throw new BaseRuntimeException(SceneConstant.FAILURE_CODE_5032, SceneConstant.FAILURE_MSG_5032);
-            }
-
-            log.info("三维家 信息保存 路径 : " + path);
-            //创建文件夹
-            FileUtils.createDir(path);
-
-            //生成vision.json
-            sceneProService.downloadVisionData(sceneProEntity.getNum());
-            //拉取data
-            CreateObjUtil.ossUtilCp("data" + File.separator + "data" + sceneProEntity.getNum()  + File.separator,
-                    path + File.separator + "scene" + File.separator + "data" + File.separator + "data" + sceneProEntity.getNum());
-
-
-            //写入 scene.json 改名为 getinfo.json
-            Result result = sceneProService.getInfo(sceneProEntity.getNum());
-            ResponseScene responseScene = (ResponseScene) result.getData();
-
-            JSONObject dataJson = (JSONObject) JSONObject.toJSON(responseScene);
-
-            FileUtils.writeFile(path + File.separator + "scene"  + File.separator + "data" +  File.separator  + "data"
-                                      + sceneProEntity.getNum() + File.separator + "getinfo.json", dataJson.toString());
-
-            //拉取images
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProEntity.getNum()  + File.separator + "floorLogoImg.png",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProEntity.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProEntity.getNum()  + File.separator + "floorplan.png",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProEntity.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProEntity.getNum()  + File.separator + "logo-main.png",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProEntity.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProEntity.getNum()  + File.separator + "logo-main-en.png",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProEntity.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProEntity.getNum()  + File.separator + "smallPic.jpg",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProEntity.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProEntity.getNum()  + File.separator + "thumbBigImg.jpg",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProEntity.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProEntity.getNum()  + File.separator + "thumbSmallImg.jpg",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProEntity.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProEntity.getNum()  + File.separator + "pan",
-                    path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProEntity.getNum());
-
-            //拉取video
-            CreateObjUtil.ossUtilCp("video" + File.separator + "video" + sceneProEntity.getNum()  + File.separator,
-                    path + File.separator + "scene"  + File.separator + "video" + File.separator + "video" + sceneProEntity.getNum());
-
-            //拉取voice
-            CreateObjUtil.ossUtilCp("voice" + File.separator + "voice" + sceneProEntity.getNum()  + File.separator,
-                    path + File.separator + "scene"  + File.separator + "voice" + File.separator + "voice" + sceneProEntity.getNum());
-
-            //压缩zip
-            FileUtils.zipFile(path + ".zip", path);
-            log.info("三维家 zip完成 : " + path);
-
-            //上传oss
-            // 上传到阿里云sso
-            uploadToOssUtil.upload(path + ".zip", DIR_NAME + sceneProEntity.getNum() + ".zip");
-            log.info("upload success");
-
-            String url = prefixAli + DIR_NAME + sceneProEntity.getNum() + ".zip";
-
-            log.info("upload url: {}" + url);
-
-            scene3dFamilyEntity.setZipLink(url);
-            scene3dFamilyEntity.setStatus(1);
-            scene3dFamilyEntity.setZipEndTime(new Date());
-            scene3dFamilyEntity.setUpdateTime(new Date());
-            Scene3dFamilyMapper.updateByPrimaryKey(scene3dFamilyEntity);
-        }catch (Exception e){
-            scene3dFamilyEntity.setStatus(2);
-            scene3dFamilyEntity.setZipEndTime(new Date());
-            scene3dFamilyEntity.setUpdateTime(new Date());
-            Scene3dFamilyMapper.updateByPrimaryKey(scene3dFamilyEntity);
-
-            e.printStackTrace();
-        }finally {
-            FileUtils.deleteDirectory(path);
-            FileUtils.deleteDirectory(path + ".zip");
-        }
-
-        return Result.success();
-    }
-
-
-    @Override
-    public Scene3dFamilyEntity findSceneNumByNum(SceneProEntity sceneProEntity,Integer status){
-
-        //验证是否在打包
-        return Scene3dFamilyMapper.findSceneNumByNum(sceneProEntity.getNum(),status);
-    }
-
-    @Override
-    public JSONObject findSceneNumByNum2(SceneProEntity sceneProEntity){
-
-        JSONObject jsonObject = new JSONObject();
-        Scene3dFamilyEntity scene3dFamilyEntity = Scene3dFamilyMapper.findSceneNumByNum2(sceneProEntity.getNum());
-        if(scene3dFamilyEntity!=null){
-            jsonObject.put("url",scene3dFamilyEntity.getZipLink() == null ?"":scene3dFamilyEntity.getZipLink());
-            jsonObject.put("status",scene3dFamilyEntity.getStatus());
-        }else{
-            jsonObject.put("url","");
-            jsonObject.put("status",3);
-        }
-        //验证是否在打包
-        return jsonObject;
-    }
-
-    @Override
-    public int updateSceneNumByNum (SceneProEntity sceneProEntity){
-
-        return Scene3dFamilyMapper.updateSceneNumByNum(sceneProEntity.getNum());
-    }
-}

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

@@ -27,7 +27,7 @@ public class Scene3dNumNewServiceImpl extends BaseServiceImpl<Scene3dNumNewEntit
     }
 
     @Override
-    public Scene3dNumNewEntity findByNum(String num) {
-        return scene3dNumMapper.findByNum(num);
+    public int updateUsed(Long id,String unicode,String code) {
+        return scene3dNumMapper.updateUsed(id,unicode,code);
     }
 }

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

@@ -968,14 +968,11 @@ public class SceneProAppServiceImpl extends BaseServiceImpl<SceneProEntity, Long
 
         //文件上传的位置可以自定义
         String path = ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+sceneNum;
-        log.info("path:" + path);
-
 
         String accessToken = WeiXinUtils.getAccessToken();
 
         InputStream is = null;
-        String url = "https://file.api.weixin.qq.com/cgi-bin/media/get?access_token="+ accessToken + "&media_id=" + id;
-        log.info("url:" + url);
+        String url = "http://file.api.weixin.qq.com/cgi-bin/media/get?access_token="+ accessToken + "&media_id=" + id;
         URL urlGet = new URL(url);
         HttpURLConnection http = (HttpURLConnection) urlGet
                 .openConnection();

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

@@ -78,6 +78,7 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
     private ISceneService sceneService;
 
 
+
     @Value("${main.url}")
     private String mainUrl;
 
@@ -1935,7 +1936,7 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
         }
 
         //重算全景图并上传oss或oss
-        if(scenejson.containsKey("buildImages")){
+        if(scenejson.containsKey("buildImages") && scenejson.getIntValue("buildImages") == 1){
             String path = sceneProEntity.getDataSource();
 
             if(path != null && !"".equals(path) && path.startsWith("http")){
@@ -1946,163 +1947,165 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
             File images = new File(target + File.separator + "extras/images");
             File video = new File(target + File.separator + "extras/video");
 
-            if(scenejson.getIntValue("buildImages") == 1){
-                log.info("下载vision.modeldata文件");
-                if("s3".equals(this.type)){
-                    FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
-                            "vision.modeldata", target + File.separator + "extras" + File.separator);
-                }
-                if("oss".equals(this.type)){
-                    FileUtils.downLoadFromUrl(prefixAli + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
-                            "vision.modeldata", target + File.separator + "extras" + File.separator);
-                }
-                CreateObjUtil.convertVisionmodeldataToTxt(target + File.separator + "extras" + File.separator + "vision.modeldata",
-                        target + File.separator + "extras" + File.separator + "vision.txt");
-
-                if(images.exists() && images.listFiles() != null && images.listFiles().length > 0){
-
-                    FileUtils.copyFile(path + File.separator + "data.json", target + File.separator+"data.json", true);
-                    FileUtils.copyFile(path + File.separator + "project.json", target + File.separator+"project.json", true);
-
-                    //data.json增加extras为执行重建算法
-                    String data = FileUtils.readFile(target + File.separator+"data.json");
-                    if(data != null){
-                        JSONObject floorplanJson = new JSONObject();
-                        floorplanJson.put("has_source_images", true);
-                        floorplanJson.put("has_vision_txt", true);
-
-                        JSONObject dataJson = JSONObject.parseObject(data);
-                        dataJson.put("extras", floorplanJson);
-                        //V5表示不需要生成high，low文件
-                        dataJson.put("skybox_type", "SKYBOX_V6");
-                        if(sceneProEntity.getSceneScheme() == 11){
-                            dataJson.put("skybox_type", "SKYBOX_V7");
-                        }
-                        dataJson.put("split_type", "SPLIT_V8");
-                        //sceneScheme为3切成瓦片图
-                        if(sceneProEntity.getSceneScheme() == 3){
-                            dataJson.put("skybox_type", "SKYBOX_V4");
-                        }
-                        FileUtils.writeFile(target + File.separator+"data.json", new String(dataJson.toString().getBytes(), "UTF-8"));
-                    }
+            log.info("下载vision.modeldata文件");
+            if("s3".equals(this.type)){
+                FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
+                        "vision.modeldata", target + File.separator + "extras" + File.separator);
+            }
+            if("oss".equals(this.type)){
+                FileUtils.downLoadFromUrl(prefixAli + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
+                        "vision.modeldata", target + File.separator + "extras" + File.separator);
+            }
+            CreateObjUtil.convertVisionmodeldataToTxt(target + File.separator + "extras" + File.separator + "vision.modeldata",
+                    target + File.separator + "extras" + File.separator + "vision.txt");
 
-                    //创建文件夹软连接并且复制data.json和project.json
-                    if(new File(target + File.separator + "capture").exists()){
-                        new File(target + File.separator + "capture").delete();
-                    }
-                    if(new File(target + File.separator + "results").exists()){
-                        FileUtils.delAllFile(target + File.separator + "results");
-                    }
-                    //下载data.fdage
-                    if("s3".equals(this.type)){
-                        //亚马逊保持旧方式，超链接capture
-                        CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
-                    }
-                    CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
+            if(images.exists() && images.listFiles() != null && images.listFiles().length > 0){
 
-                    CreateObjUtil.build3dModel(target , "1");
+                FileUtils.copyFile(path + File.separator + "data.json", target + File.separator+"data.json", true);
+                FileUtils.copyFile(path + File.separator + "project.json", target + File.separator+"project.json", true);
 
-                    //读取upload文件，检验需要上传的文件是否存在
-                    String uploadData = FileUtils.readFile(target + File.separator + "results" +File.separator+"upload.json");
-                    JSONObject uploadJson = null;
-                    JSONArray array = null;
-                    if(uploadData!=null) {
-                        uploadJson = JSONObject.parseObject(uploadData);
-                        array = uploadJson.getJSONArray("upload");
+                //data.json增加extras为执行重建算法
+                String data = FileUtils.readFile(target + File.separator+"data.json");
+                if(data != null){
+                    JSONObject floorplanJson = new JSONObject();
+                    floorplanJson.put("has_source_images", true);
+                    floorplanJson.put("has_vision_txt", true);
+
+                    JSONObject dataJson = JSONObject.parseObject(data);
+                    dataJson.put("extras", floorplanJson);
+                    //V5表示不需要生成high，low文件
+                    dataJson.put("skybox_type", "SKYBOX_V6");
+                    if(sceneProEntity.getSceneScheme() == 11){
+                        dataJson.put("skybox_type", "SKYBOX_V7");
                     }
-                    if(array == null){
-                        throw new Exception("upload.json数据出错");
+                    dataJson.put("split_type", "SPLIT_V8");
+                    //sceneScheme为3切成瓦片图
+                    if(sceneProEntity.getSceneScheme() == 3){
+                        dataJson.put("skybox_type", "SKYBOX_V4");
                     }
-                    JSONObject fileJson = null;
-                    String fileName = "";
-                    for(int i = 0, len = array.size(); i < len; i++){
-                        fileJson = array.getJSONObject(i);
-                        fileName = fileJson.getString("file");
-                        //文件不存在抛出异常
-                        if(!new File(target + File.separator + "results" +File.separator + fileName).exists()){
-                            throw new Exception(target + File.separator + "results" +File.separator + fileName+"文件不存在");
-                        }
+                    FileUtils.writeFile(target + File.separator+"data.json", new String(dataJson.toString().getBytes(), "UTF-8"));
+                }
 
-                        //high文件夹
-                        if(fileJson.getIntValue("clazz") == 3){
-                            map.put(target + File.separator + "results" +File.separator+ fileName,"images/images"+
-                                    sceneProEntity.getNum()+"/pan/high/"+ fileName.replace("high/", ""));
-                            continue;
-                        }
-                        //low文件夹
-                        if(fileJson.getIntValue("clazz") == 4){
-                            map.put(target + File.separator + "results" +File.separator+ fileName,"images/images"+
-                                    sceneProEntity.getNum()+"/pan/low/"+ fileName.replace("low/", ""));
-                            continue;
-                        }
+                //创建文件夹软连接并且复制data.json和project.json
+                if(new File(target + File.separator + "capture").exists()){
+                    new File(target + File.separator + "capture").delete();
+                }
+                if(new File(target + File.separator + "results").exists()){
+                    FileUtils.delAllFile(target + File.separator + "results");
+                }
+                //下载data.fdage
+                if("s3".equals(this.type)){
+                    //亚马逊保持旧方式，超链接capture
+                    CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
+                }
+                CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
 
-                        //tiles文件夹,亚马逊没有裁剪图片api，不需要上传4k图
-                        if(fileJson.getIntValue("clazz") == 5){
-                            map.put(target + File.separator + "results" + File.separator+ fileName,"images/images"+
-                                    sceneProEntity.getNum()+ File.separator + fileName);
-                            continue;
-                        }
+                CreateObjUtil.build3dModel(target , "1");
 
-                        //tiles文件夹,亚马逊瓦片图
-                        if(fileJson.getIntValue("clazz") == 7 ){
-                            map.put(target + File.separator + "results" + File.separator+ fileName,"images/images"+
-                                    sceneProEntity.getNum()+ File.separator + fileName);
-                            continue;
+                //读取upload文件，检验需要上传的文件是否存在
+//                Thread.sleep(20000L);
+
+                String uploadPath = target + File.separator + "results" +File.separator+"upload.json";
+
+                long timeStamp = System.currentTimeMillis();
+                Integer time = 0;
+                boolean isExsts = true;
+                while (isExsts){
+                    File f = new File(uploadPath);
+                    long diff = System.currentTimeMillis() - timeStamp;
+                    log.info("文件生产时间倒计时 -- " + diff/1000);
+                    if (f.exists()) {
+                        isExsts = false;
+                    }else{
+                        if(diff/1000 > 30){
+                            isExsts = false;
                         }
                     }
+                }
 
-                    for(String imagesName : images.list()){
-                        //覆盖原始图片资源
-                        FileUtils.copyFile(target + File.separator + "extras/images/" + imagesName,
-                                path + File.separator + "caches/images/" + imagesName, true);
-                        FileUtils.deleteFile(target + File.separator + "extras/images/" + imagesName);
-                    }
+//                String pathW = "/mnt/data/02613f6e8/812690850248130560/7ca7b00e9a90_202102200957308970_images/results/upload.json";
+                String uploadData = FileUtils.readFile(target + File.separator + "results" +File.separator+"upload.json");
+
+                JSONObject uploadJson = null;
+                JSONArray array = null;
+                if(uploadData!=null) {
+                    uploadJson = JSONObject.parseObject(uploadData);
+                    array = uploadJson.getJSONArray("upload");
                 }
 
-                if(video.exists() && video.listFiles() != null && video.listFiles().length > 0){
-                    for(String videoName : video.list()){
-                        uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName,"video/video"+
-                                sceneProEntity.getNum()+ File.separator + videoName);
+                log.info("uploadData" + array);
 
-                        CreateObjUtil.mp4ToFlv(target + File.separator + "extras/video/" + videoName,
-                                target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"));
+                if(array == null){
+                    throw new Exception("upload.json数据出错");
+                }
+                JSONObject fileJson = null;
+                String fileName = "";
+                for(int i = 0, len = array.size(); i < len; i++){
+                    fileJson = array.getJSONObject(i);
+                    fileName = fileJson.getString("file");
+                    //文件不存在抛出异常
+                    if(!new File(target + File.separator + "results" +File.separator + fileName).exists()){
+                        throw new Exception(target + File.separator + "results" +File.separator + fileName+"文件不存在");
+                    }
 
-                        uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"),"video/video"+
-                                sceneProEntity.getNum()+ File.separator + videoName.replace("mp4", "flv"));
+                    //high文件夹
+                    if(fileJson.getIntValue("clazz") == 3){
+                        map.put(target + File.separator + "results" +File.separator+ fileName,"images/images"+
+                                sceneProEntity.getNum()+"/pan/high/"+ fileName.replace("high/", ""));
+                        continue;
+                    }
+                    //low文件夹
+                    if(fileJson.getIntValue("clazz") == 4){
+                        map.put(target + File.separator + "results" +File.separator+ fileName,"images/images"+
+                                sceneProEntity.getNum()+"/pan/low/"+ fileName.replace("low/", ""));
+                        continue;
+                    }
 
-                        //覆盖原始视频资源
-                        FileUtils.copyFile(target + File.separator + "extras/video/" + videoName,
-                                path + File.separator + "caches/videos/" + videoName, true);
+                    //tiles文件夹,亚马逊没有裁剪图片api，不需要上传4k图
+                    if(fileJson.getIntValue("clazz") == 5){
+                        map.put(target + File.separator + "results" + File.separator+ fileName,"images/images"+
+                                sceneProEntity.getNum()+ File.separator + fileName);
+                        continue;
+                    }
 
+                    //tiles文件夹,亚马逊瓦片图
+                    if(fileJson.getIntValue("clazz") == 7 ){
+                        map.put(target + File.separator + "results" + File.separator+ fileName,"images/images"+
+                                sceneProEntity.getNum()+ File.separator + fileName);
+                        continue;
                     }
-                    FileUtils.deleteDirectory(target + File.separator + "extras/video/");
                 }
 
-            }else if(scenejson.getIntValue("buildImages") == 2){
-                if(video.exists() && video.listFiles() != null && video.listFiles().length > 0){
-                    for(String videoName : video.list()){
-                        uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName,"video/video"+
-                                sceneProEntity.getNum()+ File.separator + videoName);
+                for(String imagesName : images.list()){
+                    //覆盖原始图片资源
+                    FileUtils.copyFile(target + File.separator + "extras/images/" + imagesName,
+                            path + File.separator + "caches/images/" + imagesName, true);
+                    FileUtils.deleteFile(target + File.separator + "extras/images/" + imagesName);
+                }
+            }
 
-                        CreateObjUtil.mp4ToFlv(target + File.separator + "extras/video/" + videoName,
-                                target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"));
+            if(video.exists() && video.listFiles() != null && video.listFiles().length > 0){
+                for(String videoName : video.list()){
+                    uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName,"video/video"+
+                            sceneProEntity.getNum()+ File.separator + videoName);
 
-                        uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"),"video/video"+
-                                sceneProEntity.getNum()+ File.separator + videoName.replace("mp4", "flv"));
+                    CreateObjUtil.mp4ToFlv(target + File.separator + "extras/video/" + videoName,
+                            target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"));
 
-                        //覆盖原始视频资源
-                        FileUtils.copyFile(target + File.separator + "extras/video/" + videoName,
-                                path + File.separator + "caches/videos/" + videoName, true);
+                    uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"),"video/video"+
+                            sceneProEntity.getNum()+ File.separator + videoName.replace("mp4", "flv"));
+
+                    //覆盖原始视频资源
+                    FileUtils.copyFile(target + File.separator + "extras/video/" + videoName,
+                            path + File.separator + "caches/videos/" + videoName, true);
 
-                    }
-                    FileUtils.deleteDirectory(target + File.separator + "extras/video/");
                 }
+                FileUtils.deleteDirectory(target + File.separator + "extras/video/");
             }
 
             scenejson.put("imagesVersion", sceneProEditEntity.getImagesVersion() + 1);
             scenejson.put("buildImages", 0);
             sceneProEditEntity.setImagesVersion(sceneProEditEntity.getImagesVersion() + 1);
-
         }
 
         if(scenejson.containsKey("uploadBgMusic") && scenejson.getIntValue("uploadBgMusic") == 1){
@@ -3061,11 +3064,6 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
     }
 
     @Override
-    public int updateTime2(String sceneNum, String videos, long computeTime) {
-        return sceneProMapper.updateTime2(sceneNum,  videos, computeTime);
-    }
-
-    @Override
     public ResponseScene findLatestOneByUserId(Long userId) {
         return sceneProMapper.findLatestOneByUserId(userId);
     }
@@ -3092,7 +3090,6 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
 
     @Override
     public SceneProEntity findByFileId(String fileId) {
-
         return sceneProMapper.findByFileId(fileId);
     }
 
@@ -3539,15 +3536,9 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
         if(strsceneInfos!=null) {
             scenejson = JSONObject.parseObject(strsceneInfos);
         }
-        if(type.equals("video")){
-            scenejson.put("buildImages", 2);
-            FileUtils.writeFile(dataBuffer.toString() + "scene.json", scenejson.toString());
-        }else{
-            scenejson.put("buildImages", 1);
-            FileUtils.writeFile(dataBuffer.toString() + "scene.json", scenejson.toString());
-        }
-
 
+        scenejson.put("buildImages", 1);
+        FileUtils.writeFile(dataBuffer.toString() + "scene.json", scenejson.toString());
 
         return Result.success();
     }
@@ -3953,8 +3944,27 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
         CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
 
         CreateObjUtil.build3dModel(target , "1");
-
+//        CreateObjUtil.build3dModel2(target , "1");
         //读取upload文件，检验需要上传的文件是否存在
+//        Thread.sleep(20000L);
+
+        String uploadPath = target + File.separator + "results" +File.separator+"upload.json";
+        long timeStamp = System.currentTimeMillis();
+        Integer time = 0;
+        boolean isExsts = true;
+        while (isExsts){
+            File f = new File(uploadPath);
+            long diff = System.currentTimeMillis() - timeStamp;
+            log.info("文件生产时间倒计时 -- " + diff/1000);
+            if (f.exists()) {
+                isExsts = false;
+            }else{
+                if(diff/1000 > 30){
+                    isExsts = false;
+                }
+            }
+        }
+
         String uploadData = FileUtils.readFile(target + File.separator + "results" +File.separator+"upload.json");
         JSONObject uploadJson = null;
         JSONArray array = null;
@@ -4312,12 +4322,13 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
         if(sceneNum.indexOf("vr-")!=-1){
             SceneProEntity vrSceneProEntity = findLikeSceneNum(sceneNum);
             if(vrSceneProEntity != null){
-                responseScene.setVrNum(null);
+                responseScene.setVrNum(vrSceneProEntity.getNum());
                 responseScene.setVideosUser(null);
                 responseScene.setBgMusicName(null);
                 responseScene.setBgMusic(null);
             }
         }
+        
 
         //更新访问数量
         sceneService.updateViewCount(sceneNum);
@@ -4329,22 +4340,6 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, Long> i
         return sceneProMapper.findFolderIdScence(folderId,userId);
     }
 
-    @Override
-    public Result updateimageVersion(String sceneNum) throws Exception {
-        return Result.success(sceneProMapper.updateimageVersion(sceneNum));
-    }
-
-    @Override
-    public SceneProEditEntity findEdit(SceneProEntity sceneProEntity) {
-        return sceneProEditMapper.findByProId(sceneProEntity.getId());
-    }
-
-    @Override
-    public Result updateEdit(SceneProEditEntity sceneProEditEntity) {
-        return Result.success(sceneProEditMapper.updateByPrimaryKeySelective(sceneProEditEntity));
-    }
-
-
 
     public static void main(String[] args) {
         try {

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

@@ -1999,7 +1999,7 @@ public class SceneServiceImpl extends BaseServiceImpl<SceneEntity, Long> impleme
 
     @Override
     public List<SceneProEntity> findAllScene(String order, String sceneType, Integer sceneScheme,
-                                             Integer pageNum, Integer pageSize,Long userId,
+                                             Integer pageNum, Integer pageSize, Long userId,
                                              String sceneName, String cameraId, String startDate,
                                              String endDate, String num, String type, String likeNum, String nums) {
         Map<String, Object> map = new HashMap();

4dkankan-scene/src/main/java/com/fdkankan/scene/util/ComputerUtil.java

@@ -253,14 +253,9 @@ public class ComputerUtil {
 
             //video视频文件或封面图
             if (fileJson.getIntValue("clazz") == 20) {
-                if (fileName.contains(".flv")) {
-                    map.put(path + File.separator + "results" + File.separator + fileName, "video/video" +
-                            projectNum + File.separator + fileName.replace("videos/", ""));
-                }
-
                 if (fileName.contains(".mp4")) {
-                    map.put(path + File.separator + "results" + File.separator + fileName, "video/video" +
-                            projectNum + File.separator + fileName.replace("videos/", ""));
+                    map.put(path + File.separator + "results" + File.separator + fileName.replace("mp4", "flv"), "video/video" +
+                            projectNum + File.separator + fileName.replace("videos/", "").replace("mp4", "flv"));
                 }
             }
         }
@@ -408,12 +403,6 @@ public class ComputerUtil {
                 splitType = "SPLIT_V12";
             }
 
-            if(Integer.parseInt(cameraType) == 14){
-                //转台相机
-                log.info("激光转台相机调用算法");
-                skyboxType = "SKYBOX_V11";
-                splitType = "SPLIT_V14";
-            }
 
         }else {
             if("sfm".equals(algorithm)){
@@ -467,16 +456,6 @@ public class ComputerUtil {
             scene.setDataSource(prefix+imgsName);
         }
 
-        if(cameraType.longValue() == 14){
-
-            scene.setDataSource(ConstantFilePath.BUILD_MODEL_LASER_PATH +
-                    cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator +
-                    fileId + File.separator + unicode);
-
-            log.info("激光相机 dataSource ：" + scene.getDataSource());
-
-        }
-
         /*
         if(pic!=null&&pic.equals("1"))
         {
@@ -616,19 +595,13 @@ public class ComputerUtil {
             //场景来源双目相机
             scene.setSceneSource(2);
             scene.setDataSource(ConstantFilePath.BUILD_MODEL_PATH + unicode);
-        }else if(cameraType.longValue() == 14){
-
-            scene.setDataSource(ConstantFilePath.BUILD_MODEL_LASER_PATH +
-                    cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator +
-                    fileId + File.separator + unicode);
-
-            log.info("激光相机 dataSource ：" + scene.getDataSource());
-
-        }else if(cameraType.longValue() >= 3){
+        }
+        else if(cameraType.longValue() >= 3){
             scene.setDataSource(ConstantFilePath.BUILD_MODEL_PATH +
                     cameraName.replace("4DKKPRO_", "").replace("-fdage", "").toLowerCase() + File.separator +
                     fileId + File.separator + unicode);
-        }else {
+        }
+        else {
             scene.setDataSource(prefix+imgsName);
         }
 
@@ -653,12 +626,6 @@ public class ComputerUtil {
             scene.setSceneScheme(10);
         }
 
-        //激光相机
-        if(cameraType.longValue() == 14 ){
-            scene.setSceneSource(4);
-            scene.setSceneScheme(10);
-        }
-
         //亚马逊s3没有裁剪4k图的api
 //        if("s3".equals(ossType)){
 //            scene.setSceneScheme(3);

4dkankan-scene/src/main/java/com/fdkankan/scene/util/CreateObjUtil.java

@@ -89,23 +89,6 @@ public class CreateObjUtil{
 		callshell(command);
 		log.info("计算v2完毕：" + command);
 	}
-
-	//激光相机复制资源
-	public static void cpfile(String filepathOld,String filepathNew) throws Exception{
-		log.info("开始复制");
-		String command = ConstantCmd.CP_JG_EXTRA+ " " + filepathOld + " " + filepathNew;
-		callshell(command);
-		log.info("复制完毕：" + command);
-	}
-
-
-	//激光相机复制资源laser下的全部资源
-	public static void cplaserfile(String filepathOld,String filepathNew) throws Exception{
-		log.info("开始复制");
-		String command = ConstantCmd.CP_JG_ALL+ " " + filepathOld + " " + filepathNew;
-		callshell(command);
-		log.info("复制完毕：" + command);
-	}
 	
 	//开始建模
 	public void build3dModelSFM(String folderName,String isModel) throws Exception{

4dkankan-trade/4dkankan-trade.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -44,7 +44,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-trade/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-trade/src/main/java/com/fdkankan/trade/feign/TradeFeignClient.java

@@ -253,8 +253,6 @@ public class TradeFeignClient {
             dbEntity.setVirtualOrderId(param.getOrderId());
         }else if(param.getConsumeType().equals(2)){
             dbEntity.setIncrementOrderId(param.getOrderId());
-        }else if(param.getConsumeType().equals(3)){
-            dbEntity.setDownloadOrderId(param.getOrderId());
         }
 
         if (param.getCameraId() != null){

4dkankan-trade/src/main/java/com/fdkankan/trade/mapper/IInvoiceMapper.java

@@ -40,10 +40,6 @@ public interface IInvoiceMapper extends IBaseMapper<InvoiceEntity, Long> {
     @Select(" SELECT * FROM  t_invoice WHERE increment_order_id = #{orderId} and rec_status = 'A' LIMIT 1 ")
     InvoiceEntity getInvoiceByIncrementOrderId(@Param("orderId")Long orderId);
 
-    //验证 权益订单是否开票
-    @Select(" SELECT * FROM  t_invoice WHERE download_order_id = #{orderId} and rec_status = 'A' LIMIT 1 ")
-    InvoiceEntity getInvoiceByDownloadOrderId(@Param("orderId")Long orderId);
-
 
     @SelectProvider(type = InvoiceProvider.class, method = "findByParams")
     List<ResponseInvoice> findByParams(RequestInvoice param);

4dkankan-trade/src/main/java/com/fdkankan/trade/provider/InvoiceProvider.java

@@ -46,21 +46,14 @@ public class InvoiceProvider {
 
     private String getListSql(RequestTrade param){
         StringBuffer sql = new StringBuffer();
-//        sql.append( "LEFT JOIN `t_order` o ON o.id = i.order_id ");
-//        sql.append( "LEFT JOIN `t_download_order` x ON x.id = i.download_order_id ");
-//        sql.append( "LEFT JOIN `t_increment_order` w ON w.id = i.increment_order_id ");
-        sql.append(" WHERE i.rec_status = 'A' and 1=1 ");
-
+        sql.append( "LEFT JOIN `t_order` o ON o.id = i.order_id ");
+        sql.append(" WHERE i.rec_status = 'A' and IF(i.consume_type = 0, o.payment_status = 'paid', 1 = 1) ");
         if(param.getFinish() != null){
             sql.append(" AND i.finish = ").append(param.getFinish());
         }
 
         if(param.getOrderId() != null){
             sql.append(" AND i.order_id = ").append(param.getOrderId());
-        }else if(param.getIncrementId() != null){
-            sql.append(" AND i.increment_order_id = ").append(param.getIncrementId());
-        }else if(param.getDownloadId() != null){
-            sql.append(" AND i.download_order_id = ").append(param.getDownloadId());
         }
 
         if(StringUtils.isNotEmpty(param.getSearchKey())){

4dkankan-trade/src/main/java/com/fdkankan/trade/service/impl/InvoiceServiceImpl.java

@@ -113,8 +113,6 @@ public class InvoiceServiceImpl extends BaseServiceImpl<InvoiceEntity, Long> imp
             invoiceEntity = invoiceMapper.getInvoiceByVirtualOrderId(OrderId);
         }else if(type.equals(2)){
             invoiceEntity = invoiceMapper.getInvoiceByIncrementOrderId(OrderId);
-        }else if(type.equals(3)){
-            invoiceEntity = invoiceMapper.getInvoiceByIncrementOrderId(OrderId);
         }
 
         if(invoiceEntity != null){

4dkankan-user/4dkankan-user.iml

@@ -35,7 +35,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -44,7 +44,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../Java/jdk1.8.0_121/jre/../lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

4dkankan-user/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>com.fdkankan</groupId>
-        <artifactId>4dkankan_v2_mini</artifactId>
+        <artifactId>4dkankan_japan</artifactId>
         <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

4dkankan-user/src/main/java/com/fdkankan/user/entity/UserIncrementEntity.java

@@ -51,7 +51,10 @@ public class UserIncrementEntity extends BaseEntity implements Serializable {
     @Column(name = "is_expired")
     private Integer isExpired;
 
+    //权益级别  PR 年会员  SE 月会员
+    @Column(name = "member_levels")
+    private String memberLevels;
 
-
-
+    //月份 权益
+    private Integer monthQy;
 }