测试

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

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

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

@@ -247,7 +247,7 @@ public class TAdminController {
 
     @ApiOperation(value = "获取账号信息")
     @GetMapping("/getAdmin")
-    public ResponseModel<TAdmin> getAdmin(String id) {
+    public ResponseModel<TAdmin> getAdmin(@RequestParam String id) {
         TAdmin tAdmin = tAdminService.getById(id);
         return R.ok(tAdmin);
     }
@@ -366,7 +366,7 @@ public class TAdminController {
 
     @ApiOperation(value = "获取所有关联(下级)账号信息")
     @GetMapping("/getAdminIdList")
-    public ResponseModel<List<Long>> getAdminIdList(String adminId) {
+    public ResponseModel<List<Long>> getAdminIdList(@RequestParam String adminId) {
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getRelationAdminId,adminId);
         List<TAdmin> list = tAdminService.list(query);
@@ -386,7 +386,7 @@ public class TAdminController {
     }
     @ApiOperation(value = "获取账号信息byname")
     @GetMapping("/getAdminByUsername")
-    public ResponseModel<TAdmin> getAdminByUsername(String username) {
+    public ResponseModel<TAdmin> getAdminByUsername(@RequestParam String username) {
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         query.eq(TAdmin::getUsername,username);
         List<TAdmin> list = tAdminService.list(query);

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

@@ -169,14 +169,14 @@ public class TEquipmentController {
     }
     @ApiOperation(value = "id查找机器详情")
     @PostMapping("/findById")
-    public ResponseModel<?> findById(Long id) {
+    public ResponseModel<?> findById(@RequestParam Long id) {
         TEquipment equipment = tEquipmentService.getById(id);
         return R.ok(equipment);
     }
     //查找设备
     @ApiOperation(value = "ClientId查找设备")
     @GetMapping("/findEquipmentByClientId")
-    public ResponseModel<TEquipment> findEquipmentByClientId(String  clientId) {
+    public ResponseModel<TEquipment> findEquipmentByClientId(@RequestParam String  clientId) {
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
         query.like(TEquipment::getClientId,clientId);
         List<TEquipment> list = tEquipmentService.list(query);
@@ -186,7 +186,7 @@ public class TEquipmentController {
     //查找设备
     @ApiOperation(value = "获取对应的机器id")
     @GetMapping("/getClientIdList")
-    public ResponseModel<TAdminEquipment> getClientIdList(String  adminId) {
+    public ResponseModel<TAdminEquipment> getClientIdList(@RequestParam String  adminId) {
         //查找属于这个商家子账户的设备
         TAdminEquipment adminEquipment = tAdminEquipmentService.getById(adminId);
 
@@ -195,7 +195,7 @@ public class TEquipmentController {
     //查找设备
     @ApiOperation(value = "获取对应的机器编号")
     @GetMapping("/getClientIds")
-    public ResponseModel<List<String>> getClientIds(String  adminId) {
+    public ResponseModel<List<String>> getClientIds(@RequestParam String  adminId) {
         //查找属于这个商家子账户的设备
         TAdminEquipment adminEquipment = tAdminEquipmentService.getById(adminId);
         String equipmentIds = adminEquipment.getEquipmentIds();
@@ -279,7 +279,8 @@ public class TEquipmentController {
      * 更新
      */
     @ApiOperation(value = "更新机器")
-    @PostMapping("/update")
+//    @PostMapping("/update")
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
     public ResponseModel<?> update(@RequestBody TEquipment equipment) {
         //获取修改前的设备
         TEquipment oldEquipment = tEquipmentService.getById(equipment.getId());
@@ -342,13 +343,13 @@ public class TEquipmentController {
         String channel = oldEquipment.getChannel();
         String equimentType = oldEquipment.getEquimentType();
         String clientId = oldEquipment.getClientId();
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("payType", equipment.getPayType().toString() + ":" + equipment.getTimeRuleId()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("phone", equipment.getContactName() + ":" + equipment.getContactPhone().toString()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("companyPhone", equipment.getCompanyPhone()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("plcVersion",  equipment.getPlcVersion()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("selfName", equipment.getSelfName()).toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("pushTimeRule", equipment.getTimeRuleId() + "").toString());
-        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("operational", equipment.getOperationalName() + ":" + equipment.getOperationalPhone()).toString());
+        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("payType", oldEquipment.getPayType().toString() + ":" + oldEquipment.getTimeRuleId()).toString());
+        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("phone", oldEquipment.getContactName() + ":" + oldEquipment.getContactPhone().toString()).toString());
+        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("companyPhone", oldEquipment.getCompanyPhone()).toString());
+        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("plcVersion",  oldEquipment.getPlcVersion()).toString());
+        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("selfName", oldEquipment.getSelfName()).toString());
+        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("pushTimeRule", oldEquipment.getTimeRuleId() + "").toString());
+        tEquipmentService.sentMessage(oldEquipment.getClientId(),PushUtils.buildJson("operational", oldEquipment.getOperationalName() + ":" + oldEquipment.getOperationalPhone()).toString());
 //        if(StringUtils.isEmpty(channel)||channel.equals("1")||StringUtils.isEmpty(equimentType)){
 //            //用个推
 ////            PushUtils.push(oldEquipment.getGtClientId(), "设备支付方式", "设备支付方式", PushUtils.buildJson("payType", equipment.getPayType().toString() + ":" + equipment.getTimeRuleId()).toString());
@@ -517,7 +518,7 @@ public class TEquipmentController {
     }
     @ApiOperation(value = "修改机器音量")
     @PostMapping("/updateVolume")
-    public ResponseEntity<?> updateName(@RequestBody TEquipment equipment) {
+    public ResponseEntity<?> updateVolume(@RequestBody TEquipment equipment) {
         Boolean t = tEquipmentService.updateById(equipment);
         if (t == true) {
             if(!StringUtils.isEmpty(equipment.getVolume())){

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

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -33,7 +34,7 @@ public class TEquipmentDescController {
     //查找设备
     @ApiOperation(value = "ClientId查找设备")
     @GetMapping("/findEquipmentById")
-    public ResponseModel<TEquipmentDesc> findEquipmentById(Long  id) {
+    public ResponseModel<TEquipmentDesc> findEquipmentById(@RequestParam Long  id) {
         LambdaQueryWrapper<TEquipmentDesc> query = Wrappers.lambdaQuery();
         query.eq(TEquipmentDesc::getEquipmentId,id);
         List<TEquipmentDesc> list = equipmentDescService.list(query);

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

@@ -114,7 +114,7 @@ public class TJoinpayMchController {
 
     @ApiOperation(value = "获取提现信息")
     @GetMapping("/getMch")
-    public ResponseModel<TJoinpayMch> getMch(String id) {
+    public ResponseModel<TJoinpayMch> getMch(@RequestParam String id) {
         LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
         query.eq(TJoinpayMch::getAdminId,Long.valueOf(id));
         List<TJoinpayMch> list = tJoinpayMchService.list(query);

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

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -33,7 +34,7 @@ public class TPriceController {
     TPriceService priceService;
     @ApiOperation(value = "获取价格")
     @GetMapping("/getPrice")
-    public ResponseModel<TPrice> getPrice(String name) {
+    public ResponseModel<TPrice> getPrice(@RequestParam String name) {
         LambdaQueryWrapper<TPrice> query = Wrappers.lambdaQuery();
         query.eq(TPrice::getName,name);
         List<TPrice> list = priceService.list(query);

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

@@ -148,8 +148,8 @@ public class TProductController {
     }
 
     @ApiOperation(value = "获取商品")
-    @GetMapping("/getTProduct")
-    public ResponseModel<TProduct> getTProduct(@RequestParam(value = "equipmentId")String equipmentId,@RequestParam(value = "productName")String productName) {
+    @GetMapping("/getProduct")
+    public ResponseModel<TProduct> getProduct(@RequestParam(value = "equipmentId")String equipmentId,@RequestParam(value = "productName")String productName) {
         LambdaQueryWrapper<TProduct> query = Wrappers.lambdaQuery();
         query.eq(TProduct::getProductName,productName);
         query.eq(TProduct::getEquipmentId,Long.valueOf(equipmentId));

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

@@ -67,7 +67,7 @@ public class TPromoCodeController {
     PayFeign payFeign;
     @ApiOperation(value = "获取优惠码")
     @GetMapping("/getTPromoCode")
-    public ResponseModel<IPage<TPromoCode>> getTPromoCode(String  code) {
+    public ResponseModel<IPage<TPromoCode>> getTPromoCode(@RequestParam String  code) {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
         query.eq(TPromoCode::getCode,code);
         Page<TPromoCode> page = new Page<>(0, 10, true);

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

@@ -254,7 +254,7 @@ public class TProportionController {
 
     @ApiOperation(value = "获取机器分销信息")
     @GetMapping("/getProportion")
-    public ResponseModel<TProportion> getProportion( String equipmentId) {
+    public ResponseModel<TProportion> getProportion(@RequestParam String equipmentId) {
         LambdaQueryWrapper<TProportion> query = Wrappers.lambdaQuery();
         query.eq(TProportion::getEquipmentId,Long.valueOf(equipmentId));
         List<TProportion> list = tProportionService.list(query);

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

@@ -142,7 +142,7 @@ public class TShandeMchController {
 
     @ApiOperation(value = "查找杉德收款账户信息")
     @GetMapping("/getShandeMch")
-    public ResponseModel<TShandeMch> getShandeMch(String  adminId) {
+    public ResponseModel<TShandeMch> getShandeMch(@RequestParam String  adminId) {
         LambdaQueryWrapper<TShandeMch> query = Wrappers.lambdaQuery();
         query.eq(TShandeMch::getAdminId,adminId);
         List<TShandeMch> list = tShandeMchService.list(query);

src/main/java/com/szwl/feign/bean/PayFeign.java

@@ -22,7 +22,7 @@ public interface PayFeign {
     @PostMapping("/tOrder/addOrder")
     ResponseModel<?> addOrder(@RequestBody TOrder order);
     @GetMapping("/tOrder/getOrder")
-    ResponseModel<TOrder> getOrder(String id);
+    ResponseModel<TOrder> getOrder(@RequestParam String id);
     @PostMapping("/tOrder/updateOrder")
     ResponseModel<?> updateOrder(@RequestBody TOrder order);
 //    @GetMapping("/tOrder/tradeServiceUniPay")