量子点光谱

sxgk-projet/sxgk-notice/notice-boot/src/main/java/com/tofly/notice/controller/TidingsController.java

@@ -38,13 +38,6 @@ public class TidingsController {
 
     private final  TidingsService tidingsService;
 
-    //TokenStore tokenStore;
-    /*OAuth2AccessToken token = tokenStore.readAccessToken(accessToken);
-    OAuth2Authentication oAuth2Auth = tokenStore.readAuthentication(token);
-    Authentication authentication = oAuth2Auth.getUserAuthentication();
-            if (authentication.getPrincipal() instanceof ToflyUser){
-        ToflyUser user = (ToflyUser) authentication.getPrincipal();
-*/
     /**
     * 分页查询
     * @param page 分页对象
@@ -173,12 +166,12 @@ public class TidingsController {
 
 
     /**
-     * 批量根据数ID标记已读消息
+     * 批量根据检查数ID标记已读消息
      * @param ids 批量，多个id以逗号隔开
      * @return ResultRespone
      */
-    @ToFlyAppLog(title="批量根据数ID标记已读消息" )
-    @ApiOperation(value = "批量根据数ID标记已读消息")
+    @ToFlyAppLog(title="批量根据检查数ID标记已读消息" )
+    @ApiOperation(value = "批量根据检查数ID标记已读消息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "批量，多个id以逗号隔开", required = true, dataType = "String"),
             @ApiImplicitParam(name = "type", value = "告警类型:0-告警；1-预警 空全部", required = false, dataType = "Integer")

sxgk-projet/sxgk-notice/notice-boot/src/main/java/com/tofly/notice/service/impl/TidingsServiceImpl.java

@@ -196,7 +196,7 @@ public class TidingsServiceImpl extends ServiceImpl<TidingsMapper, Tidings> impl
             Map<Integer,List<Long>> map = new HashMap<>();
             for (Map<String,Object> m: maps) {
                 Integer tl = Integer.valueOf(String.valueOf(m.get("tlevel")));
-                Long id = Long.parseLong(String.valueOf(map.get("dataId")));
+                Long id = Long.parseLong(String.valueOf(m.get("dataId")));
                 List<Long> idls = null;
                 if(map.containsKey(tl)){
                     idls = map.get(tl);

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/dto/PGBSiteDataLoadDto.java

@@ -32,7 +32,7 @@ public class PGBSiteDataLoadDto implements Serializable {
     /**
      * 站点ID
      */
-    @ApiModelProperty(value = "站点ID",required = true)
+    @ApiModelProperty(value = "站点ID")
     private List<Long> siteId;
 
     /**

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/dto/PartitionSiteSaveDto.java

@@ -6,10 +6,17 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
+
 @Data
 @EqualsAndHashCode
 public class PartitionSiteSaveDto implements Serializable {
     private static final long serialVersionUID = 1L;
+    /**
+     * 项目ID
+     */
+    @ApiModelProperty(value = "项目ID")
+    private Long projectId;
     /**
      * 分区id
      */
@@ -21,7 +28,7 @@ public class PartitionSiteSaveDto implements Serializable {
      */
     @NotNull
     @ApiModelProperty(value = "站点ID",required = true)
-    private Long siteId;
+    private List<Long> siteId;
     /**
      * 备注
      */

sxgk-projet/sxgk-survey/survey-boot/src/main/java/com/tofly/survey/dto/TargetThresholdDto.java

@@ -1,5 +1,7 @@
 package com.tofly.survey.dto;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.tofly.survey.commons.TipsConstants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,12 +23,25 @@ public class TargetThresholdDto implements Serializable {
     @NotNull(message = TipsConstants.ID_ISNULL)
     @ApiModelProperty(value = "上限",required = true)
     private Double upperLimit;
+    /**
+     * 上容差
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @ApiModelProperty(value = "上容差")
+    private Double upTolerance;
     /**
      * 下限
      */
     @NotNull(message = TipsConstants.ID_ISNULL)
     @ApiModelProperty(value = "下限",required = true)
     private Double lowerLimit;
+    /**
+     * 下容差
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @ApiModelProperty(value = "下容差")
+    private Double lowTolerance;
+
     /**
      * 有效开始时段
      */