From 88c32cde660d6f6dc44f497aa0b78452c9fe1357 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 10 二月 2022 16:51:21 +0800
Subject: [PATCH] 仓库状态
---
src/main/java/com/nanometer/smartlab/service/SysWarehouseStatusService.java | 8 ++
src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java | 5 +
src/main/java/com/nanometer/smartlab/service/SysWarehouseStatusServiceImpl.java | 20 +++++
src/main/java/com/nanometer/smartlab/dao/SysWarehouseStatusDao.java | 9 ++
src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java | 4 +
src/main/java/com/nanometer/smartlab/dao/SysWarehouseStatusDao.xml | 14 +++
src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.java | 6 +
src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml | 22 ++++
src/main/java/com/nanometer/smartlab/entity/SysWarehouseStatus.java | 100 +++++++++++++++++++++++++
src/main/webapp/personal_use_info.xhtml | 5 +
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 32 ++++++++
11 files changed, 221 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 6021835..d2d9f26 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -101,6 +101,9 @@
@Lazy
@Resource
private OpeUseFlowService opeUseFlowService;
+ @Lazy
+ @Resource
+ private SysWarehouseStatusService sysWarehouseStatusService;
@Value("${institute.url}")
String instituteUrl;
@@ -1796,4 +1799,33 @@
}
return retJSON.toJSONString();
}
+
+
+
+
+ @ResponseBody
+ @RequestMapping("/getAllWarehouse")
+ public Object getAllWarehouse() {
+ try {
+ List<Map> res = sysWarehouseService.getAllWarehouse();
+ return ResponseModel.getOkInstence(res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseModel.getErrInstance("系统内部错误");
+ }
+
+ }
+
+ @ResponseBody
+ @RequestMapping(value = "addWarehouseStatus",method = RequestMethod.POST)
+ public Object addWarehouseStatus(@RequestBody SysWarehouseStatus one){
+ try {
+ one.setCreateTime(new Date());
+ sysWarehouseStatusService.addOne(one);
+ return ResponseModel.getOkInstence("新增成功");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseModel.getErrInstance("系统内部错误");
+ }
+ }
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.java b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.java
index c099403..4978cc8 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.java
@@ -26,4 +26,8 @@
public SysWarehouse getSysWarehouseByBarCode(String barCode) throws DataAccessException;
List<SysWarehouseDto> selectWarehouse();
-}
\ No newline at end of file
+
+ List<Map> selectAllWarehouse();
+
+
+}
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
index 3192bd6..8595882 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
@@ -71,7 +71,7 @@
where su.valid_flag = 1
<include refid="queryWhereSql"/>
</select>
-
+
<select id="getAllSysWarehouseList" resultMap="SysWarehouse">
select * from sys_warehouse
where valid_flag = 1
@@ -101,8 +101,8 @@
select * from sys_warehouse
where bar_code = #{barCode}
</select>
-
-
+
+
<select id="selectWarehouse" resultMap="SysWarehouseDto">
SELECT
sw.id,
@@ -128,4 +128,20 @@
where sw.valid_flag = 1
AND swc.valid_flag = 1
</select>
+ <select id="selectAllWarehouse" resultType="java.util.Map">
+ select
+ sw.id,
+ sw.type,
+ bm.meta_value typeName,
+ sw.name,
+ sw.info_code infoCode,
+ sw.bar_code barCode,
+ sw.location1,
+ sw.location2,
+ date_format(sw.create_time,'%Y-%m-%d %H:%i:%S') createTime,
+ sw.department
+ from sys_warehouse as sw
+ left join base_meta bm on bm.id = sw.type
+ where sw.valid_flag = 1
+ </select>
</mapper>
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseStatusDao.java b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseStatusDao.java
new file mode 100644
index 0000000..e0a26a3
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseStatusDao.java
@@ -0,0 +1,9 @@
+package com.nanometer.smartlab.dao;
+
+import com.nanometer.smartlab.entity.SysWarehouse;
+import com.nanometer.smartlab.entity.SysWarehouseStatus;
+
+public interface SysWarehouseStatusDao {
+
+ int insertOne(SysWarehouseStatus one);
+}
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseStatusDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseStatusDao.xml
new file mode 100644
index 0000000..8e41320
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseStatusDao.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nanometer.smartlab.dao.SysWarehouseStatusDao">
+ <resultMap id="BaseMap" type="com.nanometer.smartlab.entity.SysWarehouseStatus">
+ </resultMap>
+
+ <insert id="insertOne" parameterType="com.nanometer.smartlab.entity.SysWarehouseStatus">
+ insert into sys_warehouse_status
+ (type,name,temperature,humidity,creator,create_time,valid_flag,warehouse_id)
+ values
+ (#{type},#{name},#{temperature},#{humidity},#{creator},#{createTime},1,#{warehouseId})
+ </insert>
+
+</mapper>
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysWarehouseStatus.java b/src/main/java/com/nanometer/smartlab/entity/SysWarehouseStatus.java
new file mode 100644
index 0000000..fa19bc2
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/entity/SysWarehouseStatus.java
@@ -0,0 +1,100 @@
+package com.nanometer.smartlab.entity;
+
+import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class SysWarehouseStatus implements Serializable {
+
+ private Long id;
+
+ private String type;
+
+ private String name;
+
+ private BigDecimal temperature;
+
+ private BigDecimal humidity;
+
+ private String creator;
+
+ private Date createTime;
+
+ private ValidFlag validFlag;
+
+ private String warehouseId;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public BigDecimal getTemperature() {
+ return temperature;
+ }
+
+ public void setTemperature(BigDecimal temperature) {
+ this.temperature = temperature;
+ }
+
+ public BigDecimal getHumidity() {
+ return humidity;
+ }
+
+ public void setHumidity(BigDecimal humidity) {
+ this.humidity = humidity;
+ }
+
+ public String getCreator() {
+ return creator;
+ }
+
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public ValidFlag getValidFlag() {
+ return validFlag;
+ }
+
+ public void setValidFlag(ValidFlag validFlag) {
+ this.validFlag = validFlag;
+ }
+
+ public String getWarehouseId() {
+ return warehouseId;
+ }
+
+ public void setWarehouseId(String warehouseId) {
+ this.warehouseId = warehouseId;
+ }
+}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java
index 16ccd1d..d6e1f42 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseService.java
@@ -7,6 +7,7 @@
import com.nanometer.smartlab.entity.dto.SysWarehouseDto;
import java.util.List;
+import java.util.Map;
/**
* Created by cmower on 17/11/20.
@@ -29,4 +30,7 @@
void reagentReceiving(ReagentReceivingDto reagentReceiving);
void updateSysWarehouse2(SysWarehouse sysWarehouse, SysLaboratory sysLaboratory);
+
+ List<Map> getAllWarehouse();
+
}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
index bfcc6c4..0115716 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java
@@ -384,4 +384,9 @@
sysLaboratory.setDepartment(sysWarehouse.getDepartment());
sysLaboratoryService.updateSysLaboratory(sysLaboratory);
}
+
+ @Override
+ public List<Map> getAllWarehouse() {
+ return sysWarehouseDao.selectAllWarehouse();
+ }
}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseStatusService.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseStatusService.java
new file mode 100644
index 0000000..a3d56e3
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseStatusService.java
@@ -0,0 +1,8 @@
+package com.nanometer.smartlab.service;
+
+import com.nanometer.smartlab.entity.SysWarehouseStatus;
+
+public interface SysWarehouseStatusService {
+
+ void addOne(SysWarehouseStatus one);
+}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysWarehouseStatusServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysWarehouseStatusServiceImpl.java
new file mode 100644
index 0000000..2ee7a2b
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/service/SysWarehouseStatusServiceImpl.java
@@ -0,0 +1,20 @@
+package com.nanometer.smartlab.service;
+
+import com.nanometer.smartlab.dao.SysWarehouseStatusDao;
+import com.nanometer.smartlab.entity.SysWarehouseStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class SysWarehouseStatusServiceImpl implements SysWarehouseStatusService {
+
+ @Resource
+ private SysWarehouseStatusDao sysWarehouseStatusDao;
+
+ @Override
+ public void addOne(SysWarehouseStatus one) {
+ sysWarehouseStatusDao.insertOne(one);
+ }
+}
diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index cc56000..e986c79 100644
--- a/src/main/webapp/personal_use_info.xhtml
+++ b/src/main/webapp/personal_use_info.xhtml
@@ -91,6 +91,11 @@
update=":dialog,:dialogForm"
actionListener="#{personalUseInfoController.detailInfo}"
oncomplete="PF('dialog').show()"/>
+<!-- <p:commandButton value="导出详情"-->
+<!-- styleClass="store-btn"-->
+<!-- update=":dialog,:dialogForm"-->
+<!-- actionListener="#{personalUseInfoController.exportDetail}"-->
+<!-- oncomplete="PF('dialog').show()"/>-->
--
Gitblit v1.9.2