保存\删除热点 修改tags字段

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/controller/api/DeviceSceneController.java

@@ -1,51 +0,0 @@
-package com.fdkankan.platform.goods.controller.api;
-
-import com.fdkankan.common.controller.BaseController;
-import com.fdkankan.platform.goods.request.RequestScene;
-import com.fdkankan.platform.goods.service.IDeviceService;
-import com.fdkankan.platform.user.request.RequestCamera;
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 设备中心接口-场景模块
- */
-@Log4j2
-@RestController
-@RequestMapping("/service/platform/device/scene")
-public class DeviceSceneController extends BaseController {
-
-    @Autowired
-    private IDeviceService deviceService;
-
-    /**
-     * 获取相机场景记录
-     * cameraId         相机id
-     * cameraType       相机类型
-     * searchKey        关键词
-     * endTime          结束时间
-     * startTime        开始时间
-     * sceneType        0表示其他，1表示文博，2表示地产，3表示电商，4表示餐饮，5表示家居,99一件换装虚拟房源
-     * @return
-     */
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public String getScenes(@RequestBody RequestCamera param) throws Exception {
-        return deviceService.getScenes(param);
-    }
-
-    /**
-     * 删除场景
-     * sceneNum     场景码
-     * @return
-     */
-    @RequestMapping(value = "/delete", method = RequestMethod.POST)
-    public String deleteScene(@RequestBody RequestScene base) throws Exception {
-        return deviceService.deleteScene(base.getSceneNum());
-    }
-
-
-}

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/InvoiceServiceImpl.java

@@ -196,7 +196,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
         int maxInvoice = this.getMaxInvoice(param.getCameraId());
 
         if(Integer.parseInt(param.getAmount()) > maxInvoice){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8003, OrderConstant.FAILURE_MSG_8003);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8003);
         }
         return saveOrUpdateInvoice(ssoUser.getId(),param,null);
     }

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

@@ -288,7 +288,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         SSOUser ssoUser = userService.getSSOUserByToken(token);
         //支付美金，只能paypal支付
         if(order.getAbroad() == 1 && order.getPayType() != 2){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8004);
         }
         ResponseGoodsSku sku = goodsSkuService.getVoBySkuSn(order.getSkuSn());
         if(sku == null ){
@@ -329,7 +329,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         SSOUser ssoUser = userService.getSSOUserByToken(token);
         //支付美金，只能paypal支付
         if(order.getAbroad() == 1 && order.getPayType() != 2){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8004);
         }
         ResponseGoodsSku sku = goodsSkuService.getVoBySkuSn(order.getSkuSn());
         return incrementOrderService.saveByOrderParam(ssoUser.getId(), order, order.getAbroad() == 0 ?  sku.getPrice() : sku.getDollarPrice());
@@ -340,7 +340,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         SSOUser ssoUser = userService.getSSOUserByToken(token);
         //支付美金，只能paypal支付
         if(order.getAbroad() == 1 && order.getPayType() != 2){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
+            throw new BusinessException(ErrorCode.FAILURE_CODE_8004);
         }
         ResponseGoodsSku sku = goodsSkuService.getVoBySkuSn(order.getSkuSn());
         return downloadOrderService.saveByOrderParam(ssoUser.getId(), order, order.getAbroad() == 0 ?  sku.getPrice() : sku.getDollarPrice());

4dkankan-center-scene/src/main/java/com/fdkankan/scene/listener/RabbitMqListener.java

@@ -47,7 +47,7 @@ public class RabbitMqListener {
 
     /**
      * 开启了手动确认模式，如果没有手动确认，消费者不会重试，当服务重启时会再次消费，因为rabbitmq认为你还没有处理完你的业务
-     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列补不存在会自动创建队列
+     * queuesToDeclare = @Queue("${queue.modeling.modeling-test}"),  如果队列不不存在会自动创建队列
      * concurrency = "3"    设置消费线程数，每个线程每次只拉取一条消息消费
      */
 //    @RabbitListener(

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

@@ -2251,9 +2251,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //写入本地文件，作为备份
         this.writeHotJson(param.getNum());
 
-
         //保存数据库
-//        sceneEditInfoService.saveTagsToSceneEditInfo(param.getNum(), scenePro.getId());
+        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+        sceneEditInfoService.saveTagsToSceneEditInfo(param.getNum(), sceneEditInfo);
 
         return ResultData.ok();
     }
@@ -2313,7 +2313,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         this.writeHotJson(param.getNum());
 
         //保存数据库
-//        sceneEditInfoService.saveTagsToSceneEditInfo(param.getNum(), scenePro.getId());
+        SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+        sceneEditInfoService.saveTagsToSceneEditInfo(param.getNum(), sceneEditInfo);
 
         return ResultData.ok();
     }