Merge remote-tracking branch 'origin/main'

# Conflicts:
#	out/artifacts/equipment_SpringMVCProject_Web_exploded/WEB-INF/web.xml
#	out/production/equipment-SpringMVCProject/com/ssm/controller/FirstController.class
#	out/production/equipment-SpringMVCProject/springmvc.xml
main
your-name 2 weeks ago
commit cc7638e18c

@ -0,0 +1,13 @@
<component name="ArtifactManager">
<artifact type="exploded-war" name="equipment-SpringMVCProject:Web exploded">
<output-path>$PROJECT_DIR$/out/artifacts/equipment_SpringMVCProject_Web_exploded</output-path>
<root id="root">
<element id="javaee-facet-resources" facet="equipment-SpringMVCProject/web/Web" />
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
<element id="module-output" name="equipment-SpringMVCProject" />
</element>
</element>
</root>
</artifact>
</component>

@ -0,0 +1,13 @@
<component name="ArtifactManager">
<artifact type="exploded-war" name="equipment:Web exploded">
<output-path>$PROJECT_DIR$/out/artifacts/equipment_Web_exploded</output-path>
<root id="root">
<element id="javaee-facet-resources" facet="equipment/web/Web" />
<element id="directory" name="WEB-INF">
<element id="directory" name="classes">
<element id="module-output" name="equipment" />
</element>
</element>
</root>
</artifact>
</component>

@ -0,0 +1,16 @@
<component name="libraryTable">
<library name="commons-logging-1.1.1 (2)">
<CLASSES>
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/commons-logging-1.1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-aop-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-aspects-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-beans-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-context-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-core-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-web-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-webmvc-5.1.6.RELEASE.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

@ -0,0 +1,16 @@
<component name="libraryTable">
<library name="commons-logging-1.1.1 (3)">
<CLASSES>
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/commons-logging-1.1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-aop-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-beans-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-context-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-core-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-expression-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-web-5.1.6.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/equipment-SpringMVCProject/web/WEB-INF/lib/spring-webmvc-5.1.6.RELEASE.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WebContextManager">
<option name="state">
<map>
<entry key="file://$PROJECT_DIR$/equipment-SpringMVCProject/web/First.jsp" value="file://$PROJECT_DIR$/equipment-SpringMVCProject/web" />
</map>
</option>
</component>
</project>

@ -1,5 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/web" relative="/" />
</webroots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
@ -7,5 +19,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="commons-logging-1.1.1 (2)" level="project" />
<orderEntry type="library" name="commons-logging-1.1.1 (3)" level="project" />
<orderEntry type="library" name="aspectjweaver-1.9.7" level="project" />
</component>
</module>

@ -1,5 +1,12 @@
package com.ssm.controller;
public class FirstController {
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
}
@Controller
public class FirstController {
@RequestMapping("hello")
public String hello(){
return "showFirst";
}
}

@ -0,0 +1,24 @@
package com.ssm.controller;
import com.ssm.entity.Lab;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
@RequestMapping("/lab")
public class LabController {
@RequestMapping("/add")
public String addLab(Lab lab) {
System.out.println("实验室信息:" + lab.toString());
return "showLab";
}
@RequestMapping("/newadd")
public String newAddLab(Lab lab, Model model) {
System.out.println("实验室信息:" + lab.toString());
model.addAttribute("lab", lab);
return "showLab";
}
}

@ -0,0 +1,25 @@
package com.ssm.controller;
import com.ssm.entity.Material;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
//标记
@Controller
//请求地址与方法
@RequestMapping("/material")
public class MaterialController {
@RequestMapping("/add")
public String addMaterial(Material material) {
System.out.println("材料信息:" + material.toString());
return "showMaterial";
}
@RequestMapping("/newadd")
public String newAddMaterial(Material material, Model model) {
System.out.println("材料信息:" + material.toString());
model.addAttribute("material", material);
return "showMaterial";
}
}

@ -0,0 +1,24 @@
package com.ssm.controller;
import com.ssm.entity.MaterialStock;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
@RequestMapping("/stock")
public class MaterialStockController {
@RequestMapping("/add")
public String addStock(MaterialStock stock) {
System.out.println("材料出入库信息:" + stock.toString());
return "showMaterialStock";
}
@RequestMapping("/newadd")
public String newAddStock(MaterialStock stock, Model model) {
System.out.println("材料出入库信息:" + stock.toString());
model.addAttribute("stock", stock);
return "showMaterialStock";
}
}

@ -0,0 +1,24 @@
package com.ssm.controller;
import com.ssm.entity.Reservation;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
@RequestMapping("/reservation")
public class ReservationController {
@RequestMapping("/add")
public String addReservation(Reservation reservation) {
System.out.println("预约信息:" + reservation.toString());
return "showReservation";
}
@RequestMapping("/newadd")
public String newAddReservation(Reservation reservation, Model model) {
System.out.println("预约信息:" + reservation.toString());
model.addAttribute("reservation", reservation);
return "showReservation";
}
}

@ -0,0 +1,27 @@
package com.ssm.controller;
import com.ssm.entity.User;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
@Controller
@RequestMapping("/user")
public class UserController {
// 原方法(可选保留)
@RequestMapping("/add")
public String addUser(User user) {
System.out.println("用户信息:" + user.toString());
return "showUser";
}
// 新增方法:接收数据并响应到页面
@RequestMapping("/newadd")
public String newAddUser(User user, Model model) {
System.out.println("用户信息:" + user.toString());
// 把用户数据存入Model传给JSP
model.addAttribute("user", user);
return "showUser";
}
}

@ -0,0 +1,39 @@
package com.ssm.entity;
public class Lab {
private Integer labId; // 实验室编号
private String labName; // 实验室名称
private String location; // 位置
private Integer capacity; // 容纳人数
private String status; // 状态(可用/维修中/停用)
private String manager; // 管理员
// 无参构造
public Lab() {}
// Getter/Setter
public Integer getLabId() { return labId; }
public void setLabId(Integer labId) { this.labId = labId; }
public String getLabName() { return labName; }
public void setLabName(String labName) { this.labName = labName; }
public String getLocation() { return location; }
public void setLocation(String location) { this.location = location; }
public Integer getCapacity() { return capacity; }
public void setCapacity(Integer capacity) { this.capacity = capacity; }
public String getStatus() { return status; }
public void setStatus(String status) { this.status = status; }
public String getManager() { return manager; }
public void setManager(String manager) { this.manager = manager; }
@Override
public String toString() {
return "Lab{" +
"labId=" + labId +
", labName='" + labName + '\'' +
", location='" + location + '\'' +
", capacity=" + capacity +
", status='" + status + '\'' +
", manager='" + manager + '\'' +
'}';
}
}

@ -0,0 +1,43 @@
package com.ssm.entity;
public class Material {
private Integer mid; // 材料编号
private String mname; // 材料名称
private String spec; // 规格型号
private Integer stockNum; // 库存数量
private String unit; // 单位
private Double price; // 单价
private String supplier; // 供应商
// 无参构造
public Material() {}
// Getter/Setter
public Integer getMid() { return mid; }
public void setMid(Integer mid) { this.mid = mid; }
public String getMname() { return mname; }
public void setMname(String mname) { this.mname = mname; }
public String getSpec() { return spec; }
public void setSpec(String spec) { this.spec = spec; }
public Integer getStockNum() { return stockNum; }
public void setStockNum(Integer stockNum) { this.stockNum = stockNum; }
public String getUnit() { return unit; }
public void setUnit(String unit) { this.unit = unit; }
public Double getPrice() { return price; }
public void setPrice(Double price) { this.price = price; }
public String getSupplier() { return supplier; }
public void setSupplier(String supplier) { this.supplier = supplier; }
@Override
public String toString() {
return "Material{" +
"mid=" + mid +
", mname='" + mname + '\'' +
", spec='" + spec + '\'' +
", stockNum=" + stockNum +
", unit='" + unit + '\'' +
", price=" + price +
", supplier='" + supplier + '\'' +
'}';
}
}

@ -0,0 +1,46 @@
package com.ssm.entity;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class MaterialStock {
private Integer stockId; // 出入库记录编号
private Integer mid; // 材料编号
private String type; // 类型(入库/出库)
private Integer num; // 数量
// 关键加上日期格式注解匹配input type="date"提交的格式
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date opDate; // 操作日期
private String operator; // 操作人
// 无参构造
public MaterialStock() {}
// Getter/Setter
public Integer getStockId() { return stockId; }
public void setStockId(Integer stockId) { this.stockId = stockId; }
public Integer getMid() { return mid; }
public void setMid(Integer mid) { this.mid = mid; }
public String getType() { return type; }
public void setType(String type) { this.type = type; }
public Integer getNum() { return num; }
public void setNum(Integer num) { this.num = num; }
public Date getOpDate() { return opDate; }
public void setOpDate(Date opDate) { this.opDate = opDate; }
public String getOperator() { return operator; }
public void setOperator(String operator) { this.operator = operator; }
@Override
public String toString() {
return "MaterialStock{" +
"stockId=" + stockId +
", mid=" + mid +
", type='" + type + '\'' +
", num=" + num +
", opDate=" + opDate +
", operator='" + operator + '\'' +
'}';
}
}

@ -0,0 +1,48 @@
package com.ssm.entity;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
public class Reservation {
private Integer rid; // 预约编号
private Integer uid; // 用户编号
private Integer labId; // 实验室编号
// 关键:加上日期格式注解,匹配表单提交的 yyyy-MM-dd 格式
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startDate; // 预约开始时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date endDate; // 预约结束时间
private String status; // 状态(待审核/已通过/已拒绝)
// 无参构造
public Reservation() {}
// Getter/Setter
public Integer getRid() { return rid; }
public void setRid(Integer rid) { this.rid = rid; }
public Integer getUid() { return uid; }
public void setUid(Integer uid) { this.uid = uid; }
public Integer getLabId() { return labId; }
public void setLabId(Integer labId) { this.labId = labId; }
public Date getStartDate() { return startDate; }
public void setStartDate(Date startDate) { this.startDate = startDate; }
public Date getEndDate() { return endDate; }
public void setEndDate(Date endDate) { this.endDate = endDate; }
public String getStatus() { return status; }
public void setStatus(String status) { this.status = status; }
@Override
public String toString() {
return "Reservation{" +
"rid=" + rid +
", uid=" + uid +
", labId=" + labId +
", startDate=" + startDate +
", endDate=" + endDate +
", status='" + status + '\'' +
'}';
}
}

@ -0,0 +1,39 @@
package com.ssm.entity;
public class User {
private Integer uid; // 用户编号
private String username; // 用户名
private String password; // 密码
private String realName; // 真实姓名
private String phone; // 手机号
private String role; // 角色(管理员/普通用户)
// 无参构造
public User() {}
// Getter/Setter
public Integer getUid() { return uid; }
public void setUid(Integer uid) { this.uid = uid; }
public String getUsername() { return username; }
public void setUsername(String username) { this.username = username; }
public String getPassword() { return password; }
public void setPassword(String password) { this.password = password; }
public String getRealName() { return realName; }
public void setRealName(String realName) { this.realName = realName; }
public String getPhone() { return phone; }
public void setPhone(String phone) { this.phone = phone; }
public String getRole() { return role; }
public void setRole(String role) { this.role = role; }
@Override
public String toString() {
return "User{" +
"uid=" + uid +
", username='" + username + '\'' +
", password='" + password + '\'' +
", realName='" + realName + '\'' +
", phone='" + phone + '\'' +
", role='" + role + '\'' +
'}';
}
}

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool.xsd http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd">
</beans>

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/mvc
http://www.springframework.org/schema/mvc/spring-mvc.xsd">
<context:component-scan base-package="com.ssm"/>
<mvc:annotation-driven/>
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/WEB-INF/view/"/>
<property name="suffix" value=".jsp"/>
</bean>
</beans>

@ -0,0 +1,16 @@
<%--
Created by IntelliJ IDEA.
User: AA7
Date: 2026/4/23
Time: 14:21
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>入门程序</title>
</head>
<body>
success!
</body>
</html>

@ -0,0 +1,16 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>操作成功</title>
</head>
<body>
<h2>Success!</h2>
<p>实验室编号:${lab.labId}</p>
<p>实验室名称:${lab.labName}</p>
<p>位置:${lab.location}</p>
<p>容纳人数:${lab.capacity}</p>
<p>状态:${lab.status}</p>
<p>管理员:${lab.manager}</p>
</body>
</html>

@ -0,0 +1,17 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>操作成功</title>
</head>
<body>
<h2>Success!</h2>
<p>材料编号:${material.mid}</p>
<p>材料名称:${material.mname}</p>
<p>规格型号:${material.spec}</p>
<p>库存数量:${material.stockNum}</p>
<p>单位:${material.unit}</p>
<p>单价:${material.price}</p>
<p>供应商:${material.supplier}</p>
</body>
</html>

@ -0,0 +1,16 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>操作成功</title>
</head>
<body>
<h2>Success!</h2>
<p>记录编号:${stock.stockId}</p>
<p>材料编号:${stock.mid}</p>
<p>操作类型:${stock.type}</p>
<p>数量:${stock.num}</p>
<p>操作日期:${stock.opDate}</p>
<p>操作人:${stock.operator}</p>
</body>
</html>

@ -0,0 +1,16 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>操作成功</title>
</head>
<body>
<h2>Success!</h2>
<p>预约编号:${reservation.rid}</p>
<p>用户编号:${reservation.uid}</p>
<p>实验室编号:${reservation.labId}</p>
<p>开始日期:${reservation.startDate}</p>
<p>结束日期:${reservation.endDate}</p>
<p>状态:${reservation.status}</p>
</body>
</html>

@ -0,0 +1,15 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>操作成功</title>
</head>
<body>
<h2>Success!</h2>
<p>用户编号:${user.uid}</p>
<p>用户名:${user.username}</p>
<p>真实姓名:${user.realName}</p>
<p>手机号:${user.phone}</p>
<p>角色:${user.role}</p>
</body>
</html>

@ -1,12 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" id="WebApp_ID" version="3.1">
<display-name>equipment-SpringMVCProject</display-name>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
<welcome-file>index.jsp</welcome-file>
<welcome-file>default.html</welcome-file>
<welcome-file>default.htm</welcome-file>
<welcome-file>default.jsp</welcome-file>
</welcome-file-list>
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<filter>
<filter-name>encodingFilter</filter-name>
<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>UTF-8</param-value>
</init-param>
<init-param>
<param-name>forceEncoding</param-name>
<param-value>true</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<servlet>
<servlet-name>springmvc</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/springmvc.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>springmvc</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
</web-app>

@ -0,0 +1,25 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>实验室管理</title>
</head>
<body>
<h3>实验室信息</h3>
<form action="${pageContext.request.contextPath}/lab/newadd" method="post">
实验室编号:<input type="text" name="labId"><br><br>
实验室名称:<input type="text" name="labName"><br><br>
位置:<input type="text" name="location"><br><br>
容纳人数:<input type="text" name="capacity"><br><br>
状态:
<select name="status">
<option value="可用">可用</option>
<option value="维修中">维修中</option>
<option value="停用">停用</option>
</select><br><br>
管理员:<input type="text" name="manager"><br><br>
<input type="submit" value="添加">
<input type="reset" value="重置">
</form>
</body>
</html>

@ -0,0 +1,21 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>添加材料</title>
</head>
<body>
<h3>材料信息</h3>
<form action="${pageContext.request.contextPath}/material/newadd" method="post">
材料编号:<input type="text" name="mid"><br><br>
材料名称:<input type="text" name="mname"><br><br>
规格型号:<input type="text" name="spec"><br><br>
库存数量:<input type="text" name="stockNum"><br><br>
单位:<input type="text" name="unit"><br><br>
单价:<input type="text" name="price"><br><br>
供应商:<input type="text" name="supplier"><br><br>
<input type="submit" value="添加">
<input type="reset" value="重置">
</form>
</body>
</html>

@ -0,0 +1,24 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>材料出入库</title>
</head>
<body>
<h3>材料出入库记录</h3>
<form action="${pageContext.request.contextPath}/stock/newadd" method="post">
记录编号:<input type="text" name="stockId"><br><br>
材料编号:<input type="text" name="mid"><br><br>
操作类型:
<select name="type">
<option value="入库">入库</option>
<option value="出库">出库</option>
</select><br><br>
数量:<input type="text" name="num"><br><br>
操作日期:<input type="date" name="opDate"><br><br>
操作人:<input type="text" name="operator"><br><br>
<input type="submit" value="提交">
<input type="reset" value="重置">
</form>
</body>
</html>

@ -0,0 +1,25 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>预约管理</title>
</head>
<body>
<h3>预约信息</h3>
<form action="${pageContext.request.contextPath}/reservation/newadd" method="post">
预约编号:<input type="text" name="rid"><br><br>
用户编号:<input type="text" name="uid"><br><br>
实验室编号:<input type="text" name="labId"><br><br>
开始日期:<input type="date" name="startDate"><br><br>
结束日期:<input type="date" name="endDate"><br><br>
状态:
<select name="status">
<option value="待审核">待审核</option>
<option value="已通过">已通过</option>
<option value="已拒绝">已拒绝</option>
</select><br><br>
<input type="submit" value="提交">
<input type="reset" value="重置">
</form>
</body>
</html>

@ -0,0 +1,24 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
<html>
<head>
<meta charset="UTF-8">
<title>添加用户</title>
</head>
<body>
<h3>添加用户信息</h3>
<form action="${pageContext.request.contextPath}/user/newadd" method="post">
用户编号:<input type="text" name="uid"><br><br>
用户名:<input type="text" name="username"><br><br>
密码:<input type="password" name="password"><br><br>
真实姓名:<input type="text" name="realName"><br><br>
手机号:<input type="text" name="phone"><br><br>
角色:
<select name="role">
<option value="管理员">管理员</option>
<option value="普通用户">普通用户</option>
</select><br><br>
<input type="submit" value="添加">
<input type="reset" value="重置">
</form>
</body>
</html>

@ -0,0 +1,16 @@
<%--
Created by IntelliJ IDEA.
User: AA7
Date: 2026/4/23
Time: 9:07
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>入门程序</title>
</head>
<body>
<a href="hello">hello world</a>
</body>
</html>

@ -1,5 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/web/WEB-INF/web.xml" />
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/web/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/web" relative="/" />
</webroots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="4.0">
</web-app>

@ -0,0 +1,16 @@
<%--
Created by IntelliJ IDEA.
User: AA7
Date: 2026/4/23
Time: 9:07
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>入门程序</title>
</head>
<body>
<a href="hello">hello world</a>
</body>
</html>

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
https://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/mvc
https://www.springframework.org/schema/mvc/spring-mvc.xsd">
<context:component-scan base-package="com.ssm.controller"/>
<mvc:annotation-driven/>
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/"/>
<property name="suffix" value=".jsp"/>
</bean>
</beans>

@ -4,6 +4,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
version="4.0">
<<<<<<< HEAD
<!-- 1. 编码过滤器解决POST请求和页面乱码 -->
<filter>
<filter-name>encodingFilter</filter-name>
@ -41,5 +42,21 @@
<welcome-file-list>
<welcome-file>addUser.jsp</welcome-file>
</welcome-file-list>
=======
<servlet>
<servlet-name>DispatcherServlet</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:springmvc.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>DispatcherServlet</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
>>>>>>> origin/main
</web-app>

@ -0,0 +1,16 @@
<%--
Created by IntelliJ IDEA.
User: AA7
Date: 2026/4/25
Time: 22:14
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>入门程序</title>
</head>
<body>
success!
</body>
</html>

@ -3,7 +3,25 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool.xsd http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd">
xsi:schemaLocation="
http://www.springframework.org/schema/beans
https://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
https://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/mvc
https://www.springframework.org/schema/mvc/spring-mvc.xsd">
</beans>
<context:component-scan base-package="com.ssm.controller"/>
<mvc:annotation-driven/>
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/"/>
<property name="suffix" value=".jsp"/>
</bean>
</beans>
Loading…
Cancel
Save