综治事件列表优化接口，增加事件状态中文字典值

综治中心页面所在地增加label字典值
查询当前用户所属部门优化接口，修改key为deptId和deptName

src/main/java/com/sooka/sponest/mobile/comprehensive/eventController/EventController.java

@@ -1,14 +1,22 @@
 package com.sooka.sponest.mobile.comprehensive.eventController;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.utils.DictUtils;
+import com.ruoyi.system.api.domain.SysDictData;
 import com.sooka.sponest.comprehensive.api.comprehensiveEvent.domain.ZhsqEvent;
 import com.sooka.sponest.comprehensive.api.comprehensiveEvent.service.*;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/AppComprehensiveEvent")
@@ -40,32 +48,40 @@ public class EventController {
     @GetMapping("/event/getList")
     public AjaxResult getEventList(@RequestParam("pageNum") String pageNum, @RequestParam("pageSize") String pageSize, @RequestParam("eventType") String eventType) {
         TableDataInfo data = new TableDataInfo();
+
         switch (eventType){
             case "1":
                 data = eventService.getList(pageNum,pageSize);
-                break;
+                return setLabel(data, "eventState");
             case "2":
                 data = eventTodoService.getList(pageNum,pageSize);
-                break;
+                return setLabel(data, "sjczCzzt");
             case "3":
                 data = eventCompletedService.getList(pageNum,pageSize);
-                break;
+                return setLabel(data, "eventState");
             case "4":
                 data = eventVerfiedService.getList(pageNum,pageSize);
-                break;
+                return setLabel(data, "eventState");
             case "5":
                 data = eventDistributeService.getList(pageNum,pageSize);
-                break;
+                return setLabel(data, "sjczCzzt");
             case "6":
                 data = eventFileService.getList(pageNum,pageSize);
-                break;
+                return setLabel(data, "eventState");
             default:
-                data.setCode(500);
-                data.setMsg("参数错误");
-                break;
+                return AjaxResult.error(500, "参数错误");
         }
+
+    }
+
+    private AjaxResult setLabel(TableDataInfo data, String keys){
         if (HttpStatus.SUCCESS == data.getCode()) {
-            return AjaxResult.success(data.getRows());
+            Map<String, Object> eventType1 = DictUtils.getDictCacheToMap("eventType");
+            List<HashMap<String, Object>> rows = (List<HashMap<String, Object>>) data.getRows();
+            for (HashMap<String, Object> row : rows) {
+                row.put("eventStateLabel", eventType1.get(row.get(keys).toString()));
+            }
+            return AjaxResult.success(rows);
         } else {
             return AjaxResult.error(data.getCode(), data.getMsg());
         }
@@ -78,7 +94,21 @@ public class EventController {
      */
     @GetMapping("/event/edit")
     public AjaxResult getEdit(@RequestParam("eventId") String eventId){
-        return eventService.getEdit(eventId);
+        AjaxResult result = eventService.getEdit(eventId);
+        if("200".equals(String.valueOf(result.get("code")))){
+            HashMap<String, Object> data = (HashMap<String, Object>) result.get("data");
+            String keys = "zhsqEventType";
+            List<JSONObject> list = SpringUtils.getBean(RedisService.class).getCacheList(keys);
+            for (JSONObject map : list) {
+                if(map.getString("eventTypeId").equals(String.valueOf(data.get("eventTypeId")))){
+                    data.put("eventTypeLabel", map.get("eventTypeName"));
+                    break;
+                }
+            }
+            return AjaxResult.success(data);
+        }else{
+            return AjaxResult.error(String.valueOf(result.get("code")), result.get("msg"));
+        }
     }
 
     /**
@@ -115,7 +145,7 @@ public class EventController {
      * @param eventId
      * @return
      */
-    @PostMapping("/event/report/eventId")
+    @GetMapping("/event/report/eventId")
     public AjaxResult reportEventId(@RequestParam("eventId") String eventId){
         return eventService.reportEventId(eventId);
     }

src/main/java/com/sooka/sponest/mobile/system/dept/DeptController.java

@@ -8,6 +8,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @Author LG
@@ -28,10 +31,27 @@ public class DeptController {
 
     /**
      * 获取当日用户的所属部门
+     *
      * @return
      */
     @GetMapping("/userDeptSelect")
-    public AjaxResult getUserDeptSelect(){
-        return remoteSystemBaseService.getUserDeptSelect();
+    public AjaxResult getUserDeptSelect() {
+        AjaxResult result = remoteSystemBaseService.getUserDeptSelect();
+        if ("200".equals(String.valueOf(result.get("code")))) {
+            List<HashMap<String, Object>> data = (List<HashMap<String, Object>>) result.get("data");
+            if(!data.isEmpty()){
+                List<HashMap<String, Object>> resultList = new ArrayList<>();
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("deptId", data.get(0).get("id"));
+                map.put("deptName", data.get(0).get("label"));
+                resultList.add(map);
+                return AjaxResult.success(resultList);
+            }else{
+                return AjaxResult.error("500", "data is null");
+            }
+        } else {
+            return AjaxResult.error(String.valueOf(result.get("code")), result.get("msg"));
+
+        }
     }
 }