From 74eccbd62c8d4de728f2fc232e567f2a1d4d329a Mon Sep 17 00:00:00 2001
From: snow <jinxuesong@163.com>
Date: Sun, 22 Jul 2018 16:45:52 +0800
Subject: [PATCH] =?UTF-8?q?Mybatis=20Generator=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  12 +
 .../java/cn/edu/hit/ht/HtApplication.java     |   2 +
 .../projectlist/ProjectListController.java    |  39 +++
 .../cn/edu/hit/ht/dao/AhpInsertMapper.java    |   5 +
 .../cn/edu/hit/ht/dao/CaselistMapper.java     |   5 +
 .../hit/ht/dao/CloudmodelInsertMapper.java    |   5 +
 .../hit/ht/dao/CloudmodelResultMapper.java    |   5 +
 .../edu/hit/ht/dao/CloudstandardMapper.java   |   5 +
 .../java/cn/edu/hit/ht/dao/ExpertMapper.java  |   5 +
 .../cn/edu/hit/ht/dao/FahpresultMapper.java   |   5 +
 .../edu/hit/ht/dao/IndexStructureMapper.java  |   5 +
 .../cn/edu/hit/ht/dao/ProjectlistMapper.java  |   5 +
 .../cn/edu/hit/ht/dao/TopsisInsertMapper.java |   5 +
 .../cn/edu/hit/ht/dao/TopsisresultMapper.java |   5 +
 .../hit/ht/service/IProjectListService.java   |  10 +
 .../ht/serviceImpl/ProjectListService.java    |  25 ++
 src/main/resources/application.yml            |  11 +-
 .../mapper/AhpInsertMapper.xml                |   0
 .../mapper/CaselistMapper.xml                 |   0
 .../mapper/CloudmodelInsertMapper.xml         |   0
 .../mapper/CloudmodelResultMapper.xml         |   0
 .../mapper/CloudstandardMapper.xml            |   0
 .../ht => resources}/mapper/ExpertMapper.xml  | 308 ++++++++++++++----
 .../mapper/FahpresultMapper.xml               |   0
 .../mapper/IndexStructureMapper.xml           |   0
 .../mapper/ProjectlistMapper.xml              |   1 +
 .../mapper/TopsisInsertMapper.xml             |   0
 .../mapper/TopsisresultMapper.xml             |   0
 .../projectlist/QueryProjectList.html         |  56 ++++
 .../resources/templates/utils/header.html     |   2 +-
 src/main/resources/templates/utils/page.html  |  14 +-
 .../templates/weapontype/QueryWeaponType.html |   7 +-
 32 files changed, 462 insertions(+), 80 deletions(-)
 create mode 100644 src/main/java/cn/edu/hit/ht/controller/projectlist/ProjectListController.java
 create mode 100644 src/main/java/cn/edu/hit/ht/service/IProjectListService.java
 create mode 100644 src/main/java/cn/edu/hit/ht/serviceImpl/ProjectListService.java
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/AhpInsertMapper.xml (100%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/CaselistMapper.xml (100%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/CloudmodelInsertMapper.xml (100%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/CloudmodelResultMapper.xml (100%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/CloudstandardMapper.xml (100%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/ExpertMapper.xml (30%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/FahpresultMapper.xml (100%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/IndexStructureMapper.xml (100%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/ProjectlistMapper.xml (99%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/TopsisInsertMapper.xml (100%)
 rename src/main/{java/cn/edu/hit/ht => resources}/mapper/TopsisresultMapper.xml (100%)
 create mode 100644 src/main/resources/templates/projectlist/QueryProjectList.html

diff --git a/pom.xml b/pom.xml
index 28c3390..1de4315 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,18 @@
             <artifactId>shiro-all</artifactId>
             <version>1.3.2</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>3.2.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+            <version>1.9.22</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/cn/edu/hit/ht/HtApplication.java b/src/main/java/cn/edu/hit/ht/HtApplication.java
index ff978d0..cb84c35 100644
--- a/src/main/java/cn/edu/hit/ht/HtApplication.java
+++ b/src/main/java/cn/edu/hit/ht/HtApplication.java
@@ -1,9 +1,11 @@
 package cn.edu.hit.ht;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
+@MapperScan("cn.edu.hit.ht.**")
 public class HtApplication {
 
     public static void main(String[] args) {
diff --git a/src/main/java/cn/edu/hit/ht/controller/projectlist/ProjectListController.java b/src/main/java/cn/edu/hit/ht/controller/projectlist/ProjectListController.java
new file mode 100644
index 0000000..f0cc1e6
--- /dev/null
+++ b/src/main/java/cn/edu/hit/ht/controller/projectlist/ProjectListController.java
@@ -0,0 +1,39 @@
+package cn.edu.hit.ht.controller.projectlist;
+
+import cn.edu.hit.ht.serviceImpl.ProjectListService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@Controller
+@RequestMapping("/ProjectList")
+public class ProjectListController {
+    @Autowired
+    ProjectListService projectListService;
+
+    @RequestMapping(value="/Query",method=RequestMethod.GET)
+    public String query(Model model, HttpServletRequest request ){
+        model.addAttribute("title", "项目类型管理");
+
+        /*PageHelper.startPage(1,5);
+       List projectlists = projectListService.selectAllProjectlist();
+
+        PageInfo pageInfo = new PageInfo(projectlists);
+
+        model.addAttribute("pageInfo",pageInfo);
+        */
+
+       List projectlists = projectListService.selectAllProjectlist();
+        //System.out.println(projectlists);
+
+        return "projectlist/QueryProjectList";
+    }
+
+}
diff --git a/src/main/java/cn/edu/hit/ht/dao/AhpInsertMapper.java b/src/main/java/cn/edu/hit/ht/dao/AhpInsertMapper.java
index 21e462e..3ad228d 100644
--- a/src/main/java/cn/edu/hit/ht/dao/AhpInsertMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/AhpInsertMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.AhpInsert;
 import cn.edu.hit.ht.pojo.AhpInsertExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface AhpInsertMapper {
     int countByExample(AhpInsertExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/CaselistMapper.java b/src/main/java/cn/edu/hit/ht/dao/CaselistMapper.java
index 5968a50..71fcb0f 100644
--- a/src/main/java/cn/edu/hit/ht/dao/CaselistMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/CaselistMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.Caselist;
 import cn.edu.hit.ht.pojo.CaselistExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface CaselistMapper {
     int countByExample(CaselistExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/CloudmodelInsertMapper.java b/src/main/java/cn/edu/hit/ht/dao/CloudmodelInsertMapper.java
index eac9d37..1db92c5 100644
--- a/src/main/java/cn/edu/hit/ht/dao/CloudmodelInsertMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/CloudmodelInsertMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.CloudmodelInsert;
 import cn.edu.hit.ht.pojo.CloudmodelInsertExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface CloudmodelInsertMapper {
     int countByExample(CloudmodelInsertExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/CloudmodelResultMapper.java b/src/main/java/cn/edu/hit/ht/dao/CloudmodelResultMapper.java
index 98c5d6e..c1da310 100644
--- a/src/main/java/cn/edu/hit/ht/dao/CloudmodelResultMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/CloudmodelResultMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.CloudmodelResult;
 import cn.edu.hit.ht.pojo.CloudmodelResultExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface CloudmodelResultMapper {
     int countByExample(CloudmodelResultExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/CloudstandardMapper.java b/src/main/java/cn/edu/hit/ht/dao/CloudstandardMapper.java
index 8252d16..059d480 100644
--- a/src/main/java/cn/edu/hit/ht/dao/CloudstandardMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/CloudstandardMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.Cloudstandard;
 import cn.edu.hit.ht.pojo.CloudstandardExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface CloudstandardMapper {
     int countByExample(CloudstandardExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/ExpertMapper.java b/src/main/java/cn/edu/hit/ht/dao/ExpertMapper.java
index 722cd58..e9db2e3 100644
--- a/src/main/java/cn/edu/hit/ht/dao/ExpertMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/ExpertMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.Expert;
 import cn.edu.hit.ht.pojo.ExpertExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface ExpertMapper {
     int countByExample(ExpertExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/FahpresultMapper.java b/src/main/java/cn/edu/hit/ht/dao/FahpresultMapper.java
index 7ec2e4b..6e09d27 100644
--- a/src/main/java/cn/edu/hit/ht/dao/FahpresultMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/FahpresultMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.Fahpresult;
 import cn.edu.hit.ht.pojo.FahpresultExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface FahpresultMapper {
     int countByExample(FahpresultExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/IndexStructureMapper.java b/src/main/java/cn/edu/hit/ht/dao/IndexStructureMapper.java
index df21053..d52bfd1 100644
--- a/src/main/java/cn/edu/hit/ht/dao/IndexStructureMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/IndexStructureMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.IndexStructure;
 import cn.edu.hit.ht.pojo.IndexStructureExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface IndexStructureMapper {
     int countByExample(IndexStructureExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/ProjectlistMapper.java b/src/main/java/cn/edu/hit/ht/dao/ProjectlistMapper.java
index b311ae4..f700cf2 100644
--- a/src/main/java/cn/edu/hit/ht/dao/ProjectlistMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/ProjectlistMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.Projectlist;
 import cn.edu.hit.ht.pojo.ProjectlistExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface ProjectlistMapper {
     int countByExample(ProjectlistExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/TopsisInsertMapper.java b/src/main/java/cn/edu/hit/ht/dao/TopsisInsertMapper.java
index d3cf231..d15410e 100644
--- a/src/main/java/cn/edu/hit/ht/dao/TopsisInsertMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/TopsisInsertMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.TopsisInsert;
 import cn.edu.hit.ht.pojo.TopsisInsertExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface TopsisInsertMapper {
     int countByExample(TopsisInsertExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/dao/TopsisresultMapper.java b/src/main/java/cn/edu/hit/ht/dao/TopsisresultMapper.java
index 1b11eeb..6f3aa89 100644
--- a/src/main/java/cn/edu/hit/ht/dao/TopsisresultMapper.java
+++ b/src/main/java/cn/edu/hit/ht/dao/TopsisresultMapper.java
@@ -3,8 +3,13 @@ package cn.edu.hit.ht.dao;
 import cn.edu.hit.ht.pojo.Topsisresult;
 import cn.edu.hit.ht.pojo.TopsisresultExample;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface TopsisresultMapper {
     int countByExample(TopsisresultExample example);
 
diff --git a/src/main/java/cn/edu/hit/ht/service/IProjectListService.java b/src/main/java/cn/edu/hit/ht/service/IProjectListService.java
new file mode 100644
index 0000000..4782b1f
--- /dev/null
+++ b/src/main/java/cn/edu/hit/ht/service/IProjectListService.java
@@ -0,0 +1,10 @@
+package cn.edu.hit.ht.service;
+
+
+import cn.edu.hit.ht.pojo.Projectlist;
+
+import java.util.List;
+
+public interface IProjectListService {
+    public List<Projectlist> selectAllProjectlist();
+}
diff --git a/src/main/java/cn/edu/hit/ht/serviceImpl/ProjectListService.java b/src/main/java/cn/edu/hit/ht/serviceImpl/ProjectListService.java
new file mode 100644
index 0000000..4c5bd19
--- /dev/null
+++ b/src/main/java/cn/edu/hit/ht/serviceImpl/ProjectListService.java
@@ -0,0 +1,25 @@
+package cn.edu.hit.ht.serviceImpl;
+
+import cn.edu.hit.ht.dao.ProjectlistMapper;
+import cn.edu.hit.ht.pojo.Projectlist;
+import cn.edu.hit.ht.pojo.ProjectlistExample;
+import cn.edu.hit.ht.service.IProjectListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ProjectListService implements IProjectListService {
+    @Autowired
+    ProjectlistMapper projectlistMapper;
+
+    @Override
+    public List<Projectlist> selectAllProjectlist() {
+        ProjectlistExample example = new ProjectlistExample();
+        ProjectlistExample.Criteria criteria = example.createCriteria();
+
+        List<Projectlist> projectlist =   projectlistMapper.selectByExample(example);
+        return projectlist;
+    }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 34dd20c..19d227a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,9 +10,9 @@ spring:
 #���Ի������ݿ������
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/thesismanager
-    username: root
-    password:
+    url: jdbc:mysql://39.105.82.115:3306/wee_project
+    username: hit
+    password: hit
 
 #thymeleaf start
   thymeleaf:
@@ -32,6 +32,11 @@ spring:
   mvc:
     static-path-pattern: /**
 
+  mybatis:
+      mapper-locations: classpath:mapper/*.xml
+      type-aliases-package: cn.edu.hit.ht.pojo
+
   resources:
     static-locations: classpath:/templates/,classpath:/templates/admin,/webjars/**
 
+
diff --git a/src/main/java/cn/edu/hit/ht/mapper/AhpInsertMapper.xml b/src/main/resources/mapper/AhpInsertMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/AhpInsertMapper.xml
rename to src/main/resources/mapper/AhpInsertMapper.xml
diff --git a/src/main/java/cn/edu/hit/ht/mapper/CaselistMapper.xml b/src/main/resources/mapper/CaselistMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/CaselistMapper.xml
rename to src/main/resources/mapper/CaselistMapper.xml
diff --git a/src/main/java/cn/edu/hit/ht/mapper/CloudmodelInsertMapper.xml b/src/main/resources/mapper/CloudmodelInsertMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/CloudmodelInsertMapper.xml
rename to src/main/resources/mapper/CloudmodelInsertMapper.xml
diff --git a/src/main/java/cn/edu/hit/ht/mapper/CloudmodelResultMapper.xml b/src/main/resources/mapper/CloudmodelResultMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/CloudmodelResultMapper.xml
rename to src/main/resources/mapper/CloudmodelResultMapper.xml
diff --git a/src/main/java/cn/edu/hit/ht/mapper/CloudstandardMapper.xml b/src/main/resources/mapper/CloudstandardMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/CloudstandardMapper.xml
rename to src/main/resources/mapper/CloudstandardMapper.xml
diff --git a/src/main/java/cn/edu/hit/ht/mapper/ExpertMapper.xml b/src/main/resources/mapper/ExpertMapper.xml
similarity index 30%
rename from src/main/java/cn/edu/hit/ht/mapper/ExpertMapper.xml
rename to src/main/resources/mapper/ExpertMapper.xml
index e4f1d00..aec361c 100644
--- a/src/main/java/cn/edu/hit/ht/mapper/ExpertMapper.xml
+++ b/src/main/resources/mapper/ExpertMapper.xml
@@ -1,30 +1,30 @@
-<?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="cn.edu.hit.ht.dao.ExpertMapper" >
-  <resultMap id="BaseResultMap" type="cn.edu.hit.ht.pojo.Expert" >
-    <id column="id" property="id" jdbcType="BIGINT" />
-    <result column="expertname" property="expertname" jdbcType="VARCHAR" />
-    <result column="note" property="note" jdbcType="VARCHAR" />
+<?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="cn.edu.hit.ht.dao.ExpertMapper">
+  <resultMap id="BaseResultMap" type="cn.edu.hit.ht.pojo.Expert">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="expertname" jdbcType="VARCHAR" property="expertname" />
+    <result column="note" jdbcType="VARCHAR" property="note" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -35,25 +35,25 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -64,116 +64,294 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     id, expertname, note
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="cn.edu.hit.ht.pojo.ExpertExample" >
+  <select id="selectByExample" parameterType="cn.edu.hit.ht.pojo.ExpertExample" resultMap="BaseResultMap">
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     'true' as QUERYID,
     <include refid="Base_Column_List" />
     from expert
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from expert
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from expert
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="cn.edu.hit.ht.pojo.ExpertExample" >
+  <delete id="deleteByExample" parameterType="cn.edu.hit.ht.pojo.ExpertExample">
     delete from expert
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="cn.edu.hit.ht.pojo.Expert" >
+  <insert id="insert" parameterType="cn.edu.hit.ht.pojo.Expert">
     insert into expert (id, expertname, note
       )
     values (#{id,jdbcType=BIGINT}, #{expertname,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="cn.edu.hit.ht.pojo.Expert" >
+  <insert id="insertSelective" parameterType="cn.edu.hit.ht.pojo.Expert">
     insert into expert
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         id,
       </if>
-      <if test="expertname != null" >
+      <if test="expertname != null">
         expertname,
       </if>
-      <if test="note != null" >
+      <if test="note != null">
         note,
       </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
-      <if test="expertname != null" >
+      <if test="expertname != null">
         #{expertname,jdbcType=VARCHAR},
       </if>
-      <if test="note != null" >
+      <if test="note != null">
         #{note,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="cn.edu.hit.ht.pojo.ExpertExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="cn.edu.hit.ht.pojo.ExpertExample" resultType="java.lang.Integer">
     select count(*) from expert
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     update expert
-    <set >
-      <if test="record.id != null" >
+    <set>
+      <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="record.expertname != null" >
+      <if test="record.expertname != null">
         expertname = #{record.expertname,jdbcType=VARCHAR},
       </if>
-      <if test="record.note != null" >
+      <if test="record.note != null">
         note = #{record.note,jdbcType=VARCHAR},
       </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     update expert
     set id = #{record.id,jdbcType=BIGINT},
       expertname = #{record.expertname,jdbcType=VARCHAR},
       note = #{record.note,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="cn.edu.hit.ht.pojo.Expert" >
+  <update id="updateByPrimaryKeySelective" parameterType="cn.edu.hit.ht.pojo.Expert">
     update expert
-    <set >
-      <if test="expertname != null" >
+    <set>
+      <if test="expertname != null">
         expertname = #{expertname,jdbcType=VARCHAR},
       </if>
-      <if test="note != null" >
+      <if test="note != null">
         note = #{note,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="cn.edu.hit.ht.pojo.Expert" >
+  <update id="updateByPrimaryKey" parameterType="cn.edu.hit.ht.pojo.Expert">
+    update expert
+    set expertname = #{expertname,jdbcType=VARCHAR},
+      note = #{note,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <resultMap id="BaseResultMap" type="cn.edu.hit.ht.pojo.Expert">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="expertname" jdbcType="VARCHAR" property="expertname" />
+    <result column="note" jdbcType="VARCHAR" property="note" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, expertname, note
+  </sql>
+  <select id="selectByExample" parameterType="cn.edu.hit.ht.pojo.ExpertExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from expert
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from expert
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from expert
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="cn.edu.hit.ht.pojo.ExpertExample">
+    delete from expert
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="cn.edu.hit.ht.pojo.Expert">
+    insert into expert (id, expertname, note
+      )
+    values (#{id,jdbcType=BIGINT}, #{expertname,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="cn.edu.hit.ht.pojo.Expert">
+    insert into expert
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="expertname != null">
+        expertname,
+      </if>
+      <if test="note != null">
+        note,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="expertname != null">
+        #{expertname,jdbcType=VARCHAR},
+      </if>
+      <if test="note != null">
+        #{note,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="cn.edu.hit.ht.pojo.ExpertExample" resultType="java.lang.Integer">
+    select count(*) from expert
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update expert
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.expertname != null">
+        expertname = #{record.expertname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.note != null">
+        note = #{record.note,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update expert
+    set id = #{record.id,jdbcType=BIGINT},
+      expertname = #{record.expertname,jdbcType=VARCHAR},
+      note = #{record.note,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="cn.edu.hit.ht.pojo.Expert">
+    update expert
+    <set>
+      <if test="expertname != null">
+        expertname = #{expertname,jdbcType=VARCHAR},
+      </if>
+      <if test="note != null">
+        note = #{note,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="cn.edu.hit.ht.pojo.Expert">
     update expert
     set expertname = #{expertname,jdbcType=VARCHAR},
       note = #{note,jdbcType=VARCHAR}
diff --git a/src/main/java/cn/edu/hit/ht/mapper/FahpresultMapper.xml b/src/main/resources/mapper/FahpresultMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/FahpresultMapper.xml
rename to src/main/resources/mapper/FahpresultMapper.xml
diff --git a/src/main/java/cn/edu/hit/ht/mapper/IndexStructureMapper.xml b/src/main/resources/mapper/IndexStructureMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/IndexStructureMapper.xml
rename to src/main/resources/mapper/IndexStructureMapper.xml
diff --git a/src/main/java/cn/edu/hit/ht/mapper/ProjectlistMapper.xml b/src/main/resources/mapper/ProjectlistMapper.xml
similarity index 99%
rename from src/main/java/cn/edu/hit/ht/mapper/ProjectlistMapper.xml
rename to src/main/resources/mapper/ProjectlistMapper.xml
index aa9e584..a83b4ef 100644
--- a/src/main/java/cn/edu/hit/ht/mapper/ProjectlistMapper.xml
+++ b/src/main/resources/mapper/ProjectlistMapper.xml
@@ -179,4 +179,5 @@
       note = #{note,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/cn/edu/hit/ht/mapper/TopsisInsertMapper.xml b/src/main/resources/mapper/TopsisInsertMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/TopsisInsertMapper.xml
rename to src/main/resources/mapper/TopsisInsertMapper.xml
diff --git a/src/main/java/cn/edu/hit/ht/mapper/TopsisresultMapper.xml b/src/main/resources/mapper/TopsisresultMapper.xml
similarity index 100%
rename from src/main/java/cn/edu/hit/ht/mapper/TopsisresultMapper.xml
rename to src/main/resources/mapper/TopsisresultMapper.xml
diff --git a/src/main/resources/templates/projectlist/QueryProjectList.html b/src/main/resources/templates/projectlist/QueryProjectList.html
new file mode 100644
index 0000000..210b747
--- /dev/null
+++ b/src/main/resources/templates/projectlist/QueryProjectList.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <head th:include="utils/include::include" />
+</head>
+
+<body>
+    <!-- header content -->
+
+
+    <div th:include="utils/header::header"/>
+
+
+    <!-- body content -->
+    <div class="container" style="min-height: 400px;">
+        <div class="row">
+
+            <!-- 左侧 -->
+            <div class="col-md-3">
+            </div>
+
+            <!-- 右侧 -->
+            <div class="col-md-9">
+                <div class="table-responsive">
+                    <table class="table table-striped table-bordered">
+
+                        <thead>
+                            <tr>
+                                <th>用户名</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <!--<tr  th:each="info,infoStat : ${Infos}" >
+                                <td th:text="${info.userName}"></td>
+                            </tr>
+                            -->
+                            <tr>
+                                snow
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- page content -->
+    <!--
+    <div th:replace="utils/page::pagination"/>
+    -->
+    <!-- foot content -->
+    <div th:replace="utils/foot::copyright"/>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/utils/header.html b/src/main/resources/templates/utils/header.html
index 0dfceff..85a36f2 100644
--- a/src/main/resources/templates/utils/header.html
+++ b/src/main/resources/templates/utils/header.html
@@ -37,7 +37,7 @@
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown<strong class="caret"></strong></a>
                                 <ul class="dropdown-menu">
                                     <li>
-                                        <a href="WeaponType/Query">武器类型管理</a>
+                                        <a href="ProjectList/Query">武器类型管理</a>
                                     </li>
                                     <li>
                                         <a href="#">Another action</a>
diff --git a/src/main/resources/templates/utils/page.html b/src/main/resources/templates/utils/page.html
index 422c5d7..1d41eba 100644
--- a/src/main/resources/templates/utils/page.html
+++ b/src/main/resources/templates/utils/page.html
@@ -4,16 +4,16 @@
 
         <table>
             <tr>
-                <td><a th:href="@{/goods/page?pageNum=0}">首页</a></td>
-                <td th:switch="${pageNum}">
-                    <p th:case="1"> <a th:href="@{/goods/page?pageNum=1}">上一页</a></p>
-                    <p th:case="*"><a th:href="@{/goods/page(pageNum=${pageNum-1})}">上一页</a></p>
+                <td><a th:href="">首页</a></td>
+                <td th:switch="${pageInfo.pageNum}">
+                    <p th:case="1"> <a th:href="">上一页</a></p>
+                    <p th:case="*"><a th:href="">上一页</a></p>
                 </td>
-                <td th:switch="${pageNum}">
-                    <p th:case="${totalPages}"><a th:href="@{/goods/page(pageNum=${totalPages})}">下一页</a></p>
+                <td th:switch="${pageInfo.pageNum}">
+                    <p th:case="${pageInfo.pages}"><a th:href="">下一页</a></p>
                     <p th:case="*"><a th:href="@{/goods/page(pageNum=${pageNum+1})}">下一页</a></p>
                 </td>
-                <td><a th:href="@{/goods/page(pageNum=${totalPages})}">尾页</a></td>
+                <td><a th:href="">尾页</a></td>
             </tr>
         </table>
 
diff --git a/src/main/resources/templates/weapontype/QueryWeaponType.html b/src/main/resources/templates/weapontype/QueryWeaponType.html
index 6189e2a..9a98e53 100644
--- a/src/main/resources/templates/weapontype/QueryWeaponType.html
+++ b/src/main/resources/templates/weapontype/QueryWeaponType.html
@@ -46,13 +46,12 @@
     </div>
 
     <!-- page content -->
-    <!--
+<!--
     <div th:replace="utils/page::pagination"/>
-    -->
+-->
 
     <!-- foot content -->
-    <!--
     <div th:replace="utils/foot::copyright"/>
-    -->
+
 </body>
 </html>
\ No newline at end of file
-- 
Gitee