:art: 调整

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

@@ -3,7 +3,6 @@ package com.szwl.controller;
 
 import cn.com.crbank.ommo.bean.ResultMessage;
 import cn.com.crbank.ommo.esUtil.BeanUtils;
-//import org.apache.commons.beanutils.BeanUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,37 +19,29 @@ import com.szwl.annotation.Audit;
 import com.szwl.constant.AuditEnum;
 import com.szwl.constant.ConfigConsts;
 import com.szwl.constant.ResponseCodesEnum;
-import com.szwl.manager.TokenManager;
 import com.szwl.model.bean.*;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
-import com.szwl.model.bo.UserDetailBO;
 import com.szwl.model.entity.*;
 import com.szwl.model.param.PasswordParam;
 import com.szwl.model.query.StatisticsParam;
 import com.szwl.model.utils.DateUtils;
-import com.szwl.model.utils.MailUtil;
 import com.szwl.model.utils.PushUtils;
 import com.szwl.model.vo.EquipmentVO;
 import com.szwl.service.*;
 import com.szwl.util.DownloadUtils;
-import com.szwl.util.WechatSendUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.amqp.core.MessageProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.ParseException;
@@ -107,9 +98,9 @@ public class TEquipmentController {
     @Autowired
     TLabelService labelService;
 
-    TokenManager tokenManager;
+//    TokenManager tokenManager;
 
-    private int j;
+//    private int j;
 
     // 超时时间为30秒
     private static final int TIMEOUT = 30000;
@@ -150,7 +141,6 @@ public class TEquipmentController {
      * @param adminName     商户的登录名
      * @param equipmentName 机器名称
      * @param areaName      地址名-fullName
-     * @return
      */
     @ApiOperation(value = "查找机器列表")
     @PostMapping("/findList")
@@ -175,14 +165,12 @@ public class TEquipmentController {
             }
             if (type == 3) {
                 // TODO:
-                /**
-                 * 查找该商家的所有子账户，一层一层寻找，一个账户只能关联一个账户，
-                 * t_admin,
-                 * parent_id 指的是子商家的上级 admin_id，
-                 * relation_id 指的是关联上级账户的 admin_id，
-                 * 需要增加一个下级账户的admin_id, sub_account
-                 * child_account 孩子账户有多个，不能这样
-                 */
+//                 查找该商家的所有子账户，一层一层寻找，一个账户只能关联一个账户，
+//                 t_admin,
+//                 parent_id 指的是子商家的上级 admin_id，
+//                 relation_id 指的是关联上级账户的 admin_id，
+//                 需要增加一个下级账户的admin_id, sub_account
+//                 child_account 孩子账户有多个，不能这样
                 //查找属于这个商家子账户的设备 todo
                 TAdminEquipment adminEquipment = tAdminEquipmentService.getById(admin.getId());
                 if (adminEquipment.getType().equals("0")) {
@@ -589,7 +577,6 @@ public class TEquipmentController {
             oldEquipment.setFlowers(equipment.getFlowers());
         }
         String[] message = new String[3];
-        ;
         message[0] = equipment.getMessageReceiver1();
         message[1] = equipment.getMessageReceiver2();
         message[2] = equipment.getMessageReceiver3();
@@ -784,17 +771,17 @@ public class TEquipmentController {
 //            PushUtils.push(equipment1.getGtClientId(), "【棉花糖】设备管理-更改密码", "修改admin密码", PushUtils.buildJson("adminPwd", equipment1.getAdminPwd()).toString());
         }
         //定时开机
-        if (type == 3) {
+//        if (type == 3) {
 //            equipment1.setBootTime(equipment.getBootTime());
 //            tEquipmentService.sentMessage(equipment1.getClientId(),PushUtils.buildJson("updateBootTime", equipment.getBootTime()).toString());
 //            PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("updateBootTime", equipment.getBootTime()).toString());
-        }
+//        }
         //定时关机
-        if (type == 4) {
+//        if (type == 4) {
 //            equipment1.setOffTime(equipment.getOffTime());
 //            tEquipmentService.sentMessage(equipment1.getClientId(), PushUtils.buildJson("updateOffTime", equipment.getBootTime()).toString());
 //            PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("updateOffTime", equipment.getBootTime()).toString());
-        }
+//        }
         if (type == 5) {
             equipment1.setMessageReceiver(equipment.getMessageReceiver());
         }
@@ -907,8 +894,8 @@ public class TEquipmentController {
     @ApiOperation(value = "获取机器数量")
     @PostMapping("/getMachineNum")
     public ResponseModel<?> getMachineNum(@RequestBody StatisticsParam param) {
-        String machineTotalNum = "";
-        String machineUseNum = "";
+        String machineTotalNum;
+        String machineUseNum;
         String equipmentId = param.getEquipmentId();
         String paramAdminId = param.getAdminId();
         TAdmin admin = tAdminService.getById(paramAdminId);
@@ -926,7 +913,7 @@ public class TEquipmentController {
             param.setCompanyType("1");
         }
         //判断是否有机器id传入
-        if (equipmentId != null && equipmentId != "") {
+        if (equipmentId != null && !equipmentId.equals("")) {
             Long id = Long.valueOf(equipmentId);
             TEquipment equipment = tEquipmentService.getById(id);
             Long adminId = equipment.getAdminId();
@@ -1081,7 +1068,7 @@ public class TEquipmentController {
 
     public static Long getNetworkTime() {
         Long time = null;
-        URL url = null;//取得资源对象http://time.tianqi.com/
+        URL url;//取得资源对象http://time.tianqi.com/
         try {
             url = new URL("http://time.tianqi.com");
             URLConnection uc = url.openConnection();//生成连接对象
@@ -1375,14 +1362,14 @@ public class TEquipmentController {
                                     }
                                     StringBuffer namelast = new StringBuffer();
                                     namelast.append(cityMap.get(citykey)).append("  ");
-                                    String day = "";
-                                    String week = "";
-                                    String month = "";
-                                    String year = "";
+                                    String day;
+                                    String week;
+                                    String month;
+                                    String year;
                                     //数据为空时要处理
                                     for (int s = 1; s < 5; s++) {
-                                        String startDate = null;
-                                        String endDate = null;
+                                        String startDate;
+                                        String endDate;
                                         if (s == 1) {
                                             //日
                                             Date date = new Date();
@@ -1390,7 +1377,7 @@ public class TEquipmentController {
                                             String format = dateFormat.format(date);
                                             startDate = format;
                                             endDate = format;
-                                            Map<String, Object> params = new HashMap<String, Object>();
+                                            Map<String, Object> params = new HashMap<>();
                                             params.put("areaIds", cityIds);
                                             params.put("startDate", startDate);
                                             params.put("endDate", endDate);
@@ -1410,7 +1397,7 @@ public class TEquipmentController {
                                             Map<String, String> weekDate = getWeekDate();
                                             startDate = weekDate.get("mondayDate");
                                             endDate = weekDate.get("sundayDate");
-                                            Map<String, Object> params = new HashMap<String, Object>();
+                                            Map<String, Object> params = new HashMap<>();
                                             params.put("areaIds", cityIds);
                                             params.put("startDate", startDate);
                                             params.put("endDate", endDate);
@@ -1439,7 +1426,7 @@ public class TEquipmentController {
                                             String last = dateFormat.format(ca.getTime());
                                             startDate = first;
                                             endDate = last;
-                                            Map<String, Object> params = new HashMap<String, Object>();
+                                            Map<String, Object> params = new HashMap<>();
                                             params.put("areaIds", cityIds);
                                             params.put("startDate", startDate);
                                             params.put("endDate", endDate);
@@ -1456,7 +1443,7 @@ public class TEquipmentController {
                                         }
                                         if (s == 4) {
                                             //年
-                                            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
+//                                            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
                                             Calendar cale = Calendar.getInstance();
                                             int year1 = cale.get(Calendar.YEAR);
                                             String y = String.valueOf(year1);
@@ -1466,7 +1453,7 @@ public class TEquipmentController {
                                             StringBuffer e = new StringBuffer();
                                             e.append(y).append("/12/30");
                                             endDate = e.toString();
-                                            Map<String, Object> params = new HashMap<String, Object>();
+                                            Map<String, Object> params = new HashMap<>();
                                             params.put("areaIds", cityIds);
                                             params.put("startDate", startDate);
                                             params.put("endDate", endDate);

src/main/java/com/szwl/service/TEquipmentService.java

@@ -18,14 +18,14 @@ public interface TEquipmentService extends MyIService<TEquipment> {
     /**
      * 发送信息，1：个推，2：MQ
      */
-    public String sentMessage(String clientId,String json);
+    String sentMessage(String clientId,String json);
 
-    public String findMachineTotalNum(StatisticsParam param);
+    String findMachineTotalNum(StatisticsParam param);
 
-    public String findMachineUseNum(StatisticsParam param);
-    public String findMachineUseNumAdmin(StatisticsParam param);
+    String findMachineUseNum(StatisticsParam param);
+    String findMachineUseNumAdmin(StatisticsParam param);
 
-    Optional<String> syncOneEquipmentByClientId(String clientId);
+//    Optional<String> syncOneEquipmentByClientId(String clientId);
 
     int getForeignEquipmentCount(String area); // 0 国内，1 海外，2 全球
 

src/main/java/com/szwl/service/impl/TEquipmentServiceImpl.java

@@ -370,7 +370,7 @@ public class TEquipmentServiceImpl extends ServiceImpl<TEquipmentMapper, TEquipm
     }
 
     private String getInformContent(String deviceId) {
-        String content = "";
+        String content;
         String str = "Dear customer:<br>" +
                 "<br>" +
                 "Your machine number is <" + deviceId + "> cotton candy machine, the number of flowers has been pushed, please reset the price of the flowers!" +

src/test/java/com/szwl/service/impl/TEquipmentServiceImplTest.java

@@ -3,7 +3,6 @@ package com.szwl.service.impl;
 import com.szwl.model.utils.MailUtil;
 import com.szwl.model.utils.YunPianSms;
 import org.apache.commons.lang.StringUtils;
-import org.junit.Test;
 
 import java.io.IOException;
 
@@ -49,7 +48,7 @@ class TEquipmentServiceImplTest {
     }
 
     private static String getInformContent(String deviceId) {
-        String content = "";
+        String content;
         String str = "Dear customer:<br>" +
                 "<br>" +
                 "Your machine number is <" + deviceId + "> cotton candy machine, the number of flowers has been pushed, please reset the price of the flowers!" +