add

添加重设参数值

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IDeviceAlarmClient.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nb.web.api.entity.BusDeviceAlarmEntity;
 import com.nb.web.api.feign.query.AlarmQuery;
 
-import java.util.Date;
-
 /**
  * @author lifang
  * @version 1.0.0
@@ -23,11 +21,4 @@ public interface IDeviceAlarmClient {
      * @return IPage
      */
     IPage<BusDeviceAlarmEntity> pageQuery(AlarmQuery query);
-
-    /**
-     * 查询从某一时间段开始后的报警数量
-     * @param startTime
-     * @return
-     */
-    Long count(String tenantId, Date startTime);
 }

nb-service-api/web-service-api/src/main/java/com/nb/web/api/feign/IHospitalClient.java

@@ -18,4 +18,6 @@ public interface IHospitalClient {
      * @return List<HospitalResult>
      */
     List<HospitalResult> selectAll();
+
+    HospitalResult findById(String tenantId);
 }

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

@@ -226,7 +226,7 @@ public class BusClinicExcelVO {
                 FormulaDrugDetailDomain formulaDrugDetailDomain = CollectionUtil.get(detail, i);
                 content=content+formulaDrugDetailDomain.getName()+formulaDrugDetailDomain.getDose()+formulaDrugDetailDomain.getUnit();
                 if(i!=(detail.size()-1)){
-                    content=content+"+";
+                    content=content+1;
                 }
             }
         }

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

@@ -0,0 +1,16 @@
+package com.nb.web.service.bus.controller.vo;
+
+import lombok.Data;
+
+/**
+ * @ClassName : BusHospitalCodeAndAliasVO
+ * @Description :
+ * @Author : LF
+ * @Date: 2024年08月21日
+ */
+@Data
+public class BusHospitalCodeAndAliasVO {
+    private String hospitalCode;
+
+    private String alias;
+}

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusHospitalService.java

@@ -3,12 +3,7 @@ package com.nb.web.service.bus.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.digest.DigestUtil;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,7 +21,6 @@ import com.nb.web.service.bus.hospital.his.strategy.HisStrategyEnum;
 import com.nb.web.service.bus.mapper.BusHospitalMapper;
 import com.nb.web.service.bus.service.constant.LocalBusConAlarmService;
 import com.nb.web.service.bus.service.constant.LocalBusConMixService;
-import com.nb.web.service.bus.service.dto.IotHospitalAddDTO;
 import com.nb.web.service.bus.utils.CodeUtils;
 import com.nb.core.cache.ConfigStorage;
 import com.nb.core.cache.manager.ConfigStorageManager;
@@ -148,78 +142,61 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
 
     @Override
     public void postSave(BusHospitalEntity entity) {
+        CompletableFuture.runAsync(()->{
+            List<BusHospitalConfigEntity> configs =
+                    configService.list(new QueryWrapper<BusHospitalConfigEntity>().lambda()
+                            .or()
+                            .eq(BusHospitalConfigEntity::getTenantId, 1));
+            configs.forEach(config->{
+                config.setId(null);
+                config.setTenantId(entity.getId());
+            });
+            configService.saveBatch(configs);
+
+            //设置默认更新策略
+            HisUpdateEntity updateConfig = entity.getUpdateConfig();
+            if(updateConfig!=null){
+                hospitalManagerRegister.get(entity.getId()).refreshUpdateConfig(updateConfig);
+            }
 
-        List<BusHospitalConfigEntity> configs =
-                configService.list(new QueryWrapper<BusHospitalConfigEntity>().lambda()
-                        .or()
-                        .eq(BusHospitalConfigEntity::getTenantId, 1));
-        configs.forEach(config->{
-            config.setId(null);
-            config.setTenantId(entity.getId());
-        });
-        configService.saveBatch(configs);
-
-        //设置默认更新策略
-        HisUpdateEntity updateConfig = entity.getUpdateConfig();
-        if(updateConfig!=null){
-            hospitalManagerRegister.get(entity.getId()).refreshUpdateConfig(updateConfig);
-        }
-
-        //设置默认管理员角色
-        SysRole sysRole = new SysRole();
-        sysRole.setTenantId(entity.getId());
-        sysRole.setRoleName("超级管理员");
-        sysRole.setDataScope("1");
-        sysRole.setRoleCode("admin");
-        sysRole.setRemarks("超级管理员角色，不可编辑，不可删除");
-        sysRoleService.save(sysRole);
-        nameCache.setConfig(entity.getId(),entity.getName());
-
-        //设置默认常量信息
-        List<BusConMixEntity> drugCons = conMixService.list(new QueryWrapper<BusConMixEntity>()
-                .lambda().eq(BusConMixEntity::getTenantId, "1")
-                .eq(BusConMixEntity::getType, ConstantMixEnum.drugCate));
-        if(CollUtil.isNotEmpty(drugCons)){
-            conMixService.saveBatch(drugCons.stream().peek(mix->{
-                mix.setId(null);
-                mix.setTenantId(entity.getId());
-            }).collect(Collectors.toSet()));
-        }
-
-        //设置默认报警原因
-        List<BusConAlarmEntity> alarmCauses = conAlarmService.list(new QueryWrapper<BusConAlarmEntity>()
-                .lambda().eq(BusConAlarmEntity::getTenantId, "1"));
-        if (CollUtil.isNotEmpty(alarmCauses)) {
-            conAlarmService.saveBatch(alarmCauses.stream().peek(alarmCause->{
-                alarmCause.setId(null);
-                alarmCause.setTenantId(entity.getId());
-            }).collect(Collectors.toSet()));
-        };
-
-        sendIotAddHospital(entity);
-    }
+            //设置默认管理员角色
+            SysRole sysRole = new SysRole();
+            sysRole.setTenantId(entity.getId());
+            sysRole.setRoleName("超级管理员");
+            sysRole.setDataScope("1");
+            sysRole.setRoleCode("admin");
+            sysRole.setRemarks("超级管理员角色，不可编辑，不可删除");
+            sysRoleService.save(sysRole);
+            nameCache.setConfig(entity.getId(),entity.getName());
 
-    private void sendIotAddHospital(BusHospitalEntity source){
-        IotHospitalAddDTO sendMsg = new IotHospitalAddDTO();
-        sendMsg.setCode(source.getCode());
-        sendMsg.setUsername(source.getName());
-        sendMsg.setMobile(RandomUtil.randomNumbers(11));
-        sendMsg.setEmail(source.getEmail());
-        sendMsg.setRegionCode(source.getAreaCode());
-        String content= new StringBuffer(sendMsg.getUsername()).append("&").append("yunzhineng").toString();
-        sendMsg.setMd5(DigestUtil.md5Hex(content));
-        try {
-            String post = HttpUtil.post("https://iot.tuoren.com/forward-service/open/addUser", JSONUtil.toJsonStr(sendMsg));
-            JSONObject jsonObject = JSONUtil.parseObj(post);
-            if("1".equals(jsonObject.getStr("code"))){
-                throw new RuntimeException("新增失败,"+jsonObject.getStr("msg"));
+            //设置默认常量信息
+            List<BusConMixEntity> drugCons = conMixService.list(new QueryWrapper<BusConMixEntity>()
+                    .lambda().eq(BusConMixEntity::getTenantId, "1")
+                    .eq(BusConMixEntity::getType, ConstantMixEnum.drugCate));
+            if(CollUtil.isNotEmpty(drugCons)){
+                conMixService.saveBatch(drugCons.stream().peek(mix->{
+                    mix.setId(null);
+                    mix.setTenantId(entity.getId());
+                }).collect(Collectors.toSet()));
             }
-        }catch (Exception e){
-            log.error("iot.tuoren.com : 医院["+ source.getName()+"]新增失败",e);
-        }
-
 
+            //设置默认报警原因
+            List<BusConAlarmEntity> alarmCauses = conAlarmService.list(new QueryWrapper<BusConAlarmEntity>()
+                    .lambda().eq(BusConAlarmEntity::getTenantId, "1"));
+            if (CollUtil.isNotEmpty(alarmCauses)) {
+                conAlarmService.saveBatch(alarmCauses.stream().peek(alarmCause->{
+                    alarmCause.setId(null);
+                    alarmCause.setTenantId(entity.getId());
+                }).collect(Collectors.toSet()));
+            }
+        })
+                .whenComplete((i,e)->{
+                    if(e!=null){
+                        log.error("新增医院默认配置失败,",e);
+                    }
+                });
     }
+
     @Override
     public void postUpdate(BusHospitalEntity entity) {
         hospitalManagerRegister.refresh(entity.getId(),true,null!=entity.getScript());
@@ -326,4 +303,9 @@ public class LocalBusHospitalService extends BaseService<BusHospitalMapper, BusH
     public List<HospitalResult> selectAll() {
         return BeanUtil.copyToList(list(),HospitalResult.class);
     }
+
+    @Override
+    public HospitalResult findById(String tenantId) {
+        return BeanUtil.copyProperties(getById(tenantId),HospitalResult.class);
+    }
 }

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

@@ -49,6 +49,10 @@ public class ClinicStatsReturnResult implements Serializable {
     private List<Integer> rsrq;
     @ApiModelProperty(value = "参考信号接收功率数据集",hidden = true)
     private List<Integer> rsrp;
+    @ApiModelProperty(value = "运行时电机压力值数据集",hidden = true)
+    private List<Integer> block1;
+    @ApiModelProperty(value = "非运行时电机压力值数据集",hidden = true)
+    private List<Integer> block2;
     @ApiModelProperty("上传时间")
     private List<String> uploadTimes;
 
@@ -106,6 +110,9 @@ public class ClinicStatsReturnResult implements Serializable {
             List<Integer> rsrqCounts = Optional.ofNullable(result.getRsrq()).orElse(new ArrayList<>());
             List<Integer> rsrpCounts = Optional.ofNullable(result.getRsrp()).orElse(new ArrayList<>());
 
+            List<Integer> block1Counts = Optional.ofNullable(result.getRsrq()).orElse(new ArrayList<>());
+            List<Integer> block2Counts = Optional.ofNullable(result.getRsrp()).orElse(new ArrayList<>());
+
             BigDecimal appendDose = queryResult.getAppendDose()!=null?queryResult.getAppendDose():BigDecimal.ZERO;
             if(!ObjectUtil.equal(lastInfusionId,queryResult.getInfusionId())){
                 lastInfusionId=queryResult.getInfusionId();
@@ -146,11 +153,12 @@ public class ClinicStatsReturnResult implements Serializable {
             result.setInValidCount(inValidCounts);
             result.setUploadTimes(uploadTimes);
             result.setSingleAppendDose(singleAppendDoses);
-
             result.setSnr(snrCounts);
             result.setRssi(rssiCounts);
             result.setRsrp(rsrpCounts);
             result.setRsrq(rsrqCounts);
+            result.setBlock1(block1Counts);
+            result.setBlock2(block2Counts);
             lastValidPcaCount=queryResult.getValidCount();
         };
         result.setXAxisScales(axisScales);

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

@@ -172,7 +172,7 @@ public class CombineQuery {
     private List<String> orderByAsc=new ArrayList<>();
 
     @ApiModelProperty("统计查询时的时间枚举条件， 1、天 不可超过90天 2、周 不可超过366天 3、月 不可超过366天")
-//    @NotNull(message = "时间单位不能为空")
+    @NotNull(message = "时间单位不能为空")
     private StatsTimeUnit timeUnit;
 
     public void setPcaCountRange(List<Integer> pcaCountRange) {

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

@@ -0,0 +1,20 @@
+package com.nb.web.service.bus.service.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName : IotBusAddEntity
+ * @Description :
+ * @Author : LF
+ * @Date: 2024年08月21日
+ */
+@Data
+public class IotHospitalAddDTO {
+    private String username;
+    private String mobile;
+    private String email;
+    private String code;
+    private String regionCode;
+
+    private String md5;
+}