更新

src/main/java/com/szwl/controller/ADIndexController.java

@@ -4,8 +4,10 @@ package com.szwl.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.gexin.fastjson.JSON;
 import com.szwl.model.bo.JsonMessage;
 import com.szwl.model.dto.AdVo;
+import com.szwl.model.dto.TimeRuleVo;
 import com.szwl.model.entity.TAd;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TTimeRule;
@@ -59,6 +61,7 @@ public class ADIndexController {
                 adVo.setName(ad.getName());
                 adVo.setOrder(ad.getOrders());
                 adVo.setUrl(ad.getUrl());
+                adVo.setEquipmentType(ad.getEquipmentType());
                 adVo.setCreateDate(ad.getCreateDate());
                 adVo.setId(ad.getId());
                 adVo.setMediaPreview(ad.getMediaPreview());
@@ -168,9 +171,21 @@ public class ADIndexController {
 //            return JsonMessage.error("该规则不存在");
             return "该规则不存在";
         }
-        String rule = timeRule.getRule();
-//        return JsonMessage.success(rule);
-        return rule;
+        if(StringUtils.isEmpty(timeRule.getType())||timeRule.getType().equals("0")){
+            //旧规则
+            String rule = null;
+            List<TimeRuleVo> timeRuleVos = JSON.parseArray(timeRule.getRule(), TimeRuleVo.class);
+            for(TimeRuleVo timeRuleVo:timeRuleVos){
+                List<String> ads = timeRuleVo.getAd();
+                rule = ads.toString();
+                break;
+            }
+            return rule;
+        }else {
+            //新规则
+            String rule = timeRule.getRule();
+            return rule;
+        }
     }
 
     /**

src/main/java/com/szwl/controller/RabbitMqController.java

@@ -60,7 +60,7 @@ public class RabbitMqController {
         if(type.equals("Fanout")){
             amqpAdmin.declareExchange(new FanoutExchange(exchange, durable, false));
         }
-        return "成功";
+        return "success";
 //        return JsonMessage.success("成功");
     }
     /**
@@ -88,7 +88,7 @@ public class RabbitMqController {
         }
 
 //        return JsonMessage.success("成功");
-        return "成功";
+        return "success";
     }
     /**
      *修改信道
@@ -106,6 +106,6 @@ public class RabbitMqController {
             equipment.setChannel(type);
             tEquipmentService.updateById(equipment);
         }
-        return "成功";
+        return "success";
     }
 }

src/main/java/com/szwl/controller/TEquipmentApplyController.java

@@ -163,7 +163,7 @@ public class TEquipmentApplyController {
                             }
 
                             equipmentService.updateById(equipment);
-                            String data = com.alibaba.fastjson.JSON.toJSONString(equipment);
+//                            String data = com.alibaba.fastjson.JSON.toJSONString(equipment);
                             try {
                                 esTEquipmentService.updateDataById(equipment);
                             }catch (Exception e) {
@@ -174,7 +174,7 @@ public class TEquipmentApplyController {
                             equipmentApplyService.updateById(equipmentApply);
                             equipmentService.sentMessage(equipmentApply.getClientId(),PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                             PushUtils.push(equipmentApply.getGtClientId(), "", "", PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
-                            return R.ok();
+                            return R.ok(null,"审核成功");
                         }
 
                         TEquipment equipment = new TEquipment();
@@ -242,7 +242,8 @@ public class TEquipmentApplyController {
                         equipmentDesc.setEquipmentId(list1.get(0).getId());
                         equipmentDescService.save(equipmentDesc);
 
-                    } else if (status.equals("rejected")) {
+                    } else if (status.equals("unAgreed")) {
+                        equipmentApply.setModifyDate(new Date());
                         equipmentApply.setStatusType(2);
                         equipmentService.sentMessage(equipmentApply.getClientId(),PushUtils.buildJson("statusType", "rejected").toString());
                         PushUtils.push(equipmentApply.getGtClientId(), "【棉花糖】设备初始化申请", "拒绝", PushUtils.buildJson("statusType", "rejected").toString());

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -87,11 +87,12 @@ public class TEquipmentController {
                 TAdminEquipment adminEquipment = tAdminEquipmentService.getById(admin.getId());
                 if(adminEquipment.getType().equals("0")){
                     //全部机器
-                    query.eq(TEquipment::getAdminId,id);
+                    query.eq(TEquipment::getAdminId,admin.getParentId());
                 }else {
                     String equipmentIds = adminEquipment.getEquipmentIds();
-                    List<String> equipmentIdList = JSON.parseArray(equipmentIds, String.class);
-                    query.in(TEquipment::getId,equipmentIdList);
+                    String[] strings = equipmentIds.split(",");
+//                    List<String> equipmentIdList = JSON.parseArray(equipmentIds, String.class);
+                    query.in(TEquipment::getId,strings);
                 }
             }
         }
@@ -124,6 +125,7 @@ public class TEquipmentController {
         if(StringUtils.isNotEmpty(channel)){
             query.eq(TEquipment::getChannel,channel);
         }
+        query.orderByDesc(TEquipment::getCreateDate);
         Page<TEquipment> page = new Page<>(current, size, true);
         IPage<TEquipment> iPage = tEquipmentService.page(page, query);
         Page<TEquipmentDTO> pageDTO = new Page<>(current, size, true);
@@ -250,16 +252,17 @@ public class TEquipmentController {
         }
 
             if(type==3){
-                query.eq(TEquipment::getAdminId,adminId);
+
                 //查找属于这个商家子账户的设备 todo
                 TAdminEquipment adminEquipment = tAdminEquipmentService.getById(admin.getId());
                 if(adminEquipment.getType().equals("0")){
                     //全部机器
-                    query.eq(TEquipment::getAdminId,adminId);
+                    query.eq(TEquipment::getAdminId,admin.getParentId());
                 }else {
                     String equipmentIds = adminEquipment.getEquipmentIds();
-                    List<String> equipmentIdList = JSON.parseArray(equipmentIds, String.class);
-                    query.in(TEquipment::getId,equipmentIdList);
+                    String[] strings = equipmentIds.split(",");
+//                    List<String> equipmentIdList = JSON.parseArray(equipmentIds, String.class);
+                    query.in(TEquipment::getId,strings);
                 }
             }
 //        query.eq(TEquipment::getAdminId,adminId);
@@ -679,6 +682,11 @@ public class TEquipmentController {
         String machineTotalNum = "";
         String machineUseNum = "";
         String equipmentId = param.getEquipmentId();
+        String paramAdminId = param.getAdminId();
+        TAdmin admin = tAdminService.getById(paramAdminId);
+        if(admin.getType()<2){
+            param.setAdminId(null);
+        }
         //判断是否有机器id传入
         if (equipmentId != null && equipmentId != "") {
             Long id = Long.valueOf(equipmentId);

src/main/java/com/szwl/model/dto/AdVo.java

@@ -1,5 +1,6 @@
 package com.szwl.model.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -52,6 +53,16 @@ public class AdVo implements Serializable {
      */
     private Integer screenType;
 
+    @ApiModelProperty(value = "适用机器类型")
+    private String equipmentType;
+
+    public String getEquipmentType() {
+        return equipmentType;
+    }
+
+    public void setEquipmentType(String equipmentType) {
+        this.equipmentType = equipmentType;
+    }
 
     public Integer getScreenType() {
         return screenType;