Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/config/Knife4jConfiguration.java

@@ -78,7 +78,7 @@ public class Knife4jConfiguration {
                 .apiInfo(apiInfo())
                 .groupName(groupName)
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.wanji.holo.restful"))
+                .apis(RequestHandlerSelectors.any())
                 .paths(PathSelectors.any())
                 .build()
                 .securitySchemes(securitySchemes())

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/AnalysisProblemAreaDayController.java

 package net.wanji.opt.controllerv2.judgeanalysis;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import net.wanji.common.framework.rest.JsonViewObject;
-import net.wanji.opt.controllerv2.judgeanalysis.api.response.AreaProblemOverview;
-import net.wanji.opt.servicev2.TrendServiceV2;
-import net.wanji.opt.vo2.CrossGreenStatusTimeRateVO;
+import net.wanji.opt.controllerv2.judgeanalysis.design.response.areaproblem.AreaCrossProblemAnalysisResult;
+import net.wanji.opt.controllerv2.judgeanalysis.design.response.areaproblem.AreaGreenProblemAnalysisResult;
+import net.wanji.opt.controllerv2.judgeanalysis.design.response.areaproblem.AreaProblemOverview;
+import net.wanji.opt.controllerv2.judgeanalysis.design.response.areaproblem.AreaProblemTrendAnalysisResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import javax.ws.rs.core.MediaType;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * <p>
@@ -25,13 +25,13 @@ import java.util.List;
  * @author fengyi
  * @since 2025-03-13
  */
-@Api(tags = "区域问题分析")
+@Api(tags = "研判分析-区域问题分析")
 @RestController
 @RequestMapping("/analysis-area-problem")
 public class AnalysisProblemAreaDayController {
 
 
-    @ApiOperation(value = "研判分析-区域问题总览",   response = JsonViewObject.class,
+    @ApiOperation(value = "区域-问题数量总览",   response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @GetMapping(value = "/overview")
     @ApiResponses({
@@ -42,4 +42,43 @@ public class AnalysisProblemAreaDayController {
     }
 
 
+    @ApiOperation(value = "区域-问题数量趋势分析",   response = JsonViewObject.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @GetMapping(value = "/trend")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = AreaProblemTrendAnalysisResult.class),
+    })
+    public JsonViewObject trend() {
+        return JsonViewObject.newInstance().success(null);
+    }
+
+
+
+    @ApiOperation(value = "区域-路口问题数量分析",   response = JsonViewObject.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "eventCode", value = "事件代码 701：空放 702：路口失衡，703：路口溢出", required = true, dataType = "String", defaultValue = "")
+    })
+    @GetMapping(value = "/cross-problem-number")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = AreaCrossProblemAnalysisResult.class),
+    })
+    public JsonViewObject crossProblemNumber() {
+        return JsonViewObject.newInstance().success(null);
+    }
+
+
+    @ApiOperation(value = "区域-干线问题数量分析",   response = JsonViewObject.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "eventCode", value = "事件代码 705：干线缓行 706：干线拥堵", required = true, dataType = "String", defaultValue = "")
+    })
+    @GetMapping(value = "/green-problem-number")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = AreaGreenProblemAnalysisResult.class),
+    })
+    public JsonViewObject greenProblemNumber() {
+        return JsonViewObject.newInstance().success(null);
+    }
+
 }

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/AnalysisProblemCrossDayController.java

@@ -24,7 +24,7 @@ import java.util.List;
 * @author fengyi
 * @since 2025-03-13
 */
-@Api(tags = "路口问题分析")
+@Api(tags = "研判分析-路口问题分析")
 
 @RestController
 @RequestMapping("/analysis-problem-cross-day")

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/AnalysisProblemGreenDayController.java

@@ -24,7 +24,7 @@ import java.util.List;
 * @author fengyi
 * @since 2025-03-13
 */
-@Api(tags = "绿波问题分析")
+@Api(tags = "研判分析-绿波问题分析")
 @RestController
 @RequestMapping("/analysis-problem-green-day")
 public class AnalysisProblemGreenDayController {

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/api/response/ParentResult.java → signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/design/response/ParentResult.java

-package net.wanji.opt.controllerv2.judgeanalysis.api.response;
+package net.wanji.opt.controllerv2.judgeanalysis.design.response;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/design/response/areaproblem/AreaCrossProblemAnalysisResult.java

+package net.wanji.opt.controllerv2.judgeanalysis.design.response.areaproblem;
+
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.wanji.opt.controllerv2.judgeanalysis.design.response.ParentResult;
+
+import java.util.List;
+
+@Data
+public class AreaCrossProblemAnalysisResult extends ParentResult {
+
+    private List<CrossProblemAnalysisResultResponse> content;
+
+    public   List<CrossProblemAnalysisResultResponse> getContent() {
+        return content;
+    }
+
+    public AreaCrossProblemAnalysisResult setContent(  List<CrossProblemAnalysisResultResponse> content) {
+        this.content = content;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
+}
+
+@Data
+class  CrossProblemAnalysisResultResponse {
+
+    @ApiModelProperty(value = "路口ID",example = "13LBF0B5SP0")
+    private   String crossId ;
+
+    @ApiModelProperty(value = "路口名称",example = "经十西路与经十路交叉口")
+    private   String crossName ;
+
+    @ApiModelProperty(value = "事件类型码",example = "'707'",dataType = "String")
+    private   String eventType ;
+
+    @ApiModelProperty(value = "事件类型名称",example = "路口拥堵")
+    private   String eventLabel ;
+
+    @ApiModelProperty(value = "事件问题梳理",example = "2",dataType = "Integer")
+    private   Integer number ;
+
+}
+
+
+
+
+

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/design/response/areaproblem/AreaGreenProblemAnalysisResult.java

+package net.wanji.opt.controllerv2.judgeanalysis.design.response.areaproblem;
+
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.wanji.opt.controllerv2.judgeanalysis.design.response.ParentResult;
+
+import java.util.List;
+
+@Data
+public class AreaGreenProblemAnalysisResult extends ParentResult {
+
+    private List<GreenProblemAnalysisResultResponse> content;
+
+    public   List<GreenProblemAnalysisResultResponse> getContent() {
+        return content;
+    }
+
+    public AreaGreenProblemAnalysisResult setContent(  List<GreenProblemAnalysisResultResponse> content) {
+        this.content = content;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
+}
+
+@Data
+class  GreenProblemAnalysisResultResponse {
+
+    @ApiModelProperty(value = "绿波干线ID",example = "2")
+    private   Integer greenId ;
+
+    @ApiModelProperty(value = "绿波干线名称",example = "经十路（舜耕路-山大路）")
+    private   String crossName ;
+
+    @ApiModelProperty(value = "事件类型码",example = "'707'" , dataType = "String")
+    private   String eventType ;
+
+    @ApiModelProperty(value = "事件类型名称",example = "路口拥堵")
+    private   String eventLabel ;
+
+    @ApiModelProperty(value = "事件问题数量",example = "2")
+    private   Integer number ;
+
+}
+
+
+
+
+

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/api/response/AreaProblemOverview.java → signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/design/response/areaproblem/AreaProblemOverview.java

-package net.wanji.opt.controllerv2.judgeanalysis.api.response;
+package net.wanji.opt.controllerv2.judgeanalysis.design.response.areaproblem;
 
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import net.wanji.opt.controllerv2.judgeanalysis.design.response.ParentResult;
 
 import java.util.List;
 
@@ -30,10 +31,11 @@ public class AreaProblemOverview extends ParentResult {
 @Data
 class  EventAnalysisResultResponse  {
 
-    @ApiModelProperty(value = "问题类型编码 ",example = "1")
-    private String eventCode;
-    @ApiModelProperty(value = "问题类型描述",example = "路口拥堵")
-    private String eventDesc;
+    @ApiModelProperty(value = "事件类型码",example = "'707'",dataType = "string")
+    private   String eventType ;
+
+    @ApiModelProperty(value = "事件类型名称",example = "路口拥堵")
+    private   String eventLabel ;
 
     @ApiModelProperty(value = "问题数量",example = "1")
     private Integer number;

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/judgeanalysis/design/response/areaproblem/AreaProblemTrendAnalysisResult.java

+package net.wanji.opt.controllerv2.judgeanalysis.design.response.areaproblem;
+
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import net.wanji.opt.controllerv2.judgeanalysis.design.response.ParentResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AreaProblemTrendAnalysisResult extends ParentResult {
+
+    private  ProblemTrendAnalysisResultResponse content;
+
+    public  ProblemTrendAnalysisResultResponse getContent() {
+        return content;
+    }
+
+    public AreaProblemTrendAnalysisResult setContent( ProblemTrendAnalysisResultResponse content) {
+        this.content = content;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
+}
+
+@Data
+class  ProblemTrendAnalysisResultResponse {
+
+
+    @ApiModelProperty(value = "时段列表",example = "[\"20250311\",\"20250312\"]",dataType = "String[]")
+    private   List<String> timeList = new ArrayList<>();
+
+//    @ApiModelProperty(value = "各路口时段流量列表",
+//            example = "[{\"name\":\"路口1\",\"list\":[150,300]}," +
+//                       "{\"name\":\"路口2\",\"list\":[150,300]}]")
+    private List<ProblemTrendAnalysisResultTimeFlow> dataList=new ArrayList<>();
+
+}
+
+@Data
+class  ProblemTrendAnalysisResultTimeFlow {
+
+    @ApiModelProperty(value = "事件类型码",example = "'707'",dataType = "string")
+    private   String eventType ;
+    @ApiModelProperty(value = "事件类型名称",example = "路口拥堵")
+    private   String eventLabel ;
+    @ApiModelProperty(value = "时段事件数量，时段对应到timeList",example = "[300,400]",dataType = "int[]")
+    private List<Integer> list ;
+
+}
+
+
+

wj-gernerator/src/main/resources/templates/mybatisplus/controller.java.ftl

@@ -32,7 +32,6 @@ import java.util.List;
 * @since ${date}
 */
 @Api(tags = "${table.comment!}")
-
 @RestController
 @RequestMapping("<#if package.ModuleName??>/${package.ModuleName}</#if>/<#if controllerMappingHyphenStyle??>${controllerMappingHyphen}<#else>${table.entityPath}</#if>")
 public class ${table.controllerName} {