fix ws授权模块

nb-auth/src/main/java/com/nb/auth/utils/SecurityUtil.java

@@ -17,7 +17,7 @@ import java.util.Objects;
  * @author Kevin
  */
 public class SecurityUtil {
-    private static final String LOGIN_USER_KEY="loginUser";
+    public static final String LOGIN_USER_KEY="loginUser";
     /**
      * 获取用户账户
      **/

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/vo/ClinicStatsVo.java

@@ -35,6 +35,8 @@ public class ClinicStatsVo {
     private boolean validCount;
     @ApiModelProperty("是否统计无效次数")
     private boolean inValidCount;
+    @ApiModelProperty("是否统计电量")
+    private boolean electricQuantity;
 
     @ApiModelProperty("参数修改id")
     private List<String> infusionModifyIds;

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicStatsQueryResult.java

@@ -36,4 +36,7 @@ public class ClinicStatsQueryResult implements Serializable {
     @ApiModelProperty(hidden = true)
     @JsonIgnore
     private String infusionId;
+
+    @ApiModelProperty(value = "电量",hidden = true)
+    private Integer electricQuantity;
 }

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicStatsReturnResult.java

@@ -39,6 +39,8 @@ public class ClinicStatsReturnResult implements Serializable {
     private List<Integer> validCount;
     @ApiModelProperty("无效次数数据集")
     private List<Integer> inValidCount;
+    @ApiModelProperty("电量数据集")
+    private List<Integer> electricQuantity;
 
     @ApiModelProperty("上传时间")
     private List<String> uploadTimes;
@@ -88,6 +90,7 @@ public class ClinicStatsReturnResult implements Serializable {
             List<BigDecimal> inputDoses = Optional.ofNullable(result.getInputDose()).orElse(new ArrayList<>());
             List<Integer> validCounts = Optional.ofNullable(result.getValidCount()).orElse(new ArrayList<>());
             List<Integer> inValidCounts = Optional.ofNullable(result.getInValidCount()).orElse(new ArrayList<>());
+            List<Integer> electricQuantities = Optional.ofNullable(result.getInValidCount()).orElse(new ArrayList<>());
             List<String> uploadTimes = Optional.ofNullable(result.getUploadTimes()).orElse(new ArrayList<>());
             List<BigDecimal> singleAppendDoses = Optional.ofNullable(result.getSingleAppendDose()).orElse(new ArrayList<>());
 
@@ -103,6 +106,7 @@ public class ClinicStatsReturnResult implements Serializable {
             continueDoses.add(queryResult.getContinueDose()!=null?queryResult.getContinueDose():BigDecimal.ZERO);
             appendDoses.add(appendDose);
             inputDoses.add( queryResult.getInputDose()!=null?queryResult.getInputDose():BigDecimal.ZERO);
+            electricQuantities.add(queryResult.getElectricQuantity());
             validCounts.add(queryResult.getValidCount()!=null?queryResult.getValidCount():0);
             inValidCounts.add(queryResult.getInValidCount()!=null?queryResult.getInValidCount():0);
 

nb-service/web-service/src/main/java/com/nb/web/service/bus/websocket/auth/UserAuthFilter.java

@@ -24,7 +24,7 @@ public class UserAuthFilter implements IWebSocketAuthFilter {
     @Override
     public boolean auth(HttpRequest httpRequest, HttpResponse httpResponse, ChannelContext channelContext) {
         String authorization = httpRequest.getParam("Authorization");
-        LoginUser loginUser = (LoginUser) SecurityUtil.getStpLogic( httpRequest.getHeader("Login-Type")).getTokenSessionByToken(authorization).get(LOGIN_USER_KEY);
+        LoginUser loginUser = (LoginUser) SecurityUtil.getStpLogic( httpRequest.getParam("LoginType")).getTokenSessionByToken(authorization).get(SecurityUtil.LOGIN_USER_KEY);
         Tio.bindToken(channelContext, JSONUtil.toJsonStr(authorization));
         channelContext.set(LOGIN_USER_KEY,loginUser);
         return loginUser!=null;

nb-service/web-service/src/main/resources/mapper/bus/BusClinicMapper.xml

@@ -11,6 +11,7 @@
         <result column="invalid_count" property="inValidCount"/>
         <result column="upload_time" property="uploadTime"/>
         <result column="infusion_id" property="infusionId"/>
+        <result column="electric_quantity" property="electricQuantity"/>
     </resultMap>
 
     <resultMap id="queryResult" type="com.nb.web.service.bus.service.dto.ClinicResult">
@@ -38,6 +39,9 @@
         <if test="query.continueDose!=false">
             h.continue_dose as continue_dose,
         </if>
+        <if test="query.electricQuantity!=false">
+            h.electric_quantity as electric_quantity,
+        </if>
         <if test="query.appendDose!=false">
             h.total_append_dose as append_dose,
         </if>