大屏接口修改

src/main/java/com/glxp/api/controller/stat/BigVisController.java

@@ -53,6 +53,7 @@ public class BigVisController extends BaseController {
         List<StatCityCorpEntity> statCityCorpEntities = statCityCorpService.list(
                 new QueryWrapper<StatCityCorpEntity>()
                         .eq(StrUtil.isNotEmpty(statCityCorpRequest.getRegionCode()), "pCityCode", statCityCorpRequest.getRegionCode())
+                        .eq(StrUtil.isNotEmpty(statCityCorpRequest.getCityCode()), "cityCode", statCityCorpRequest.getCityCode())
                         .orderByDesc("count"));
         return ResultVOUtils.success(statCityCorpEntities);
     }
@@ -65,7 +66,7 @@ public class BigVisController extends BaseController {
 
         List<StatCorpProductEntity> statCorpProductEntities = statCorpProductService.list(
                 new QueryWrapper<StatCorpProductEntity>()
-                        .eq(StrUtil.isNotEmpty(statCityCorpRequest.getRegionCode()), "cityCode", statCityCorpRequest.getRegionCode())
+                        .eq(!statCityCorpRequest.getRegionCode().equals("350000"), "cityCode", statCityCorpRequest.getRegionCode())
                         .orderByDesc("productCount").last("limit 10"));
         return ResultVOUtils.success(statCorpProductEntities);
     }
@@ -94,7 +95,8 @@ public class BigVisController extends BaseController {
     /**
      * 企业在线统计
      */
-    @GetMapping("/cpt/bigVis/company/online/list")
+    @GetMapping("/" +
+            "cpt/bigVis/company/online/list")
     public BaseResponse companyOnLineList(StatCityCorpRequest statCityCorpRequest) {
 
         if (StrUtil.isEmpty(statCityCorpRequest.getRegionCode()) || !statCityCorpRequest.getRegionCode().equals("350000")) {

src/main/java/com/glxp/api/controller/trace/UdiTraceController.java

@@ -104,7 +104,7 @@ public class UdiTraceController extends BaseController {
      * @return
      */
     @ApiOperation(value = "源头追溯查询", response = TraceOrderEntity.class)
-    @AuthRuleAnnotation("udi/trace/source/search")
+//    @AuthRuleAnnotation("udi/trace/source/search")
     @GetMapping("udi/trace/source/search")
     public BaseResponse createTrace(TraceRecordRequest traceRecordRequest) {
 
@@ -138,6 +138,8 @@ public class UdiTraceController extends BaseController {
 
             //4.生成查询记录
             String userId = getUserId() + "";
+            if (StrUtil.isEmpty(userId))
+                userId = "1";
             traceRecordLogEntity = udiTraceService.createRecordLog(userId, traceRecordRequest.getFromType(), traceRecordRequest.getTraceType());
 
 

src/main/java/com/glxp/api/entity/stat/StatAmapFlowEntity.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -34,5 +36,11 @@ public class StatAmapFlowEntity implements Serializable {
     @TableField(value = "`count`")
     private String count;
 
+    @TableField(value = "`company`")
+    private String company;
+
+    @TableField(value = "`remark`")
+    private String remark;
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/glxp/api/service/auth/CustomerService.java

@@ -30,6 +30,8 @@ public class CustomerService {
         }
         HttpServletRequest request = attributes.getRequest();
         String userId = request.getHeader("ADMIN_ID");
+        if (userId == null)
+            return 1l;
         return Long.parseLong(userId);
     }