sonar

src/main/java/com/fdkankan/scene/bean/ResultData.java

@@ -10,7 +10,7 @@ import java.util.Calendar;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class ResultData<T> implements Serializable {
+public class ResultData<T extends Serializable> implements Serializable {
     /**
      * 状态码
      */
@@ -22,7 +22,7 @@ public class ResultData<T> implements Serializable {
     /**
      * 后端返回结果
      */
-    private transient T data;
+    private T data;
     /**
      * 请求是否成功
      */
@@ -53,7 +53,7 @@ public class ResultData<T> implements Serializable {
         ResultData rd = new ResultData();
         rd.setCode(code);
         rd.setMessage(msg);
-        rd.setData(data);
+        rd.setData((Serializable) data);
         rd.setSuccess(success);
         return rd;
     }

src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -1,42 +1,30 @@
 package com.fdkankan.scene.controller;
 
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
 import com.fdkankan.common.constant.SceneInfoReqType;
 import com.fdkankan.common.util.ESAPIUtil;
 import com.fdkankan.common.util.FdfsUtil;
-import com.fdkankan.common.util.XssFilterUtil;
 import com.fdkankan.scene.annotation.CheckToken;
 import com.fdkankan.scene.annotation.InitEditInfo;
 import com.fdkankan.scene.annotation.VrLog;
 import com.fdkankan.scene.bean.ResultData;
-import com.fdkankan.scene.httpclient.CustomHttpClient;
-import com.fdkankan.scene.service.*;
+import com.fdkankan.scene.service.FYunFileService;
+import com.fdkankan.scene.service.SceneEditInfoService;
+import com.fdkankan.scene.service.SceneService;
+import com.fdkankan.scene.service.SystemSecretService;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
 import org.apache.commons.lang.StringEscapeUtils;
-import org.omg.PortableInterceptor.PolicyFactory;
-import org.owasp.esapi.ESAPI;
 import org.owasp.esapi.errors.EncodingException;
 import org.owasp.esapi.errors.ValidationException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.websocket.server.PathParam;
-import java.io.File;
 import java.io.IOException;
-import java.util.Map;
-import java.util.UUID;
 
 /**
  * <p>
@@ -75,7 +63,7 @@ public class SceneController extends BaseController{
     @GetMapping(value = "/getInfo")
     public ResultData getInfo(@Validated SceneInfoParamVO param) throws Exception{
         param.setReqType(SceneInfoReqType.VIEW.code());
-        SceneInfoVO sceneInfo = sceneEditInfoService.getSceneInfo(StringEscapeUtils.escapeHtml(param.getNum()), param.getSubgroup(), param.getUpTimeKey(), (byte)1);
+        SceneInfoVO sceneInfo = sceneEditInfoService.getSceneInfo(StringEscapeUtils.escapeHtml(param.getNum()), param.getSubgroup(), param.getUpTimeKey(), (byte)2);
         return ResultData.ok(sceneInfo);
     }
 

src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -287,7 +287,7 @@ public class SceneEditController extends BaseController{
     public SceneInfoVO getInfo(@Validated SceneInfoParamVO param) throws Exception{
         param.setReqType(SceneInfoReqType.EDIT.code());
         response.setHeader("Set-Cookie","cookiename=cookievalue; path=/; Domain=domainvaule; Max-age=seconds; HttpOnly");
-        return sceneEditInfoService.getSceneInfo(StringEscapeUtils.escapeHtml(param.getNum()), param.getSubgroup(), param.getUpTimeKey(), (byte)2);
+        return sceneEditInfoService.getSceneInfo(StringEscapeUtils.escapeHtml(param.getNum()), param.getSubgroup(), param.getUpTimeKey(), (byte)1);
     }
 
     /**

src/main/java/com/fdkankan/scene/service/SceneService.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.websocket.server.PathParam;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,7 +38,7 @@ public interface SceneService extends IService<Scene> {
 
     List<Scene> listByStationcode(String stationCode);
 
-    Map<String, String> listByNumLast3(String num);
+    HashMap<String, String> listByNumLast3(String num);
 
 
 

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -216,12 +216,12 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
 
                 //查询机房列表
                 List<Scene> sceneList = sceneService.listByStationcode(sceneInfo.getStationCode());
-                List<Map<String, String>> roomList = new ArrayList<>();
+                ArrayList<HashMap<String, String>> roomList = new ArrayList<>();
                 for (Scene scene : sceneList) {
                     if(scene.getNum().equals(sceneInfo.getNum())){
                         continue;
                     }
-                    Map<String, String> item = new HashMap<>();
+                    HashMap<String, String> item = new HashMap<>();
                     item.put("stationCode", scene.getStationcode());
                     item.put("roomEntityID", scene.getNum());
                     item.put("title", scene.getTitle());

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -158,12 +158,12 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
     }
 
     @Override
-    public Map<String, String> listByNumLast3(String num) {
+    public HashMap<String, String> listByNumLast3(String num) {
         List<Scene> list = this.list(new LambdaQueryWrapper<Scene>().eq(Scene::getNum, num).eq(Scene::getSubgroup, 0).orderByDesc(Scene::getUpTime).last("limit 3"));
         if(CollUtil.isEmpty(list)){
             return null;
         }
-        Map<String, String> map = new LinkedHashMap<>();
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
         for (Scene scene : list) {
             map.put(scene.getUpTimeKey(), DateUtil.formatDateTime(DateUtil.parse(scene.getUpTimeKey(), DatePattern.PURE_DATETIME_PATTERN)));
         }

src/main/java/com/fdkankan/scene/vo/BaseSceneParamVO.java

@@ -3,6 +3,8 @@ package com.fdkankan.scene.vo;
 import javax.validation.constraints.NotBlank;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * TODO
@@ -12,7 +14,7 @@ import lombok.Data;
  * @since 2022/2/22
  **/
 @Data
-public class BaseSceneParamVO {
+public class BaseSceneParamVO implements Serializable {
 
     /**
      * 场景码

src/main/java/com/fdkankan/scene/vo/SceneAuthVO.java

@@ -6,6 +6,10 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * TODO
@@ -20,7 +24,7 @@ import lombok.Setter;
 @AllArgsConstructor
 @Getter
 @Setter
-public class SceneAuthVO {
+public class SceneAuthVO implements Serializable {
 
     /**
      * 是否过期
@@ -39,9 +43,9 @@ public class SceneAuthVO {
 
     private Long company;
 
-    private Object exclude;
+    private ArrayList exclude;
 
-    private Object include;
+    private ArrayList include;
 
     public void setIsExpired(boolean isExpired){
         this.isExpired = isExpired;

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -3,7 +3,9 @@ package com.fdkankan.scene.vo;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.List;
+
+import java.io.Serializable;
+import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
@@ -12,9 +14,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
-import java.util.Map;
-
 /**
  * <p>
  * TODO
@@ -27,7 +26,7 @@ import java.util.Map;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SceneInfoVO {
+public class SceneInfoVO  implements Serializable {
 
     private Long id;
 
@@ -273,10 +272,10 @@ public class SceneInfoVO {
 
     private String stationCode;
 
-    List<Map<String, String>> entityList;
+    ArrayList<HashMap<String, String>> entityList;
 
     //历史时间
-    Map<String, String> historyList;
+    HashMap<String, String> historyList;
 
 //    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")