Merge remote-tracking branch 'origin/develop' into develop

ruoyi-ui/src/views/login.vue

@@ -104,7 +104,7 @@ export default {
       codeUrl: "",
       loginForm: {
         username: "admin",
-        password: "admin123",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
@@ -191,6 +191,16 @@ export default {
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
+          if (this.loginForm.rememberMe) {
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30, });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, { expires: 30 });
+          } else {
+            Cookies.remove("username");
+            Cookies.remove("password");
+            Cookies.remove("rememberMe");
+          }
+          
           if(this.captchaOnOff && 'behavioral' === this.captchaType){
             this.$refs.verify.show();
           }else{

zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java

@@ -82,6 +82,20 @@ public class DcTrafficIncidentsController {
         return trafficIncidentsService.getTrafficIncidentsNum();
     }
 
+    /**
+     * @Description 路网管控-事件管控分析-各类事件的状态数量
+     *
+     * @author liuwenge
+     * @date 2024/1/13 15:07
+     * @param
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     */
+    @ApiOperation("各类事件的状态数量")
+    @GetMapping("/getEventStatusNum")
+    public AjaxResult getEventStatusNum(){
+        return trafficIncidentsService.getEventStatusNum();
+    }
+
     /**
      * @Description 路网管控-事件管控分析-事件类型分析占比
      *

zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java

@@ -52,6 +52,15 @@ public interface IDcTrafficIncidentsService {
      */
     AjaxResult getTrafficIncidentsNum();
 
+    /**
+     * @param
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     * @Description 路网管控-事件管控分析-各类事件的状态数量
+     * @author liuwenge
+     * @date 2024/1/13 15:46
+     */
+    AjaxResult getEventStatusNum();
+
     /**
      * @param
      * @return com.ruoyi.common.core.domain.AjaxResult

zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java

@@ -105,6 +105,63 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService
     }
 
     /**
+     * @Description 路网管控-事件管控分析-各类事件的状态数量
+     *
+     * @author liuwenge
+     * @date 2024/1/13 15:46
+     * @param
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     */
+    @Override
+    public AjaxResult getEventStatusNum(){
+        //事件类型
+        List<Map<String,Object>> eventTypeList = trafficIncidentsMapper.selectEventTypeList();
+
+        for (Map<String, Object> eventType : eventTypeList) {
+            //该类型下的各状态事件数量
+            List<Map<String,Object>> eventTypeDataList = trafficIncidentsMapper.selectStatusCountByEventType(eventType.get("eventType").toString());
+
+            if (eventTypeDataList != null && eventTypeDataList.size() > 0){
+                int total = 0;
+                for (Map<String, Object> eventTypeData : eventTypeDataList) {
+
+                    String status = eventTypeData.get("eventState").toString();
+                    if ("0".equals(status)) {
+                        //待确认
+                        eventType.put("unconfirmed", eventTypeData.get("num"));
+                    } else if ("1".equals(status)) {
+                        //处理中
+                        eventType.put("processing", eventTypeData.get("num"));
+                    } else if ("2".equals(status)) {
+                        //已完成
+                        eventType.put("finished", eventTypeData.get("num"));
+                    }
+                    total += Integer.parseInt(eventTypeData.get("num").toString());
+                }
+                eventType.put("total",total);
+            }
+
+            //待确认
+            if (!eventType.containsKey("unconfirmed")){
+                eventType.put("unconfirmed", "0");
+            }
+            //处理中
+            if (!eventType.containsKey("processing")){
+                eventType.put("processing", "0");
+            }
+            //已完成
+            if (!eventType.containsKey("finished")){
+                eventType.put("finished", "0");
+            }
+            //总数
+            if (!eventType.containsKey("total")){
+                eventType.put("total", "0");
+            }
+
+        }
+
+        return AjaxResult.success(eventTypeList);
+    }/**
      * @Description 路网管控-事件管控分析-事件类型分析占比
      *
      * @author liuwenge