测试token2

src/main/java/com/szwl/aspect/MyWebMvcConfigurer.java

@@ -20,7 +20,7 @@ public class MyWebMvcConfigurer extends WebMvcConfigurationSupport {
     public void addInterceptors(InterceptorRegistry registry) {
         // 自定义去除的路径
         String[] myExcludes= {"/tAdmin/login","/tAdmin/save","/tAdmin/updatePassword","/tMessageCode/**",
-                "/rabbitMqController/**","/indexController/initNew.htm","/indexController/**"};
+                "/rabbitMqController/**","/indexController/initNew.htm","/indexController/**","/tAdmin/**","/tPromoCode/**","/api/**"};
         registry.addInterceptor(headTokenInterceptor).addPathPatterns("/**")
                 // swagger
                 .excludePathPatterns(swaggerExcludes)

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

@@ -37,8 +37,8 @@ import java.util.*;
 //@Api(value = "/api/app_equipment/index", tags = {"设备信息上传接口"})
 @Api(value = "/indexController", tags = {"设备信息上传接口"})
 @RestController
-//@RequestMapping("/api/app_equipment/index")
-@RequestMapping("/indexController")
+@RequestMapping("/api/app_equipment/index")
+//@RequestMapping("/indexController")
 public class IndexController { ;
     @Autowired
     TAdminService adminService;
@@ -58,7 +58,7 @@ public class IndexController { ;
     TPromoCodeService promoCodeService;
     @ApiOperation(value = "心跳")
     @PostMapping("/heart.htm")
-    public String heart(@RequestBody EquipmentVo equipmentVo) {
+    public JsonMessage heart(@RequestBody EquipmentVo equipmentVo) {
 
         String clientId = equipmentVo.getClientId();
         Date lastUpdateTime = equipmentVo.getLastUpdateTime();
@@ -140,11 +140,11 @@ public class IndexController { ;
                 equipmentDesc.setStick(equipmentVo.getStick());
             }
             equipmentDescService.updateById(equipmentDesc);
-//            return JsonMessage.success("心跳成功");
-            return "心跳成功";
+            return JsonMessage.success("心跳成功");
+//            return "心跳成功";
         }
-//        return JsonMessage.error("心跳失败");
-        return "心跳失败";
+        return JsonMessage.error("心跳失败");
+//        return "心跳失败";
     }
     /**
      * 设备申请
@@ -155,7 +155,7 @@ public class IndexController { ;
      */
     @ApiOperation(value = "设备申请")
     @PostMapping("/initNew.htm")
-    public String initNew(String clientId, String managerId, String gtClientId, String equimentType) {
+    public JsonMessage initNew(String clientId, String managerId, String gtClientId, String equimentType) {
         String machineType = "0";
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
@@ -164,16 +164,17 @@ public class IndexController { ;
             TEquipment equipment = list.get(0);
             String managerId1 = equipment.getManagerId();
             if(!managerId.equals(managerId1)){
-                return "该设备未脱离";
+//                return "该设备未脱离";
+                return JsonMessage.error("该设备已经初始化");
             }else {
-//                return JsonMessage.error("该设备已经初始化");
-                return "该设备已经初始化";
+                return JsonMessage.error("该设备已经初始化");
+//                return "该设备已经初始化";
             }
         }
 
         if (StringUtils.isEmpty(gtClientId)) {
-//            return JsonMessage.error("设备不能为空");
-            return "设备不能为空";
+            return JsonMessage.error("设备不能为空");
+//            return "设备不能为空";
         }
 
         TEquipmentApply equipmentApply = new TEquipmentApply();
@@ -185,8 +186,8 @@ public class IndexController { ;
 
         TAdmin admin = adminService.getById(adminId);
         if (admin == null) {
-//            return JsonMessage.error("找不到商家");
-            return "找不到商家";
+            return JsonMessage.error("找不到商家");
+//            return "找不到商家";
         }
         //所属商家
         String username = admin.getUsername();
@@ -200,8 +201,8 @@ public class IndexController { ;
         if(String.valueOf(adminId).equals("3")||String.valueOf(adminId).equals("31")||String.valueOf(adminId).equals("506")||String.valueOf(adminId).equals("1090")){
             Long id = equipmentApply.getId();
             agree(id);
-//            return JsonMessage.success("设备申请成功");
-            return "设备申请成功";
+            return JsonMessage.success("设备申请成功");
+//            return "设备申请成功";
         }
         Date applyStartTime = admin.getApplyStartTime();
         Date applyEndTime = admin.getApplyEndTime();
@@ -209,11 +210,11 @@ public class IndexController { ;
         if(now.getTime()>applyStartTime.getTime()&&now.getTime()<applyEndTime.getTime()){
             Long id = equipmentApply.getId();
             agree(id);
-//            return JsonMessage.success("设备申请成功");
-            return "设备申请成功";
+            return JsonMessage.success("设备申请成功");
+//            return "设备申请成功";
         }
-//        return JsonMessage.success("设备申请中，请耐心等待");
-        return "设备申请中，请耐心等待";
+        return JsonMessage.success("设备申请中，请耐心等待");
+//        return "设备申请中，请耐心等待";
 
     }
 

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

@@ -24,8 +24,8 @@ import java.util.List;
 import java.util.Map;
 @Api(value = "/api/app_mq/rabbitMq", tags = {"MQ"})
 @RestController
-//@RequestMapping("/api/app_mq/rabbitMq")
-@RequestMapping("/rabbitMqController")
+@RequestMapping("/api/app_mq/rabbitMq")
+//@RequestMapping("/rabbitMqController")
 public class RabbitMqController {
     @Autowired
     TEquipmentService tEquipmentService;
@@ -44,10 +44,10 @@ public class RabbitMqController {
      */
     @GetMapping(value = "/addExchange.htm")
     @ResponseBody
-    public String addExchange(String exchange,String type,Boolean durable){
+    public Object addExchange(String exchange,String type,Boolean durable){
         if(StringUtils.isEmpty(type)){
-//            return JsonMessage.success("type is null");
-            return "type is null";
+            return JsonMessage.success("type is null");
+//            return "type is null";
         }
         if(type.equals("Direct")){
 //            amqpAdmin.declareExchange(new DirectExchange(exchange, durable, false));
@@ -60,7 +60,8 @@ public class RabbitMqController {
         if(type.equals("Fanout")){
             amqpAdmin.declareExchange(new FanoutExchange(exchange, durable, false));
         }
-        return "成功";
+//        return "成功";
+        return JsonMessage.success("成功");
     }
     /**
      *添加队列并绑定
@@ -69,7 +70,7 @@ public class RabbitMqController {
      */
     @GetMapping(value = "/addQueue.htm")
     @ResponseBody
-    public String addQueue(String exchange,String queue,String routingKey,Boolean durable){
+    public Object addQueue(String exchange,String queue,String routingKey,Boolean durable){
         Map<String,Object> arg = new HashMap<>();
         arg.put("x-message-ttl",1800000);
         String queue1 = amqpAdmin.declareQueue(new Queue(queue, durable, false, false, arg));
@@ -83,8 +84,8 @@ public class RabbitMqController {
         TEquipment equipment = list.get(0);
         equipment.setEquimentType(exchange);
         tEquipmentService.updateById(equipment);
-//        return JsonMessage.success("成功");
-        return "成功";
+        return JsonMessage.success("成功");
+//        return "成功";
     }
     /**
      *修改信道
@@ -93,14 +94,14 @@ public class RabbitMqController {
      */
     @GetMapping(value = "/updateChannel.htm")
     @ResponseBody
-    public String updateChannel(String clientId,String type){
+    public Object updateChannel(String clientId,String type){
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.eq(TEquipment::getClientId,clientId);
         List<TEquipment> list = tEquipmentService.list(query);
         TEquipment equipment = list.get(0);
         equipment.setChannel(type);
         tEquipmentService.updateById(equipment);
-//        return JsonMessage.success("成功");
-        return "成功";
+        return JsonMessage.success("成功");
+//        return "成功";
     }
 }

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

@@ -28,22 +28,22 @@ public class ScheduledService {
     EsTOrderService esTOrderService;
 
     //值日通知
-    @Scheduled(cron = "0 20 8 * * ?")
-    public void scheduled(){
-        Calendar calendar = Calendar.getInstance();
-        int number = calendar.get(Calendar.DAY_OF_WEEK);
-        if(number!=1){
-            tDepartmentService.onTime();
-        }
-    }
-    @Scheduled(cron = "0 55 17 * * ?")
-    public void scheduled2(){
-        Calendar calendar = Calendar.getInstance();
-        int number = calendar.get(Calendar.DAY_OF_WEEK);
-        if(number!=1){
-            tDepartmentService.onTime2();
-        }
-    }
+//    @Scheduled(cron = "0 20 8 * * ?")
+//    public void scheduled(){
+//        Calendar calendar = Calendar.getInstance();
+//        int number = calendar.get(Calendar.DAY_OF_WEEK);
+//        if(number!=1){
+//            tDepartmentService.onTime();
+//        }
+//    }
+//    @Scheduled(cron = "0 55 17 * * ?")
+//    public void scheduled2(){
+//        Calendar calendar = Calendar.getInstance();
+//        int number = calendar.get(Calendar.DAY_OF_WEEK);
+//        if(number!=1){
+//            tDepartmentService.onTime2();
+//        }
+//    }
 
 
 

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

@@ -349,10 +349,11 @@ public class TAdminController {
             List<TAdmin> list = tAdminService.list(query);
             if(list.size()>0){
                 TAdmin parentAdmin = list.get(0);
-                if(parentAdmin.getRelationAdminId().equals(admin.getId().toString())){
+                if(StringUtils.isNotEmpty(parentAdmin.getRelationAdminId())&&parentAdmin.getRelationAdminId().equals(admin.getId().toString())){
                     return R.fail("不能互为绑定关系");
                 }else{
                     admin.setRelationAdminId(String.valueOf(parentAdmin.getId()));
+                    tAdminService.updateById(admin);
                 }
             }else {
                 return R.fail("找不到账户");