修改毕业生融合

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

@@ -146,6 +146,7 @@ public interface OrderMapper extends BaseMapper<Order> {
      */
     int updateNosendAndRhTimeLtNowOrder();
 
-
+    @Select("select * from bys_student where phone = #{phone}")
+    List<Map<String, Object>> selectBys(String phone);
 
 }

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

@@ -26,6 +26,7 @@ public class ImgController {
         request.getServletPath();
         String  imgurl= FilePath.BACKGROUNDIMG.getValue()+"/"+request.getServletPath();
         imgurl = imgurl.replace("//", "/");
+        
         File file = new File(imgurl);
         FileInputStream inputStream = null;
         try {
@@ -40,6 +41,7 @@ public class ImgController {
             }
 
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("图片下载失败",e.getMessage());
         }finally{
             if (inputStream != null) {

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

@@ -463,7 +463,7 @@ public class OrderController extends BaseController {
     }
 
     /**
-     * 编辑订单
+     * 编辑宽带订单（超级管理员、县分管理员、修改身份证）
      *
      * @return
      */
@@ -474,6 +474,11 @@ public class OrderController extends BaseController {
                                           @RequestParam(value = "studentCard",required = false) String student_card,@RequestParam(value = "address",required = false) String address,
                                           @RequestParam(value = "site",required = false) String site, @RequestParam(value = "remarks",required = false) String remarks,@RequestParam(value = "orderStatus",required = false) String order_status) {
         ShiroUser user = getShiroUser();
+
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）", "修改身份证"))) {
+            ResponseData.error("无权限修改订单");
+        }
+
         List<Map<String, Object>> hhrOrderId = orderMapper.findHhrOrderId(id);
         if(hhrOrderId.size()!=1){
             return ResponseData.error("无数据查询");

service-manager/src/main/java/com/winsun/service/impl/AccessStatisticServiceImpl.java

@@ -145,7 +145,7 @@ public class AccessStatisticServiceImpl implements AccessStatisticService {
         }
         log.info("统计用户：" + userIdsDql.toString());
 
-        String dql = "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"range\":{\"@timestamp\":{\"gte\":" + startDate.getTime() + ",\"lte\":" + endDate.getTime() +",\"format\":\"epoch_millis\"}}},{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"agent.hostname:\\\"ESC-NETWORK\\\" AND request:*.do* " + userIdsDql.toString() + "\"}}]}},\"aggs\":{\"groupBy\": {\"date_histogram\": {\"field\": \"@timestamp\",\"interval\": \"" + type + "\"},\"aggs\":{\"userCount\":{\"cardinality\":{\"field\":\"remote_addr\"}}}}}}";
+        String dql = "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"range\":{\"@timestamp\":{\"gte\":" + startDate.getTime() + ",\"lte\":" + endDate.getTime() +",\"format\":\"epoch_millis\"}}},{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"request:*.do* " + userIdsDql.toString() + "\"}}]}},\"aggs\":{\"groupBy\": {\"date_histogram\": {\"field\": \"@timestamp\",\"interval\": \"" + type + "\"},\"aggs\":{\"userCount\":{\"cardinality\":{\"field\":\"remote_addr\"}}}}}}";
         log.info("dql：" + dql);
         try {
             String esSearch = AccessStatisticDataSearchUtils.esSearch(dql);