新智能平台对接开发

common/src/main/java/com/winsun/mapper/OrderMapper.java

@@ -94,7 +94,7 @@ public interface OrderMapper extends BaseMapper<Order> {
 
     List<BroadBandOrder> selectBroadBandOrderList(Page<BroadBandOrder> page, BroadBandOrder broadBandOrder);
 
-    List<Map<String, Object>> selectBroadBandOrderList2(BroadBandOrder bao,String startTime,String endTime);
+    List<Map<String, Object>> selectBroadBandOrderList2(BroadBandOrder bao);
 
     /**
      * 查询重复订单
@@ -170,10 +170,6 @@ public interface OrderMapper extends BaseMapper<Order> {
     List<Map<String,Object>> selectDKList();
 
 
-    @Select("SELECT * FROM hhr_order WHERE user_type = '5' and kd_order_id = 'dl6w7nvh8u34zx29w5uh'")
-    Map<String,Object> selectDKList2();
-
-
     /**
      * 一人一码订单通报  -- 移动订单（学校）
      * @return

core-service/src/main/resources/application-test.yml

@@ -82,9 +82,9 @@ spring:
       nodes:
         - ${spring.redis.host}:${spring.redis.port}
     database: 0
-    host: schoolcenterredis
+    host: 127.0.0.1
     port: 6379
-    password: ENC(dzBR0ihAkOs43UgnwmnQfFpmjbWvfqmtOIwwgra/+ik=)
+    password:
     lettuce:
       pool:
         max-active: -1

core-service/src/test/java/com/winsun/base/AppApplicationBaseIT.java

@@ -6,6 +6,7 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
 /**

service-manager/src/main/java/com/winsun/controller/OrderViewController.java

@@ -104,7 +104,7 @@ public class OrderViewController extends BaseController {
         return ResponseData.success(page, "查询成功！");
     }
 
-    /*@Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST)
+    @Permission(menuname = "导出宽带订单", value = "download", method = RequestMethod.POST)
     public ResponseData<String> downloadOrderView(BroadBandOrder broadBandOrder){
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员",  "县分管理员（订单）", "修改身份证", "合伙人"))) {
@@ -126,6 +126,6 @@ public class OrderViewController extends BaseController {
             return ResponseData.error("导出失败");
         }
         return ResponseData.success("导出成功");
-    }*/
+    }
 
 }