feat："机器增加国内外字段"

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

@@ -517,6 +517,11 @@ 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 {
@@ -582,6 +587,11 @@ 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
@@ -1562,29 +1572,6 @@ public class IndexController {
 
     /**
      * 修改设备共同参数/进阶参数
-     *
-     * @param
-     * @return
-     */
-//    @PostMapping(value = "/updateParam/{code}/{clientId}", produces = "application/json;charset=UTF-8")
-//    @ResponseBody
-//    public JsonMessage updateParam(@PathVariable Integer code, @PathVariable String clientId, @RequestBody List<CommonParamVo> commonParamVos) {
-//        Equipment equipment = equipmentService.findByClientId(clientId);
-//        if (equipment == null) {
-//            return JsonMessage.error("设备不存在");
-//        }
-//        String param = JSONArray.toJSONString(commonParamVos);
-//        if (code == 0) {
-//            equipment.setCommonParameters(param);
-//        } else {
-//            equipment.setAdvancedParameters(param);
-//        }
-//        equipmentService.update(equipment);
-//        return JsonMessage.success("修改成功");
-//    }
-
-    /**
-     * 修改设备共同参数/进阶参数
      * code 0：通用参数；1：进阶参数；2：调试页参数；3：湿度参数
      *
      * @param

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

@@ -226,6 +226,11 @@ 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);
                             }
 
@@ -339,6 +344,11 @@ 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,6 +310,7 @@ public class TEquipmentController {
                 equipmentDTO.setTaxStatus(equipmentDesc.getTaxStatus());
                 equipmentDTO.setTaxRate(equipmentDesc.getTaxRate());
                 equipmentDTO.setBanPaper(equipmentDesc.getBanPaper());
+                equipmentDTO.setIsAbroad(equipmentDesc.getIsAbroad());
             }
 
         }
@@ -341,6 +342,7 @@ 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,11 +36,12 @@
         <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
+        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
     </sql>
 
 </mapper>

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

@@ -119,6 +119,9 @@ 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/TEquipmentDesc.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2025-06-30
+ * @since 2025-07-19
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -121,5 +121,8 @@ public class TEquipmentDesc implements Serializable {
     @ApiModelProperty(value = "纸币器禁能，0：关闭，1：开启，默认关闭")
     private Boolean banPaper;
 
+    @ApiModelProperty(value = "是否海外机器，0：国内，1：海外")
+    private Boolean isAbroad;
+
 
 }