Merge remote-tracking branch 'origin/for-yx' into for-yx

license/src/main/java/iot/sixiang/license/controller/OperateController.java

@@ -104,9 +104,6 @@ public class OperateController {
         String user = UserUtils.getLoginUserId();
         int userI = Integer.valueOf(user);
         List<AlarmVo> alarmList = alarmService.getAlarmList(userI);
-        for (AlarmVo alarmVo : alarmList) {
-            alarmVo.setLevelDescribe(ESAPI.encoder().encodeForHTML(alarmVo.getLevelDescribe()));
-        }
         return ResResult.success().goRecord(alarmList);
     }
 
@@ -114,9 +111,9 @@ public class OperateController {
     @PostMapping("alarm/read")
     @MyLog(title = "将告警信息状态设为已读", businessType = BusinessType.OTHER)
     public BaseResult readAlarm() {
-        String id = UserUtils.getLoginUserId();
-        int userId = Integer.valueOf(id);
-        boolean res = alarmReadService.readAlarm(userId);
+        String i = UserUtils.getLoginUserId();
+        int uI = Integer.valueOf(i);
+        boolean res = alarmReadService.readAlarm(uI);
         if (res) {
             return BaseResult.success();
         } else {

license/src/main/java/iot/sixiang/license/service/impl/AlarmReadServiceImpl.java

@@ -8,9 +8,11 @@ import iot.sixiang.license.mapper.AlarmMapper;
 import iot.sixiang.license.mapper.AlarmReadMapper;
 import iot.sixiang.license.model.vo.AlarmVo;
 import iot.sixiang.license.service.AlarmReadService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -29,12 +31,14 @@ public class AlarmReadServiceImpl extends ServiceImpl<AlarmReadMapper, AlarmRead
     @Resource
     AlarmReadMapper alarmReadMapper;
 
+
     @Override
     public boolean readAlarm(int userId) {
         if (userId == 0) {
             throw new IotLicenseException(ResultCode.VALIDATE_FAILED.getCode(),ResultCode.VALIDATE_FAILED.getMsg());
         }
         List<AlarmVo> alarmList = alarmMapper.getAlarmList(userId);
+
         for (AlarmVo alarm: alarmList) {
             if (alarm.getReadFlag() == 0) {
                 int alarmId = alarm.getId();

license/src/main/java/iot/sixiang/license/xss/XssHttpServletRequestWrapper.java

@@ -56,7 +56,7 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
         if (isMultipartContent || isMultipart) {
             fileUpload = true;
         }
-        try (BufferedReader isr = new BufferedReader(new InputStreamReader(ins, StandardCharsets.UTF_8));) {
+        try (BufferedReader isr = new BufferedReader(new InputStreamReader(ins, StandardCharsets.UTF_8))) {
             String line = "";
             while ((line = isr.readLine()) != null) {
                 sb.append(line);