diff --git a/lab-auth/src/main/resources/application-dev.yml b/lab-auth/src/main/resources/application-dev.yml
index 21fd98e..fa2f530 100644
--- a/lab-auth/src/main/resources/application-dev.yml
+++ b/lab-auth/src/main/resources/application-dev.yml
@@ -1,3 +1,3 @@
#服务器端口
server:
- port: 8002
+ port: 8102
diff --git a/lab-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/lab-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
index 13dd238..2b7a184 100644
--- a/lab-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
+++ b/lab-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java
@@ -22,8 +22,10 @@ public class LauncherServiceImpl implements LauncherService {
// 通用注册
// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
// PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
- PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "44debeab-5f49-41b6-a664-2f0a33825f8f");
- PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "44debeab-5f49-41b6-a664-2f0a33825f8f");
+// PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "44debeab-5f49-41b6-a664-2f0a33825f8f");
+// PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "44debeab-5f49-41b6-a664-2f0a33825f8f");
+ PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "e9bcb975-a8b3-43d1-812f-8408ce571137");
+ PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "e9bcb975-a8b3-43d1-812f-8408ce571137");
// PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
// PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false");
diff --git a/lab-gateway/src/main/resources/bootstrap.yml b/lab-gateway/src/main/resources/bootstrap.yml
index 7c80c34..503f923 100644
--- a/lab-gateway/src/main/resources/bootstrap.yml
+++ b/lab-gateway/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
server:
- port: 81
+ port: 82
spring:
cloud:
diff --git a/lab-ops-api/pom.xml b/lab-ops-api/pom.xml
index 630fc88..5fef6ec 100644
--- a/lab-ops-api/pom.xml
+++ b/lab-ops-api/pom.xml
@@ -17,7 +17,7 @@
lab-resource-api
- lab-mail-api
+
diff --git a/lab-ops/lab-resource/src/main/resources/application-dev.yml b/lab-ops/lab-resource/src/main/resources/application-dev.yml
index 71290d5..a2d6fae 100644
--- a/lab-ops/lab-resource/src/main/resources/application-dev.yml
+++ b/lab-ops/lab-resource/src/main/resources/application-dev.yml
@@ -1,3 +1,3 @@
#服务器端口
server:
- port: 8008
\ No newline at end of file
+ port: 8108
\ No newline at end of file
diff --git a/lab-ops/pom.xml b/lab-ops/pom.xml
index 2a4a806..21e32e7 100644
--- a/lab-ops/pom.xml
+++ b/lab-ops/pom.xml
@@ -15,15 +15,15 @@
pom
- lab-develop
+
- lab-swagger
+
lab-log
lab-resource
- lab-xxljob
- lab-xxljob-admin
- lab-office
- lab-mail
+
+
+
+
diff --git a/lab-plugin/lab-workflow/src/main/resources/application-dev.yml b/lab-plugin/lab-workflow/src/main/resources/application-dev.yml
index 65465db..27acd86 100644
--- a/lab-plugin/lab-workflow/src/main/resources/application-dev.yml
+++ b/lab-plugin/lab-workflow/src/main/resources/application-dev.yml
@@ -1,3 +1,3 @@
#服务器端口
server:
- port: 8005
\ No newline at end of file
+ port: 8105
\ No newline at end of file
diff --git a/lab-service-api/lab-system-api/src/main/java/org/springblade/system/cache/SysCache.java b/lab-service-api/lab-system-api/src/main/java/org/springblade/system/cache/SysCache.java
index 5666ef8..09e4a42 100644
--- a/lab-service-api/lab-system-api/src/main/java/org/springblade/system/cache/SysCache.java
+++ b/lab-service-api/lab-system-api/src/main/java/org/springblade/system/cache/SysCache.java
@@ -10,6 +10,7 @@ import org.springblade.system.feign.ISysClient;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
@@ -41,6 +42,7 @@ public class SysCache {
private static final String ROLE_ALIASES_ID = "roleAliases:id:";
private static final String TENANT_ID = "tenant:id:";
private static final String TENANT_TENANT_ID = "tenant:tenantId:";
+ private static final String DATA_ACQUISTION_ID = "dataAcquisition:id:";
private static ISysClient sysClient;
@@ -169,6 +171,21 @@ public class SysCache {
return deptIdList;
}
+ public static Map getDataAcquisition(String num) {
+ Map map = CacheUtil.get(SYS_CACHE, DATA_ACQUISTION_ID, num, Map.class);
+// if (map == null) {
+// deptIdList = new ArrayList<>();
+// List deptChild = getDeptChild(deptId);
+// if (deptChild != null) {
+// List collect = deptChild.stream().map(Dept::getId).collect(Collectors.toList());
+// deptIdList.addAll(collect);
+// }
+// deptIdList.add(deptId);
+// CacheUtil.put(SYS_CACHE, DEPT_CHILDIDS_ID, deptId, deptIdList);
+// }
+ return map;
+ }
+
/**
* 获取岗位
*
diff --git a/lab-service-api/pom.xml b/lab-service-api/pom.xml
index 5e9c63b..6eb9c9e 100644
--- a/lab-service-api/pom.xml
+++ b/lab-service-api/pom.xml
@@ -16,18 +16,18 @@
BladeX 微服务API集合
- lab-desk-api
+
lab-dict-api
- lab-scope-api
+
lab-system-api
lab-user-api
lab-lims-api
lab-capital-api
- lab-repair-api
- lab-monitor-api
- lab-lims-report-api
+
+
+
lab-file-api
- lab-iot-api
+
diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java
index cd7e895..a4adc27 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java
@@ -453,4 +453,11 @@ public class ApplyController extends BladeController {
applyService.print(id, response);
}
+ /**
+ * 12.申领校验
+ */
+ @GetMapping("/applyCheck")
+ public R applyCheck() {
+ return R.status(applyService.applyCheck());
+ }
}
diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IApplyService.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IApplyService.java
index 4011d49..4f23e00 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IApplyService.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/IApplyService.java
@@ -12,4 +12,6 @@ public interface IApplyService extends BaseService {
void reture(Apply apply);
boolean updateApplyOrDetails(Apply apply);
+
+ boolean applyCheck();
}
diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java
index 83d2853..03d50c7 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/ApplyServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.lims.capital.entity.ProductStoreDetial;
import org.springblade.lims.capital.service.IProductStoreDetialService;
import org.springblade.lims.goods.entity.Apply;
@@ -246,4 +247,13 @@ public class ApplyServiceImpl extends BaseServiceImpl implem
// 修改申领单
return this.updateById(apply);
}
+
+ @Override
+ public boolean applyCheck() {
+ int count = this.count(new LambdaQueryWrapper().eq(Apply::getApplyUserId, AuthUtil.getUserId()).eq(Apply::getStatus, 2));
+ if (count > 0) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/lab-service/lab-capital/src/main/resources/application-dev.yml b/lab-service/lab-capital/src/main/resources/application-dev.yml
index 57ede2e..96fc066 100644
--- a/lab-service/lab-capital/src/main/resources/application-dev.yml
+++ b/lab-service/lab-capital/src/main/resources/application-dev.yml
@@ -1,3 +1,3 @@
#服务器端口
server:
- port: 8007
\ No newline at end of file
+ port: 8107
\ No newline at end of file
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/demo/DataAcquisition.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/demo/DataAcquisition.java
index ed4aa9f..772f1b1 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/demo/DataAcquisition.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/demo/DataAcquisition.java
@@ -55,29 +55,23 @@ public class DataAcquisition implements Runnable {
public void receiveRealtimeData(RealTimeData data) {// 实时数据接收处理
// 遍历节点数据。数据包括网络设备的数据以及各个节点数据。温湿度数据存放在节点数据中
for (NodeData nd : data.getNodeList()) {
- System.out.println("实时数据->设备地址:" + data.getDeviceId()
- + "\t节点:" + nd.getNodeId() + "\t温度:" + nd.getTem()
- + "\t湿度:" + nd.getHum() + "\t经度:" + data.getLng()
- + "\t纬度:" + data.getLat() + "\t坐标类型:"
- + data.getCoordinateType() + "\t继电器状态:"
- + data.getRelayStatus());
+// System.out.println("实时数据->设备地址:" + data.getDeviceId()
+// + "\t节点:" + nd.getNodeId() + "\t温度:" + nd.getTem()
+// + "\t湿度:" + nd.getHum() + "\t经度:" + data.getLng()
+// + "\t纬度:" + data.getLat() + "\t坐标类型:"
+// + data.getCoordinateType() + "\t继电器状态:"
+// + data.getRelayStatus());
Map map = new HashMap();
map.put("wd", nd.getTem());
map.put("sd", nd.getHum());
CacheUtil.put(SYS_CACHE, "dataAcquisition:id:", data.getDeviceId() + "-" + nd.getNodeId(), map);
-// boolean set = redisUtil.set(SYS_CACHE + ":" + "dataAcquisition:id:" + data.getDeviceId() + "-" + nd.getNodeId(), JSONObject.toJSONString(map));
-// System.out.println("isChengGong: " + set);
-// String str = (String) redisUtil.get(data.getDeviceId() + "-" + nd.getNodeId());
-// System.out.println(str);
-// Map map3 = JSONObject.parseObject(str, Map.class);
-// System.out.println("map3: " + map3);
Map map1 = CacheUtil.get(SYS_CACHE, "dataAcquisition:id:", data.getDeviceId() + "-" + nd.getNodeId(), Map.class);
- System.out.println(data.getDeviceId() + "-" + nd.getNodeId() + ":" + map1);
- System.out.println("===================");
+// System.out.println(data.getDeviceId() + "-" + nd.getNodeId() + ":" + map1);
+// System.out.println("===================");
}
- System.out.println("========================================================================");
+// System.out.println("========================================================================");
}
@Override
diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
index 96eaec9..339978c 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java
@@ -3665,8 +3665,8 @@ public class EntrustServiceImpl extends BaseServiceImpl
}
// 布鲁氏菌 CELISA 抗体检测试剂盒---青岛立见生物科技有限公司
else if ("1665968083879366657".equals(reagentId)) {
- double yin = (a1 + a2) / 2;
- double yang = (b1 + b2) / 2;
+ double yin = Double.parseDouble(format);
+ double yang = Double.parseDouble(format1);
map1.put("2", "阴性对照的平均值");
map1.put("3", df.format(yin));
map2.put("2", "阳性对照血清抑制率");
@@ -4117,6 +4117,7 @@ public class EntrustServiceImpl extends BaseServiceImpl
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void simpleHandlePrint(String id, HttpServletResponse response) {
Entrust entrust = this.getById(id);
entrust.setIsHandle("1");
@@ -4159,7 +4160,6 @@ public class EntrustServiceImpl extends BaseServiceImpl
doc.write(response.getOutputStream());
-
} catch (Exception e) {
e.printStackTrace();
} finally {
diff --git a/lab-service/lab-lims/src/main/resources/application-dev.yml b/lab-service/lab-lims/src/main/resources/application-dev.yml
index 8ffb2a4..2f5d861 100644
--- a/lab-service/lab-lims/src/main/resources/application-dev.yml
+++ b/lab-service/lab-lims/src/main/resources/application-dev.yml
@@ -1,3 +1,3 @@
#服务器端口
server:
- port: 8006
\ No newline at end of file
+ port: 8106
\ No newline at end of file
diff --git a/lab-service/lab-system/src/main/resources/application-dev.yml b/lab-service/lab-system/src/main/resources/application-dev.yml
index 284d40c..1185dc2 100644
--- a/lab-service/lab-system/src/main/resources/application-dev.yml
+++ b/lab-service/lab-system/src/main/resources/application-dev.yml
@@ -1,3 +1,3 @@
#服务器端口
server:
- port: 8003
\ No newline at end of file
+ port: 8103
\ No newline at end of file
diff --git a/lab-service/lab-user/src/main/resources/application-dev.yml b/lab-service/lab-user/src/main/resources/application-dev.yml
index 91e2580..6b8a031 100644
--- a/lab-service/lab-user/src/main/resources/application-dev.yml
+++ b/lab-service/lab-user/src/main/resources/application-dev.yml
@@ -1,4 +1,4 @@
-#服务器端口
+#服务1器端口
server:
- port: 8004
+ port: 8104
diff --git a/lab-service/pom.xml b/lab-service/pom.xml
index 038e2f2..c2f4f7f 100644
--- a/lab-service/pom.xml
+++ b/lab-service/pom.xml
@@ -22,10 +22,10 @@
lab-user
lab-lims
lab-capital
- lab-repair
- lab-monitor
+
+
lab-file
- lab-iot
+