feat："机器列表接口增加是否海外筛选"

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

@@ -483,6 +483,11 @@ public class IndexController {
                             } else {
                                 equipment.setEquimentType(equipmentApply.getEquimentType());
                             }
+                            equipment.setIsAbroad(false);
+                            String ifForeign = admin.getIfForeign();
+                            if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
+                                equipment.setIsAbroad(true);
+                            }
                             equipmentService.updateById(equipment);
                             LambdaQueryWrapper<TProportion> queryProportion = Wrappers.lambdaQuery();
                             queryProportion.eq(TProportion::getEquipmentId, equipment.getId());
@@ -517,11 +522,6 @@ public class IndexController {
                             if (equipmentDescs.size() == 0) {
                                 TEquipmentDesc equipmentDesc = new TEquipmentDesc();
                                 equipmentDesc.setEquipmentId(equipment.getId());
-                                equipmentDesc.setIsAbroad(false);
-                                String ifForeign = admin.getIfForeign();
-                                if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
-                                    equipmentDesc.setIsAbroad(true);
-                                }
                                 equipmentDescService.save(equipmentDesc);
                             }
                         } else {
@@ -563,7 +563,11 @@ public class IndexController {
                                 equipmentService.sentMessage(clientId, PushUtils.buildJson("endDate", String.valueOf(equipment.getEndDate().getTime())).toString());
                                 PushUtils.push(equipmentApply.getGtClientId(), "", "", PushUtils.buildJson("endDate", String.valueOf(equipment.getEndDate().getTime())).toString());
                             }
-
+                            equipment.setIsAbroad(false);
+                            String ifForeign = admin.getIfForeign();
+                            if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
+                                equipment.setIsAbroad(true);
+                            }
                             equipmentService.save(equipment);
                             if (StringUtils.isEmpty(machineType) || machineType.equals("0")) {
                                 equipmentService.sentMessage(clientId, PushUtils.buildJson("statusType", "agreed" + old).toString());
@@ -587,11 +591,6 @@ public class IndexController {
                             }
                             TEquipmentDesc equipmentDesc = new TEquipmentDesc();
                             equipmentDesc.setEquipmentId(tEquipment.getId());
-                            equipmentDesc.setIsAbroad(false);
-                            String ifForeign = admin.getIfForeign();
-                            if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
-                                equipmentDesc.setIsAbroad(true);
-                            }
                             equipmentDescService.save(equipmentDesc);
                         }
                         //获取设备的id

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

@@ -191,7 +191,11 @@ public class TEquipmentApplyController {
                             } else {
                                 equipment.setEquimentType(equipmentType);
                             }
-
+                            equipment.setIsAbroad(false);
+                            String ifForeign = tAdmin.getIfForeign();
+                            if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
+                                equipment.setIsAbroad(true);
+                            }
                             equipmentService.updateById(equipment);
                             LambdaQueryWrapper<TProportion> queryProportion = Wrappers.lambdaQuery();
                             queryProportion.eq(TProportion::getEquipmentId,equipment.getId());
@@ -226,11 +230,6 @@ public class TEquipmentApplyController {
                             if (equipmentDescs.size() == 0) {
                                 TEquipmentDesc equipmentDesc = new TEquipmentDesc();
                                 equipmentDesc.setEquipmentId(equipment.getId());
-                                equipmentDesc.setIsAbroad(false);
-                                String ifForeign = tAdmin.getIfForeign();
-                                if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
-                                    equipmentDesc.setIsAbroad(true);
-                                }
                                 equipmentDescService.save(equipmentDesc);
                             }
 
@@ -276,6 +275,11 @@ public class TEquipmentApplyController {
                                 PushUtils.push(equipmentApply.getGtClientId(), "", "", PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                             }
                         }
+                        equipment.setIsAbroad(false);
+                        String ifForeign = tAdmin.getIfForeign();
+                        if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
+                            equipment.setIsAbroad(true);
+                        }
                         equipmentService.save(equipment);
                         equipmentService.sentMessage(clientId,PushUtils.buildJson("statusType", "agreed" + old).toString());
                         if(StringUtils.isEmpty(machineType) || machineType.equals("0")) {
@@ -344,11 +348,6 @@ public class TEquipmentApplyController {
                         TEquipmentDesc equipmentDesc = new TEquipmentDesc();
                         equipmentDesc.setEquipmentId(tEquipment.getId());
                         equipmentDesc.setFlowers(tEquipment.getFlowers());
-                        equipmentDesc.setIsAbroad(false);
-                        String ifForeign = tAdmin.getIfForeign();
-                        if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1")) {
-                            equipmentDesc.setIsAbroad(true);
-                        }
                         equipmentDescService.save(equipmentDesc);
 
                     } else if (status.equals("unAgreed")) {

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

@@ -310,7 +310,6 @@ public class TEquipmentController {
                 equipmentDTO.setTaxStatus(equipmentDesc.getTaxStatus());
                 equipmentDTO.setTaxRate(equipmentDesc.getTaxRate());
                 equipmentDTO.setBanPaper(equipmentDesc.getBanPaper());
-                equipmentDTO.setIsAbroad(equipmentDesc.getIsAbroad());
             }
 
         }
@@ -399,8 +398,6 @@ public class TEquipmentController {
         // 公司平台
         if (StringUtils.isNotEmpty(companyType)) {
             if (companyType.equals("0")) {
-//                query.isNull(TEquipment::getCompanyType)
-//                        .or().eq(TEquipment::getCompanyType, companyType);
                 query.ne(TEquipment::getCompanyType, "1");
             } else {
                 query.eq(TEquipment::getCompanyType, companyType);
@@ -420,7 +417,10 @@ public class TEquipmentController {
                 query.eq(TEquipment::getEqeStatus, 1);
             }
         }
-        // todo 是否海外
+        // 是否海外
+        if (isAbroad != null) {
+            query.eq(TEquipment::getIsAbroad, isAbroad);
+        }
         query.orderByDesc(TEquipment::getCreateDate);
         Page<TEquipment> page = new Page<>(current, size, true);
         IPage<TEquipment> iPage = tEquipmentService.page(page, query);
@@ -479,7 +479,6 @@ public class TEquipmentController {
                 equipmentDTO.setTaxStatus(equipmentDesc.getTaxStatus());
                 equipmentDTO.setTaxRate(equipmentDesc.getTaxRate());
                 equipmentDTO.setBanPaper(equipmentDesc.getBanPaper());
-                equipmentDTO.setIsAbroad(equipmentDesc.getIsAbroad());
             }
 
         }
@@ -510,7 +509,6 @@ public class TEquipmentController {
             equipmentDTO.setTaxStatus(equipmentDesc.getTaxStatus());
             equipmentDTO.setTaxRate(equipmentDesc.getTaxRate());
             equipmentDTO.setBanPaper(equipmentDesc.getBanPaper());
-            equipmentDTO.setIsAbroad(equipmentDesc.getIsAbroad());
         }
         String messageReceiver = equipment.getMessageReceiver();
         if (StringUtils.isNotEmpty(messageReceiver)) {

src/main/java/com/szwl/mapper/xml/TEquipmentDescMapper.xml

@@ -36,12 +36,11 @@
         <result column="tax_status" property="taxStatus" />
         <result column="tax_rate" property="taxRate" />
         <result column="ban_paper" property="banPaper" />
-        <result column="is_abroad" property="isAbroad" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        equipment_id, flowers, white_sugar, red_sugar, yellow_sugar, blue_sugar, stick, water, waste_water, is_material_use, pay_type, note, status, coupon_status, out_door, in_door, sleep_desc, cup_quantity, stir_tm, corn_generator_tm, number_one, candy_generator_tm, outside_tm, outside_hd, diy_flower_status, language, patch_id, working_mode, clean_function, tax_status, tax_rate, ban_paper, is_abroad
+        equipment_id, flowers, white_sugar, red_sugar, yellow_sugar, blue_sugar, stick, water, waste_water, is_material_use, pay_type, note, status, coupon_status, out_door, in_door, sleep_desc, cup_quantity, stir_tm, corn_generator_tm, number_one, candy_generator_tm, outside_tm, outside_hd, diy_flower_status, language, patch_id, working_mode, clean_function, tax_status, tax_rate, ban_paper
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/bean/TEquipmentDTO.java

@@ -119,9 +119,6 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "纸币器禁能，0：关闭，1：开启，默认关闭")
     private Boolean banPaper;
 
-    @ApiModelProperty(value = "是否海外机器，0：国内，1：海外")
-    private Boolean isAbroad;
-
     public void setOccurrenceTime(Date occurrenceTime) {
         if(null != occurrenceTime){
             this.hasTodayAlarm = DateUtils.isSameDay(new Date(),occurrenceTime);

src/main/java/com/szwl/model/entity/TEquipment.java

@@ -1,15 +1,14 @@
 package com.szwl.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * <p>
  * 设备表
@@ -205,5 +204,8 @@ public class TEquipment implements Serializable {
     @ApiModelProperty(value = "是否有报警")
     private Boolean isAlarm;
 
+    @ApiModelProperty(value = "是否海外机器，0：国内，1：海外")
+    private Boolean isAbroad;
+
 
 }

src/main/java/com/szwl/model/entity/TEquipmentDesc.java

@@ -121,8 +121,5 @@ public class TEquipmentDesc implements Serializable {
     @ApiModelProperty(value = "纸币器禁能，0：关闭，1：开启，默认关闭")
     private Boolean banPaper;
 
-    @ApiModelProperty(value = "是否海外机器，0：国内，1：海外")
-    private Boolean isAbroad;
-
 
 }

src/main/java/com/szwl/model/param/EquipmentParam.java

@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class EquipmentParam extends TEquipment {
+public class EquipmentParam {
 
     @ApiModelProperty(value = "设备id")
     private Long id;