feat："增加闹钟修改状态接口，增加海外修改支付接口"

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

@@ -283,7 +283,7 @@ public class IndexController {
             String ipApiAddr = WhoIsUtil.getLocByIp2(ip);
             try {
                 String lonLatAddr = getLocByLonLatVer(longitude, latitude);
-                if (lonLatAddr!= null &&!lonLatAddr.isEmpty()) {
+                if (lonLatAddr != null && !lonLatAddr.isEmpty()) {
                     addr = lonLatAddr + ipApiAddr;
                 } else {
                     addr = ipApiAddr;
@@ -419,9 +419,6 @@ public class IndexController {
 
     }
 
-    //    @ApiOperation(value = "同意设备申请")
-//    @RequestMapping(value = "/agree", method = RequestMethod.POST, produces = "text/html;charset=utf-8")
-//    @ResponseBody
     private void agree(Long id) {
         String status = "agreed";
         if (null != id) {
@@ -1472,7 +1469,7 @@ public class IndexController {
                 }
                 // 查询是否国外账号，国外就发送邮件
                 String ifForeign = admin.getIfForeign();
-                if(StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1") && onOffNotice.equals("1")) {
+                if (StringUtils.isNotEmpty(ifForeign) && ifForeign.equals("1") && onOffNotice.equals("1")) {
                     // 发送邮件提醒
                     String machineType = equipment.getMachineType();
                     if (StringUtils.isNotEmpty(machineType)) {
@@ -2440,8 +2437,9 @@ public class IndexController {
 
     /**
      * 新修改商品名称
-     * @param clientId 设备编号
-     * @param productNo 商品编号
+     *
+     * @param clientId       设备编号
+     * @param productNo      商品编号
      * @param newProductName 新名称
      * @return 修改结果
      */
@@ -2475,5 +2473,19 @@ public class IndexController {
         returnCoinRecordService.updateById(returnCoinRecord);
         return "success";
     }
+
+    @ApiOperation("上传支付方式状态")
+    @GetMapping(value = "/updatePaymentTypeStatus")
+    public String updatePaymentTypeStatus(String clientId, String paymentType) {
+        LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+        query.eq(TEquipment::getClientId, clientId);
+        TEquipment equipment = equipmentService.getOne(query);
+        if (equipment != null && equipment.getId() != null) {
+            equipment.setPaymentType(paymentType);
+            equipmentService.updateById(equipment);
+            return "success";
+        }
+        return "error";
+    }
 }
 

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

@@ -310,10 +310,6 @@ public class TAlarmClockController {
                 oldAlarmClock.setWeek(alarmClock.getWeek()+",");
                 tAlarmClockService.updateById(oldAlarmClock);
                 //删除其对应的单个机器的数据
-//                TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
-//                TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
-//                criteria.andClockIdEqualTo(oldAlarmClock.getId());
-//                tAlarmClockItemService.deleteByOption(itemExample);
                 LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                 query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                 List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
@@ -344,10 +340,6 @@ public class TAlarmClockController {
                     oldAlarmClock.setWeek(alarmClock.getWeek()+",");
                     tAlarmClockService.updateById(oldAlarmClock);
                     //删除其对应的单个机器的数据
-//                    TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
-//                    TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
-//                    criteria.andClockIdEqualTo(oldAlarmClock.getId());
-//                    tAlarmClockItemService.deleteByOption(itemExample);
                     LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                     query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                     List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
@@ -375,10 +367,6 @@ public class TAlarmClockController {
                         oldAlarmClock.setWeek(alarmClock.getWeek()+",");
                         tAlarmClockService.updateById(oldAlarmClock);
                         //删除其对应的单个机器的数据
-//                        TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
-//                        TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
-//                        criteria.andClockIdEqualTo(oldAlarmClock.getId());
-//                        tAlarmClockItemService.deleteByOption(itemExample);
                         LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                         query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                         List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
@@ -402,10 +390,6 @@ public class TAlarmClockController {
                             oldAlarmClock.setHour(alarmClock.getHour()+":00");
                             tAlarmClockService.updateById(oldAlarmClock);
                             //删除其对应的单个机器的数据
-//                            TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
-//                            TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
-//                            criteria.andClockIdEqualTo(oldAlarmClock.getId());
-//                            tAlarmClockItemService.deleteByOption(itemExample);
                             LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                             query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                             List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
@@ -473,6 +457,21 @@ public class TAlarmClockController {
         tAlarmClockService.removeById(alarmClock.getId());
         return R.ok();
     }
+
+    @ApiOperation("修改闹钟状态")
+    @PostMapping("/updataStatus")
+    public ResponseModel<?> updataStatus(@RequestBody TAlarmClock alarmClock){
+        if(alarmClock.getId()==null){
+            return R.fail(ResponseCodesEnum.A0001);
+        }
+        TAlarmClock tAlarmClock = tAlarmClockService.getById(alarmClock.getId());
+        if(tAlarmClock!=null){
+            tAlarmClock.setStatus(alarmClock.getStatus());
+            tAlarmClockService.updateById(tAlarmClock);
+        }
+        return R.ok();
+    }
+
     // 添加对应单个机器的列表
     private void addItemList(TAlarmClock alarmClock) {
         Long alarmClockItemId = alarmClock.getId();

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

@@ -1862,6 +1862,20 @@ public class TEquipmentController {
         return R.ok(String.valueOf(list.size()));
     }
 
+    @ApiOperation("海外修改支付方式")
+    @PostMapping("/updatePayment")
+    public ResponseModel<?> updatePayment(@RequestBody TEquipment equipment) {
+        Long equipmentId = equipment.getId();
+        String paymentType = equipment.getPaymentType();
+        equipment = tEquipmentService.getById(equipmentId);
+        if (equipment != null) {
+            tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("paymentType", paymentType).toString());
+            return R.ok();
+        } else {
+            return R.fail(ResponseCodesEnum.A0001, "设备不存在");
+        }
+    }
+
     @ApiOperation("导出设备列表")
     @GetMapping("/exportEquipment")
     public void exportEquipment(HttpServletResponse response) {

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

@@ -199,7 +199,7 @@ public class TEquipment implements Serializable {
     @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
     private String companyType;
 
-    @ApiModelProperty(value = "支付方式：为了远程修改支付方式")
+    @ApiModelProperty(value = "支付方式：为了远程修改支付方式  Z1:Nayax, Z2:WMDB, Z3:Mixed")
     private String paymentType;
 
     @ApiModelProperty(value = "是否有报警")