。。

bin/pom.xml

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.chinaitop</groupId>
+	<artifactId>depot-device</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>depot-device</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.0.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<spring-cloud.version>Finchley.M8</spring-cloud.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		<!-- 引入spring boot自带的pagehelper插件 -->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+		</dependency>
+		<dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.7</version>
+		</dependency>
+
+		<!-- swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.6.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.9</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>  
+	        <groupId>org.springframework.session</groupId>  
+	        <artifactId>spring-session-data-redis</artifactId>  
+		</dependency>
+		
+		<!-- 阿里巴巴json -->
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>fastjson</artifactId>
+		    <version>1.2.37</version>
+		</dependency>
+		
+		<!-- 调用http接口需要 -->
+		<dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.6</version>
+        </dependency>
+	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-dependencies</artifactId>
+				<version>${spring-cloud.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+	    <finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+            	<groupId>org.apache.maven.plugins</groupId>
+            	<artifactId>maven-war-plugin</artifactId>
+            	<version>2.6</version>
+            	<configuration>
+                	<failOnMissingWebXml>false</failOnMissingWebXml>
+            	</configuration>
+        	</plugin>
+		</plugins>
+		
+		<!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+					<include>**/*.xml</include>
+					<include>**/*.store</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+	</build>
+
+	<repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+
+</project>

bin/src/main/java/com/chinaitop/depot/device/mapper/BasicEquipmentEquipmentPoolMapper.xml

@@ -0,0 +1,258 @@
+<?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.chinaitop.depot.device.mapper.BasicEquipmentEquipmentPoolMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="put_position" jdbcType="VARCHAR" property="putPosition" />
+    <result column="shelf_id" jdbcType="VARCHAR" property="shelfId" />
+    <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="input_person_id" jdbcType="INTEGER" property="inputPersonId" />
+    <result column="input_date" jdbcType="TIMESTAMP" property="inputDate" />
+  </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, org_id, put_position, shelf_id, warehouse_id, remark, input_person_id, input_date
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from basic_equipment_equipment_pool
+    <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.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from basic_equipment_equipment_pool
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from basic_equipment_equipment_pool
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample">
+    delete from basic_equipment_equipment_pool
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    insert into basic_equipment_equipment_pool (id, org_id, put_position, 
+      shelf_id, warehouse_id, remark, 
+      input_person_id, input_date)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{putPosition,jdbcType=VARCHAR}, 
+      #{shelfId,jdbcType=VARCHAR}, #{warehouseId,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{inputPersonId,jdbcType=INTEGER}, #{inputDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    insert into basic_equipment_equipment_pool
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="putPosition != null">
+        put_position,
+      </if>
+      <if test="shelfId != null">
+        shelf_id,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="inputPersonId != null">
+        input_person_id,
+      </if>
+      <if test="inputDate != null">
+        input_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="putPosition != null">
+        #{putPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="shelfId != null">
+        #{shelfId,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="inputPersonId != null">
+        #{inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="inputDate != null">
+        #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample" resultType="java.lang.Integer">
+    select count(*) from basic_equipment_equipment_pool
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update basic_equipment_equipment_pool
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.putPosition != null">
+        put_position = #{record.putPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shelfId != null">
+        shelf_id = #{record.shelfId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputPersonId != null">
+        input_person_id = #{record.inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="record.inputDate != null">
+        input_date = #{record.inputDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update basic_equipment_equipment_pool
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      put_position = #{record.putPosition,jdbcType=VARCHAR},
+      shelf_id = #{record.shelfId,jdbcType=VARCHAR},
+      warehouse_id = #{record.warehouseId,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      input_person_id = #{record.inputPersonId,jdbcType=INTEGER},
+      input_date = #{record.inputDate,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    update basic_equipment_equipment_pool
+    <set>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="putPosition != null">
+        put_position = #{putPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="shelfId != null">
+        shelf_id = #{shelfId,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="inputPersonId != null">
+        input_person_id = #{inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="inputDate != null">
+        input_date = #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    update basic_equipment_equipment_pool
+    set org_id = #{orgId,jdbcType=INTEGER},
+      put_position = #{putPosition,jdbcType=VARCHAR},
+      shelf_id = #{shelfId,jdbcType=VARCHAR},
+      warehouse_id = #{warehouseId,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      input_person_id = #{inputPersonId,jdbcType=INTEGER},
+      input_date = #{inputDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

bin/src/main/java/com/chinaitop/depot/device/mapper/StorageDevicebackMapper.xml

@@ -0,0 +1,281 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicebackMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDeviceback">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="get_id" jdbcType="INTEGER" property="getId" />
+    <result column="back_keeper" jdbcType="VARCHAR" property="backKeeper" />
+    <result column="back_handler" jdbcType="VARCHAR" property="backHandler" />
+    <result column="collator" jdbcType="VARCHAR" property="collator" />
+    <result column="back_time" jdbcType="DATE" property="backTime" />
+    <result column="broken_count" jdbcType="INTEGER" property="brokenCount" />
+    <result column="number" jdbcType="INTEGER" property="number" />
+    <result column="back_count" jdbcType="INTEGER" property="backCount" />
+  </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, get_id, back_keeper, back_handler, collator, back_time, broken_count, number, 
+    back_count
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicebackExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_deviceback
+    <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.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from storage_deviceback
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from storage_deviceback
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicebackExample">
+    delete from storage_deviceback
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDeviceback">
+    insert into storage_deviceback (id, get_id, back_keeper, 
+      back_handler, collator, back_time, 
+      broken_count, number, back_count
+      )
+    values (#{id,jdbcType=INTEGER}, #{getId,jdbcType=INTEGER}, #{backKeeper,jdbcType=VARCHAR}, 
+      #{backHandler,jdbcType=VARCHAR}, #{collator,jdbcType=VARCHAR}, #{backTime,jdbcType=DATE}, 
+      #{brokenCount,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{backCount,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceback">
+    insert into storage_deviceback
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="getId != null">
+        get_id,
+      </if>
+      <if test="backKeeper != null">
+        back_keeper,
+      </if>
+      <if test="backHandler != null">
+        back_handler,
+      </if>
+      <if test="collator != null">
+        collator,
+      </if>
+      <if test="backTime != null">
+        back_time,
+      </if>
+      <if test="brokenCount != null">
+        broken_count,
+      </if>
+      <if test="number != null">
+        number,
+      </if>
+      <if test="backCount != null">
+        back_count,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="getId != null">
+        #{getId,jdbcType=INTEGER},
+      </if>
+      <if test="backKeeper != null">
+        #{backKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="backHandler != null">
+        #{backHandler,jdbcType=VARCHAR},
+      </if>
+      <if test="collator != null">
+        #{collator,jdbcType=VARCHAR},
+      </if>
+      <if test="backTime != null">
+        #{backTime,jdbcType=DATE},
+      </if>
+      <if test="brokenCount != null">
+        #{brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=INTEGER},
+      </if>
+      <if test="backCount != null">
+        #{backCount,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicebackExample" resultType="java.lang.Integer">
+    select count(*) from storage_deviceback
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_deviceback
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.getId != null">
+        get_id = #{record.getId,jdbcType=INTEGER},
+      </if>
+      <if test="record.backKeeper != null">
+        back_keeper = #{record.backKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.backHandler != null">
+        back_handler = #{record.backHandler,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collator != null">
+        collator = #{record.collator,jdbcType=VARCHAR},
+      </if>
+      <if test="record.backTime != null">
+        back_time = #{record.backTime,jdbcType=DATE},
+      </if>
+      <if test="record.brokenCount != null">
+        broken_count = #{record.brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.number != null">
+        number = #{record.number,jdbcType=INTEGER},
+      </if>
+      <if test="record.backCount != null">
+        back_count = #{record.backCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update storage_deviceback
+    set id = #{record.id,jdbcType=INTEGER},
+      get_id = #{record.getId,jdbcType=INTEGER},
+      back_keeper = #{record.backKeeper,jdbcType=VARCHAR},
+      back_handler = #{record.backHandler,jdbcType=VARCHAR},
+      collator = #{record.collator,jdbcType=VARCHAR},
+      back_time = #{record.backTime,jdbcType=DATE},
+      broken_count = #{record.brokenCount,jdbcType=INTEGER},
+      number = #{record.number,jdbcType=INTEGER},
+      back_count = #{record.backCount,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceback">
+    update storage_deviceback
+    <set>
+      <if test="getId != null">
+        get_id = #{getId,jdbcType=INTEGER},
+      </if>
+      <if test="backKeeper != null">
+        back_keeper = #{backKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="backHandler != null">
+        back_handler = #{backHandler,jdbcType=VARCHAR},
+      </if>
+      <if test="collator != null">
+        collator = #{collator,jdbcType=VARCHAR},
+      </if>
+      <if test="backTime != null">
+        back_time = #{backTime,jdbcType=DATE},
+      </if>
+      <if test="brokenCount != null">
+        broken_count = #{brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        number = #{number,jdbcType=INTEGER},
+      </if>
+      <if test="backCount != null">
+        back_count = #{backCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDeviceback">
+    update storage_deviceback
+    set get_id = #{getId,jdbcType=INTEGER},
+      back_keeper = #{backKeeper,jdbcType=VARCHAR},
+      back_handler = #{backHandler,jdbcType=VARCHAR},
+      collator = #{collator,jdbcType=VARCHAR},
+      back_time = #{backTime,jdbcType=DATE},
+      broken_count = #{brokenCount,jdbcType=INTEGER},
+      number = #{number,jdbcType=INTEGER},
+      back_count = #{backCount,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectBygetId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  	select * from storage_deviceback where get_id=#{id};
+  </select>
+  
+</mapper>

bin/src/main/java/com/chinaitop/depot/device/mapper/StorageDevicecheckMapper.xml

@@ -0,0 +1,370 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicecheckMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="check_number" property="checkNumber" jdbcType="VARCHAR" />
+    <result column="check_date" property="checkDate" jdbcType="TIMESTAMP" />
+    <result column="depot_id" property="depotId" jdbcType="INTEGER" />
+    <result column="check_person" property="checkPerson" jdbcType="VARCHAR" />
+    <result column="device_type" property="deviceType" jdbcType="VARCHAR" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="store_count" property="storeCount" jdbcType="INTEGER" />
+    <result column="really_count" property="reallyCount" jdbcType="INTEGER" />
+    <result column="check_result" property="checkResult" jdbcType="VARCHAR" />
+    <result column="reason" property="reason" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, check_number, check_date, depot_id, check_person, device_type, device_name, model, 
+    store_count, really_count, check_result, reason, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDevicecheckExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_devicecheck
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_devicecheck
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_devicecheck
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicecheckExample" >
+    delete from storage_devicecheck
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    insert into storage_devicecheck (id, check_number, check_date, 
+      depot_id, check_person, device_type, 
+      device_name, model, store_count, 
+      really_count, check_result, reason, 
+      org_id)
+    values (#{id,jdbcType=INTEGER}, #{checkNumber,jdbcType=VARCHAR}, #{checkDate,jdbcType=TIMESTAMP}, 
+      #{depotId,jdbcType=INTEGER}, #{checkPerson,jdbcType=VARCHAR}, #{deviceType,jdbcType=VARCHAR}, 
+      #{deviceName,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{storeCount,jdbcType=INTEGER}, 
+      #{reallyCount,jdbcType=INTEGER}, #{checkResult,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR}, 
+      #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    insert into storage_devicecheck
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="checkNumber != null" >
+        check_number,
+      </if>
+      <if test="checkDate != null" >
+        check_date,
+      </if>
+      <if test="depotId != null" >
+        depot_id,
+      </if>
+      <if test="checkPerson != null" >
+        check_person,
+      </if>
+      <if test="deviceType != null" >
+        device_type,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="storeCount != null" >
+        store_count,
+      </if>
+      <if test="reallyCount != null" >
+        really_count,
+      </if>
+      <if test="checkResult != null" >
+        check_result,
+      </if>
+      <if test="reason != null" >
+        reason,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="checkNumber != null" >
+        #{checkNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="checkDate != null" >
+        #{checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="depotId != null" >
+        #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="checkPerson != null" >
+        #{checkPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceType != null" >
+        #{deviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="storeCount != null" >
+        #{storeCount,jdbcType=INTEGER},
+      </if>
+      <if test="reallyCount != null" >
+        #{reallyCount,jdbcType=INTEGER},
+      </if>
+      <if test="checkResult != null" >
+        #{checkResult,jdbcType=VARCHAR},
+      </if>
+      <if test="reason != null" >
+        #{reason,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicecheckExample" resultType="java.lang.Integer" >
+    select count(*) from storage_devicecheck
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_devicecheck
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.checkNumber != null" >
+        check_number = #{record.checkNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.checkDate != null" >
+        check_date = #{record.checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.depotId != null" >
+        depot_id = #{record.depotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.checkPerson != null" >
+        check_person = #{record.checkPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceType != null" >
+        device_type = #{record.deviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storeCount != null" >
+        store_count = #{record.storeCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.reallyCount != null" >
+        really_count = #{record.reallyCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.checkResult != null" >
+        check_result = #{record.checkResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reason != null" >
+        reason = #{record.reason,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_devicecheck
+    set id = #{record.id,jdbcType=INTEGER},
+      check_number = #{record.checkNumber,jdbcType=VARCHAR},
+      check_date = #{record.checkDate,jdbcType=TIMESTAMP},
+      depot_id = #{record.depotId,jdbcType=INTEGER},
+      check_person = #{record.checkPerson,jdbcType=VARCHAR},
+      device_type = #{record.deviceType,jdbcType=VARCHAR},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      store_count = #{record.storeCount,jdbcType=INTEGER},
+      really_count = #{record.reallyCount,jdbcType=INTEGER},
+      check_result = #{record.checkResult,jdbcType=VARCHAR},
+      reason = #{record.reason,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    update storage_devicecheck
+    <set >
+      <if test="checkNumber != null" >
+        check_number = #{checkNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="checkDate != null" >
+        check_date = #{checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="depotId != null" >
+        depot_id = #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="checkPerson != null" >
+        check_person = #{checkPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceType != null" >
+        device_type = #{deviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="storeCount != null" >
+        store_count = #{storeCount,jdbcType=INTEGER},
+      </if>
+      <if test="reallyCount != null" >
+        really_count = #{reallyCount,jdbcType=INTEGER},
+      </if>
+      <if test="checkResult != null" >
+        check_result = #{checkResult,jdbcType=VARCHAR},
+      </if>
+      <if test="reason != null" >
+        reason = #{reason,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    update storage_devicecheck
+    set check_number = #{checkNumber,jdbcType=VARCHAR},
+      check_date = #{checkDate,jdbcType=TIMESTAMP},
+      depot_id = #{depotId,jdbcType=INTEGER},
+      check_person = #{checkPerson,jdbcType=VARCHAR},
+      device_type = #{deviceType,jdbcType=VARCHAR},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      store_count = #{storeCount,jdbcType=INTEGER},
+      really_count = #{reallyCount,jdbcType=INTEGER},
+      check_result = #{checkResult,jdbcType=VARCHAR},
+      reason = #{reason,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="getCountForDate" parameterType="java.util.Map" resultType="java.util.Map">
+      SELECT  * FROM storage_devicecheck WHERE check_date LIKE ${checkDate} AND  depot_id = #{depotId,jdbcType=VARCHAR} GROUP BY check_date
+  </select>
+
+    <select id="selectBySql" parameterType="com.chinaitop.depot.device.model.StorageDevicecheckExample" resultMap="BaseResultMap">
+        SELECT
+            id,
+            check_number,
+            check_date,
+            depot_id,
+            check_person,
+            device_type,
+            device_name,
+            model,
+            store_count,
+            really_count,
+            reason,
+            org_id
+        FROM
+          storage_devicecheck
+        <if test="_parameter != null">
+          <include refid="Example_Where_Clause" />
+        </if>
+        GROUP BY depot_id,
+          check_number
+        ORDER BY depot_id , check_date DESC
+    </select>
+
+  <insert id="insertBySql" parameterType="java.util.Map">
+    ${sql}
+  </insert>
+</mapper>

bin/src/main/java/com/chinaitop/depot/device/mapper/StorageDevicegetMapper.xml

@@ -0,0 +1,399 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicegetMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDeviceget" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="device_type" property="deviceType" jdbcType="INTEGER" />
+    <result column="get_time" property="getTime" jdbcType="TIMESTAMP" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="get_count" property="getCount" jdbcType="INTEGER" />
+    <result column="back_count" property="backCount" jdbcType="INTEGER" />
+    <result column="book_keeper" property="bookKeeper" jdbcType="VARCHAR" />
+    <result column="handler" property="handler" jdbcType="VARCHAR" />
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="collator" property="collator" jdbcType="VARCHAR" />
+    <result column="use_count" property="useCount" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="input_id" property="inputId" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, device_type, get_time, device_name, model, get_count, back_count, book_keeper, 
+    handler, house_id, number, collator, use_count, remark, input_id, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDevicegetExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_deviceget
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_deviceget
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_deviceget
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicegetExample" >
+    delete from storage_deviceget
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDeviceget" >
+    insert into storage_deviceget (id, device_type, get_time, 
+      device_name, model, get_count, 
+      back_count, book_keeper, handler, 
+      house_id, number, collator, 
+      use_count, remark, input_id, 
+      org_id)
+    values (#{id,jdbcType=INTEGER}, #{deviceType,jdbcType=INTEGER}, #{getTime,jdbcType=TIMESTAMP}, 
+      #{deviceName,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{getCount,jdbcType=INTEGER}, 
+      #{backCount,jdbcType=INTEGER}, #{bookKeeper,jdbcType=VARCHAR}, #{handler,jdbcType=VARCHAR}, 
+      #{houseId,jdbcType=INTEGER}, #{number,jdbcType=VARCHAR}, #{collator,jdbcType=VARCHAR}, 
+      #{useCount,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{inputId,jdbcType=INTEGER}, 
+      #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceget" >
+    insert into storage_deviceget
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="deviceType != null" >
+        device_type,
+      </if>
+      <if test="getTime != null" >
+        get_time,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="getCount != null" >
+        get_count,
+      </if>
+      <if test="backCount != null" >
+        back_count,
+      </if>
+      <if test="bookKeeper != null" >
+        book_keeper,
+      </if>
+      <if test="handler != null" >
+        handler,
+      </if>
+      <if test="houseId != null" >
+        house_id,
+      </if>
+      <if test="number != null" >
+        number,
+      </if>
+      <if test="collator != null" >
+        collator,
+      </if>
+      <if test="useCount != null" >
+        use_count,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="inputId != null" >
+        input_id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="deviceType != null" >
+        #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="getTime != null" >
+        #{getTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="getCount != null" >
+        #{getCount,jdbcType=INTEGER},
+      </if>
+      <if test="backCount != null" >
+        #{backCount,jdbcType=INTEGER},
+      </if>
+      <if test="bookKeeper != null" >
+        #{bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="handler != null" >
+        #{handler,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="number != null" >
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="collator != null" >
+        #{collator,jdbcType=VARCHAR},
+      </if>
+      <if test="useCount != null" >
+        #{useCount,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="inputId != null" >
+        #{inputId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicegetExample" resultType="java.lang.Integer" >
+    select count(*) from storage_deviceget
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_deviceget
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceType != null" >
+        device_type = #{record.deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="record.getTime != null" >
+        get_time = #{record.getTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.getCount != null" >
+        get_count = #{record.getCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.backCount != null" >
+        back_count = #{record.backCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.bookKeeper != null" >
+        book_keeper = #{record.bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.handler != null" >
+        handler = #{record.handler,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null" >
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.number != null" >
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collator != null" >
+        collator = #{record.collator,jdbcType=VARCHAR},
+      </if>
+      <if test="record.useCount != null" >
+        use_count = #{record.useCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputId != null" >
+        input_id = #{record.inputId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_deviceget
+    set id = #{record.id,jdbcType=INTEGER},
+      device_type = #{record.deviceType,jdbcType=INTEGER},
+      get_time = #{record.getTime,jdbcType=TIMESTAMP},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      get_count = #{record.getCount,jdbcType=INTEGER},
+      back_count = #{record.backCount,jdbcType=INTEGER},
+      book_keeper = #{record.bookKeeper,jdbcType=VARCHAR},
+      handler = #{record.handler,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      number = #{record.number,jdbcType=VARCHAR},
+      collator = #{record.collator,jdbcType=VARCHAR},
+      use_count = #{record.useCount,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      input_id = #{record.inputId,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceget" >
+    update storage_deviceget
+    <set >
+      <if test="deviceType != null" >
+        device_type = #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="getTime != null" >
+        get_time = #{getTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="getCount != null" >
+        get_count = #{getCount,jdbcType=INTEGER},
+      </if>
+      <if test="backCount != null" >
+        back_count = #{backCount,jdbcType=INTEGER},
+      </if>
+      <if test="bookKeeper != null" >
+        book_keeper = #{bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="handler != null" >
+        handler = #{handler,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="number != null" >
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="collator != null" >
+        collator = #{collator,jdbcType=VARCHAR},
+      </if>
+      <if test="useCount != null" >
+        use_count = #{useCount,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="inputId != null" >
+        input_id = #{inputId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDeviceget" >
+    update storage_deviceget
+    set device_type = #{deviceType,jdbcType=INTEGER},
+      get_time = #{getTime,jdbcType=TIMESTAMP},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      get_count = #{getCount,jdbcType=INTEGER},
+      back_count = #{backCount,jdbcType=INTEGER},
+      book_keeper = #{bookKeeper,jdbcType=VARCHAR},
+      handler = #{handler,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=INTEGER},
+      number = #{number,jdbcType=VARCHAR},
+      collator = #{collator,jdbcType=VARCHAR},
+      use_count = #{useCount,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      input_id = #{inputId,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectByHouseId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    house_id,device_type,device_name,model,get_count,back_count
+    from storage_deviceget
+    where house_id = #{houseId}
+  </select>
+  
+  <!-- 获取每个类型的使用数量  -->
+   <select id="queryCountByType"  resultType="java.util.Map">
+    select SUM(get_count) getCounts, device_type from storage_deviceget 
+    GROUP BY device_type 
+    order by device_type asc
+  </select>
+</mapper>

bin/src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -0,0 +1,733 @@
+<?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.chinaitop.depot.device.mapper.StorageDeviceinputMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="device_type" property="deviceType" jdbcType="INTEGER" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="use_count" property="useCount" jdbcType="INTEGER" />
+    <result column="device_manager" property="deviceManager" jdbcType="VARCHAR" />
+    <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
+    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="unit" property="unit" jdbcType="VARCHAR" />
+    <result column="device_price" property="devicePrice" jdbcType="DECIMAL" />
+    <result column="storage_rack" property="storageRack" jdbcType="VARCHAR" />
+    <result column="storage_rack_cell" property="storageRackCell" jdbcType="VARCHAR" />
+    <result column="handler" property="handler" jdbcType="VARCHAR" />
+    <result column="book_keeper" property="bookKeeper" jdbcType="VARCHAR" />
+    <result column="producer" property="producer" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="service_life" property="serviceLife" jdbcType="DECIMAL" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="position" property="position" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="broken_count" property="brokenCount" jdbcType="INTEGER" />
+    <result column="produce_time" property="produceTime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, device_type, device_name, model, use_count, device_manager, input_time, number, 
+    unit, device_price, storage_rack, storage_rack_cell, handler, book_keeper, producer, 
+    remark, service_life, parent_id, position, status, broken_count, produce_time, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_deviceinput
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_deviceinput
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_deviceinput
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" >
+    delete from storage_deviceinput
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    insert into storage_deviceinput (id, device_type, device_name, 
+      model, use_count, device_manager, 
+      input_time, number, unit, 
+      device_price, storage_rack, storage_rack_cell, 
+      handler, book_keeper, producer, 
+      remark, service_life, parent_id, 
+      position, status, broken_count, 
+      produce_time, org_id)
+    values (#{id,jdbcType=INTEGER}, #{deviceType,jdbcType=INTEGER}, #{deviceName,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{useCount,jdbcType=INTEGER}, #{deviceManager,jdbcType=VARCHAR}, 
+      #{inputTime,jdbcType=TIMESTAMP}, #{number,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, 
+      #{devicePrice,jdbcType=DECIMAL}, #{storageRack,jdbcType=VARCHAR}, #{storageRackCell,jdbcType=VARCHAR}, 
+      #{handler,jdbcType=VARCHAR}, #{bookKeeper,jdbcType=VARCHAR}, #{producer,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{serviceLife,jdbcType=DECIMAL}, #{parentId,jdbcType=INTEGER}, 
+      #{position,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{brokenCount,jdbcType=INTEGER}, 
+      #{produceTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    insert into storage_deviceinput
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="deviceType != null" >
+        device_type,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="useCount != null" >
+        use_count,
+      </if>
+      <if test="deviceManager != null" >
+        device_manager,
+      </if>
+      <if test="inputTime != null" >
+        input_time,
+      </if>
+      <if test="number != null" >
+        number,
+      </if>
+      <if test="unit != null" >
+        unit,
+      </if>
+      <if test="devicePrice != null" >
+        device_price,
+      </if>
+      <if test="storageRack != null" >
+        storage_rack,
+      </if>
+      <if test="storageRackCell != null" >
+        storage_rack_cell,
+      </if>
+      <if test="handler != null" >
+        handler,
+      </if>
+      <if test="bookKeeper != null" >
+        book_keeper,
+      </if>
+      <if test="producer != null" >
+        producer,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="serviceLife != null" >
+        service_life,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="position != null" >
+        position,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="brokenCount != null" >
+        broken_count,
+      </if>
+      <if test="produceTime != null" >
+        produce_time,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="deviceType != null" >
+        #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="useCount != null" >
+        #{useCount,jdbcType=INTEGER},
+      </if>
+      <if test="deviceManager != null" >
+        #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null" >
+        #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="number != null" >
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null" >
+        #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="devicePrice != null" >
+        #{devicePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="storageRack != null" >
+        #{storageRack,jdbcType=VARCHAR},
+      </if>
+      <if test="storageRackCell != null" >
+        #{storageRackCell,jdbcType=VARCHAR},
+      </if>
+      <if test="handler != null" >
+        #{handler,jdbcType=VARCHAR},
+      </if>
+      <if test="bookKeeper != null" >
+        #{bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="producer != null" >
+        #{producer,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceLife != null" >
+        #{serviceLife,jdbcType=DECIMAL},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="position != null" >
+        #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="brokenCount != null" >
+        #{brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="produceTime != null" >
+        #{produceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" resultType="java.lang.Integer" >
+    select count(*) from storage_deviceinput
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_deviceinput
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceType != null" >
+        device_type = #{record.deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.useCount != null" >
+        use_count = #{record.useCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceManager != null" >
+        device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputTime != null" >
+        input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.number != null" >
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unit != null" >
+        unit = #{record.unit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.devicePrice != null" >
+        device_price = #{record.devicePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.storageRack != null" >
+        storage_rack = #{record.storageRack,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storageRackCell != null" >
+        storage_rack_cell = #{record.storageRackCell,jdbcType=VARCHAR},
+      </if>
+      <if test="record.handler != null" >
+        handler = #{record.handler,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bookKeeper != null" >
+        book_keeper = #{record.bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.producer != null" >
+        producer = #{record.producer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serviceLife != null" >
+        service_life = #{record.serviceLife,jdbcType=DECIMAL},
+      </if>
+      <if test="record.parentId != null" >
+        parent_id = #{record.parentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.position != null" >
+        position = #{record.position,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null" >
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.brokenCount != null" >
+        broken_count = #{record.brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.produceTime != null" >
+        produce_time = #{record.produceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_deviceinput
+    set id = #{record.id,jdbcType=INTEGER},
+      device_type = #{record.deviceType,jdbcType=INTEGER},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      use_count = #{record.useCount,jdbcType=INTEGER},
+      device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      number = #{record.number,jdbcType=VARCHAR},
+      unit = #{record.unit,jdbcType=VARCHAR},
+      device_price = #{record.devicePrice,jdbcType=DECIMAL},
+      storage_rack = #{record.storageRack,jdbcType=VARCHAR},
+      storage_rack_cell = #{record.storageRackCell,jdbcType=VARCHAR},
+      handler = #{record.handler,jdbcType=VARCHAR},
+      book_keeper = #{record.bookKeeper,jdbcType=VARCHAR},
+      producer = #{record.producer,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      service_life = #{record.serviceLife,jdbcType=DECIMAL},
+      parent_id = #{record.parentId,jdbcType=INTEGER},
+      position = #{record.position,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      broken_count = #{record.brokenCount,jdbcType=INTEGER},
+      produce_time = #{record.produceTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    update storage_deviceinput
+    <set >
+      <if test="deviceType != null" >
+        device_type = #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="useCount != null" >
+        use_count = #{useCount,jdbcType=INTEGER},
+      </if>
+      <if test="deviceManager != null" >
+        device_manager = #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null" >
+        input_time = #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="number != null" >
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null" >
+        unit = #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="devicePrice != null" >
+        device_price = #{devicePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="storageRack != null" >
+        storage_rack = #{storageRack,jdbcType=VARCHAR},
+      </if>
+      <if test="storageRackCell != null" >
+        storage_rack_cell = #{storageRackCell,jdbcType=VARCHAR},
+      </if>
+      <if test="handler != null" >
+        handler = #{handler,jdbcType=VARCHAR},
+      </if>
+      <if test="bookKeeper != null" >
+        book_keeper = #{bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="producer != null" >
+        producer = #{producer,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceLife != null" >
+        service_life = #{serviceLife,jdbcType=DECIMAL},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="position != null" >
+        position = #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="brokenCount != null" >
+        broken_count = #{brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="produceTime != null" >
+        produce_time = #{produceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    update storage_deviceinput
+    set device_type = #{deviceType,jdbcType=INTEGER},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      use_count = #{useCount,jdbcType=INTEGER},
+      device_manager = #{deviceManager,jdbcType=VARCHAR},
+      input_time = #{inputTime,jdbcType=TIMESTAMP},
+      number = #{number,jdbcType=VARCHAR},
+      unit = #{unit,jdbcType=VARCHAR},
+      device_price = #{devicePrice,jdbcType=DECIMAL},
+      storage_rack = #{storageRack,jdbcType=VARCHAR},
+      storage_rack_cell = #{storageRackCell,jdbcType=VARCHAR},
+      handler = #{handler,jdbcType=VARCHAR},
+      book_keeper = #{bookKeeper,jdbcType=VARCHAR},
+      producer = #{producer,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      service_life = #{serviceLife,jdbcType=DECIMAL},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      position = #{position,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      broken_count = #{brokenCount,jdbcType=INTEGER},
+      produce_time = #{produceTime,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <!-- 自定义sql -->
+
+   <select id="getHouseList" resultType="com.chinaitop.depot.device.model.HouseNameBean">
+
+  	select s.depot_id depotId,b.storehouse_name storeName from storage_deviceinput s left join basic_storehouse b on s.depot_id=b.storehouse_id GROUP BY s.depot_id;
+
+   </select>
+
+  
+
+  <select id="getTypeList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.device.model.HouseTypeBean">
+
+  	select s.depot_id depotId,s.device_type deviceType,cc.enumName enumName from storage_deviceinput s left join basic_enum cc on cc.enumId = s.device_type where s.depot_id = #{depotId};
+
+  </select>
+
+  
+
+  <select id="getNameList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.device.model.ShelfContentBean">
+
+    select DISTINCT (be.enumName),sd.device_name from storage_deviceinput sd left join basic_enum be on be.enumId=sd.device_name  where device_type=#{deviceTypeId} and `status`!=1 and use_count!=0;
+
+   </select>
+
+  
+
+  <select id="getcontentGetList" parameterType="java.util.Map" resultType="com.chinaitop.depot.device.model.ContentBean">
+
+  	select s.device_type deviceType,s.device_name deviceName,s.model model,s.number number,s.use_count useCount from storage_deviceinput s where s.device_name = #{deviceName};
+
+  </select>
+
+  
+
+  <select id="getShelfGetList" parameterType="java.lang.String" resultType="com.chinaitop.depot.device.model.ContentBean">
+
+    select shelf_id shelfId,id  from basic_equipment_equipment_pool bee
+
+	where id in 
+
+	(select sd.storage_rack from storage_deviceinput sd left join basic_enum be on be.enumId=sd.device_name 
+
+	WHERE sd.device_name in (select enumId from basic_enum where enumName=#{deviceName}))
+
+  </select>
+
+  
+
+  <select id="getDeviceInputList" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+
+    select  DISTINCT(device_name)  from storage_deviceinput where depot_id=#{depotId}; 
+
+  </select>
+
+  
+
+  <select id="getModelList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select  DISTINCT(model) from storage_deviceinput where device_name=#{deviceName};
+
+  </select>
+
+  
+
+  <select id="getNumberList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select number from storage_deviceinput where model=#{deviceModel};
+
+  </select>
+
+  
+
+  <select id="getCountList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select use_count,broken_count from storage_deviceinput where number=#{number};
+
+  </select>
+
+  
+
+   <select id="getAllList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select  <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number};
+
+  </select>
+
+  
+
+   <select id="getModelGetList" parameterType="java.util.Map" resultMap="BaseResultMap">
+
+   select distinct sd.model from storage_deviceinput sd where device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+
+   storage_rack IN (select id  from basic_equipment_equipment_pool bee where shelf_id=#{storageRack}) ;
+
+  </select>
+
+  
+
+   <select id="getNumberGetList" parameterType="java.util.Map" resultMap="BaseResultMap">
+
+   select <include refid="Base_Column_List" /> from storage_deviceinput where model=#{model} and device_type=#{deviceTypeId} and
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId}; 
+
+  </select>
+
+  
+
+   <select id="getUseCountGetList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number};
+
+  </select>
+
+  
+
+   <select id="getUseCount" parameterType="java.util.Map" resultMap="BaseResultMap">
+
+   select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number} and model=#{model}
+    and device_type=#{deviceTypeId} and
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId};
+
+  </select>
+
+  
+
+  
+
+  
+
+  
+
+  <resultMap id="DeviceInputMap" type="com.chinaitop.depot.device.model.StorageDeviceinput">
+
+    <result column="device_name" jdbcType="VARCHAR" property="deviceName" />
+
+    <result column="inputDeviceName" jdbcType="VARCHAR" property="inputDeviceName" />
+
+    </resultMap>
+
+  
+
+  <select id="getdevieName" resultMap="DeviceInputMap">
+
+     select distinct d.device_name,d.device_type,b.enumName inputDeviceName from storage_deviceinput d left join basic_enum  b on  b.enumId=d.device_name where `status`=0 and device_type=5476 and use_count!=0
+
+  </select>
+
+  
+
+  <select id="getRepairNameList" resultMap="DeviceInputMap">
+
+	select distinct d.device_name,d.device_type,b.enumName inputDeviceName from storage_deviceinput d left join basic_enum  b on  b.enumId=d.device_name where `status`=5 and device_type=5476 and broken_count!=0
+
+  </select>
+
+  
+
+  <select id="getDeviceModelList" parameterType="java.lang.String" resultType="com.chinaitop.depot.device.model.StorageDeviceinput">
+
+    select  model,number,use_count from storage_deviceinput where device_name=#{deviceName} and `status`=0
+
+  </select>
+
+  
+
+  <select id="getDeviceModelRepair" parameterType="java.lang.String" resultType="com.chinaitop.depot.device.model.StorageDeviceinput">
+
+    select  model,number,use_count from storage_deviceinput where device_name=#{deviceName} and `status`=5
+
+  </select>
+
+  
+
+  <!-- <select id="getDeviceModelListRepair" parameterType="java.lang.String" resultType="com.chinaitop.depot.device.model.StorageDeviceinput">
+
+    select  model,number,use_count from storage_deviceinput where device_name=#{deviceName} and `status`=5
+
+  </select> -->
+  
+  
+  <!-- 每个类型的入库数量 -->
+  <select id="queryCountByType"  resultType="java.util.Map">
+
+    SELECT
+		SUM(use_count) userCounts,
+		sum(device_manager) sumCounts,
+		IFNULL(SUM(broken_count), 0) brokenCount,
+		device_type
+    FROM
+	    storage_deviceinput
+    GROUP BY
+	    device_type
+    ORDER BY
+	    device_type ASC
+    
+  </select>
+
+  
+
+   <!-- 设备数据 -->
+
+  <select id="queryDevice" resultMap="BaseResultMap" parameterType="map">
+
+		 SELECT
+
+			<include refid="Base_Column_List" />
+
+		FROM
+
+			storage_deviceinput where device_type=5476  order by status asc
+
+  </select>
+  
+  <!-- 台账 -->
+  <select id="queryDeviceAccount" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" >
+    SELECT
+	id,
+	device_type,
+	device_name,
+	model,
+	SUM(use_count) use_count,
+	SUM(broken_count) broken_count
+FROM
+	storage_deviceinput
+	<if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+GROUP BY
+	model,
+	device_name,
+	device_type
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+</mapper>

bin/src/main/java/com/chinaitop/depot/device/mapper/StorageDevicekeepMapper.xml

@@ -0,0 +1,310 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicekeepMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="keep_start" property="keepStart" jdbcType="TIMESTAMP" />
+    <result column="keep_end" property="keepEnd" jdbcType="TIMESTAMP" />
+    <result column="keeper" property="keeper" jdbcType="VARCHAR" />
+    <result column="device_manager" property="deviceManager" jdbcType="VARCHAR" />
+    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="keep_status" property="keepStatus" jdbcType="INTEGER" />
+    <result column="input_id" property="inputId" jdbcType="INTEGER" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, device_name, model, keep_start, keep_end, keeper, device_manager, number, 
+    keep_status, input_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDevicekeepExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_devicekeep
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_devicekeep
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_devicekeep
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicekeepExample" >
+    delete from storage_devicekeep
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    insert into storage_devicekeep (id, org_id, device_name, 
+      model, keep_start, keep_end, 
+      keeper, device_manager, number, 
+      keep_status, input_id)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{deviceName,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{keepStart,jdbcType=TIMESTAMP}, #{keepEnd,jdbcType=TIMESTAMP}, 
+      #{keeper,jdbcType=VARCHAR}, #{deviceManager,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
+      #{keepStatus,jdbcType=INTEGER}, #{inputId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    insert into storage_devicekeep
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="keepStart != null" >
+        keep_start,
+      </if>
+      <if test="keepEnd != null" >
+        keep_end,
+      </if>
+      <if test="keeper != null" >
+        keeper,
+      </if>
+      <if test="deviceManager != null" >
+        device_manager,
+      </if>
+      <if test="number != null" >
+        number,
+      </if>
+      <if test="keepStatus != null" >
+        keep_status,
+      </if>
+      <if test="inputId != null" >
+        input_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="keepStart != null" >
+        #{keepStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keepEnd != null" >
+        #{keepEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keeper != null" >
+        #{keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceManager != null" >
+        #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null" >
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="keepStatus != null" >
+        #{keepStatus,jdbcType=INTEGER},
+      </if>
+      <if test="inputId != null" >
+        #{inputId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicekeepExample" resultType="java.lang.Integer" >
+    select count(*) from storage_devicekeep
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_devicekeep
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keepStart != null" >
+        keep_start = #{record.keepStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.keepEnd != null" >
+        keep_end = #{record.keepEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.keeper != null" >
+        keeper = #{record.keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceManager != null" >
+        device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="record.number != null" >
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keepStatus != null" >
+        keep_status = #{record.keepStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.inputId != null" >
+        input_id = #{record.inputId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_devicekeep
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      keep_start = #{record.keepStart,jdbcType=TIMESTAMP},
+      keep_end = #{record.keepEnd,jdbcType=TIMESTAMP},
+      keeper = #{record.keeper,jdbcType=VARCHAR},
+      device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      number = #{record.number,jdbcType=VARCHAR},
+      keep_status = #{record.keepStatus,jdbcType=INTEGER},
+      input_id = #{record.inputId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    update storage_devicekeep
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="keepStart != null" >
+        keep_start = #{keepStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keepEnd != null" >
+        keep_end = #{keepEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keeper != null" >
+        keeper = #{keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceManager != null" >
+        device_manager = #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null" >
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="keepStatus != null" >
+        keep_status = #{keepStatus,jdbcType=INTEGER},
+      </if>
+      <if test="inputId != null" >
+        input_id = #{inputId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    update storage_devicekeep
+    set org_id = #{orgId,jdbcType=INTEGER},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      keep_start = #{keepStart,jdbcType=TIMESTAMP},
+      keep_end = #{keepEnd,jdbcType=TIMESTAMP},
+      keeper = #{keeper,jdbcType=VARCHAR},
+      device_manager = #{deviceManager,jdbcType=VARCHAR},
+      number = #{number,jdbcType=VARCHAR},
+      keep_status = #{keepStatus,jdbcType=INTEGER},
+      input_id = #{inputId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectEnumNameList" resultType="com.chinaitop.depot.device.model.StorageDevicekeep">
+     select enumId deviceName,enumName from basic_enum where enumId in (select device_name from storage_deviceinput);
+  </select>
+</mapper>

bin/src/main/java/com/chinaitop/depot/device/mapper/StorageDevicerepairMapper.xml

@@ -0,0 +1,338 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicerepairMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="repair_start" property="repairStart" jdbcType="TIMESTAMP" />
+    <result column="repair_end" property="repairEnd" jdbcType="TIMESTAMP" />
+    <result column="repairer" property="repairer" jdbcType="VARCHAR" />
+    <result column="device_manager" property="deviceManager" jdbcType="VARCHAR" />
+    <result column="repair_sumnumber" property="repairSumnumber" jdbcType="INTEGER" />
+    <result column="repair_status" property="repairStatus" jdbcType="INTEGER" />
+    <result column="repair_number" property="repairNumber" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, device_name, model, number, repair_start, repair_end, repairer, device_manager, 
+    repair_sumnumber, repair_status, repair_number, remark
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDevicerepairExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_devicerepair
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_devicerepair
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_devicerepair
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicerepairExample" >
+    delete from storage_devicerepair
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    insert into storage_devicerepair (id, org_id, device_name, 
+      model, number, repair_start, 
+      repair_end, repairer, device_manager, 
+      repair_sumnumber, repair_status, repair_number, 
+      remark)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{deviceName,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{repairStart,jdbcType=TIMESTAMP}, 
+      #{repairEnd,jdbcType=TIMESTAMP}, #{repairer,jdbcType=VARCHAR}, #{deviceManager,jdbcType=VARCHAR}, 
+      #{repairSumnumber,jdbcType=INTEGER}, #{repairStatus,jdbcType=INTEGER}, #{repairNumber,jdbcType=INTEGER}, 
+      #{remark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    insert into storage_devicerepair
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="number != null" >
+        number,
+      </if>
+      <if test="repairStart != null" >
+        repair_start,
+      </if>
+      <if test="repairEnd != null" >
+        repair_end,
+      </if>
+      <if test="repairer != null" >
+        repairer,
+      </if>
+      <if test="deviceManager != null" >
+        device_manager,
+      </if>
+      <if test="repairSumnumber != null" >
+        repair_sumnumber,
+      </if>
+      <if test="repairStatus != null" >
+        repair_status,
+      </if>
+      <if test="repairNumber != null" >
+        repair_number,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null" >
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="repairStart != null" >
+        #{repairStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairEnd != null" >
+        #{repairEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairer != null" >
+        #{repairer,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceManager != null" >
+        #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="repairSumnumber != null" >
+        #{repairSumnumber,jdbcType=INTEGER},
+      </if>
+      <if test="repairStatus != null" >
+        #{repairStatus,jdbcType=INTEGER},
+      </if>
+      <if test="repairNumber != null" >
+        #{repairNumber,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicerepairExample" resultType="java.lang.Integer" >
+    select count(*) from storage_devicerepair
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_devicerepair
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.number != null" >
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.repairStart != null" >
+        repair_start = #{record.repairStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.repairEnd != null" >
+        repair_end = #{record.repairEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.repairer != null" >
+        repairer = #{record.repairer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceManager != null" >
+        device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="record.repairSumnumber != null" >
+        repair_sumnumber = #{record.repairSumnumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.repairStatus != null" >
+        repair_status = #{record.repairStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.repairNumber != null" >
+        repair_number = #{record.repairNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_devicerepair
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      number = #{record.number,jdbcType=VARCHAR},
+      repair_start = #{record.repairStart,jdbcType=TIMESTAMP},
+      repair_end = #{record.repairEnd,jdbcType=TIMESTAMP},
+      repairer = #{record.repairer,jdbcType=VARCHAR},
+      device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      repair_sumnumber = #{record.repairSumnumber,jdbcType=INTEGER},
+      repair_status = #{record.repairStatus,jdbcType=INTEGER},
+      repair_number = #{record.repairNumber,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    update storage_devicerepair
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null" >
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="repairStart != null" >
+        repair_start = #{repairStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairEnd != null" >
+        repair_end = #{repairEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairer != null" >
+        repairer = #{repairer,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceManager != null" >
+        device_manager = #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="repairSumnumber != null" >
+        repair_sumnumber = #{repairSumnumber,jdbcType=INTEGER},
+      </if>
+      <if test="repairStatus != null" >
+        repair_status = #{repairStatus,jdbcType=INTEGER},
+      </if>
+      <if test="repairNumber != null" >
+        repair_number = #{repairNumber,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    update storage_devicerepair
+    set org_id = #{orgId,jdbcType=INTEGER},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      number = #{number,jdbcType=VARCHAR},
+      repair_start = #{repairStart,jdbcType=TIMESTAMP},
+      repair_end = #{repairEnd,jdbcType=TIMESTAMP},
+      repairer = #{repairer,jdbcType=VARCHAR},
+      device_manager = #{deviceManager,jdbcType=VARCHAR},
+      repair_sumnumber = #{repairSumnumber,jdbcType=INTEGER},
+      repair_status = #{repairStatus,jdbcType=INTEGER},
+      repair_number = #{repairNumber,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

bin/src/main/java/com/chinaitop/depot/device/mapper/SystemLogMapper.xml

@@ -0,0 +1,465 @@
+<?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.chinaitop.depot.device.mapper.SystemLogMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.SystemLog" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="user_zh" property="userZh" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="user_role" property="userRole" jdbcType="VARCHAR" />
+    <result column="user_address" property="userAddress" jdbcType="VARCHAR" />
+    <result column="dl_time" property="dlTime" jdbcType="TIMESTAMP" />
+    <result column="zx_time" property="zxTime" jdbcType="TIMESTAMP" />
+    <result column="func_id" property="funcId" jdbcType="INTEGER" />
+    <result column="func_name" property="funcName" jdbcType="VARCHAR" />
+    <result column="btn_id" property="btnId" jdbcType="INTEGER" />
+    <result column="method_name" property="methodName" jdbcType="VARCHAR" />
+    <result column="oper_result" property="operResult" jdbcType="VARCHAR" />
+    <result column="parameter" property="parameter" jdbcType="VARCHAR" />
+    <result column="rtn_param" property="rtnParam" jdbcType="VARCHAR" />
+    <result column="describes" property="describes" jdbcType="VARCHAR" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="device_ip" property="deviceIp" jdbcType="VARCHAR" />
+    <result column="system_identify" property="systemIdentify" jdbcType="VARCHAR" />
+    <result column="operation_time" property="operationTime" jdbcType="TIMESTAMP" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, user_id, user_zh, user_name, user_role, user_address, dl_time, zx_time, 
+    func_id, func_name, btn_id, method_name, oper_result, parameter, rtn_param, describes, 
+    type, device_ip, system_identify, operation_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.SystemLogExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from system_log
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from system_log
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.SystemLogExample" >
+    delete from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.SystemLog" >
+    insert into system_log (id, org_id, user_id, 
+      user_zh, user_name, user_role, 
+      user_address, dl_time, zx_time, 
+      func_id, func_name, btn_id, 
+      method_name, oper_result, parameter, 
+      rtn_param, describes, type, 
+      device_ip, system_identify, operation_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, 
+      #{userZh,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{userRole,jdbcType=VARCHAR}, 
+      #{userAddress,jdbcType=VARCHAR}, #{dlTime,jdbcType=TIMESTAMP}, #{zxTime,jdbcType=TIMESTAMP}, 
+      #{funcId,jdbcType=INTEGER}, #{funcName,jdbcType=VARCHAR}, #{btnId,jdbcType=INTEGER}, 
+      #{methodName,jdbcType=VARCHAR}, #{operResult,jdbcType=VARCHAR}, #{parameter,jdbcType=VARCHAR}, 
+      #{rtnParam,jdbcType=VARCHAR}, #{describes,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
+      #{deviceIp,jdbcType=VARCHAR}, #{systemIdentify,jdbcType=VARCHAR}, #{operationTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.SystemLog" >
+    insert into system_log
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="userZh != null" >
+        user_zh,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="userRole != null" >
+        user_role,
+      </if>
+      <if test="userAddress != null" >
+        user_address,
+      </if>
+      <if test="dlTime != null" >
+        dl_time,
+      </if>
+      <if test="zxTime != null" >
+        zx_time,
+      </if>
+      <if test="funcId != null" >
+        func_id,
+      </if>
+      <if test="funcName != null" >
+        func_name,
+      </if>
+      <if test="btnId != null" >
+        btn_id,
+      </if>
+      <if test="methodName != null" >
+        method_name,
+      </if>
+      <if test="operResult != null" >
+        oper_result,
+      </if>
+      <if test="parameter != null" >
+        parameter,
+      </if>
+      <if test="rtnParam != null" >
+        rtn_param,
+      </if>
+      <if test="describes != null" >
+        describes,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="deviceIp != null" >
+        device_ip,
+      </if>
+      <if test="systemIdentify != null" >
+        system_identify,
+      </if>
+      <if test="operationTime != null" >
+        operation_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userZh != null" >
+        #{userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null" >
+        #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null" >
+        #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="dlTime != null" >
+        #{dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zxTime != null" >
+        #{zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="funcId != null" >
+        #{funcId,jdbcType=INTEGER},
+      </if>
+      <if test="funcName != null" >
+        #{funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="btnId != null" >
+        #{btnId,jdbcType=INTEGER},
+      </if>
+      <if test="methodName != null" >
+        #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="operResult != null" >
+        #{operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null" >
+        #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="rtnParam != null" >
+        #{rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="describes != null" >
+        #{describes,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceIp != null" >
+        #{deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="systemIdentify != null" >
+        #{systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null" >
+        #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.SystemLogExample" resultType="java.lang.Integer" >
+    select count(*) from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update system_log
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userId != null" >
+        user_id = #{record.userId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userZh != null" >
+        user_zh = #{record.userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userName != null" >
+        user_name = #{record.userName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userRole != null" >
+        user_role = #{record.userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userAddress != null" >
+        user_address = #{record.userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dlTime != null" >
+        dl_time = #{record.dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.zxTime != null" >
+        zx_time = #{record.zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.funcId != null" >
+        func_id = #{record.funcId,jdbcType=INTEGER},
+      </if>
+      <if test="record.funcName != null" >
+        func_name = #{record.funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.btnId != null" >
+        btn_id = #{record.btnId,jdbcType=INTEGER},
+      </if>
+      <if test="record.methodName != null" >
+        method_name = #{record.methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operResult != null" >
+        oper_result = #{record.operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parameter != null" >
+        parameter = #{record.parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rtnParam != null" >
+        rtn_param = #{record.rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="record.describes != null" >
+        describes = #{record.describes,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceIp != null" >
+        device_ip = #{record.deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="record.systemIdentify != null" >
+        system_identify = #{record.systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operationTime != null" >
+        operation_time = #{record.operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update system_log
+    set id = #{record.id,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=INTEGER},
+      user_zh = #{record.userZh,jdbcType=VARCHAR},
+      user_name = #{record.userName,jdbcType=VARCHAR},
+      user_role = #{record.userRole,jdbcType=VARCHAR},
+      user_address = #{record.userAddress,jdbcType=VARCHAR},
+      dl_time = #{record.dlTime,jdbcType=TIMESTAMP},
+      zx_time = #{record.zxTime,jdbcType=TIMESTAMP},
+      func_id = #{record.funcId,jdbcType=INTEGER},
+      func_name = #{record.funcName,jdbcType=VARCHAR},
+      btn_id = #{record.btnId,jdbcType=INTEGER},
+      method_name = #{record.methodName,jdbcType=VARCHAR},
+      oper_result = #{record.operResult,jdbcType=VARCHAR},
+      parameter = #{record.parameter,jdbcType=VARCHAR},
+      rtn_param = #{record.rtnParam,jdbcType=VARCHAR},
+      describes = #{record.describes,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=VARCHAR},
+      device_ip = #{record.deviceIp,jdbcType=VARCHAR},
+      system_identify = #{record.systemIdentify,jdbcType=VARCHAR},
+      operation_time = #{record.operationTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.SystemLog" >
+    update system_log
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userZh != null" >
+        user_zh = #{userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null" >
+        user_role = #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null" >
+        user_address = #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="dlTime != null" >
+        dl_time = #{dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zxTime != null" >
+        zx_time = #{zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="funcId != null" >
+        func_id = #{funcId,jdbcType=INTEGER},
+      </if>
+      <if test="funcName != null" >
+        func_name = #{funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="btnId != null" >
+        btn_id = #{btnId,jdbcType=INTEGER},
+      </if>
+      <if test="methodName != null" >
+        method_name = #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="operResult != null" >
+        oper_result = #{operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null" >
+        parameter = #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="rtnParam != null" >
+        rtn_param = #{rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="describes != null" >
+        describes = #{describes,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceIp != null" >
+        device_ip = #{deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="systemIdentify != null" >
+        system_identify = #{systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null" >
+        operation_time = #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.SystemLog" >
+    update system_log
+    set org_id = #{orgId,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=INTEGER},
+      user_zh = #{userZh,jdbcType=VARCHAR},
+      user_name = #{userName,jdbcType=VARCHAR},
+      user_role = #{userRole,jdbcType=VARCHAR},
+      user_address = #{userAddress,jdbcType=VARCHAR},
+      dl_time = #{dlTime,jdbcType=TIMESTAMP},
+      zx_time = #{zxTime,jdbcType=TIMESTAMP},
+      func_id = #{funcId,jdbcType=INTEGER},
+      func_name = #{funcName,jdbcType=VARCHAR},
+      btn_id = #{btnId,jdbcType=INTEGER},
+      method_name = #{methodName,jdbcType=VARCHAR},
+      oper_result = #{operResult,jdbcType=VARCHAR},
+      parameter = #{parameter,jdbcType=VARCHAR},
+      rtn_param = #{rtnParam,jdbcType=VARCHAR},
+      describes = #{describes,jdbcType=VARCHAR},
+      type = #{type,jdbcType=VARCHAR},
+      device_ip = #{deviceIp,jdbcType=VARCHAR},
+      system_identify = #{systemIdentify,jdbcType=VARCHAR},
+      operation_time = #{operationTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

bin/src/main/resources/bootstrap.yml

@@ -0,0 +1,48 @@
+server:
+  port: 9005
+  tomcat:
+    uri-encoding: utf-8
+
+# 注册中心配置
+eureka:
+  client:
+    service-url:
+      defaultZone: http://172.16.0.46:9511/eureka/
+  instance:
+    prefer-ip-address: true
+
+spring:
+  application:
+    name: depot-device
+  # 数据库配置
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://172.16.0.46:3306/depot-yunnan?useUnicode=true&characterEncoding=utf-8
+    username: root
+    password: 123456
+  # 缓存配置
+  session:
+    store-type: redis
+  redis:
+    database: 1
+    host: 172.16.0.46
+    port: 6679
+    password: 123456
+    timeout: 3000
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+  # 静态资源配置
+  resources:
+    static-locations: classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
+
+  jackson:
+    date-format: yyyy-MM-dd
+    time-zone: GMT+8
+
+web:
+  upload-path: /upload
+

src/main/java/com/chinaitop/depot/device/controller/BasicEquipmentEquipmentPoolController.java

@@ -0,0 +1,204 @@
+package com.chinaitop.depot.device.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool;
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample;
+import com.chinaitop.depot.device.service.BasicEquipmentEquipmentPoolService;
+import com.chinaitop.depot.device.service.impl.ImportServiceImpl;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 设备器材库Controller
+ * @author User
+ *
+ */
+@RestController
+@RequestMapping(value="/BasicEquipmentEquipmentPool")
+@Api(value= "BasicEquipmentEquipmentPoolController", description = "设备器材库")
+public class BasicEquipmentEquipmentPoolController {
+
+	@Resource
+	private BasicEquipmentEquipmentPoolService poolServivce;
+	@Resource
+	private ImportServiceImpl importService;
+
+	/**
+	 * 查询数据列表
+	 * 
+	 * @param request request对象
+	 * @param pageNum 页数
+	 * @param pageSize 每页显示的条数
+	 * @param shelfId 货架号
+	 * @param warehouseId 货位号
+	 * @return
+	 */
+	@RequestMapping(value = "/getList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="查询数据信息", notes = "查询数据列表，支持分页")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+  			@ApiImplicitParam(name = "orgId", value = "当前登录人组织id", paramType = "query")
+  	})
+	public PageInfo<BasicEquipmentEquipmentPool> getList(HttpServletRequest request, Integer pageNum, Integer pageSize,
+			String shelfId, String warehouseId ,Integer orgId) {
+		//Integer depotId = (Integer) request.getSession().getAttribute("depotId");
+		BasicEquipmentEquipmentPoolExample example = new BasicEquipmentEquipmentPoolExample();
+		BasicEquipmentEquipmentPoolExample.Criteria criteria = example.createCriteria();
+
+		if (null != shelfId && !"".equals(shelfId)) {
+			criteria.andShelfIdLike("%"+shelfId+"%");
+		}
+
+		if (null != warehouseId && !"".equals(warehouseId)) {
+			criteria.andWarehouseIdLike("%"+warehouseId+"%");
+		}
+		
+
+		criteria.andOrgIdEqualTo(orgId); //只能查询当前单位的数据
+		example.setOrderByClause("id asc");
+		
+		if (pageNum != null && pageSize != null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		List<BasicEquipmentEquipmentPool> list = poolServivce.findByCondition(example);
+
+		PageInfo<BasicEquipmentEquipmentPool> pageInfo = new PageInfo<BasicEquipmentEquipmentPool>(list);
+
+		return pageInfo;
+	}
+
+	/**
+	 * 查询一条数据
+	 * 
+	 * @param id 数据ID
+	 * @return
+	 */
+	@RequestMapping(value ="/edit",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="根据id查询数据", notes = "根据id查询数据")
+	@ApiImplicitParams({
+		  @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+	})
+	public BasicEquipmentEquipmentPool edit(Integer id) {
+		BasicEquipmentEquipmentPool pool = null;
+		if (id != null) {
+			pool = poolServivce.findByIdObj(id);
+		}
+		return pool;
+	}
+
+	/**
+	 * 更新数据
+	 * 
+	 * @param request request对象
+	 * @param poolJson 数据对象
+	 * @return
+	 */
+	@RequestMapping(value="/update", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="更新数据", notes = "修改数据")
+	@ApiImplicitParams({
+		  @ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "form"),
+		  @ApiImplicitParam(name = "orgId", value = "当前登录人组织id", paramType = "form"),
+		  @ApiImplicitParam(name = "poolJson", value = "数据对象", paramType = "form")
+	})
+	public Map<String, Object> update(String poolJson ,Integer userId ,Integer orgId) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			BasicEquipmentEquipmentPool pool = mapper.readValue(poolJson, BasicEquipmentEquipmentPool.class);
+			if (pool.getId() == null) {
+				pool.setOrgId(orgId);
+				pool.setInputPersonId(userId);
+				pool.setInputDate(new Date());
+				poolServivce.add(pool);
+			} else {
+				poolServivce.update(pool);
+			}
+			map.put("status", "success");
+			map.put("msg", "保存成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return map;
+	}
+
+	/**
+	 * 删除
+	 * 
+	 * @param id 数据ID
+	 * @return
+	 */
+	@RequestMapping(value ="/remove",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="根据id删除数据", notes = "根据id删除数据")
+	@ApiImplicitParams({
+		  @ApiImplicitParam(name = "id", value = "id", paramType = "form")
+	})
+	public Map<String, Object> remove(Integer id) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		poolServivce.remove(id);
+		map.put("status", "success");
+		map.put("msg", "删除成功！");
+		return map;
+	}
+
+	/**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @param request
+     * @return
+     */
+    @RequestMapping(value ="/importFile",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="导入Excel", notes = "导入Excel")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "file", value = "文件", paramType = "form"),
+    	@ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "form"),
+		@ApiImplicitParam(name = "orgId", value = "当前登录人组织id", paramType = "form")
+	})
+    public String importFile(MultipartFile file, String fileType, Integer orgId , HttpServletRequest request){
+
+        String[] titleArr = {"存放区域", "货架号", "货位号", "备注"};//第一行的title
+        boolean[] emptyArr = {false  ,  false  ,  false , true  ,  true};//指定列可为空，不可为空值为false.
+
+        List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+        String errormsg = null;
+        try {
+        	errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list);
+        	
+        	if (errormsg != null && !"".equals(errormsg)) {
+        		return errormsg;
+        	}
+
+            if (list.size()>0) {
+            	errormsg = poolServivce.importData(list, orgId);
+
+            	System.out.println(list);
+            	System.out.println(errormsg);
+            	//errormsg = "导入成功！";
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return errormsg;
+    }
+}

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceCheckController.java

@@ -0,0 +1,204 @@
+package com.chinaitop.depot.device.controller;
+
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool;
+import com.chinaitop.depot.device.service.BasicEquipmentEquipmentPoolService;
+import com.chinaitop.depot.device.model.StorageDevicecheck;
+import com.chinaitop.depot.device.model.StorageDevicecheckExample;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
+import com.chinaitop.depot.device.service.StorageDeviceCheckService;
+import com.chinaitop.depot.utils.ParameterUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value= {"/deviceCheck"})
+@Api(value= "StorageDeviceCheckController", description = "器材设备盘点")
+public class StorageDeviceCheckController {
+
+	@Resource
+	private StorageDeviceCheckService storageDeviceCheckService;
+	@Resource
+	private BasicEquipmentEquipmentPoolService equipmentPoolService;
+	
+	 /**
+     * 设备器材管理-盘点单查询
+	 * @throws Exception 
+     */
+    @RequestMapping(value = "/getCheckList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="盘点单查询", notes = "设备器材管理-盘点单查询，支持分页")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+  	})
+    public PageInfo<StorageDevicecheck> listCheckPage(Integer pageNum, Integer pageSize, String pdNum,String starttime,String endtime) throws Exception{
+
+        StorageDevicecheckExample storageDevicecheckExample=new StorageDevicecheckExample();
+        StorageDevicecheckExample.Criteria criteria= storageDevicecheckExample.createCriteria();
+        if(ParameterUtil.isnotnull(pdNum)) criteria.andCheckNumberLike("%"+pdNum+"%");
+       if(ParameterUtil.isnotnull(starttime)) criteria.andCheckDateGreaterThanOrEqualTo(ParameterUtil.string2datetime(starttime+" 00:00:00"));
+       if(ParameterUtil.isnotnull(endtime)) criteria.andCheckDateLessThanOrEqualTo(ParameterUtil.string2datetime(endtime+" 00:00:00"));
+        //按照id进行降序
+        storageDevicecheckExample.setOrderByClause("id desc");
+        if (pageNum!=null && pageSize!=null) PageHelper.startPage(pageNum, pageSize);
+
+        List<StorageDevicecheck> list = storageDeviceCheckService.queryByExample(storageDevicecheckExample);
+        if(list!=null && list.size()>0){
+        	for (StorageDevicecheck storageDevicecheck : list) {
+        		if(storageDevicecheck.getDepotId()!=null){
+        			BasicEquipmentEquipmentPool equipmentPool=equipmentPoolService.findByIdObj(storageDevicecheck.getDepotId());
+        			if(equipmentPool != null) storageDevicecheck.setDepotName(equipmentPool.getPutPosition());
+        		}
+        	}
+        }
+
+        PageInfo<StorageDevicecheck> pageInfo = new PageInfo<StorageDevicecheck>(list);
+        return pageInfo;
+    }
+    /**
+     * 设备器材管理-盘点单查询 NoPage
+	 * @throws Exception
+     */
+    @RequestMapping(value = "/getCheckListNoPage",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="盘点单查询", notes = "设备器材管理-盘点单查询，不支持分页")
+    public List<StorageDevicecheck> listCheckPageNoPage() throws Exception{
+
+        StorageDevicecheckExample storageDevicecheckExample=new StorageDevicecheckExample();
+        storageDevicecheckExample.setOrderByClause("check_number desc");
+
+        List<StorageDevicecheck> list = storageDeviceCheckService.queryByExample(storageDevicecheckExample);
+
+        return list;
+    }
+
+
+    /**
+     * 根据盘点种类获取子类数据
+     * @return
+     */
+    @RequestMapping(value = "/childZlList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="根据盘点种类获取子类数据", notes = "根据盘点种类获取子类数据")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "deviceType", value = "类型", paramType = "query"),
+  			@ApiImplicitParam(name = "position", value = "器材的存放位置", paramType = "query")
+  	})
+    public List<StorageDeviceinput> childZlList(Integer position,String deviceType){
+        List<StorageDeviceinput> list = null;
+        StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
+        StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
+        if(ParameterUtil.isnotnull(deviceType)){
+            criteria.andDeviceTypeEqualTo(Integer.valueOf(deviceType));
+        }
+        if(ParameterUtil.isnotnull(position)){
+            criteria.andPositionEqualTo(Integer.toString(position));
+        }
+        try {
+            list = storageDeviceCheckService.childZlList(storageDeviceinputExample);
+            /*for (StorageDeviceinput storageDevicecheck : list) {
+                if(storageDevicecheck.getPosition()!=null){
+                	BasicEquipmentEquipmentPool equipmentPool=equipmentPoolService.findByIdObj(position);
+                    if(equipmentPool != null) storageDevicecheck.(equipmentPool.getPutPosition());
+
+                }
+            }*/
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+    /**
+     * 根据盘点种类获取子类数据
+     * @return
+     */
+    @RequestMapping(value = "/getCountForDate",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="根据盘点种类获取子类数据", notes = "根据盘点种类获取子类数据")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "depotId", value = "depotId", paramType = "query")
+  	})
+    public int getCountForDate(String depotId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("checkDate","\""+ParameterUtil.getSysDate()+"%\"");
+        map.put("depotId",depotId);
+        int count  = storageDeviceCheckService.getCountForDate(map);
+        return count;
+    }
+
+    /**
+     * 根据depotid删除数据
+     */
+    @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="删除数据", notes = "根据条件删除数据")
+	@ApiImplicitParams({
+	   	 @ApiImplicitParam(name = "depotid", value = "depotid", paramType = "form"),
+	   	 @ApiImplicitParam(name = "checkNum", value = "checkNum", paramType = "form")
+	}) 
+    public Map<String, Object> remove(Integer depotId,String checkNum){
+        Map<String,Object> retMap = new HashMap<String,Object>();
+        storageDeviceCheckService.remove(depotId,checkNum);
+        retMap.put("msg","success");
+        return retMap;
+    }
+
+    /**
+     * 新增
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存数据", notes = "保存增加或修改的数据")
+    @ApiImplicitParams({
+	   	 @ApiImplicitParam(name = "deviceCheckJson", value = "新增数据", paramType = "form"),
+	   	 @ApiImplicitParam(name = "type", value = "类型", paramType = "form")
+	})
+    public Map<String, Object>  add(String deviceCheckJson,String type){
+        Map<String, Object> modelMap = new HashMap<>();
+        try {
+            storageDeviceCheckService.add(deviceCheckJson,type);
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+        }
+        return modelMap;
+    }
+
+      /**
+     * 根据id加载对应数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value ="/loadDataByDepotId",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询数据", notes = "根据条件查询数据")
+	@ApiImplicitParams({
+		 @ApiImplicitParam(name = "id", value = "id", paramType = "query"),
+		 @ApiImplicitParam(name = "pddh", value = "盘点单号", paramType = "query")
+	})
+    public List<StorageDevicecheck> loadDataByDepotId(Integer id,String pddh){
+    	List<StorageDevicecheck> storageDevicekeepList =storageDeviceCheckService.loadDataByDepotId(id,pddh);
+        for (StorageDevicecheck storageDeviceCheck : storageDevicekeepList) {
+           
+                if(storageDeviceCheck.getDepotId()!=null){
+                   /* BasicStorehouse storehouse=storehouseService.findByPrimary(storageDeviceCheck.getDepotId());
+                    if(storehouse != null) storageDeviceCheck.setDepotName(storehouse.getStorehouseName());*/
+                	BasicEquipmentEquipmentPool equipmentPool=equipmentPoolService.findByIdObj(storageDeviceCheck.getDepotId());
+                    if(equipmentPool != null) storageDeviceCheck.setDepotName(equipmentPool.getPutPosition());
+
+                }
+            } 
+       
+        return storageDevicekeepList;
+    }
+}

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceGetController.java

@@ -0,0 +1,416 @@
+package com.chinaitop.depot.device.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool;
+import com.chinaitop.depot.device.service.BasicEquipmentEquipmentPoolService;
+import com.chinaitop.depot.device.model.ContentBean;
+import com.chinaitop.depot.device.model.HouseNameBean;
+import com.chinaitop.depot.device.model.HouseTypeBean;
+import com.chinaitop.depot.device.model.ShelfContentBean;
+import com.chinaitop.depot.device.model.StorageDeviceback;
+import com.chinaitop.depot.device.model.StorageDeviceget;
+import com.chinaitop.depot.device.model.StorageDevicegetExample;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample.Criteria;
+import com.chinaitop.depot.device.service.StorageDeviceBackService;
+import com.chinaitop.depot.device.service.StorageDeviceGetService;
+import com.chinaitop.depot.device.service.StorageDeviceInputService;
+import com.chinaitop.depot.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value= {"/deviceGet"})
+@Api(value= "StorageDeviceGetController", description = "器材设备领用")
+public class StorageDeviceGetController {
+
+	@Resource
+	private StorageDeviceGetService deviceGetService;
+	
+	@Resource
+	private StorageDeviceInputService deviceInputService;
+	
+	@Resource
+	private StorageDeviceBackService deviceBackService;
+	
+	@Resource
+	private BasicEquipmentEquipmentPoolService equipmentPoolService;
+	
+	
+	 /**
+     * 分页获取器材信息
+     */
+    @RequestMapping(value = "/getDeviceList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="获取领用信息", notes = "领用信息查询，支持分页")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+  			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query")
+  	})
+    public PageInfo<StorageDeviceget> listCheckPage(HttpServletRequest request,Integer pageNum, Integer pageSize, 
+    		String deviceName, Integer deviceType){
+    	
+    	StorageDevicegetExample storageDevicegetExample=new StorageDevicegetExample(); 
+    	StorageDevicegetExample.Criteria criteria=storageDevicegetExample.createCriteria();
+    	
+    	if(ParameterUtil.isnotnull(deviceName)){
+            criteria.andDeviceNameLike(deviceName);
+        }
+        if(ParameterUtil.isnotnull(deviceType)){
+           criteria.andDeviceTypeEqualTo(deviceType);
+        }
+        
+    	
+        //按照id进行降序
+        storageDevicegetExample.setOrderByClause("id desc");
+   
+        PageHelper.startPage(pageNum, pageSize);
+        List<StorageDeviceget> list = deviceGetService.queryByDevice(storageDevicegetExample);
+        PageInfo<StorageDeviceget> pageInfo = new PageInfo<StorageDeviceget>(list);
+        return pageInfo;
+    }
+
+   /**
+     * 根据主键id删除数据
+     */
+    @RequestMapping(value="/remove",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+   	@ApiOperation(value="删除数据", notes = "根据id删除数据")
+   	@ApiImplicitParams({
+   	   	 @ApiImplicitParam(name = "id", value = "id", paramType = "form")
+   	}) 
+    public Map<String, Object> remove(Integer id){
+        Map<String,Object> retMap = new HashMap<String,Object>();
+        deviceInputService.remove(id);
+        retMap.put("msg","success");
+        return retMap;
+    }
+	
+    /**
+     * 新增和修改的数据进行保存
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存数据", notes = "保存增加或修改的数据")
+    @ApiImplicitParams({
+  	   	 @ApiImplicitParam(name = "deviceGetJson", value = "新增数据", paramType = "form"),
+  	   	 @ApiImplicitParam(name = "contentBeanJson", value = "新增数据", paramType = "form")
+  	})
+    public Map<String, Object> save(String deviceGetJson,String contentBeanJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageDeviceget storageDeviceget = null;
+        try {
+        	//保存领用数据
+        	ContentBean cb=(ContentBean)mapper.readValue(contentBeanJson, ContentBean.class);
+        	storageDeviceget = (StorageDeviceget)mapper.readValue(deviceGetJson, StorageDeviceget.class);
+        	storageDeviceget.setDeviceName(cb.getDeviceName());
+        	storageDeviceget.setDeviceType(cb.getDeviceTypeId());
+        	storageDeviceget.setModel(cb.getModel());
+        	storageDeviceget.setNumber(cb.getNumber());
+        	storageDeviceget.setUseCount(cb.getUseCount());
+        	storageDeviceget.setBackCount(0);
+        	storageDeviceget.setHouseId(storageDeviceget.getHouseId());
+        	deviceGetService.save(storageDeviceget);
+        	
+        	//根据设备编号获取入库表的该设备信息
+        	modelMap.put("number", storageDeviceget.getNumber());
+        	modelMap.put("model", storageDeviceget.getModel());
+        	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(modelMap);
+        	inputList.get(0).setStatus(4);//领用状态
+        	inputList.get(0).setUseCount(inputList.get(0).getUseCount()-storageDeviceget.getGetCount());//数量减少
+        	deviceInputService.updateByPrimaryKeySelective(inputList.get(0));
+        	//改变入库的数量
+        	/*StorageDeviceinputExample storageDeviceinputExample2 = new StorageDeviceinputExample();
+        	Criteria criteria2 = storageDeviceinputExample2.createCriteria();
+        	criteria2.andNumberEqualTo(cb.getNumber());
+        	List<StorageDeviceinput> list=deviceInputService.queryByNumber(storageDeviceinputExample2);
+        	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
+        	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
+        	criteria.andIdEqualTo(Integer.valueOf(storageDeviceget.getInputId()));
+        	List<StorageDeviceinput> inputlist = deviceInputService.queryByDevice(storageDeviceinputExample);
+            if(inputlist!=null){
+            	StorageDeviceinput storageDeviceinput=list.get(0);
+            	//使其状态改变为领用
+            	storageDeviceinput.setStatus(4);
+            	storageDeviceinput.setUseCount(storageDeviceinput.getUseCount()-storageDeviceget.getGetCount());
+            	deviceInputService.save(storageDeviceinput);
+            }*/
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+    
+    /**
+     *  根据id加载对应数据
+     */
+    @RequestMapping(value ="/loadDataById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询数据", notes = "根据id查询数据")
+	@ApiImplicitParams({
+		 @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+	})
+    public StorageDeviceinput loadDataById(int id){
+    	if(id !=0){
+    		return deviceInputService.loadDataById(id);
+    	}
+        return new StorageDeviceinput();
+    }
+
+    /**
+     * 获取入库的仓房名
+     */
+    @RequestMapping(value ="/getHouseList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取入库仓房名称", notes = "获取入库仓房名称")
+    public List<HouseNameBean> getHouseList(){
+    	List<HouseNameBean> storageDeviceinput=deviceInputService.getHouseList();
+        return storageDeviceinput;
+    }
+    /**
+     * 获取仓房对应的类型
+     */
+    @RequestMapping(value ="/getTypeList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取仓房对应的类型", notes = "获取仓房对应的类型")
+	@ApiImplicitParams({
+		 @ApiImplicitParam(name = "depotId", value = "depotId", paramType = "query"),
+	})
+    public List<HouseTypeBean> getTypeList(Integer depotId){
+    	List<HouseTypeBean> TypeNameList=deviceInputService.getTypeList(depotId);
+    	return TypeNameList;
+    }
+    /**
+     * 获取仓房对应的类型的货架和名称getNameList
+     */
+    @RequestMapping(value ="/getNameList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取仓房对应的类型的货架和名称", notes = "获取仓房对应的类型的货架和名称")
+	@ApiImplicitParams({
+		 @ApiImplicitParam(name = "depotTypeId", value = "depotTypeId", paramType = "query"),
+	})
+    public List<ShelfContentBean> getNameList(Integer depotTypeId){
+    	List<ShelfContentBean> getNameList=deviceInputService.getNameList(depotTypeId);
+    	return getNameList;
+    }
+   
+    
+    /**
+     * 根据名称获取货架getShelfGetList
+     */
+    @RequestMapping(value ="/getShelfGetList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="根据名称获取货架", notes = "根据名称获取货架")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "deviceName", value = "设备名称", paramType = "query"),
+   	})
+    public List<ContentBean> getShelfGetList(String deviceName){
+    	List<ContentBean> shelfGetList = deviceInputService.getShelfGetList(deviceName);
+    	return shelfGetList;
+    }
+    
+    /**
+     * 根据货架和名称获取规格型号getModelGetList
+     */
+    @RequestMapping(value ="/getModelGetList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="根据货架和名称获取规格型号", notes = "根据货架和名称获取规格型号")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "shelfId", value = "货架", paramType = "query"),
+   		 @ApiImplicitParam(name = "deviceName", value = "设备名称", paramType = "query")
+   	})
+    public List<ContentBean> getModelGetList(String shelfId,String deviceName){
+    	Map<String, Object> map  = new HashMap<>();
+		map.put("deviceName", deviceName);
+		map.put("storageRack", shelfId);
+    	List<ContentBean> getModelList=deviceInputService.getModelGetList(map);
+    	return getModelList;
+    }
+    
+    /**
+     * 根据规格型号获取数量getNumberGetList
+     */
+    @RequestMapping(value ="/getNumberGetList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="根据规格型号获取数量", notes = "根据规格型号获取数量")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "model", value = "规格型号", paramType = "query")
+   	})
+    public List<StorageDeviceinput> getNumberGetList(String deviceTypeId,String deviceName,String shelfId,String model,Integer orgId){
+    	Map<String, Object> map  = new HashMap<>();
+		map.put("deviceName", deviceName);
+		map.put("deviceTypeId", deviceTypeId);
+		map.put("shelfId", shelfId);
+		map.put("model", model);
+		map.put("orgId", orgId);
+    	List<StorageDeviceinput> getNumberList=deviceInputService.getNumberGetList(map);
+    	return getNumberList;
+    }
+    
+    /**
+     * 根据编号和规格获取可用数量getUseCountGetList
+     */
+    @RequestMapping(value ="/getUseCountGetList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="根据编号和规格获取可用数量", notes = "根据编号和规格获取可用数量")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "model", value = "规格型号", paramType = "query"),
+   		 @ApiImplicitParam(name = "number", value = "编号", paramType = "query")
+   	})
+    public List<StorageDeviceinput> getUseCountGetList(String deviceTypeId,String deviceName,String shelfId,String number,String model,Integer orgId){
+    		Map<String,Object> map = new HashMap<String,Object>();
+    		map.put("deviceTypeId", deviceTypeId);
+    		map.put("deviceName", deviceName);
+    		map.put("shelfId", shelfId);
+    		map.put("number", number);
+    		map.put("model", model);
+    		map.put("orgId", orgId);
+    		List<StorageDeviceinput> getUseCountList=deviceInputService.getUseCount(map);
+    	return getUseCountList;
+    }
+    
+    
+    /**
+     * 根据ID获取借取信息
+     * @throws Exception 
+     */
+    @RequestMapping(value ="/getDeviceGetById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="根据ID获取借取信息", notes = "根据ID获取借取信息")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+   	})
+    public List<StorageDeviceget> getDeviceGetById(String id) throws Exception{
+    	StorageDeviceget storageDeviceget=null;
+    	if(id != null && !"".equals(id)){
+    		storageDeviceget=deviceGetService.selectByPrimaryKey(Integer.valueOf(id));
+    	}
+    	/*if(storageDeviceget.getDepotId()!=null){
+            BasicEquipmentEquipmentPool equipmentPool=equipmentPoolService.findByIdObj(storageDeviceget.getDepotId());
+            if(equipmentPool != null) storageDeviceget.setDepotName(equipmentPool.getPutPosition());
+        }*/
+    	List<StorageDeviceget> list =new ArrayList<StorageDeviceget>();
+    	list.add(storageDeviceget);
+        return list;
+    }
+    
+    /**
+     * 根据ID获取归还信息
+     * @throws Exception 
+     */
+    @RequestMapping(value ="/getDeviceBackById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="根据ID获取归还信息", notes = "根据ID获取归还信息")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+   	})
+    public List<StorageDeviceback> getDeviceBackById(Integer id) throws Exception{
+    	List<StorageDeviceback> backList =null;
+    	if(id != null && !"".equals(id)){
+    		backList=deviceBackService.selectBygetId(id);
+    	}
+    	return backList;
+    }
+    
+    /**
+     * 获取ID修改信息
+     */
+    @RequestMapping(value ="/updateDeviceGetById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="获取ID修改信息", notes = "获取ID修改信息")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "storageDeviceget", value = "storageDeviceget", paramType = "query")
+   	})
+    public Map<String, Object> updateDeviceGetById(StorageDeviceget storageDeviceget){
+    	Map<String,Object> retMap = new HashMap<String,Object>();
+    	if(storageDeviceget != null){
+    		deviceGetService.save(storageDeviceget);
+    		retMap.put("msg","success");
+    	}else{
+    		retMap.put("msg","error");
+    	}
+        return retMap;
+    }
+    
+    /*
+     * 增加归还信息
+     */
+    @RequestMapping(value ="/saveBack",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+   	@ApiOperation(value="增加归还信息", notes = "增加归还信息")
+    @ApiImplicitParams({
+  		 @ApiImplicitParam(name = "deviceBackJson", value = "增加数据", paramType = "query")
+  	})
+    public Map<String, Object> endMore(String deviceBackJson) {
+    	Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageDeviceget storageDeviceget=null;
+        StorageDeviceback storageDeviceback=null;
+    	StorageDeviceinput storageDeviceinput=null;
+
+        try {
+        	//storageDeviceget = (StorageDeviceget)mapper.readValue(deviceBackJson, StorageDeviceget.class);
+        	storageDeviceback = (StorageDeviceback)mapper.readValue(deviceBackJson, StorageDeviceback.class);
+        	//增加归还信息（归还表）
+        	storageDeviceback.setGetId(storageDeviceback.getId());
+        	storageDeviceback.setId(0);
+        	deviceBackService.save(storageDeviceback);
+        	//领取表中的归还数量增加（领取时，默认归还为0）
+        	storageDeviceget=deviceGetService.selectByPrimaryKey(storageDeviceback.getGetId());//获取上次归还的数量
+        		storageDeviceget.setBackCount(storageDeviceback.getBackCount()+storageDeviceget.getBackCount());
+        	deviceGetService.updateByPrimaryKeySelective(storageDeviceget);
+        	
+            //入库表的数量增加
+       	    storageDeviceinput = deviceInputService.selectById(storageDeviceget.getInputId());//获取之前的数量
+       	    //修改现在入库表的数量
+        	storageDeviceinput.setUseCount(storageDeviceinput.getUseCount()+storageDeviceback.getBackCount()-storageDeviceback.getBrokenCount());
+        	storageDeviceinput.setBrokenCount(storageDeviceback.getBrokenCount());
+        	if(storageDeviceinput.getBrokenCount()!=0){
+        		storageDeviceinput.setStatus(5);//故障
+        	}else{
+        		storageDeviceinput.setStatus(0);//正常
+        	}
+        	deviceInputService.updateByPrimaryKeySelective(storageDeviceinput);
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+    
+    /**
+     * 获取仓房下的器材和设备用于APP端
+     */
+    @RequestMapping(value ="/getDeviceByHouseId",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="获取仓房下的器材和设备用于APP端", notes = "获取仓房下的器材和设备用于APP端")
+   	@ApiImplicitParams({
+   		 @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+   		 @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+   		 @ApiImplicitParam(name = "houseId", value = "仓房编号", paramType = "query")
+   	})
+    public PageInfo<StorageDeviceget> getDeviceByHouseId(Integer pageNum, Integer pageSize,Integer houseId){
+   
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        
+        List<StorageDeviceget> list=deviceGetService.selectByHouseId(houseId);
+       
+        PageInfo<StorageDeviceget> pageInfo = new PageInfo<StorageDeviceget>(list);
+        return pageInfo;
+    }
+}

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceInputController.java

@@ -0,0 +1,272 @@
+package com.chinaitop.depot.device.controller;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
+import com.chinaitop.depot.device.service.BasicEquipmentEquipmentPoolService;
+import com.chinaitop.depot.device.service.StorageDeviceGetService;
+import com.chinaitop.depot.device.service.StorageDeviceInputService;
+import com.chinaitop.depot.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 
+ * 
+ * @author gaodd
+ *
+ */
+
+@RestController
+@RequestMapping(value= {"/deviceInput"})
+@Api(value= "StorageDeviceInputController", description = "器材设备入库")
+public class StorageDeviceInputController {
+
+	@Resource
+	private StorageDeviceInputService deviceInputService;
+	@Resource
+	private BasicEquipmentEquipmentPoolService poolServivce;
+	@Resource
+	private StorageDeviceGetService deviceGetService;
+	
+	
+	 /**
+     * 分页获取器材设备信息
+	 * @throws Exception 
+     */
+	@RequestMapping(value = "/getDeviceList",produces = MediaType.APPLICATION_JSON_VALUE,method=RequestMethod.GET)
+    @ApiOperation(value="查询入库设备信息", notes = "查询入库设备列表，支持分页")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+  			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query")
+  	})
+    public PageInfo<StorageDeviceinput> getList(HttpServletRequest request,Integer pageNum, Integer pageSize, String deviceName, Integer deviceType) throws Exception{
+    	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
+    	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
+    	if(ParameterUtil.isnotnull(deviceType)){
+    		criteria.andDeviceTypeEqualTo(deviceType);
+    	}
+    	if(ParameterUtil.isnotnull(deviceName)){
+    		criteria.andDeviceNameLike(deviceName);
+    	}
+
+        //排序
+        //storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");
+        storageDeviceinputExample.setOrderByClause("id desc");
+        
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
+        PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
+        return pageInfo;
+    }
+
+    
+    /**
+     * 根据主键id删除数据
+     */
+	 @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	 @ApiOperation(value="删除数据", notes = "根据id删除数据")
+	 @ApiImplicitParams({
+	   	 @ApiImplicitParam(name = "id", value = "id", paramType = "form"),
+	 })    
+	 public Map<String, Object> remove(Integer id){
+        Map<String,Object> retMap = new HashMap<String,Object>();
+        deviceInputService.remove(id);
+        retMap.put("msg","success");
+        return retMap;
+    }
+	
+    /**
+     * 新增和修改的数据进行保存
+     */
+	 @RequestMapping(value="/save",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	 @ApiOperation(value="保存数据", notes = "保存")
+	 @ApiImplicitParams({
+	    	@ApiImplicitParam(name="deviceInputJson", value="主表数据", paramType="form")
+	 })
+    public Map<String, Object> save(String deviceInputJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+        	StorageDeviceinput storageDeviceinput = (StorageDeviceinput)mapper.readValue(deviceInputJson, StorageDeviceinput.class);
+            //校验同一类型同一名称同一规格型号的编号是否重复
+        	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
+        	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
+        	criteria.andDeviceTypeEqualTo(storageDeviceinput.getDeviceType());
+        	criteria.andDeviceNameEqualTo(storageDeviceinput.getDeviceName());
+        	criteria.andModelEqualTo(storageDeviceinput.getModel());
+        	criteria.andNumberEqualTo(storageDeviceinput.getNumber());
+        	criteria.andOrgIdEqualTo(storageDeviceinput.getOrgId());
+        	List<StorageDeviceinput> list = deviceInputService.queryByDevice(storageDeviceinputExample);
+        	if (null != list && list.size() > 0) {
+        		// 获取自己数据的ID
+        		modelMap.put("status", "error");
+        		modelMap.put("msg", "同一类型同一名称同一规格型号的资产编号已重复！");
+        		return modelMap;
+        	}else{//新增
+        		storageDeviceinput.setStatus(0);
+            	deviceInputService.save(storageDeviceinput);
+                modelMap.put("status", "success");
+        	}
+        	
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+	   
+	 
+    /**
+     * 根据id加载对应数据
+     */
+	 @RequestMapping(value ="/loadDataById", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	 @ApiOperation(value="查询数据", notes = "根据id查询数据")
+	 @ApiImplicitParams({
+		  @ApiImplicitParam(name = "id", value = "id", paramType = "query"),
+	 })
+    public StorageDeviceinput loadDataById(int id){
+	   if(id != 0) {
+           return  deviceInputService.loadDataById(id);
+       }
+       return new StorageDeviceinput();
+    }
+   
+   /**
+    * 查询设备数据（5476）
+    */
+    @RequestMapping(value="/getDevice", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="查询设备信息", notes = "查询设备信息")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+  	})
+	public PageInfo<StorageDeviceinput> getDevice(HttpServletRequest request,Integer pageNum, Integer pageSize, String deviceName, Integer deviceTypeId) {
+
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		//排序
+		HashMap<Object, Object> map = new HashMap<Object, Object>();
+		map.put("deviceName", deviceName);
+		map.put("deviceTypeId", deviceTypeId);
+		List<StorageDeviceinput> list=deviceInputService.queryDevice(map);
+		PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
+		return pageInfo;
+	}
+	 
+    /**
+     * 根据类型查询数量
+     * @param example 粮食业务
+     * @return
+     */
+    @RequestMapping(value="/getDate", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="获取各个类型入库和使用数量", notes = "获取各个类型入库和使用数量")
+    public Map<String, Object> getDate() {
+		
+    	Map<String, Object> returnMap = new HashMap<String, Object>();
+    	//入库数量
+    	List<Map<String, Object>> queryCountByType = deviceInputService.queryCountByType();
+    	String sumCount = "";
+    	String useCount = "";
+    	if(queryCountByType.size()>0 && queryCountByType!=null){
+    		for (Map<String, Object> map : queryCountByType) {
+        		/*int useCount = Integer.parseInt(map.get("userCounts").toString());
+        		sumCount = sumCount + useCount+",";*/
+    			//入库时的数量
+    			//String sumCounts = map.get("sumCounts").toString();
+    			//int sumCounts = Integer.valueOf(map.get("sumCounts").toString());
+    			String a = map.get("sumCounts").toString().substring(0, map.get("sumCounts").toString().length()-2);
+    			int sumCounts = Integer.valueOf(a);
+    			
+    			//使用数量
+    			int useCounts = sumCounts-(Integer.parseInt(map.get("userCounts").toString())+Integer.parseInt(map.get("brokenCount").toString()));
+    			System.out.println("****"+Integer.parseInt(map.get("brokenCount").toString()));
+    			sumCount = sumCount + sumCounts+",";
+    			useCount = useCount + useCounts+",";
+    			
+    		}
+    		sumCount = sumCount.substring(0, sumCount.length()-1);
+    		useCount = useCount.substring(0, useCount.length()-1);
+    		System.out.println(sumCount+"****sumCount***");
+    		System.out.println(useCount+"****useCount***");
+    	}
+    	
+    	returnMap.put("sumCount", sumCount);
+    	
+    	/*//使用数量
+    	List<Map<String, Object>> queryUseCountByType = deviceGetService.queryCountByType();
+    	String useCount = "";
+    	if(queryUseCountByType.size()>0 && queryUseCountByType!=null){
+    		for (Map<String, Object> map : queryUseCountByType) {
+        		int getCount = Integer.parseInt(map.get("getCounts").toString());
+        		useCount = useCount + getCount+",";
+    		}
+        	useCount = useCount.substring(0, useCount.length()-1);
+    	}*/
+    	
+    	returnMap.put("useCount", useCount);
+        return returnMap;
+    }
+    
+    
+    /**
+     * 分页获取器材设备信息
+	 * @throws Exception 
+     */
+	@RequestMapping(value = "/getDeviceAccountList",produces = MediaType.APPLICATION_JSON_VALUE,method=RequestMethod.GET)
+    @ApiOperation(value="查询入库设备信息", notes = "查询入库设备列表，支持分页")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+  			@ApiImplicitParam(name = "orgName", value = "当前登录人组织名称", paramType = "query")
+  	})
+    public PageInfo<StorageDeviceinput> getDeviceAccountList(HttpServletRequest request,Integer pageNum, Integer pageSize, Integer deviceType ,String orgName) throws Exception{
+    	StorageDeviceinputExample storageDeviceinputExample=new StorageDeviceinputExample();
+    	StorageDeviceinputExample.Criteria criteria=storageDeviceinputExample.createCriteria();
+    	if(ParameterUtil.isnotnull(deviceType)){
+    		criteria.andDeviceTypeEqualTo(deviceType);
+    	}
+        //排序
+        storageDeviceinputExample.setOrderByClause("FIELD(status,0,1),input_time desc,id desc");
+   
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        
+        List<StorageDeviceinput> list = deviceInputService.queryDeviceAccount(storageDeviceinputExample);
+         for (StorageDeviceinput storageDeviceinput : list) {
+        	 if(orgName!=null){
+        		 storageDeviceinput.setOrgName(orgName);
+        	 }
+		}
+        PageInfo<StorageDeviceinput> pageInfo = new PageInfo<StorageDeviceinput>(list);
+        return pageInfo;
+    }
+}

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceKeepController.java

@@ -0,0 +1,248 @@
+package com.chinaitop.depot.device.controller;
+
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDevicekeep;
+import com.chinaitop.depot.device.model.StorageDevicekeepExample;
+import com.chinaitop.depot.device.service.StorageDeviceInputService;
+import com.chinaitop.depot.device.service.StorageDeviceKeepService;
+import com.chinaitop.depot.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value= {"/deviceKeep"})
+@Api(value= "StorageDeviceKeepController", description = "器材设备保养")
+public class StorageDeviceKeepController {
+
+	@Resource
+	private StorageDeviceKeepService deviceKeepService;
+	@Resource
+	private StorageDeviceInputService deviceInputService;
+	/*@Resource
+	private OrgInfoService orgInfoService;*/
+	
+	 /**
+     * 分页获取器材信息
+	 * @throws Exception 
+     */
+    @RequestMapping(value = "/getDeviceList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="查询保养信息", notes = "查询保养信息，支持分页")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+  	})
+    public PageInfo<StorageDevicekeep> listCheckPage(HttpServletRequest request,Integer pageNum, Integer pageSize, String deviceName, 
+    		Integer keepStatus, Integer orgId) throws Exception{
+
+    	StorageDevicekeepExample storageDevicekeepExample=new StorageDevicekeepExample();
+    	StorageDevicekeepExample.Criteria criteria=storageDevicekeepExample.createCriteria();
+       
+    	if(ParameterUtil.isnotnull(deviceName)){
+            criteria.andDeviceNameLike(deviceName);
+        }
+        if(ParameterUtil.isnotnull(keepStatus)){
+           criteria.andKeepStatusEqualTo(keepStatus);
+        }
+        if(ParameterUtil.isnotnull(orgId)){
+        	criteria.andOrgIdEqualTo(orgId);
+        }
+    	
+
+        //排序
+        storageDevicekeepExample.setOrderByClause("FIELD(keep_status,1,0), keep_end desc , id desc");
+        
+   
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<StorageDevicekeep> list = deviceKeepService.queryByDevice(storageDevicekeepExample);
+        PageInfo<StorageDevicekeep> pageInfo = new PageInfo<StorageDevicekeep>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 根据主键id删除数据
+     */
+    @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="删除数据", notes = "根据id删除数据")
+	@ApiImplicitParams({
+	   	@ApiImplicitParam(name = "id", value = "id", paramType = "form"),
+	}) 
+    public Map<String, Object> remove(Integer id){
+        Map<String,Object> retMap = new HashMap<String,Object>();
+        deviceKeepService.remove(id);
+        retMap.put("msg","success");
+        return retMap;
+    }
+	
+    /**
+     * 结束保养
+     */
+    @RequestMapping(value="/end", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="结束保养", notes = "结束保养")
+    public Map<String, Object> end(String deviceListJson) {
+        Map<String, Object> map = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageDevicekeep storageDevicekeep = null;
+        try {
+        	storageDevicekeep = (StorageDevicekeep)mapper.readValue(deviceListJson, StorageDevicekeep.class);
+        	storageDevicekeep.setKeepEnd(new Date());
+        	storageDevicekeep.setKeepStatus(0);
+        	deviceKeepService.updateByPrimaryKeySelective(storageDevicekeep);
+        	//根据id获取编号和型号
+        	storageDevicekeep=deviceKeepService.selectById(storageDevicekeep.getId());
+        	//改变入库表的状态
+        	map.put("number", storageDevicekeep.getNumber());
+        	map.put("model", storageDevicekeep.getModel());
+        	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(map);
+        	inputList.get(0).setStatus(0);//正常状态
+        	inputList.get(0).setUseCount(inputList.get(0).getUseCount()+1);//数量增加
+        	deviceInputService.updateByPrimaryKeySelective(inputList.get(0));
+        	deviceKeepService.updateByPrimaryKeySelective(storageDevicekeep);
+            map.put("status", "success");
+        } catch (IOException e) {
+            map.put("status", "error");
+            e.printStackTrace();
+        }
+        return map;
+    }
+    
+    /**
+     * 批量结束保养
+     */
+    @RequestMapping(value="/endMore", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="批量结束保养", notes = "批量结束保养")
+    public Map<String, Object> endMore(String deviceListJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+        	JSONObject jsonObject = JSONObject.parseObject(deviceListJson);
+        	String idStr = jsonObject.getString("id");
+        	
+        	if(idStr != null && !"".equals(idStr)){
+        		String[] ids = idStr.split(",");
+        		for(int i=0; i<ids.length; i++){
+        			StorageDevicekeep storageDevicekeep = new StorageDevicekeep();
+                	storageDevicekeep.setKeepEnd(new Date());
+                	storageDevicekeep.setKeepStatus(0);
+                	storageDevicekeep.setId(Integer.parseInt(ids[i]));
+                	deviceKeepService.updateByPrimaryKeySelective(storageDevicekeep);
+        		}
+        	}
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+
+	 /**
+     * 新增保养
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+   	@ApiOperation(value="新增保养", notes = "新增保养")
+    public Map<String, Object> save(String deviceAddJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageDevicekeep storageDevicekeep = null;
+        try {
+        	storageDevicekeep = (StorageDevicekeep)mapper.readValue(deviceAddJson, StorageDevicekeep.class);
+        	storageDevicekeep.setKeepStatus(1);
+        	deviceKeepService.save(storageDevicekeep);
+        	//根据设备编号获取入库表的改设备信息
+        	modelMap.put("number", storageDevicekeep.getNumber());
+        	modelMap.put("model", storageDevicekeep.getModel());
+        	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(modelMap);
+        	inputList.get(0).setStatus(2);//保养状态
+        	inputList.get(0).setUseCount(inputList.get(0).getUseCount()-1);//数量减少
+        	deviceInputService.updateByPrimaryKeySelective(inputList.get(0));
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+    
+      /**
+     * 根据id加载对应数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value="/loadDataById", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="获取数据", notes = "根据id获取数据")
+   	@ApiImplicitParams({
+   	   	@ApiImplicitParam(name = "id", value = "id", paramType = "form"),
+   	}) 
+    public List<StorageDevicekeep> loadDataById(int id){
+    	List<StorageDevicekeep> list=new ArrayList<StorageDevicekeep>();
+    	StorageDevicekeep storageDevicekeep=deviceKeepService.loadDataById(id);
+    	list.add(storageDevicekeep);
+        return list;
+    }
+    
+    
+    /**
+     * 获取机械及器材名称列表
+     */
+    @RequestMapping(value="/getDeviceNameList",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+   	@ApiOperation(value="获取机械及器材名称列表", notes = "获取机械及器材名称列表")
+    public List<StorageDeviceinput> getDeviceNameList(){
+        return deviceInputService.getdevieName();
+    }
+    
+    /**
+     * 获取机械及器材规格型号与编号
+     */
+    @RequestMapping(value="/getDeviceModelList",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+   	@ApiOperation(value="获取机械及器材规格型号与编号", notes = "获取机械及器材规格型号与编号")
+	@ApiImplicitParams({
+   	   	@ApiImplicitParam(name = "deviceName", value = "deviceName", paramType = "form"),
+   	}) 
+    public List<StorageDeviceinput> getDeviceModelList(String deviceName){
+    	return deviceInputService.getDeviceModelList(deviceName);
+    }
+    
+    /**
+     * 获取机械及器材规格型号与编号（维修）
+     */
+    @RequestMapping(value="/getDeviceModelListRepair",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+    @ApiOperation(value="获取机械及器材规格型号与编号", notes = "获取机械及器材规格型号与编号")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "deviceName", value = "deviceName", paramType = "form"),
+    }) 
+    public List<StorageDeviceinput> getDeviceModelListRepair(String deviceName){
+    	return deviceInputService.getDeviceModelListRepair(deviceName);
+    }
+
+}

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceOutController.java

@@ -0,0 +1,85 @@
+package com.chinaitop.depot.device.controller;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.service.StorageDeviceInputService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value= {"/deviceOut"})
+@Api(value= "StorageDeviceOutController", description = "器材设备报废")
+public class StorageDeviceOutController {
+
+	@Resource
+	private StorageDeviceInputService deviceInputService;
+	
+    
+    /**
+     * 报废
+     */
+    @RequestMapping(value="/Out", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="报废", notes = "报废")
+    public Map<String, Object> out(String deviceListJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageDeviceinput storageDeviceinput = null;
+        try {
+        	storageDeviceinput = (StorageDeviceinput)mapper.readValue(deviceListJson, StorageDeviceinput.class);
+        	storageDeviceinput.setStatus(1);
+        	deviceInputService.updateByPrimaryKeySelective(storageDeviceinput);
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+    
+   /**
+     * 批量结束报废
+     */
+    @RequestMapping(value="/outMore", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+   	@ApiOperation(value="批量报废", notes = "批量报废")
+    public Map<String, Object> endMore(String deviceListJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+        	JSONObject jsonObject = JSONObject.parseObject(deviceListJson);
+        	String idStr = jsonObject.getString("id");
+        	
+        	if(idStr != null && !"".equals(idStr)){
+        		String[] ids = idStr.split(",");
+        		for(int i=0; i<ids.length; i++){
+        			StorageDeviceinput storageDeviceinput = new StorageDeviceinput();
+        			storageDeviceinput.setStatus(0);
+        			storageDeviceinput.setId(Integer.parseInt(ids[i]));
+        			deviceInputService.updateByPrimaryKeySelective(storageDeviceinput);
+        		}
+        	}
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+}

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceRepairController.java

@@ -0,0 +1,266 @@
+package com.chinaitop.depot.device.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDevicerepair;
+import com.chinaitop.depot.device.model.StorageDevicerepairExample;
+import com.chinaitop.depot.device.service.StorageDeviceInputService;
+import com.chinaitop.depot.device.service.StorageDeviceRepairService;
+import com.chinaitop.depot.utils.ParameterUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value= {"/deviceRepair"})
+@Api(value= "StorageDeviceRepairController", description = "器材设备维修")
+public class StorageDeviceRepairController {
+
+	@Resource
+	private StorageDeviceRepairService deviceRepairService;
+	@Resource
+	private StorageDeviceInputService deviceInputService;
+	/*@Resource
+	private OrgInfoService orgInfoService;*/
+	
+	 /**
+     * 分页获取器材信息
+	 * @throws Exception 
+     */
+    @RequestMapping(value = "/getDeviceList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="查询维修设备信息", notes = "查询维修设备列表，支持分页")
+  	@ApiImplicitParams({
+  			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+  			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+  	})
+    public PageInfo<StorageDevicerepair> listCheckPage(HttpServletRequest request,Integer pageNum, Integer pageSize ,Integer repairStatus) throws Exception{
+
+         
+    	StorageDevicerepairExample storageDevicerepairExample=new StorageDevicerepairExample();
+    	StorageDevicerepairExample.Criteria criteria=storageDevicerepairExample.createCriteria();
+    	
+    	if(ParameterUtil.isnotnull(repairStatus)){
+        	criteria.andRepairStatusEqualTo(repairStatus);
+        }
+
+        //按照id进行降序
+        storageDevicerepairExample.setOrderByClause("FIELD(repair_status,1,2,0),repair_end desc,id desc");
+   
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<StorageDevicerepair> list = deviceRepairService.queryByDevice(storageDevicerepairExample);
+        PageInfo<StorageDevicerepair> pageInfo = new PageInfo<StorageDevicerepair>(list);
+        return pageInfo;
+    }
+
+	
+
+	 /**
+     * 新增维修
+     */
+    @RequestMapping(value="/save",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+	@ApiOperation(value="保存数据", notes = "保存增加或修改的数据")
+    public Map<String, Object> save(String deviceRepairJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageDevicerepair storageDevicerepair = null;
+        try {
+        	storageDevicerepair = (StorageDevicerepair)mapper.readValue(deviceRepairJson, StorageDevicerepair.class);
+        	storageDevicerepair.setRepairStatus(1);//改变维修表中的状态
+        	deviceRepairService.save(storageDevicerepair);
+        	//入库表中的状态改变  数量改变
+        	modelMap.put("number", storageDevicerepair.getNumber());
+        	modelMap.put("model", storageDevicerepair.getModel());
+        	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(modelMap);//查询入库表的该信息
+        	inputList.get(0).setStatus(3);//维修状态
+        	inputList.get(0).setBrokenCount(inputList.get(0).getBrokenCount()-1);//故障数量减少
+        	deviceInputService.updateByPrimaryKeySelective(inputList.get(0));
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+    
+     /**
+     * 查询仓房对应的设备名称
+     * @param id
+     * @return
+     */
+    @RequestMapping(value ="/getDeviceName",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询数据", notes = "根据depotId查询数据")
+	@ApiImplicitParams({
+		 @ApiImplicitParam(name = "depotId", value = "depotId", paramType = "query"),
+	})
+    public List<StorageDeviceinput> getHouseList(Integer depotId){
+    	List<StorageDeviceinput> storageDeviceinput=null;
+    	if(depotId!=0){
+    		storageDeviceinput=deviceInputService.getDeviceInputList(depotId);
+    	}
+        return storageDeviceinput;
+    }
+    
+    /**
+     * 查询维修的设备名称
+     */
+    @RequestMapping(value ="/getDeviceNameList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询数据", notes = "查询数据")
+    public List<StorageDeviceinput> getDeviceNameList(){
+    	return deviceInputService.getRepairNameList();
+    }
+    
+    /**
+     * 查询设备名称对应的型号
+     * @param id
+     * @return
+     */
+    @RequestMapping(value ="/getDeviceModel",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询数据根据名称", notes = "查询数据根据名称")
+    @ApiImplicitParams({
+		 @ApiImplicitParam(name = "deviceName", value = "deviceName", paramType = "query"),
+	})
+    public List<StorageDeviceinput> getModelList(String deviceName){
+    	List<StorageDeviceinput> storageDeviceinput=deviceInputService.getDeviceModelRepair(deviceName);
+    	return storageDeviceinput;
+    }
+    
+    /**
+     * 查询设备名称对应的型号
+     * @param id
+     * @return
+     */
+    @RequestMapping(value ="/getDeviceNumber",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询设备名称对应的型号", notes = "查询设备名称对应的型号")
+    @ApiImplicitParams({
+		 @ApiImplicitParam(name = "deviceModel", value = "deviceModel", paramType = "query")
+	})
+    public List<StorageDeviceinput> getDeviceNumber(String deviceModel){
+    	List<StorageDeviceinput> storageDeviceinput=deviceInputService.getNumberList(deviceModel);
+    	return storageDeviceinput;
+    }
+    
+    /**
+     * 查询型号对应的数量
+     * @param id
+     * @return
+     */
+    @RequestMapping(value ="/getDeviceCount",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="查询数量", notes = "查询设备名称对应的型号")
+    @ApiImplicitParams({
+   	    @ApiImplicitParam(name = "deviceModel", value = "deviceModel", paramType = "query")
+   	})
+    public List<StorageDeviceinput> getDeviceCount(String number,String model){
+    	
+    	List<StorageDeviceinput> storageDeviceinput=deviceInputService.getCountList(number);
+    	return storageDeviceinput;
+    }
+    
+    /**
+     * 结束维修
+     */
+    @RequestMapping(value ="/end",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+   	@ApiOperation(value="结束维修", notes = "结束维修")
+    public Map<String, Object> end(String deviceListJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        StorageDevicerepair storageDevicerepair = null;
+        try {
+        	storageDevicerepair = (StorageDevicerepair)mapper.readValue(deviceListJson, StorageDevicerepair.class);
+        	//改变维修表中的信息
+        	storageDevicerepair.setRepairEnd(new Date());
+        	storageDevicerepair.setRepairStatus(0);
+        	deviceRepairService.updateByPrimaryKeySelective(storageDevicerepair);
+        	//根据id获取编号和型号
+        	storageDevicerepair=deviceRepairService.loadDataById(storageDevicerepair.getId());
+        	//入库表中的数量增加 状态发生改变
+        	modelMap.put("number", storageDevicerepair.getNumber());
+        	modelMap.put("model", storageDevicerepair.getModel());
+
+        	List<StorageDeviceinput> inputList=deviceInputService.getUseCount(modelMap);
+        	inputList.get(0).setStatus(0);//正常状态
+        	inputList.get(0).setUseCount(inputList.get(0).getUseCount()+1);//可用数量增加
+        	deviceInputService.updateByPrimaryKeySelective(inputList.get(0));
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+    
+    /**
+     * 批量结束维修
+     */
+    @RequestMapping(value ="/endMore",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+   	@ApiOperation(value="批量结束维修", notes = "批量结束维修")
+    public Map<String, Object> endMore(String deviceListJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        try {
+        	JSONObject jsonObject = JSONObject.parseObject(deviceListJson);
+        	String idStr = jsonObject.getString("id");
+        	
+        	if(idStr != null && !"".equals(idStr)){
+        		String[] ids = idStr.split(",");
+        		for(int i=0; i<ids.length; i++){
+        			StorageDevicerepair storageDevicerepair = new StorageDevicerepair();
+        			storageDevicerepair.setRepairEnd(new Date());
+        			storageDevicerepair.setRepairStatus(0);
+        			storageDevicerepair.setId(Integer.parseInt(ids[i]));
+                	deviceRepairService.updateByPrimaryKeySelective(storageDevicerepair);
+        		}
+        	}
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+    
+     /**
+     * 根据id加载对应数据
+     * @param id
+     * @return
+     * @throws Exception 
+     */
+    @RequestMapping(value ="/loadDataById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="根据id加载数据", notes = "根据id加载数据")
+    @ApiImplicitParams({
+   	    @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+   	})
+    public List<StorageDevicerepair> loadDataById(int id) throws Exception{
+    	StorageDevicerepair storageDevicerepair=deviceRepairService.loadDataById(id);
+    	List<StorageDevicerepair> repairMassageList=new ArrayList<StorageDevicerepair>();
+    	repairMassageList.add(storageDevicerepair);
+        return repairMassageList;
+    }
+
+}

src/main/java/com/chinaitop/depot/device/mapper/BasicEquipmentEquipmentPoolMapper.java

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.device.mapper;
+
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool;
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BasicEquipmentEquipmentPoolMapper {
+    int countByExample(BasicEquipmentEquipmentPoolExample example);
+
+    int deleteByExample(BasicEquipmentEquipmentPoolExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BasicEquipmentEquipmentPool record);
+
+    int insertSelective(BasicEquipmentEquipmentPool record);
+
+    List<BasicEquipmentEquipmentPool> selectByExample(BasicEquipmentEquipmentPoolExample example);
+
+    BasicEquipmentEquipmentPool selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BasicEquipmentEquipmentPool record, @Param("example") BasicEquipmentEquipmentPoolExample example);
+
+    int updateByExample(@Param("record") BasicEquipmentEquipmentPool record, @Param("example") BasicEquipmentEquipmentPoolExample example);
+
+    int updateByPrimaryKeySelective(BasicEquipmentEquipmentPool record);
+
+    int updateByPrimaryKey(BasicEquipmentEquipmentPool record);
+}

src/main/java/com/chinaitop/depot/device/mapper/BasicEquipmentEquipmentPoolMapper.xml

@@ -0,0 +1,258 @@
+<?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.chinaitop.depot.device.mapper.BasicEquipmentEquipmentPoolMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="put_position" jdbcType="VARCHAR" property="putPosition" />
+    <result column="shelf_id" jdbcType="VARCHAR" property="shelfId" />
+    <result column="warehouse_id" jdbcType="VARCHAR" property="warehouseId" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="input_person_id" jdbcType="INTEGER" property="inputPersonId" />
+    <result column="input_date" jdbcType="TIMESTAMP" property="inputDate" />
+  </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, org_id, put_position, shelf_id, warehouse_id, remark, input_person_id, input_date
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from basic_equipment_equipment_pool
+    <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.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from basic_equipment_equipment_pool
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from basic_equipment_equipment_pool
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample">
+    delete from basic_equipment_equipment_pool
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    insert into basic_equipment_equipment_pool (id, org_id, put_position, 
+      shelf_id, warehouse_id, remark, 
+      input_person_id, input_date)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{putPosition,jdbcType=VARCHAR}, 
+      #{shelfId,jdbcType=VARCHAR}, #{warehouseId,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{inputPersonId,jdbcType=INTEGER}, #{inputDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    insert into basic_equipment_equipment_pool
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="putPosition != null">
+        put_position,
+      </if>
+      <if test="shelfId != null">
+        shelf_id,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="inputPersonId != null">
+        input_person_id,
+      </if>
+      <if test="inputDate != null">
+        input_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="putPosition != null">
+        #{putPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="shelfId != null">
+        #{shelfId,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="inputPersonId != null">
+        #{inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="inputDate != null">
+        #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample" resultType="java.lang.Integer">
+    select count(*) from basic_equipment_equipment_pool
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update basic_equipment_equipment_pool
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.putPosition != null">
+        put_position = #{record.putPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shelfId != null">
+        shelf_id = #{record.shelfId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputPersonId != null">
+        input_person_id = #{record.inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="record.inputDate != null">
+        input_date = #{record.inputDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update basic_equipment_equipment_pool
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      put_position = #{record.putPosition,jdbcType=VARCHAR},
+      shelf_id = #{record.shelfId,jdbcType=VARCHAR},
+      warehouse_id = #{record.warehouseId,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      input_person_id = #{record.inputPersonId,jdbcType=INTEGER},
+      input_date = #{record.inputDate,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    update basic_equipment_equipment_pool
+    <set>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="putPosition != null">
+        put_position = #{putPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="shelfId != null">
+        shelf_id = #{shelfId,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="inputPersonId != null">
+        input_person_id = #{inputPersonId,jdbcType=INTEGER},
+      </if>
+      <if test="inputDate != null">
+        input_date = #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool">
+    update basic_equipment_equipment_pool
+    set org_id = #{orgId,jdbcType=INTEGER},
+      put_position = #{putPosition,jdbcType=VARCHAR},
+      shelf_id = #{shelfId,jdbcType=VARCHAR},
+      warehouse_id = #{warehouseId,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      input_person_id = #{inputPersonId,jdbcType=INTEGER},
+      input_date = #{inputDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicebackMapper.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.device.mapper;
+
+import com.chinaitop.depot.device.model.StorageDeviceback;
+import com.chinaitop.depot.device.model.StorageDevicebackExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageDevicebackMapper {
+    int countByExample(StorageDevicebackExample example);
+
+    int deleteByExample(StorageDevicebackExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageDeviceback record);
+
+    int insertSelective(StorageDeviceback record);
+
+    List<StorageDeviceback> selectByExample(StorageDevicebackExample example);
+
+    StorageDeviceback selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageDeviceback record, @Param("example") StorageDevicebackExample example);
+
+    int updateByExample(@Param("record") StorageDeviceback record, @Param("example") StorageDevicebackExample example);
+
+    int updateByPrimaryKeySelective(StorageDeviceback record);
+
+    int updateByPrimaryKey(StorageDeviceback record);
+
+	List<StorageDeviceback> selectBygetId(Integer id);
+}

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicebackMapper.xml

@@ -0,0 +1,281 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicebackMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDeviceback">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="get_id" jdbcType="INTEGER" property="getId" />
+    <result column="back_keeper" jdbcType="VARCHAR" property="backKeeper" />
+    <result column="back_handler" jdbcType="VARCHAR" property="backHandler" />
+    <result column="collator" jdbcType="VARCHAR" property="collator" />
+    <result column="back_time" jdbcType="DATE" property="backTime" />
+    <result column="broken_count" jdbcType="INTEGER" property="brokenCount" />
+    <result column="number" jdbcType="INTEGER" property="number" />
+    <result column="back_count" jdbcType="INTEGER" property="backCount" />
+  </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, get_id, back_keeper, back_handler, collator, back_time, broken_count, number, 
+    back_count
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicebackExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_deviceback
+    <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.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from storage_deviceback
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from storage_deviceback
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicebackExample">
+    delete from storage_deviceback
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDeviceback">
+    insert into storage_deviceback (id, get_id, back_keeper, 
+      back_handler, collator, back_time, 
+      broken_count, number, back_count
+      )
+    values (#{id,jdbcType=INTEGER}, #{getId,jdbcType=INTEGER}, #{backKeeper,jdbcType=VARCHAR}, 
+      #{backHandler,jdbcType=VARCHAR}, #{collator,jdbcType=VARCHAR}, #{backTime,jdbcType=DATE}, 
+      #{brokenCount,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{backCount,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceback">
+    insert into storage_deviceback
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="getId != null">
+        get_id,
+      </if>
+      <if test="backKeeper != null">
+        back_keeper,
+      </if>
+      <if test="backHandler != null">
+        back_handler,
+      </if>
+      <if test="collator != null">
+        collator,
+      </if>
+      <if test="backTime != null">
+        back_time,
+      </if>
+      <if test="brokenCount != null">
+        broken_count,
+      </if>
+      <if test="number != null">
+        number,
+      </if>
+      <if test="backCount != null">
+        back_count,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="getId != null">
+        #{getId,jdbcType=INTEGER},
+      </if>
+      <if test="backKeeper != null">
+        #{backKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="backHandler != null">
+        #{backHandler,jdbcType=VARCHAR},
+      </if>
+      <if test="collator != null">
+        #{collator,jdbcType=VARCHAR},
+      </if>
+      <if test="backTime != null">
+        #{backTime,jdbcType=DATE},
+      </if>
+      <if test="brokenCount != null">
+        #{brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        #{number,jdbcType=INTEGER},
+      </if>
+      <if test="backCount != null">
+        #{backCount,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicebackExample" resultType="java.lang.Integer">
+    select count(*) from storage_deviceback
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_deviceback
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.getId != null">
+        get_id = #{record.getId,jdbcType=INTEGER},
+      </if>
+      <if test="record.backKeeper != null">
+        back_keeper = #{record.backKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.backHandler != null">
+        back_handler = #{record.backHandler,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collator != null">
+        collator = #{record.collator,jdbcType=VARCHAR},
+      </if>
+      <if test="record.backTime != null">
+        back_time = #{record.backTime,jdbcType=DATE},
+      </if>
+      <if test="record.brokenCount != null">
+        broken_count = #{record.brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.number != null">
+        number = #{record.number,jdbcType=INTEGER},
+      </if>
+      <if test="record.backCount != null">
+        back_count = #{record.backCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update storage_deviceback
+    set id = #{record.id,jdbcType=INTEGER},
+      get_id = #{record.getId,jdbcType=INTEGER},
+      back_keeper = #{record.backKeeper,jdbcType=VARCHAR},
+      back_handler = #{record.backHandler,jdbcType=VARCHAR},
+      collator = #{record.collator,jdbcType=VARCHAR},
+      back_time = #{record.backTime,jdbcType=DATE},
+      broken_count = #{record.brokenCount,jdbcType=INTEGER},
+      number = #{record.number,jdbcType=INTEGER},
+      back_count = #{record.backCount,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceback">
+    update storage_deviceback
+    <set>
+      <if test="getId != null">
+        get_id = #{getId,jdbcType=INTEGER},
+      </if>
+      <if test="backKeeper != null">
+        back_keeper = #{backKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="backHandler != null">
+        back_handler = #{backHandler,jdbcType=VARCHAR},
+      </if>
+      <if test="collator != null">
+        collator = #{collator,jdbcType=VARCHAR},
+      </if>
+      <if test="backTime != null">
+        back_time = #{backTime,jdbcType=DATE},
+      </if>
+      <if test="brokenCount != null">
+        broken_count = #{brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="number != null">
+        number = #{number,jdbcType=INTEGER},
+      </if>
+      <if test="backCount != null">
+        back_count = #{backCount,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDeviceback">
+    update storage_deviceback
+    set get_id = #{getId,jdbcType=INTEGER},
+      back_keeper = #{backKeeper,jdbcType=VARCHAR},
+      back_handler = #{backHandler,jdbcType=VARCHAR},
+      collator = #{collator,jdbcType=VARCHAR},
+      back_time = #{backTime,jdbcType=DATE},
+      broken_count = #{brokenCount,jdbcType=INTEGER},
+      number = #{number,jdbcType=INTEGER},
+      back_count = #{backCount,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectBygetId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  	select * from storage_deviceback where get_id=#{id};
+  </select>
+  
+</mapper>

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicecheckMapper.java

@@ -0,0 +1,38 @@
+package com.chinaitop.depot.device.mapper;
+
+import com.chinaitop.depot.device.model.StorageDevicecheck;
+import com.chinaitop.depot.device.model.StorageDevicecheckExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageDevicecheckMapper {
+    int countByExample(StorageDevicecheckExample example);
+
+    int deleteByExample(StorageDevicecheckExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageDevicecheck record);
+
+    int insertSelective(StorageDevicecheck record);
+
+    List<StorageDevicecheck> selectByExample(StorageDevicecheckExample example);
+
+    StorageDevicecheck selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageDevicecheck record, @Param("example") StorageDevicecheckExample example);
+
+    int updateByExample(@Param("record") StorageDevicecheck record, @Param("example") StorageDevicecheckExample example);
+
+    int updateByPrimaryKeySelective(StorageDevicecheck record);
+
+    int updateByPrimaryKey(StorageDevicecheck record);
+    
+    List<Map<String,Object>> getCountForDate(Map<String,Object> map);
+
+    void insertBySql(Map<String,Object> map);
+
+	List<StorageDevicecheck> selectBySql(StorageDevicecheckExample storageDevicecheckExample);
+}

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicecheckMapper.xml

@@ -0,0 +1,370 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicecheckMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="check_number" property="checkNumber" jdbcType="VARCHAR" />
+    <result column="check_date" property="checkDate" jdbcType="TIMESTAMP" />
+    <result column="depot_id" property="depotId" jdbcType="INTEGER" />
+    <result column="check_person" property="checkPerson" jdbcType="VARCHAR" />
+    <result column="device_type" property="deviceType" jdbcType="VARCHAR" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="store_count" property="storeCount" jdbcType="INTEGER" />
+    <result column="really_count" property="reallyCount" jdbcType="INTEGER" />
+    <result column="check_result" property="checkResult" jdbcType="VARCHAR" />
+    <result column="reason" property="reason" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, check_number, check_date, depot_id, check_person, device_type, device_name, model, 
+    store_count, really_count, check_result, reason, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDevicecheckExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_devicecheck
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_devicecheck
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_devicecheck
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicecheckExample" >
+    delete from storage_devicecheck
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    insert into storage_devicecheck (id, check_number, check_date, 
+      depot_id, check_person, device_type, 
+      device_name, model, store_count, 
+      really_count, check_result, reason, 
+      org_id)
+    values (#{id,jdbcType=INTEGER}, #{checkNumber,jdbcType=VARCHAR}, #{checkDate,jdbcType=TIMESTAMP}, 
+      #{depotId,jdbcType=INTEGER}, #{checkPerson,jdbcType=VARCHAR}, #{deviceType,jdbcType=VARCHAR}, 
+      #{deviceName,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{storeCount,jdbcType=INTEGER}, 
+      #{reallyCount,jdbcType=INTEGER}, #{checkResult,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR}, 
+      #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    insert into storage_devicecheck
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="checkNumber != null" >
+        check_number,
+      </if>
+      <if test="checkDate != null" >
+        check_date,
+      </if>
+      <if test="depotId != null" >
+        depot_id,
+      </if>
+      <if test="checkPerson != null" >
+        check_person,
+      </if>
+      <if test="deviceType != null" >
+        device_type,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="storeCount != null" >
+        store_count,
+      </if>
+      <if test="reallyCount != null" >
+        really_count,
+      </if>
+      <if test="checkResult != null" >
+        check_result,
+      </if>
+      <if test="reason != null" >
+        reason,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="checkNumber != null" >
+        #{checkNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="checkDate != null" >
+        #{checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="depotId != null" >
+        #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="checkPerson != null" >
+        #{checkPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceType != null" >
+        #{deviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="storeCount != null" >
+        #{storeCount,jdbcType=INTEGER},
+      </if>
+      <if test="reallyCount != null" >
+        #{reallyCount,jdbcType=INTEGER},
+      </if>
+      <if test="checkResult != null" >
+        #{checkResult,jdbcType=VARCHAR},
+      </if>
+      <if test="reason != null" >
+        #{reason,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicecheckExample" resultType="java.lang.Integer" >
+    select count(*) from storage_devicecheck
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_devicecheck
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.checkNumber != null" >
+        check_number = #{record.checkNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.checkDate != null" >
+        check_date = #{record.checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.depotId != null" >
+        depot_id = #{record.depotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.checkPerson != null" >
+        check_person = #{record.checkPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceType != null" >
+        device_type = #{record.deviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storeCount != null" >
+        store_count = #{record.storeCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.reallyCount != null" >
+        really_count = #{record.reallyCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.checkResult != null" >
+        check_result = #{record.checkResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reason != null" >
+        reason = #{record.reason,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_devicecheck
+    set id = #{record.id,jdbcType=INTEGER},
+      check_number = #{record.checkNumber,jdbcType=VARCHAR},
+      check_date = #{record.checkDate,jdbcType=TIMESTAMP},
+      depot_id = #{record.depotId,jdbcType=INTEGER},
+      check_person = #{record.checkPerson,jdbcType=VARCHAR},
+      device_type = #{record.deviceType,jdbcType=VARCHAR},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      store_count = #{record.storeCount,jdbcType=INTEGER},
+      really_count = #{record.reallyCount,jdbcType=INTEGER},
+      check_result = #{record.checkResult,jdbcType=VARCHAR},
+      reason = #{record.reason,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    update storage_devicecheck
+    <set >
+      <if test="checkNumber != null" >
+        check_number = #{checkNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="checkDate != null" >
+        check_date = #{checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="depotId != null" >
+        depot_id = #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="checkPerson != null" >
+        check_person = #{checkPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceType != null" >
+        device_type = #{deviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="storeCount != null" >
+        store_count = #{storeCount,jdbcType=INTEGER},
+      </if>
+      <if test="reallyCount != null" >
+        really_count = #{reallyCount,jdbcType=INTEGER},
+      </if>
+      <if test="checkResult != null" >
+        check_result = #{checkResult,jdbcType=VARCHAR},
+      </if>
+      <if test="reason != null" >
+        reason = #{reason,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDevicecheck" >
+    update storage_devicecheck
+    set check_number = #{checkNumber,jdbcType=VARCHAR},
+      check_date = #{checkDate,jdbcType=TIMESTAMP},
+      depot_id = #{depotId,jdbcType=INTEGER},
+      check_person = #{checkPerson,jdbcType=VARCHAR},
+      device_type = #{deviceType,jdbcType=VARCHAR},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      store_count = #{storeCount,jdbcType=INTEGER},
+      really_count = #{reallyCount,jdbcType=INTEGER},
+      check_result = #{checkResult,jdbcType=VARCHAR},
+      reason = #{reason,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="getCountForDate" parameterType="java.util.Map" resultType="java.util.Map">
+      SELECT  * FROM storage_devicecheck WHERE check_date LIKE ${checkDate} AND  depot_id = #{depotId,jdbcType=VARCHAR} GROUP BY check_date
+  </select>
+
+    <select id="selectBySql" parameterType="com.chinaitop.depot.device.model.StorageDevicecheckExample" resultMap="BaseResultMap">
+        SELECT
+            id,
+            check_number,
+            check_date,
+            depot_id,
+            check_person,
+            device_type,
+            device_name,
+            model,
+            store_count,
+            really_count,
+            reason,
+            org_id
+        FROM
+          storage_devicecheck
+        <if test="_parameter != null">
+          <include refid="Example_Where_Clause" />
+        </if>
+        GROUP BY depot_id,
+          check_number
+        ORDER BY depot_id , check_date DESC
+    </select>
+
+  <insert id="insertBySql" parameterType="java.util.Map">
+    ${sql}
+  </insert>
+</mapper>

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicegetMapper.java

@@ -0,0 +1,36 @@
+package com.chinaitop.depot.device.mapper;
+
+import com.chinaitop.depot.device.model.StorageDeviceget;
+import com.chinaitop.depot.device.model.StorageDevicegetExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageDevicegetMapper {
+    int countByExample(StorageDevicegetExample example);
+
+    int deleteByExample(StorageDevicegetExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageDeviceget record);
+
+    int insertSelective(StorageDeviceget record);
+
+    List<StorageDeviceget> selectByExample(StorageDevicegetExample example);
+
+    StorageDeviceget selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageDeviceget record, @Param("example") StorageDevicegetExample example);
+
+    int updateByExample(@Param("record") StorageDeviceget record, @Param("example") StorageDevicegetExample example);
+
+    int updateByPrimaryKeySelective(StorageDeviceget record);
+
+    int updateByPrimaryKey(StorageDeviceget record);
+    
+    List<StorageDeviceget> selectByHouseId(Integer houseId);
+
+	List<Map<String, Object>> queryCountByType();
+}

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicegetMapper.xml

@@ -0,0 +1,399 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicegetMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDeviceget" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="device_type" property="deviceType" jdbcType="INTEGER" />
+    <result column="get_time" property="getTime" jdbcType="TIMESTAMP" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="get_count" property="getCount" jdbcType="INTEGER" />
+    <result column="back_count" property="backCount" jdbcType="INTEGER" />
+    <result column="book_keeper" property="bookKeeper" jdbcType="VARCHAR" />
+    <result column="handler" property="handler" jdbcType="VARCHAR" />
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="collator" property="collator" jdbcType="VARCHAR" />
+    <result column="use_count" property="useCount" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="input_id" property="inputId" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, device_type, get_time, device_name, model, get_count, back_count, book_keeper, 
+    handler, house_id, number, collator, use_count, remark, input_id, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDevicegetExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_deviceget
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_deviceget
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_deviceget
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicegetExample" >
+    delete from storage_deviceget
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDeviceget" >
+    insert into storage_deviceget (id, device_type, get_time, 
+      device_name, model, get_count, 
+      back_count, book_keeper, handler, 
+      house_id, number, collator, 
+      use_count, remark, input_id, 
+      org_id)
+    values (#{id,jdbcType=INTEGER}, #{deviceType,jdbcType=INTEGER}, #{getTime,jdbcType=TIMESTAMP}, 
+      #{deviceName,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{getCount,jdbcType=INTEGER}, 
+      #{backCount,jdbcType=INTEGER}, #{bookKeeper,jdbcType=VARCHAR}, #{handler,jdbcType=VARCHAR}, 
+      #{houseId,jdbcType=INTEGER}, #{number,jdbcType=VARCHAR}, #{collator,jdbcType=VARCHAR}, 
+      #{useCount,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{inputId,jdbcType=INTEGER}, 
+      #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceget" >
+    insert into storage_deviceget
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="deviceType != null" >
+        device_type,
+      </if>
+      <if test="getTime != null" >
+        get_time,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="getCount != null" >
+        get_count,
+      </if>
+      <if test="backCount != null" >
+        back_count,
+      </if>
+      <if test="bookKeeper != null" >
+        book_keeper,
+      </if>
+      <if test="handler != null" >
+        handler,
+      </if>
+      <if test="houseId != null" >
+        house_id,
+      </if>
+      <if test="number != null" >
+        number,
+      </if>
+      <if test="collator != null" >
+        collator,
+      </if>
+      <if test="useCount != null" >
+        use_count,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="inputId != null" >
+        input_id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="deviceType != null" >
+        #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="getTime != null" >
+        #{getTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="getCount != null" >
+        #{getCount,jdbcType=INTEGER},
+      </if>
+      <if test="backCount != null" >
+        #{backCount,jdbcType=INTEGER},
+      </if>
+      <if test="bookKeeper != null" >
+        #{bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="handler != null" >
+        #{handler,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="number != null" >
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="collator != null" >
+        #{collator,jdbcType=VARCHAR},
+      </if>
+      <if test="useCount != null" >
+        #{useCount,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="inputId != null" >
+        #{inputId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicegetExample" resultType="java.lang.Integer" >
+    select count(*) from storage_deviceget
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_deviceget
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceType != null" >
+        device_type = #{record.deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="record.getTime != null" >
+        get_time = #{record.getTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.getCount != null" >
+        get_count = #{record.getCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.backCount != null" >
+        back_count = #{record.backCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.bookKeeper != null" >
+        book_keeper = #{record.bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.handler != null" >
+        handler = #{record.handler,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null" >
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.number != null" >
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.collator != null" >
+        collator = #{record.collator,jdbcType=VARCHAR},
+      </if>
+      <if test="record.useCount != null" >
+        use_count = #{record.useCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputId != null" >
+        input_id = #{record.inputId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_deviceget
+    set id = #{record.id,jdbcType=INTEGER},
+      device_type = #{record.deviceType,jdbcType=INTEGER},
+      get_time = #{record.getTime,jdbcType=TIMESTAMP},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      get_count = #{record.getCount,jdbcType=INTEGER},
+      back_count = #{record.backCount,jdbcType=INTEGER},
+      book_keeper = #{record.bookKeeper,jdbcType=VARCHAR},
+      handler = #{record.handler,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      number = #{record.number,jdbcType=VARCHAR},
+      collator = #{record.collator,jdbcType=VARCHAR},
+      use_count = #{record.useCount,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      input_id = #{record.inputId,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceget" >
+    update storage_deviceget
+    <set >
+      <if test="deviceType != null" >
+        device_type = #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="getTime != null" >
+        get_time = #{getTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="getCount != null" >
+        get_count = #{getCount,jdbcType=INTEGER},
+      </if>
+      <if test="backCount != null" >
+        back_count = #{backCount,jdbcType=INTEGER},
+      </if>
+      <if test="bookKeeper != null" >
+        book_keeper = #{bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="handler != null" >
+        handler = #{handler,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="number != null" >
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="collator != null" >
+        collator = #{collator,jdbcType=VARCHAR},
+      </if>
+      <if test="useCount != null" >
+        use_count = #{useCount,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="inputId != null" >
+        input_id = #{inputId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDeviceget" >
+    update storage_deviceget
+    set device_type = #{deviceType,jdbcType=INTEGER},
+      get_time = #{getTime,jdbcType=TIMESTAMP},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      get_count = #{getCount,jdbcType=INTEGER},
+      back_count = #{backCount,jdbcType=INTEGER},
+      book_keeper = #{bookKeeper,jdbcType=VARCHAR},
+      handler = #{handler,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=INTEGER},
+      number = #{number,jdbcType=VARCHAR},
+      collator = #{collator,jdbcType=VARCHAR},
+      use_count = #{useCount,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      input_id = #{inputId,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectByHouseId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    house_id,device_type,device_name,model,get_count,back_count
+    from storage_deviceget
+    where house_id = #{houseId}
+  </select>
+  
+  <!-- 获取每个类型的使用数量  -->
+   <select id="queryCountByType"  resultType="java.util.Map">
+    select SUM(get_count) getCounts, device_type from storage_deviceget 
+    GROUP BY device_type 
+    order by device_type asc
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.java

@@ -0,0 +1,86 @@
+package com.chinaitop.depot.device.mapper;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.chinaitop.depot.device.model.ContentBean;
+import com.chinaitop.depot.device.model.HouseNameBean;
+import com.chinaitop.depot.device.model.HouseTypeBean;
+import com.chinaitop.depot.device.model.ShelfContentBean;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
+
+public interface StorageDeviceinputMapper {
+    int countByExample(StorageDeviceinputExample example);
+
+    int deleteByExample(StorageDeviceinputExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageDeviceinput record);
+
+    int insertSelective(StorageDeviceinput record);
+
+    List<StorageDeviceinput> selectByExample(StorageDeviceinputExample example);
+
+    StorageDeviceinput selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageDeviceinput record, @Param("example") StorageDeviceinputExample example);
+
+    int updateByExample(@Param("record") StorageDeviceinput record, @Param("example") StorageDeviceinputExample example);
+
+    int updateByPrimaryKeySelective(StorageDeviceinput record);
+
+    int updateByPrimaryKey(StorageDeviceinput record);
+    
+    List<HouseNameBean> getHouseList();
+
+   	List<HouseTypeBean> getTypeList(Integer depotId);
+   	
+   	List<ShelfContentBean> getShelfList(Integer depotTypeId);
+
+   	List<ShelfContentBean> getNameList(Integer depotTypeId);
+
+   	ContentBean getcontentGetList(Map<String, Object> map);
+
+   	List<StorageDeviceinput> getDeviceInputList(Integer depotId);
+
+   	List<ContentBean> getShelfGetList(String deviceName);
+
+   	List<StorageDeviceinput> getModelList(String deviceName);
+
+   	List<StorageDeviceinput> getNumberList(String deviceModel);
+
+   	List<StorageDeviceinput> getCountList(String number);
+
+   	List<StorageDeviceinput> getAllList(String number);
+
+   	List<ContentBean> getModelGetList(Map<String, Object> map);
+
+   	List<StorageDeviceinput> getNumberGetList(Map<String, Object> map);
+
+   	List<StorageDeviceinput> getUseCountGetList(String number);
+
+   	List<StorageDeviceinput> getDeviceModelList(String deviceName);
+   	
+   	List<ContentBean> getcontentNameList(Integer depotTypeId);
+
+   	List<StorageDeviceinput> getdevieName();
+
+   	List<StorageDeviceinput> getRepairNameList();
+
+   	List<StorageDeviceinput> getUseCount(Map<String, Object> map);
+
+	List<StorageDeviceinput> queryDevice(HashMap<Object, Object> map);
+
+	List<StorageDeviceinput> getDeviceModelRepair(String deviceName);
+
+	List<StorageDeviceinput> getDeviceModelListRepair(String deviceName);
+
+	List<Map<String, Object>> queryCountByType();
+
+	List<StorageDeviceinput> queryDeviceAccount(StorageDeviceinputExample storageDeviceinputExample);
+}

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -0,0 +1,733 @@
+<?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.chinaitop.depot.device.mapper.StorageDeviceinputMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="device_type" property="deviceType" jdbcType="INTEGER" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="use_count" property="useCount" jdbcType="INTEGER" />
+    <result column="device_manager" property="deviceManager" jdbcType="VARCHAR" />
+    <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
+    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="unit" property="unit" jdbcType="VARCHAR" />
+    <result column="device_price" property="devicePrice" jdbcType="DECIMAL" />
+    <result column="storage_rack" property="storageRack" jdbcType="VARCHAR" />
+    <result column="storage_rack_cell" property="storageRackCell" jdbcType="VARCHAR" />
+    <result column="handler" property="handler" jdbcType="VARCHAR" />
+    <result column="book_keeper" property="bookKeeper" jdbcType="VARCHAR" />
+    <result column="producer" property="producer" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="service_life" property="serviceLife" jdbcType="DECIMAL" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="position" property="position" jdbcType="VARCHAR" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="broken_count" property="brokenCount" jdbcType="INTEGER" />
+    <result column="produce_time" property="produceTime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, device_type, device_name, model, use_count, device_manager, input_time, number, 
+    unit, device_price, storage_rack, storage_rack_cell, handler, book_keeper, producer, 
+    remark, service_life, parent_id, position, status, broken_count, produce_time, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_deviceinput
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_deviceinput
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_deviceinput
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" >
+    delete from storage_deviceinput
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    insert into storage_deviceinput (id, device_type, device_name, 
+      model, use_count, device_manager, 
+      input_time, number, unit, 
+      device_price, storage_rack, storage_rack_cell, 
+      handler, book_keeper, producer, 
+      remark, service_life, parent_id, 
+      position, status, broken_count, 
+      produce_time, org_id)
+    values (#{id,jdbcType=INTEGER}, #{deviceType,jdbcType=INTEGER}, #{deviceName,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{useCount,jdbcType=INTEGER}, #{deviceManager,jdbcType=VARCHAR}, 
+      #{inputTime,jdbcType=TIMESTAMP}, #{number,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, 
+      #{devicePrice,jdbcType=DECIMAL}, #{storageRack,jdbcType=VARCHAR}, #{storageRackCell,jdbcType=VARCHAR}, 
+      #{handler,jdbcType=VARCHAR}, #{bookKeeper,jdbcType=VARCHAR}, #{producer,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{serviceLife,jdbcType=DECIMAL}, #{parentId,jdbcType=INTEGER}, 
+      #{position,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{brokenCount,jdbcType=INTEGER}, 
+      #{produceTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    insert into storage_deviceinput
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="deviceType != null" >
+        device_type,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="useCount != null" >
+        use_count,
+      </if>
+      <if test="deviceManager != null" >
+        device_manager,
+      </if>
+      <if test="inputTime != null" >
+        input_time,
+      </if>
+      <if test="number != null" >
+        number,
+      </if>
+      <if test="unit != null" >
+        unit,
+      </if>
+      <if test="devicePrice != null" >
+        device_price,
+      </if>
+      <if test="storageRack != null" >
+        storage_rack,
+      </if>
+      <if test="storageRackCell != null" >
+        storage_rack_cell,
+      </if>
+      <if test="handler != null" >
+        handler,
+      </if>
+      <if test="bookKeeper != null" >
+        book_keeper,
+      </if>
+      <if test="producer != null" >
+        producer,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="serviceLife != null" >
+        service_life,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="position != null" >
+        position,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="brokenCount != null" >
+        broken_count,
+      </if>
+      <if test="produceTime != null" >
+        produce_time,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="deviceType != null" >
+        #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="useCount != null" >
+        #{useCount,jdbcType=INTEGER},
+      </if>
+      <if test="deviceManager != null" >
+        #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null" >
+        #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="number != null" >
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null" >
+        #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="devicePrice != null" >
+        #{devicePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="storageRack != null" >
+        #{storageRack,jdbcType=VARCHAR},
+      </if>
+      <if test="storageRackCell != null" >
+        #{storageRackCell,jdbcType=VARCHAR},
+      </if>
+      <if test="handler != null" >
+        #{handler,jdbcType=VARCHAR},
+      </if>
+      <if test="bookKeeper != null" >
+        #{bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="producer != null" >
+        #{producer,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceLife != null" >
+        #{serviceLife,jdbcType=DECIMAL},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="position != null" >
+        #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="brokenCount != null" >
+        #{brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="produceTime != null" >
+        #{produceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" resultType="java.lang.Integer" >
+    select count(*) from storage_deviceinput
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_deviceinput
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceType != null" >
+        device_type = #{record.deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.useCount != null" >
+        use_count = #{record.useCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceManager != null" >
+        device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputTime != null" >
+        input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.number != null" >
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unit != null" >
+        unit = #{record.unit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.devicePrice != null" >
+        device_price = #{record.devicePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.storageRack != null" >
+        storage_rack = #{record.storageRack,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storageRackCell != null" >
+        storage_rack_cell = #{record.storageRackCell,jdbcType=VARCHAR},
+      </if>
+      <if test="record.handler != null" >
+        handler = #{record.handler,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bookKeeper != null" >
+        book_keeper = #{record.bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.producer != null" >
+        producer = #{record.producer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serviceLife != null" >
+        service_life = #{record.serviceLife,jdbcType=DECIMAL},
+      </if>
+      <if test="record.parentId != null" >
+        parent_id = #{record.parentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.position != null" >
+        position = #{record.position,jdbcType=VARCHAR},
+      </if>
+      <if test="record.status != null" >
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.brokenCount != null" >
+        broken_count = #{record.brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.produceTime != null" >
+        produce_time = #{record.produceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_deviceinput
+    set id = #{record.id,jdbcType=INTEGER},
+      device_type = #{record.deviceType,jdbcType=INTEGER},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      use_count = #{record.useCount,jdbcType=INTEGER},
+      device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      number = #{record.number,jdbcType=VARCHAR},
+      unit = #{record.unit,jdbcType=VARCHAR},
+      device_price = #{record.devicePrice,jdbcType=DECIMAL},
+      storage_rack = #{record.storageRack,jdbcType=VARCHAR},
+      storage_rack_cell = #{record.storageRackCell,jdbcType=VARCHAR},
+      handler = #{record.handler,jdbcType=VARCHAR},
+      book_keeper = #{record.bookKeeper,jdbcType=VARCHAR},
+      producer = #{record.producer,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      service_life = #{record.serviceLife,jdbcType=DECIMAL},
+      parent_id = #{record.parentId,jdbcType=INTEGER},
+      position = #{record.position,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      broken_count = #{record.brokenCount,jdbcType=INTEGER},
+      produce_time = #{record.produceTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    update storage_deviceinput
+    <set >
+      <if test="deviceType != null" >
+        device_type = #{deviceType,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="useCount != null" >
+        use_count = #{useCount,jdbcType=INTEGER},
+      </if>
+      <if test="deviceManager != null" >
+        device_manager = #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null" >
+        input_time = #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="number != null" >
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="unit != null" >
+        unit = #{unit,jdbcType=VARCHAR},
+      </if>
+      <if test="devicePrice != null" >
+        device_price = #{devicePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="storageRack != null" >
+        storage_rack = #{storageRack,jdbcType=VARCHAR},
+      </if>
+      <if test="storageRackCell != null" >
+        storage_rack_cell = #{storageRackCell,jdbcType=VARCHAR},
+      </if>
+      <if test="handler != null" >
+        handler = #{handler,jdbcType=VARCHAR},
+      </if>
+      <if test="bookKeeper != null" >
+        book_keeper = #{bookKeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="producer != null" >
+        producer = #{producer,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceLife != null" >
+        service_life = #{serviceLife,jdbcType=DECIMAL},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="position != null" >
+        position = #{position,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="brokenCount != null" >
+        broken_count = #{brokenCount,jdbcType=INTEGER},
+      </if>
+      <if test="produceTime != null" >
+        produce_time = #{produceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDeviceinput" >
+    update storage_deviceinput
+    set device_type = #{deviceType,jdbcType=INTEGER},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      use_count = #{useCount,jdbcType=INTEGER},
+      device_manager = #{deviceManager,jdbcType=VARCHAR},
+      input_time = #{inputTime,jdbcType=TIMESTAMP},
+      number = #{number,jdbcType=VARCHAR},
+      unit = #{unit,jdbcType=VARCHAR},
+      device_price = #{devicePrice,jdbcType=DECIMAL},
+      storage_rack = #{storageRack,jdbcType=VARCHAR},
+      storage_rack_cell = #{storageRackCell,jdbcType=VARCHAR},
+      handler = #{handler,jdbcType=VARCHAR},
+      book_keeper = #{bookKeeper,jdbcType=VARCHAR},
+      producer = #{producer,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      service_life = #{serviceLife,jdbcType=DECIMAL},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      position = #{position,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      broken_count = #{brokenCount,jdbcType=INTEGER},
+      produce_time = #{produceTime,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <!-- 自定义sql -->
+
+   <select id="getHouseList" resultType="com.chinaitop.depot.device.model.HouseNameBean">
+
+  	select s.depot_id depotId,b.storehouse_name storeName from storage_deviceinput s left join basic_storehouse b on s.depot_id=b.storehouse_id GROUP BY s.depot_id;
+
+   </select>
+
+  
+
+  <select id="getTypeList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.device.model.HouseTypeBean">
+
+  	select s.depot_id depotId,s.device_type deviceType,cc.enumName enumName from storage_deviceinput s left join basic_enum cc on cc.enumId = s.device_type where s.depot_id = #{depotId};
+
+  </select>
+
+  
+
+  <select id="getNameList" parameterType="java.lang.Integer" resultType="com.chinaitop.depot.device.model.ShelfContentBean">
+
+    select DISTINCT (be.enumName),sd.device_name from storage_deviceinput sd left join basic_enum be on be.enumId=sd.device_name  where device_type=#{deviceTypeId} and `status`!=1 and use_count!=0;
+
+   </select>
+
+  
+
+  <select id="getcontentGetList" parameterType="java.util.Map" resultType="com.chinaitop.depot.device.model.ContentBean">
+
+  	select s.device_type deviceType,s.device_name deviceName,s.model model,s.number number,s.use_count useCount from storage_deviceinput s where s.device_name = #{deviceName};
+
+  </select>
+
+  
+
+  <select id="getShelfGetList" parameterType="java.lang.String" resultType="com.chinaitop.depot.device.model.ContentBean">
+
+    select shelf_id shelfId,id  from basic_equipment_equipment_pool bee
+
+	where id in 
+
+	(select sd.storage_rack from storage_deviceinput sd left join basic_enum be on be.enumId=sd.device_name 
+
+	WHERE sd.device_name in (select enumId from basic_enum where enumName=#{deviceName}))
+
+  </select>
+
+  
+
+  <select id="getDeviceInputList" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+
+    select  DISTINCT(device_name)  from storage_deviceinput where depot_id=#{depotId}; 
+
+  </select>
+
+  
+
+  <select id="getModelList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select  DISTINCT(model) from storage_deviceinput where device_name=#{deviceName};
+
+  </select>
+
+  
+
+  <select id="getNumberList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select number from storage_deviceinput where model=#{deviceModel};
+
+  </select>
+
+  
+
+  <select id="getCountList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select use_count,broken_count from storage_deviceinput where number=#{number};
+
+  </select>
+
+  
+
+   <select id="getAllList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select  <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number};
+
+  </select>
+
+  
+
+   <select id="getModelGetList" parameterType="java.util.Map" resultMap="BaseResultMap">
+
+   select distinct sd.model from storage_deviceinput sd where device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+
+   storage_rack IN (select id  from basic_equipment_equipment_pool bee where shelf_id=#{storageRack}) ;
+
+  </select>
+
+  
+
+   <select id="getNumberGetList" parameterType="java.util.Map" resultMap="BaseResultMap">
+
+   select <include refid="Base_Column_List" /> from storage_deviceinput where model=#{model} and device_type=#{deviceTypeId} and
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId}; 
+
+  </select>
+
+  
+
+   <select id="getUseCountGetList" parameterType="java.lang.String" resultMap="BaseResultMap">
+
+   select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number};
+
+  </select>
+
+  
+
+   <select id="getUseCount" parameterType="java.util.Map" resultMap="BaseResultMap">
+
+   select <include refid="Base_Column_List" /> from storage_deviceinput where number=#{number} and model=#{model}
+    and device_type=#{deviceTypeId} and
+    device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+    storage_rack IN (select id  from basic_equipment_equipment_pool where shelf_id=#{shelfId}) and org_id=#{orgId};
+
+  </select>
+
+  
+
+  
+
+  
+
+  
+
+  <resultMap id="DeviceInputMap" type="com.chinaitop.depot.device.model.StorageDeviceinput">
+
+    <result column="device_name" jdbcType="VARCHAR" property="deviceName" />
+
+    <result column="inputDeviceName" jdbcType="VARCHAR" property="inputDeviceName" />
+
+    </resultMap>
+
+  
+
+  <select id="getdevieName" resultMap="DeviceInputMap">
+
+     select distinct d.device_name,d.device_type,b.enumName inputDeviceName from storage_deviceinput d left join basic_enum  b on  b.enumId=d.device_name where `status`=0 and device_type=5476 and use_count!=0
+
+  </select>
+
+  
+
+  <select id="getRepairNameList" resultMap="DeviceInputMap">
+
+	select distinct d.device_name,d.device_type,b.enumName inputDeviceName from storage_deviceinput d left join basic_enum  b on  b.enumId=d.device_name where `status`=5 and device_type=5476 and broken_count!=0
+
+  </select>
+
+  
+
+  <select id="getDeviceModelList" parameterType="java.lang.String" resultType="com.chinaitop.depot.device.model.StorageDeviceinput">
+
+    select  model,number,use_count from storage_deviceinput where device_name=#{deviceName} and `status`=0
+
+  </select>
+
+  
+
+  <select id="getDeviceModelRepair" parameterType="java.lang.String" resultType="com.chinaitop.depot.device.model.StorageDeviceinput">
+
+    select  model,number,use_count from storage_deviceinput where device_name=#{deviceName} and `status`=5
+
+  </select>
+
+  
+
+  <!-- <select id="getDeviceModelListRepair" parameterType="java.lang.String" resultType="com.chinaitop.depot.device.model.StorageDeviceinput">
+
+    select  model,number,use_count from storage_deviceinput where device_name=#{deviceName} and `status`=5
+
+  </select> -->
+  
+  
+  <!-- 每个类型的入库数量 -->
+  <select id="queryCountByType"  resultType="java.util.Map">
+
+    SELECT
+		SUM(use_count) userCounts,
+		sum(device_manager) sumCounts,
+		IFNULL(SUM(broken_count), 0) brokenCount,
+		device_type
+    FROM
+	    storage_deviceinput
+    GROUP BY
+	    device_type
+    ORDER BY
+	    device_type ASC
+    
+  </select>
+
+  
+
+   <!-- 设备数据 -->
+
+  <select id="queryDevice" resultMap="BaseResultMap" parameterType="map">
+
+		 SELECT
+
+			<include refid="Base_Column_List" />
+
+		FROM
+
+			storage_deviceinput where device_type=5476  order by status asc
+
+  </select>
+  
+  <!-- 台账 -->
+  <select id="queryDeviceAccount" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDeviceinputExample" >
+    SELECT
+	id,
+	device_type,
+	device_name,
+	model,
+	SUM(use_count) use_count,
+	SUM(broken_count) broken_count
+FROM
+	storage_deviceinput
+	<if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+GROUP BY
+	model,
+	device_name,
+	device_type
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicekeepMapper.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.device.mapper;
+
+import com.chinaitop.depot.device.model.StorageDevicekeep;
+import com.chinaitop.depot.device.model.StorageDevicekeepExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageDevicekeepMapper {
+    int countByExample(StorageDevicekeepExample example);
+
+    int deleteByExample(StorageDevicekeepExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageDevicekeep record);
+
+    int insertSelective(StorageDevicekeep record);
+
+    List<StorageDevicekeep> selectByExample(StorageDevicekeepExample example);
+
+    StorageDevicekeep selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageDevicekeep record, @Param("example") StorageDevicekeepExample example);
+
+    int updateByExample(@Param("record") StorageDevicekeep record, @Param("example") StorageDevicekeepExample example);
+
+    int updateByPrimaryKeySelective(StorageDevicekeep record);
+
+    int updateByPrimaryKey(StorageDevicekeep record);
+    
+    List<StorageDevicekeep> selectEnumNameList();
+}

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicekeepMapper.xml

@@ -0,0 +1,310 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicekeepMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="keep_start" property="keepStart" jdbcType="TIMESTAMP" />
+    <result column="keep_end" property="keepEnd" jdbcType="TIMESTAMP" />
+    <result column="keeper" property="keeper" jdbcType="VARCHAR" />
+    <result column="device_manager" property="deviceManager" jdbcType="VARCHAR" />
+    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="keep_status" property="keepStatus" jdbcType="INTEGER" />
+    <result column="input_id" property="inputId" jdbcType="INTEGER" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, device_name, model, keep_start, keep_end, keeper, device_manager, number, 
+    keep_status, input_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDevicekeepExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_devicekeep
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_devicekeep
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_devicekeep
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicekeepExample" >
+    delete from storage_devicekeep
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    insert into storage_devicekeep (id, org_id, device_name, 
+      model, keep_start, keep_end, 
+      keeper, device_manager, number, 
+      keep_status, input_id)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{deviceName,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{keepStart,jdbcType=TIMESTAMP}, #{keepEnd,jdbcType=TIMESTAMP}, 
+      #{keeper,jdbcType=VARCHAR}, #{deviceManager,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
+      #{keepStatus,jdbcType=INTEGER}, #{inputId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    insert into storage_devicekeep
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="keepStart != null" >
+        keep_start,
+      </if>
+      <if test="keepEnd != null" >
+        keep_end,
+      </if>
+      <if test="keeper != null" >
+        keeper,
+      </if>
+      <if test="deviceManager != null" >
+        device_manager,
+      </if>
+      <if test="number != null" >
+        number,
+      </if>
+      <if test="keepStatus != null" >
+        keep_status,
+      </if>
+      <if test="inputId != null" >
+        input_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="keepStart != null" >
+        #{keepStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keepEnd != null" >
+        #{keepEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keeper != null" >
+        #{keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceManager != null" >
+        #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null" >
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="keepStatus != null" >
+        #{keepStatus,jdbcType=INTEGER},
+      </if>
+      <if test="inputId != null" >
+        #{inputId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicekeepExample" resultType="java.lang.Integer" >
+    select count(*) from storage_devicekeep
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_devicekeep
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keepStart != null" >
+        keep_start = #{record.keepStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.keepEnd != null" >
+        keep_end = #{record.keepEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.keeper != null" >
+        keeper = #{record.keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceManager != null" >
+        device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="record.number != null" >
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keepStatus != null" >
+        keep_status = #{record.keepStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.inputId != null" >
+        input_id = #{record.inputId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_devicekeep
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      keep_start = #{record.keepStart,jdbcType=TIMESTAMP},
+      keep_end = #{record.keepEnd,jdbcType=TIMESTAMP},
+      keeper = #{record.keeper,jdbcType=VARCHAR},
+      device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      number = #{record.number,jdbcType=VARCHAR},
+      keep_status = #{record.keepStatus,jdbcType=INTEGER},
+      input_id = #{record.inputId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    update storage_devicekeep
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="keepStart != null" >
+        keep_start = #{keepStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keepEnd != null" >
+        keep_end = #{keepEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keeper != null" >
+        keeper = #{keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceManager != null" >
+        device_manager = #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null" >
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="keepStatus != null" >
+        keep_status = #{keepStatus,jdbcType=INTEGER},
+      </if>
+      <if test="inputId != null" >
+        input_id = #{inputId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDevicekeep" >
+    update storage_devicekeep
+    set org_id = #{orgId,jdbcType=INTEGER},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      keep_start = #{keepStart,jdbcType=TIMESTAMP},
+      keep_end = #{keepEnd,jdbcType=TIMESTAMP},
+      keeper = #{keeper,jdbcType=VARCHAR},
+      device_manager = #{deviceManager,jdbcType=VARCHAR},
+      number = #{number,jdbcType=VARCHAR},
+      keep_status = #{keepStatus,jdbcType=INTEGER},
+      input_id = #{inputId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="selectEnumNameList" resultType="com.chinaitop.depot.device.model.StorageDevicekeep">
+     select enumId deviceName,enumName from basic_enum where enumId in (select device_name from storage_deviceinput);
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicerepairMapper.java

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.device.mapper;
+
+import com.chinaitop.depot.device.model.StorageDevicerepair;
+import com.chinaitop.depot.device.model.StorageDevicerepairExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageDevicerepairMapper {
+    int countByExample(StorageDevicerepairExample example);
+
+    int deleteByExample(StorageDevicerepairExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageDevicerepair record);
+
+    int insertSelective(StorageDevicerepair record);
+
+    List<StorageDevicerepair> selectByExample(StorageDevicerepairExample example);
+
+    StorageDevicerepair selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageDevicerepair record, @Param("example") StorageDevicerepairExample example);
+
+    int updateByExample(@Param("record") StorageDevicerepair record, @Param("example") StorageDevicerepairExample example);
+
+    int updateByPrimaryKeySelective(StorageDevicerepair record);
+
+    int updateByPrimaryKey(StorageDevicerepair record);
+}

src/main/java/com/chinaitop/depot/device/mapper/StorageDevicerepairMapper.xml

@@ -0,0 +1,338 @@
+<?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.chinaitop.depot.device.mapper.StorageDevicerepairMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="device_name" property="deviceName" jdbcType="VARCHAR" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="number" property="number" jdbcType="VARCHAR" />
+    <result column="repair_start" property="repairStart" jdbcType="TIMESTAMP" />
+    <result column="repair_end" property="repairEnd" jdbcType="TIMESTAMP" />
+    <result column="repairer" property="repairer" jdbcType="VARCHAR" />
+    <result column="device_manager" property="deviceManager" jdbcType="VARCHAR" />
+    <result column="repair_sumnumber" property="repairSumnumber" jdbcType="INTEGER" />
+    <result column="repair_status" property="repairStatus" jdbcType="INTEGER" />
+    <result column="repair_number" property="repairNumber" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, device_name, model, number, repair_start, repair_end, repairer, device_manager, 
+    repair_sumnumber, repair_status, repair_number, remark
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.StorageDevicerepairExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_devicerepair
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from storage_devicerepair
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_devicerepair
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicerepairExample" >
+    delete from storage_devicerepair
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    insert into storage_devicerepair (id, org_id, device_name, 
+      model, number, repair_start, 
+      repair_end, repairer, device_manager, 
+      repair_sumnumber, repair_status, repair_number, 
+      remark)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{deviceName,jdbcType=VARCHAR}, 
+      #{model,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{repairStart,jdbcType=TIMESTAMP}, 
+      #{repairEnd,jdbcType=TIMESTAMP}, #{repairer,jdbcType=VARCHAR}, #{deviceManager,jdbcType=VARCHAR}, 
+      #{repairSumnumber,jdbcType=INTEGER}, #{repairStatus,jdbcType=INTEGER}, #{repairNumber,jdbcType=INTEGER}, 
+      #{remark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    insert into storage_devicerepair
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="deviceName != null" >
+        device_name,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="number != null" >
+        number,
+      </if>
+      <if test="repairStart != null" >
+        repair_start,
+      </if>
+      <if test="repairEnd != null" >
+        repair_end,
+      </if>
+      <if test="repairer != null" >
+        repairer,
+      </if>
+      <if test="deviceManager != null" >
+        device_manager,
+      </if>
+      <if test="repairSumnumber != null" >
+        repair_sumnumber,
+      </if>
+      <if test="repairStatus != null" >
+        repair_status,
+      </if>
+      <if test="repairNumber != null" >
+        repair_number,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null" >
+        #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="repairStart != null" >
+        #{repairStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairEnd != null" >
+        #{repairEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairer != null" >
+        #{repairer,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceManager != null" >
+        #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="repairSumnumber != null" >
+        #{repairSumnumber,jdbcType=INTEGER},
+      </if>
+      <if test="repairStatus != null" >
+        #{repairStatus,jdbcType=INTEGER},
+      </if>
+      <if test="repairNumber != null" >
+        #{repairNumber,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.StorageDevicerepairExample" resultType="java.lang.Integer" >
+    select count(*) from storage_devicerepair
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_devicerepair
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.deviceName != null" >
+        device_name = #{record.deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.number != null" >
+        number = #{record.number,jdbcType=VARCHAR},
+      </if>
+      <if test="record.repairStart != null" >
+        repair_start = #{record.repairStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.repairEnd != null" >
+        repair_end = #{record.repairEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.repairer != null" >
+        repairer = #{record.repairer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceManager != null" >
+        device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="record.repairSumnumber != null" >
+        repair_sumnumber = #{record.repairSumnumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.repairStatus != null" >
+        repair_status = #{record.repairStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.repairNumber != null" >
+        repair_number = #{record.repairNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_devicerepair
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      device_name = #{record.deviceName,jdbcType=VARCHAR},
+      model = #{record.model,jdbcType=VARCHAR},
+      number = #{record.number,jdbcType=VARCHAR},
+      repair_start = #{record.repairStart,jdbcType=TIMESTAMP},
+      repair_end = #{record.repairEnd,jdbcType=TIMESTAMP},
+      repairer = #{record.repairer,jdbcType=VARCHAR},
+      device_manager = #{record.deviceManager,jdbcType=VARCHAR},
+      repair_sumnumber = #{record.repairSumnumber,jdbcType=INTEGER},
+      repair_status = #{record.repairStatus,jdbcType=INTEGER},
+      repair_number = #{record.repairNumber,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    update storage_devicerepair
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="deviceName != null" >
+        device_name = #{deviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="number != null" >
+        number = #{number,jdbcType=VARCHAR},
+      </if>
+      <if test="repairStart != null" >
+        repair_start = #{repairStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairEnd != null" >
+        repair_end = #{repairEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairer != null" >
+        repairer = #{repairer,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceManager != null" >
+        device_manager = #{deviceManager,jdbcType=VARCHAR},
+      </if>
+      <if test="repairSumnumber != null" >
+        repair_sumnumber = #{repairSumnumber,jdbcType=INTEGER},
+      </if>
+      <if test="repairStatus != null" >
+        repair_status = #{repairStatus,jdbcType=INTEGER},
+      </if>
+      <if test="repairNumber != null" >
+        repair_number = #{repairNumber,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.StorageDevicerepair" >
+    update storage_devicerepair
+    set org_id = #{orgId,jdbcType=INTEGER},
+      device_name = #{deviceName,jdbcType=VARCHAR},
+      model = #{model,jdbcType=VARCHAR},
+      number = #{number,jdbcType=VARCHAR},
+      repair_start = #{repairStart,jdbcType=TIMESTAMP},
+      repair_end = #{repairEnd,jdbcType=TIMESTAMP},
+      repairer = #{repairer,jdbcType=VARCHAR},
+      device_manager = #{deviceManager,jdbcType=VARCHAR},
+      repair_sumnumber = #{repairSumnumber,jdbcType=INTEGER},
+      repair_status = #{repairStatus,jdbcType=INTEGER},
+      repair_number = #{repairNumber,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/device/mapper/SystemLogMapper.java

@@ -0,0 +1,31 @@
+package com.chinaitop.depot.device.mapper;
+
+import com.chinaitop.depot.device.model.SystemLog;
+import com.chinaitop.depot.device.model.SystemLogExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface SystemLogMapper {
+    int countByExample(SystemLogExample example);
+
+    int deleteByExample(SystemLogExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(SystemLog record);
+
+    int insertSelective(SystemLog record);
+
+    List<SystemLog> selectByExample(SystemLogExample example);
+
+    SystemLog selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") SystemLog record, @Param("example") SystemLogExample example);
+
+    int updateByExample(@Param("record") SystemLog record, @Param("example") SystemLogExample example);
+
+    int updateByPrimaryKeySelective(SystemLog record);
+
+    int updateByPrimaryKey(SystemLog record);
+}

src/main/java/com/chinaitop/depot/device/mapper/SystemLogMapper.xml

@@ -0,0 +1,465 @@
+<?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.chinaitop.depot.device.mapper.SystemLogMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.device.model.SystemLog" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="user_zh" property="userZh" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="user_role" property="userRole" jdbcType="VARCHAR" />
+    <result column="user_address" property="userAddress" jdbcType="VARCHAR" />
+    <result column="dl_time" property="dlTime" jdbcType="TIMESTAMP" />
+    <result column="zx_time" property="zxTime" jdbcType="TIMESTAMP" />
+    <result column="func_id" property="funcId" jdbcType="INTEGER" />
+    <result column="func_name" property="funcName" jdbcType="VARCHAR" />
+    <result column="btn_id" property="btnId" jdbcType="INTEGER" />
+    <result column="method_name" property="methodName" jdbcType="VARCHAR" />
+    <result column="oper_result" property="operResult" jdbcType="VARCHAR" />
+    <result column="parameter" property="parameter" jdbcType="VARCHAR" />
+    <result column="rtn_param" property="rtnParam" jdbcType="VARCHAR" />
+    <result column="describes" property="describes" jdbcType="VARCHAR" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="device_ip" property="deviceIp" jdbcType="VARCHAR" />
+    <result column="system_identify" property="systemIdentify" jdbcType="VARCHAR" />
+    <result column="operation_time" property="operationTime" jdbcType="TIMESTAMP" />
+  </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" >
+                  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 collection="criterion.value" item="listItem" open="(" close=")" 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="(" suffix=")" prefixOverrides="and" >
+            <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 collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, org_id, user_id, user_zh, user_name, user_role, user_address, dl_time, zx_time, 
+    func_id, func_name, btn_id, method_name, oper_result, parameter, rtn_param, describes, 
+    type, device_ip, system_identify, operation_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.SystemLogExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from system_log
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from system_log
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.device.model.SystemLogExample" >
+    delete from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.device.model.SystemLog" >
+    insert into system_log (id, org_id, user_id, 
+      user_zh, user_name, user_role, 
+      user_address, dl_time, zx_time, 
+      func_id, func_name, btn_id, 
+      method_name, oper_result, parameter, 
+      rtn_param, describes, type, 
+      device_ip, system_identify, operation_time
+      )
+    values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, 
+      #{userZh,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{userRole,jdbcType=VARCHAR}, 
+      #{userAddress,jdbcType=VARCHAR}, #{dlTime,jdbcType=TIMESTAMP}, #{zxTime,jdbcType=TIMESTAMP}, 
+      #{funcId,jdbcType=INTEGER}, #{funcName,jdbcType=VARCHAR}, #{btnId,jdbcType=INTEGER}, 
+      #{methodName,jdbcType=VARCHAR}, #{operResult,jdbcType=VARCHAR}, #{parameter,jdbcType=VARCHAR}, 
+      #{rtnParam,jdbcType=VARCHAR}, #{describes,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
+      #{deviceIp,jdbcType=VARCHAR}, #{systemIdentify,jdbcType=VARCHAR}, #{operationTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.SystemLog" >
+    insert into system_log
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="userZh != null" >
+        user_zh,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="userRole != null" >
+        user_role,
+      </if>
+      <if test="userAddress != null" >
+        user_address,
+      </if>
+      <if test="dlTime != null" >
+        dl_time,
+      </if>
+      <if test="zxTime != null" >
+        zx_time,
+      </if>
+      <if test="funcId != null" >
+        func_id,
+      </if>
+      <if test="funcName != null" >
+        func_name,
+      </if>
+      <if test="btnId != null" >
+        btn_id,
+      </if>
+      <if test="methodName != null" >
+        method_name,
+      </if>
+      <if test="operResult != null" >
+        oper_result,
+      </if>
+      <if test="parameter != null" >
+        parameter,
+      </if>
+      <if test="rtnParam != null" >
+        rtn_param,
+      </if>
+      <if test="describes != null" >
+        describes,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="deviceIp != null" >
+        device_ip,
+      </if>
+      <if test="systemIdentify != null" >
+        system_identify,
+      </if>
+      <if test="operationTime != null" >
+        operation_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userZh != null" >
+        #{userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null" >
+        #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null" >
+        #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="dlTime != null" >
+        #{dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zxTime != null" >
+        #{zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="funcId != null" >
+        #{funcId,jdbcType=INTEGER},
+      </if>
+      <if test="funcName != null" >
+        #{funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="btnId != null" >
+        #{btnId,jdbcType=INTEGER},
+      </if>
+      <if test="methodName != null" >
+        #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="operResult != null" >
+        #{operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null" >
+        #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="rtnParam != null" >
+        #{rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="describes != null" >
+        #{describes,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceIp != null" >
+        #{deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="systemIdentify != null" >
+        #{systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null" >
+        #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.device.model.SystemLogExample" resultType="java.lang.Integer" >
+    select count(*) from system_log
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update system_log
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userId != null" >
+        user_id = #{record.userId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userZh != null" >
+        user_zh = #{record.userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userName != null" >
+        user_name = #{record.userName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userRole != null" >
+        user_role = #{record.userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userAddress != null" >
+        user_address = #{record.userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dlTime != null" >
+        dl_time = #{record.dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.zxTime != null" >
+        zx_time = #{record.zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.funcId != null" >
+        func_id = #{record.funcId,jdbcType=INTEGER},
+      </if>
+      <if test="record.funcName != null" >
+        func_name = #{record.funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.btnId != null" >
+        btn_id = #{record.btnId,jdbcType=INTEGER},
+      </if>
+      <if test="record.methodName != null" >
+        method_name = #{record.methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operResult != null" >
+        oper_result = #{record.operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parameter != null" >
+        parameter = #{record.parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="record.rtnParam != null" >
+        rtn_param = #{record.rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="record.describes != null" >
+        describes = #{record.describes,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deviceIp != null" >
+        device_ip = #{record.deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="record.systemIdentify != null" >
+        system_identify = #{record.systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operationTime != null" >
+        operation_time = #{record.operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update system_log
+    set id = #{record.id,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=INTEGER},
+      user_zh = #{record.userZh,jdbcType=VARCHAR},
+      user_name = #{record.userName,jdbcType=VARCHAR},
+      user_role = #{record.userRole,jdbcType=VARCHAR},
+      user_address = #{record.userAddress,jdbcType=VARCHAR},
+      dl_time = #{record.dlTime,jdbcType=TIMESTAMP},
+      zx_time = #{record.zxTime,jdbcType=TIMESTAMP},
+      func_id = #{record.funcId,jdbcType=INTEGER},
+      func_name = #{record.funcName,jdbcType=VARCHAR},
+      btn_id = #{record.btnId,jdbcType=INTEGER},
+      method_name = #{record.methodName,jdbcType=VARCHAR},
+      oper_result = #{record.operResult,jdbcType=VARCHAR},
+      parameter = #{record.parameter,jdbcType=VARCHAR},
+      rtn_param = #{record.rtnParam,jdbcType=VARCHAR},
+      describes = #{record.describes,jdbcType=VARCHAR},
+      type = #{record.type,jdbcType=VARCHAR},
+      device_ip = #{record.deviceIp,jdbcType=VARCHAR},
+      system_identify = #{record.systemIdentify,jdbcType=VARCHAR},
+      operation_time = #{record.operationTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.device.model.SystemLog" >
+    update system_log
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="userZh != null" >
+        user_zh = #{userZh,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="userRole != null" >
+        user_role = #{userRole,jdbcType=VARCHAR},
+      </if>
+      <if test="userAddress != null" >
+        user_address = #{userAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="dlTime != null" >
+        dl_time = #{dlTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="zxTime != null" >
+        zx_time = #{zxTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="funcId != null" >
+        func_id = #{funcId,jdbcType=INTEGER},
+      </if>
+      <if test="funcName != null" >
+        func_name = #{funcName,jdbcType=VARCHAR},
+      </if>
+      <if test="btnId != null" >
+        btn_id = #{btnId,jdbcType=INTEGER},
+      </if>
+      <if test="methodName != null" >
+        method_name = #{methodName,jdbcType=VARCHAR},
+      </if>
+      <if test="operResult != null" >
+        oper_result = #{operResult,jdbcType=VARCHAR},
+      </if>
+      <if test="parameter != null" >
+        parameter = #{parameter,jdbcType=VARCHAR},
+      </if>
+      <if test="rtnParam != null" >
+        rtn_param = #{rtnParam,jdbcType=VARCHAR},
+      </if>
+      <if test="describes != null" >
+        describes = #{describes,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceIp != null" >
+        device_ip = #{deviceIp,jdbcType=VARCHAR},
+      </if>
+      <if test="systemIdentify != null" >
+        system_identify = #{systemIdentify,jdbcType=VARCHAR},
+      </if>
+      <if test="operationTime != null" >
+        operation_time = #{operationTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.device.model.SystemLog" >
+    update system_log
+    set org_id = #{orgId,jdbcType=INTEGER},
+      user_id = #{userId,jdbcType=INTEGER},
+      user_zh = #{userZh,jdbcType=VARCHAR},
+      user_name = #{userName,jdbcType=VARCHAR},
+      user_role = #{userRole,jdbcType=VARCHAR},
+      user_address = #{userAddress,jdbcType=VARCHAR},
+      dl_time = #{dlTime,jdbcType=TIMESTAMP},
+      zx_time = #{zxTime,jdbcType=TIMESTAMP},
+      func_id = #{funcId,jdbcType=INTEGER},
+      func_name = #{funcName,jdbcType=VARCHAR},
+      btn_id = #{btnId,jdbcType=INTEGER},
+      method_name = #{methodName,jdbcType=VARCHAR},
+      oper_result = #{operResult,jdbcType=VARCHAR},
+      parameter = #{parameter,jdbcType=VARCHAR},
+      rtn_param = #{rtnParam,jdbcType=VARCHAR},
+      describes = #{describes,jdbcType=VARCHAR},
+      type = #{type,jdbcType=VARCHAR},
+      device_ip = #{deviceIp,jdbcType=VARCHAR},
+      system_identify = #{systemIdentify,jdbcType=VARCHAR},
+      operation_time = #{operationTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/device/model/BasicEquipmentEquipmentPool.java

@@ -0,0 +1,149 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.Date;
+
+public class BasicEquipmentEquipmentPool {
+    private Integer id;
+
+    private Integer orgId;
+
+    private String putPosition;
+
+    private String shelfId;
+
+    private String warehouseId;
+
+    private String remark;
+
+    private Integer inputPersonId;
+
+    private Date inputDate;
+
+    /**
+     * 主键ID
+     * @return id 主键ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键ID
+     * @param id 主键ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID(粮库ID)
+     * @return org_id 单位ID(粮库ID)
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID(粮库ID)
+     * @param orgId 单位ID(粮库ID)
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 存放区域
+     * @return put_position 存放区域
+     */
+    public String getPutPosition() {
+        return putPosition;
+    }
+
+    /**
+     * 存放区域
+     * @param putPosition 存放区域
+     */
+    public void setPutPosition(String putPosition) {
+        this.putPosition = putPosition == null ? null : putPosition.trim();
+    }
+
+    /**
+     * 货架号
+     * @return shelf_id 货架号
+     */
+    public String getShelfId() {
+        return shelfId;
+    }
+
+    /**
+     * 货架号
+     * @param shelfId 货架号
+     */
+    public void setShelfId(String shelfId) {
+        this.shelfId = shelfId == null ? null : shelfId.trim();
+    }
+
+    /**
+     * 货位号
+     * @return warehouse_id 货位号
+     */
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位号
+     * @param warehouseId 货位号
+     */
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId == null ? null : warehouseId.trim();
+    }
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 录入人
+     * @return input_person_id 录入人
+     */
+    public Integer getInputPersonId() {
+        return inputPersonId;
+    }
+
+    /**
+     * 录入人
+     * @param inputPersonId 录入人
+     */
+    public void setInputPersonId(Integer inputPersonId) {
+        this.inputPersonId = inputPersonId;
+    }
+
+    /**
+     * 录入时间
+     * @return input_date 录入时间
+     */
+    public Date getInputDate() {
+        return inputDate;
+    }
+
+    /**
+     * 录入时间
+     * @param inputDate 录入时间
+     */
+    public void setInputDate(Date inputDate) {
+        this.inputDate = inputDate;
+    }
+}

src/main/java/com/chinaitop/depot/device/model/BasicEquipmentEquipmentPoolExample.java

@@ -0,0 +1,739 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BasicEquipmentEquipmentPoolExample {
+    /**
+     * basic_equipment_equipment_pool
+     */
+    protected String orderByClause;
+
+    /**
+     * basic_equipment_equipment_pool
+     */
+    protected boolean distinct;
+
+    /**
+     * basic_equipment_equipment_pool
+     */
+    protected List<Criteria> oredCriteria;
+
+    public BasicEquipmentEquipmentPoolExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * basic_equipment_equipment_pool 2017-12-23
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionIsNull() {
+            addCriterion("put_position is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionIsNotNull() {
+            addCriterion("put_position is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionEqualTo(String value) {
+            addCriterion("put_position =", value, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionNotEqualTo(String value) {
+            addCriterion("put_position <>", value, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionGreaterThan(String value) {
+            addCriterion("put_position >", value, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionGreaterThanOrEqualTo(String value) {
+            addCriterion("put_position >=", value, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionLessThan(String value) {
+            addCriterion("put_position <", value, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionLessThanOrEqualTo(String value) {
+            addCriterion("put_position <=", value, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionLike(String value) {
+            addCriterion("put_position like", value, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionNotLike(String value) {
+            addCriterion("put_position not like", value, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionIn(List<String> values) {
+            addCriterion("put_position in", values, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionNotIn(List<String> values) {
+            addCriterion("put_position not in", values, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionBetween(String value1, String value2) {
+            addCriterion("put_position between", value1, value2, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andPutPositionNotBetween(String value1, String value2) {
+            addCriterion("put_position not between", value1, value2, "putPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdIsNull() {
+            addCriterion("shelf_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdIsNotNull() {
+            addCriterion("shelf_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdEqualTo(String value) {
+            addCriterion("shelf_id =", value, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdNotEqualTo(String value) {
+            addCriterion("shelf_id <>", value, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdGreaterThan(String value) {
+            addCriterion("shelf_id >", value, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdGreaterThanOrEqualTo(String value) {
+            addCriterion("shelf_id >=", value, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdLessThan(String value) {
+            addCriterion("shelf_id <", value, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdLessThanOrEqualTo(String value) {
+            addCriterion("shelf_id <=", value, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdLike(String value) {
+            addCriterion("shelf_id like", value, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdNotLike(String value) {
+            addCriterion("shelf_id not like", value, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdIn(List<String> values) {
+            addCriterion("shelf_id in", values, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdNotIn(List<String> values) {
+            addCriterion("shelf_id not in", values, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdBetween(String value1, String value2) {
+            addCriterion("shelf_id between", value1, value2, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andShelfIdNotBetween(String value1, String value2) {
+            addCriterion("shelf_id not between", value1, value2, "shelfId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNull() {
+            addCriterion("warehouse_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNotNull() {
+            addCriterion("warehouse_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdEqualTo(String value) {
+            addCriterion("warehouse_id =", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotEqualTo(String value) {
+            addCriterion("warehouse_id <>", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThan(String value) {
+            addCriterion("warehouse_id >", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThanOrEqualTo(String value) {
+            addCriterion("warehouse_id >=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThan(String value) {
+            addCriterion("warehouse_id <", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThanOrEqualTo(String value) {
+            addCriterion("warehouse_id <=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLike(String value) {
+            addCriterion("warehouse_id like", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotLike(String value) {
+            addCriterion("warehouse_id not like", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIn(List<String> values) {
+            addCriterion("warehouse_id in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotIn(List<String> values) {
+            addCriterion("warehouse_id not in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdBetween(String value1, String value2) {
+            addCriterion("warehouse_id between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotBetween(String value1, String value2) {
+            addCriterion("warehouse_id not between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdIsNull() {
+            addCriterion("input_person_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdIsNotNull() {
+            addCriterion("input_person_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdEqualTo(Integer value) {
+            addCriterion("input_person_id =", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdNotEqualTo(Integer value) {
+            addCriterion("input_person_id <>", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdGreaterThan(Integer value) {
+            addCriterion("input_person_id >", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("input_person_id >=", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdLessThan(Integer value) {
+            addCriterion("input_person_id <", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdLessThanOrEqualTo(Integer value) {
+            addCriterion("input_person_id <=", value, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdIn(List<Integer> values) {
+            addCriterion("input_person_id in", values, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdNotIn(List<Integer> values) {
+            addCriterion("input_person_id not in", values, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdBetween(Integer value1, Integer value2) {
+            addCriterion("input_person_id between", value1, value2, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputPersonIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("input_person_id not between", value1, value2, "inputPersonId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateIsNull() {
+            addCriterion("input_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateIsNotNull() {
+            addCriterion("input_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateEqualTo(Date value) {
+            addCriterion("input_date =", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateNotEqualTo(Date value) {
+            addCriterion("input_date <>", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateGreaterThan(Date value) {
+            addCriterion("input_date >", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("input_date >=", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateLessThan(Date value) {
+            addCriterion("input_date <", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateLessThanOrEqualTo(Date value) {
+            addCriterion("input_date <=", value, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateIn(List<Date> values) {
+            addCriterion("input_date in", values, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateNotIn(List<Date> values) {
+            addCriterion("input_date not in", values, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateBetween(Date value1, Date value2) {
+            addCriterion("input_date between", value1, value2, "inputDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputDateNotBetween(Date value1, Date value2) {
+            addCriterion("input_date not between", value1, value2, "inputDate");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * basic_equipment_equipment_pool
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * basic_equipment_equipment_pool 2017-12-23
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/chinaitop/depot/device/model/ContentBean.java

@@ -0,0 +1,62 @@
+package com.chinaitop.depot.device.model;
+
+public class ContentBean {
+	private Integer deviceTypeId;
+	private String deviceName;
+	private String model;
+	private String number;
+	private Integer useCount;
+	private String putPosition;
+	private String shelfId;
+	private int id;
+	
+	
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public String getShelfId() {
+		return shelfId;
+	}
+	public void setShelfId(String shelfId) {
+		this.shelfId = shelfId;
+	}
+	public String getPutPosition() {
+		return putPosition;
+	}
+	public void setPutPosition(String putPosition) {
+		this.putPosition = putPosition;
+	}
+	public Integer getDeviceTypeId() {
+		return deviceTypeId;
+	}
+	public void setDeviceTypeId(Integer deviceTypeId) {
+		this.deviceTypeId = deviceTypeId;
+	}
+	public String getDeviceName() {
+		return deviceName;
+	}
+	public void setDeviceName(String deviceName) {
+		this.deviceName = deviceName;
+	}
+	public String getModel() {
+		return model;
+	}
+	public void setModel(String model) {
+		this.model = model;
+	}
+	public String getNumber() {
+		return number;
+	}
+	public void setNumber(String number) {
+		this.number = number;
+	}
+	public Integer getUseCount() {
+		return useCount;
+	}
+	public void setUseCount(Integer useCount) {
+		this.useCount = useCount;
+	}
+}

src/main/java/com/chinaitop/depot/device/model/HouseNameBean.java

@@ -0,0 +1,18 @@
+package com.chinaitop.depot.device.model;
+
+public class HouseNameBean {
+	private Integer depotId;
+	private String storeName;
+	public Integer getDepotId() {
+		return depotId;
+	}
+	public void setDepotId(Integer depotId) {
+		this.depotId = depotId;
+	}
+	public String getStoreName() {
+		return storeName;
+	}
+	public void setStoreName(String storeName) {
+		this.storeName = storeName;
+	}
+}

src/main/java/com/chinaitop/depot/device/model/HouseTypeBean.java

@@ -0,0 +1,25 @@
+package com.chinaitop.depot.device.model;
+
+public class HouseTypeBean {
+	private Integer depotId;
+	private Integer deviceTypeId;
+	private String enumName;
+	public Integer getDepotId() {
+		return depotId;
+	}
+	public void setDepotId(Integer depotId) {
+		this.depotId = depotId;
+	}
+	public Integer getDeviceTypeId() {
+		return deviceTypeId;
+	}
+	public void setDeviceTypeId(Integer deviceTypeId) {
+		this.deviceTypeId = deviceTypeId;
+	}
+	public String getEnumName() {
+		return enumName;
+	}
+	public void setEnumName(String enumName) {
+		this.enumName = enumName;
+	}
+}

src/main/java/com/chinaitop/depot/device/model/ShelfContentBean.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.device.model;
+
+public class ShelfContentBean {
+	private Integer deviceTypeId;
+	private Integer storageRack;
+	private String enumName;
+	private String shelfId;
+	public Integer getDeviceTypeId() {
+		return deviceTypeId;
+	}
+	public void setDeviceTypeId(Integer deviceTypeId) {
+		this.deviceTypeId = deviceTypeId;
+	}
+	public Integer getStorageRack() {
+		return storageRack;
+	}
+	public void setStorageRack(Integer storageRack) {
+		this.storageRack = storageRack;
+	}
+	public String getEnumName() {
+		return enumName;
+	}
+	public void setEnumName(String enumName) {
+		this.enumName = enumName;
+	}
+	public String getShelfId() {
+		return shelfId;
+	}
+	public void setShelfId(String shelfId) {
+		this.shelfId = shelfId;
+	}
+}

src/main/java/com/chinaitop/depot/device/model/StorageDeviceback.java

@@ -0,0 +1,167 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.Date;
+
+public class StorageDeviceback {
+    private Integer id;
+
+    private Integer getId;
+
+    private String backKeeper;
+
+    private String backHandler;
+
+    private String collator;
+
+    private Date backTime;
+
+    private Integer brokenCount;
+
+    private String number;
+
+    private Integer backCount;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 关联领用的id
+     * @return get_id 关联领用的id
+     */
+    public Integer getGetId() {
+        return getId;
+    }
+
+    /**
+     * 关联领用的id
+     * @param getId 关联领用的id
+     */
+    public void setGetId(Integer getId) {
+        this.getId = getId;
+    }
+
+    /**
+     * 记账人
+     * @return back_keeper 记账人
+     */
+    public String getBackKeeper() {
+        return backKeeper;
+    }
+
+    /**
+     * 记账人
+     * @param backKeeper 记账人
+     */
+    public void setBackKeeper(String backKeeper) {
+        this.backKeeper = backKeeper == null ? null : backKeeper.trim();
+    }
+
+    /**
+     * 经手人
+     * @return back_handler 经手人
+     */
+    public String getBackHandler() {
+        return backHandler;
+    }
+
+    /**
+     * 经手人
+     * @param backHandler 经手人
+     */
+    public void setBackHandler(String backHandler) {
+        this.backHandler = backHandler == null ? null : backHandler.trim();
+    }
+
+    /**
+     * 核对人
+     * @return collator 核对人
+     */
+    public String getCollator() {
+        return collator;
+    }
+
+    /**
+     * 核对人
+     * @param collator 核对人
+     */
+    public void setCollator(String collator) {
+        this.collator = collator == null ? null : collator.trim();
+    }
+
+    /**
+     * 归还时间
+     * @return back_time 归还时间
+     */
+    public Date getBackTime() {
+        return backTime;
+    }
+
+    /**
+     * 归还时间
+     * @param backTime 归还时间
+     */
+    public void setBackTime(Date backTime) {
+        this.backTime = backTime;
+    }
+
+    /**
+     * 故障数量
+     * @return broken_count 故障数量
+     */
+    public Integer getBrokenCount() {
+        return brokenCount;
+    }
+
+    /**
+     * 故障数量
+     * @param brokenCount 故障数量
+     */
+    public void setBrokenCount(Integer brokenCount) {
+        this.brokenCount = brokenCount;
+    }
+
+    /**
+     * 设备编号
+     * @return number 设备编号
+     */
+    public String getNumber() {
+        return number;
+    }
+
+    /**
+     * 设备编号
+     * @param number 设备编号
+     */
+    public void setNumber(String number) {
+        this.number = number == null ? null : number.trim();
+    }
+
+    /**
+     * 归还数量
+     * @return back_count 归还数量
+     */
+    public Integer getBackCount() {
+        return backCount;
+    }
+
+    /**
+     * 归还数量
+     * @param backCount 归还数量
+     */
+    public void setBackCount(Integer backCount) {
+        this.backCount = backCount;
+    }
+}

src/main/java/com/chinaitop/depot/device/model/StorageDevicebackExample.java

@@ -0,0 +1,826 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+public class StorageDevicebackExample {
+    /**
+     * storage_deviceback
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_deviceback
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_deviceback
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageDevicebackExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_deviceback 2018-03-22
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        protected void addCriterionForJDBCDate(String condition, Date value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value.getTime()), property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
+            if (values == null || values.size() == 0) {
+                throw new RuntimeException("Value list for " + property + " cannot be null or empty");
+            }
+            List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
+            Iterator<Date> iter = values.iterator();
+            while (iter.hasNext()) {
+                dateList.add(new java.sql.Date(iter.next().getTime()));
+            }
+            addCriterion(condition, dateList, property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdIsNull() {
+            addCriterion("get_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdIsNotNull() {
+            addCriterion("get_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdEqualTo(Integer value) {
+            addCriterion("get_id =", value, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdNotEqualTo(Integer value) {
+            addCriterion("get_id <>", value, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdGreaterThan(Integer value) {
+            addCriterion("get_id >", value, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("get_id >=", value, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdLessThan(Integer value) {
+            addCriterion("get_id <", value, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdLessThanOrEqualTo(Integer value) {
+            addCriterion("get_id <=", value, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdIn(List<Integer> values) {
+            addCriterion("get_id in", values, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdNotIn(List<Integer> values) {
+            addCriterion("get_id not in", values, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdBetween(Integer value1, Integer value2) {
+            addCriterion("get_id between", value1, value2, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGetIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("get_id not between", value1, value2, "getId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperIsNull() {
+            addCriterion("back_keeper is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperIsNotNull() {
+            addCriterion("back_keeper is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperEqualTo(String value) {
+            addCriterion("back_keeper =", value, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperNotEqualTo(String value) {
+            addCriterion("back_keeper <>", value, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperGreaterThan(String value) {
+            addCriterion("back_keeper >", value, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperGreaterThanOrEqualTo(String value) {
+            addCriterion("back_keeper >=", value, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperLessThan(String value) {
+            addCriterion("back_keeper <", value, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperLessThanOrEqualTo(String value) {
+            addCriterion("back_keeper <=", value, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperLike(String value) {
+            addCriterion("back_keeper like", value, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperNotLike(String value) {
+            addCriterion("back_keeper not like", value, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperIn(List<String> values) {
+            addCriterion("back_keeper in", values, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperNotIn(List<String> values) {
+            addCriterion("back_keeper not in", values, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperBetween(String value1, String value2) {
+            addCriterion("back_keeper between", value1, value2, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackKeeperNotBetween(String value1, String value2) {
+            addCriterion("back_keeper not between", value1, value2, "backKeeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerIsNull() {
+            addCriterion("back_handler is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerIsNotNull() {
+            addCriterion("back_handler is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerEqualTo(String value) {
+            addCriterion("back_handler =", value, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerNotEqualTo(String value) {
+            addCriterion("back_handler <>", value, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerGreaterThan(String value) {
+            addCriterion("back_handler >", value, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerGreaterThanOrEqualTo(String value) {
+            addCriterion("back_handler >=", value, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerLessThan(String value) {
+            addCriterion("back_handler <", value, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerLessThanOrEqualTo(String value) {
+            addCriterion("back_handler <=", value, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerLike(String value) {
+            addCriterion("back_handler like", value, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerNotLike(String value) {
+            addCriterion("back_handler not like", value, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerIn(List<String> values) {
+            addCriterion("back_handler in", values, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerNotIn(List<String> values) {
+            addCriterion("back_handler not in", values, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerBetween(String value1, String value2) {
+            addCriterion("back_handler between", value1, value2, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackHandlerNotBetween(String value1, String value2) {
+            addCriterion("back_handler not between", value1, value2, "backHandler");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorIsNull() {
+            addCriterion("collator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorIsNotNull() {
+            addCriterion("collator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorEqualTo(String value) {
+            addCriterion("collator =", value, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorNotEqualTo(String value) {
+            addCriterion("collator <>", value, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorGreaterThan(String value) {
+            addCriterion("collator >", value, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorGreaterThanOrEqualTo(String value) {
+            addCriterion("collator >=", value, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorLessThan(String value) {
+            addCriterion("collator <", value, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorLessThanOrEqualTo(String value) {
+            addCriterion("collator <=", value, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorLike(String value) {
+            addCriterion("collator like", value, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorNotLike(String value) {
+            addCriterion("collator not like", value, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorIn(List<String> values) {
+            addCriterion("collator in", values, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorNotIn(List<String> values) {
+            addCriterion("collator not in", values, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorBetween(String value1, String value2) {
+            addCriterion("collator between", value1, value2, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCollatorNotBetween(String value1, String value2) {
+            addCriterion("collator not between", value1, value2, "collator");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeIsNull() {
+            addCriterion("back_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeIsNotNull() {
+            addCriterion("back_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeEqualTo(Date value) {
+            addCriterionForJDBCDate("back_time =", value, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeNotEqualTo(Date value) {
+            addCriterionForJDBCDate("back_time <>", value, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeGreaterThan(Date value) {
+            addCriterionForJDBCDate("back_time >", value, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("back_time >=", value, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeLessThan(Date value) {
+            addCriterionForJDBCDate("back_time <", value, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("back_time <=", value, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeIn(List<Date> values) {
+            addCriterionForJDBCDate("back_time in", values, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeNotIn(List<Date> values) {
+            addCriterionForJDBCDate("back_time not in", values, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("back_time between", value1, value2, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackTimeNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("back_time not between", value1, value2, "backTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountIsNull() {
+            addCriterion("broken_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountIsNotNull() {
+            addCriterion("broken_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountEqualTo(Integer value) {
+            addCriterion("broken_count =", value, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountNotEqualTo(Integer value) {
+            addCriterion("broken_count <>", value, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountGreaterThan(Integer value) {
+            addCriterion("broken_count >", value, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("broken_count >=", value, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountLessThan(Integer value) {
+            addCriterion("broken_count <", value, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountLessThanOrEqualTo(Integer value) {
+            addCriterion("broken_count <=", value, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountIn(List<Integer> values) {
+            addCriterion("broken_count in", values, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountNotIn(List<Integer> values) {
+            addCriterion("broken_count not in", values, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountBetween(Integer value1, Integer value2) {
+            addCriterion("broken_count between", value1, value2, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrokenCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("broken_count not between", value1, value2, "brokenCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNull() {
+            addCriterion("number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNotNull() {
+            addCriterion("number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberEqualTo(String value) {
+            addCriterion("number =", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotEqualTo(String value) {
+            addCriterion("number <>", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThan(String value) {
+            addCriterion("number >", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("number >=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThan(String value) {
+            addCriterion("number <", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThanOrEqualTo(String value) {
+            addCriterion("number <=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLike(String value) {
+            addCriterion("number like", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotLike(String value) {
+            addCriterion("number not like", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIn(List<String> values) {
+            addCriterion("number in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotIn(List<String> values) {
+            addCriterion("number not in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberBetween(String value1, String value2) {
+            addCriterion("number between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotBetween(String value1, String value2) {
+            addCriterion("number not between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountIsNull() {
+            addCriterion("back_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountIsNotNull() {
+            addCriterion("back_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountEqualTo(Integer value) {
+            addCriterion("back_count =", value, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountNotEqualTo(Integer value) {
+            addCriterion("back_count <>", value, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountGreaterThan(Integer value) {
+            addCriterion("back_count >", value, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("back_count >=", value, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountLessThan(Integer value) {
+            addCriterion("back_count <", value, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountLessThanOrEqualTo(Integer value) {
+            addCriterion("back_count <=", value, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountIn(List<Integer> values) {
+            addCriterion("back_count in", values, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountNotIn(List<Integer> values) {
+            addCriterion("back_count not in", values, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountBetween(Integer value1, Integer value2) {
+            addCriterion("back_count between", value1, value2, "backCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("back_count not between", value1, value2, "backCount");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_deviceback
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_deviceback 2018-03-22
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/chinaitop/depot/device/model/StorageDevicecheck.java

@@ -0,0 +1,250 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.Date;
+
+public class StorageDevicecheck {
+    private Integer id;
+
+    private String checkNumber;
+
+    private Date checkDate;
+
+    private Integer depotId;
+
+    private String checkPerson;
+
+    private String deviceType;
+
+    private String deviceName;
+
+    private String model;
+
+    private Integer storeCount;
+
+    private Integer reallyCount;
+
+    private String checkResult;
+
+    private String reason;
+
+    private Integer orgId;
+    
+    //业务字段
+    private String DepotName;
+
+    public String getDepotName() {
+        return DepotName;
+    }
+
+    public void setDepotName(String depotName) {
+        DepotName = depotName;
+    }
+
+    /**
+     * 盘点单
+     * @return id 盘点单
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 盘点单
+     * @param id 盘点单
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 盘点单号
+     * @return check_number 盘点单号
+     */
+    public String getCheckNumber() {
+        return checkNumber;
+    }
+
+    /**
+     * 盘点单号
+     * @param checkNumber 盘点单号
+     */
+    public void setCheckNumber(String checkNumber) {
+        this.checkNumber = checkNumber == null ? null : checkNumber.trim();
+    }
+
+    /**
+     * 盘点时间
+     * @return check_date 盘点时间
+     */
+    public Date getCheckDate() {
+        return checkDate;
+    }
+
+    /**
+     * 盘点时间
+     * @param checkDate 盘点时间
+     */
+    public void setCheckDate(Date checkDate) {
+        this.checkDate = checkDate;
+    }
+
+    /**
+     * 库名称
+     * @return depot_id 库名称
+     */
+    public Integer getDepotId() {
+        return depotId;
+    }
+
+    /**
+     * 库名称
+     * @param depotId 库名称
+     */
+    public void setDepotId(Integer depotId) {
+        this.depotId = depotId;
+    }
+
+    /**
+     * 负责人
+     * @return check_person 负责人
+     */
+    public String getCheckPerson() {
+        return checkPerson;
+    }
+
+    /**
+     * 负责人
+     * @param checkPerson 负责人
+     */
+    public void setCheckPerson(String checkPerson) {
+        this.checkPerson = checkPerson == null ? null : checkPerson.trim();
+    }
+
+    /**
+     * 盘点种类
+     * @return device_type 盘点种类
+     */
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    /**
+     * 盘点种类
+     * @param deviceType 盘点种类
+     */
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType == null ? null : deviceType.trim();
+    }
+
+    /**
+     * 器材名称
+     * @return device_name 器材名称
+     */
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    /**
+     * 器材名称
+     * @param deviceName 器材名称
+     */
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName == null ? null : deviceName.trim();
+    }
+
+    /**
+     * 规格型号
+     * @return model 规格型号
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * 规格型号
+     * @param model 规格型号
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * 库存数量
+     * @return store_count 库存数量
+     */
+    public Integer getStoreCount() {
+        return storeCount;
+    }
+
+    /**
+     * 库存数量
+     * @param storeCount 库存数量
+     */
+    public void setStoreCount(Integer storeCount) {
+        this.storeCount = storeCount;
+    }
+
+    /**
+     * 实际库存数量
+     * @return really_count 实际库存数量
+     */
+    public Integer getReallyCount() {
+        return reallyCount;
+    }
+
+    /**
+     * 实际库存数量
+     * @param reallyCount 实际库存数量
+     */
+    public void setReallyCount(Integer reallyCount) {
+        this.reallyCount = reallyCount;
+    }
+
+    /**
+     * 盘点情况
+     * @return check_result 盘点情况
+     */
+    public String getCheckResult() {
+        return checkResult;
+    }
+
+    /**
+     * 盘点情况
+     * @param checkResult 盘点情况
+     */
+    public void setCheckResult(String checkResult) {
+        this.checkResult = checkResult == null ? null : checkResult.trim();
+    }
+
+    /**
+     * 原因
+     * @return reason 原因
+     */
+    public String getReason() {
+        return reason;
+    }
+
+    /**
+     * 原因
+     * @param reason 原因
+     */
+    public void setReason(String reason) {
+        this.reason = reason == null ? null : reason.trim();
+    }
+
+    /**
+     * 组织id
+     * @return org_id 组织id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织id
+     * @param orgId 组织id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+}

src/main/java/com/chinaitop/depot/device/model/StorageDeviceget.java

@@ -0,0 +1,306 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.Date;
+
+public class StorageDeviceget {
+    private Integer id;
+
+    private Integer deviceType;
+
+    private Date getTime;
+
+    private String deviceName;
+
+    private String model;
+
+    private Integer getCount;
+
+    private Integer backCount;
+
+    private String bookKeeper;
+
+    private String handler;
+
+    private Integer houseId;
+
+    private String number;
+
+    private String collator;
+
+    private Integer useCount;
+
+    private String remark;
+
+    private Integer inputId;
+
+    private Integer orgId;
+    
+    //业务字段
+    private String orgName;
+    
+    
+
+    public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+    /**
+     * 领用表
+     * @return id 领用表
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 领用表
+     * @param id 领用表
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 类型
+     * @return device_type 类型
+     */
+    public Integer getDeviceType() {
+        return deviceType;
+    }
+
+    /**
+     * 类型
+     * @param deviceType 类型
+     */
+    public void setDeviceType(Integer deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    /**
+     * 领用的时间
+     * @return get_time 领用的时间
+     */
+    public Date getGetTime() {
+        return getTime;
+    }
+
+    /**
+     * 领用的时间
+     * @param getTime 领用的时间
+     */
+    public void setGetTime(Date getTime) {
+        this.getTime = getTime;
+    }
+
+    /**
+     * 器材名称
+     * @return device_name 器材名称
+     */
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    /**
+     * 器材名称
+     * @param deviceName 器材名称
+     */
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName == null ? null : deviceName.trim();
+    }
+
+    /**
+     * 规格型号
+     * @return model 规格型号
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * 规格型号
+     * @param model 规格型号
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * 领用数量（可用）
+     * @return get_count 领用数量（可用）
+     */
+    public Integer getGetCount() {
+        return getCount;
+    }
+
+    /**
+     * 领用数量（可用）
+     * @param getCount 领用数量（可用）
+     */
+    public void setGetCount(Integer getCount) {
+        this.getCount = getCount;
+    }
+
+    /**
+     * 归还数量
+     * @return back_count 归还数量
+     */
+    public Integer getBackCount() {
+        return backCount;
+    }
+
+    /**
+     * 归还数量
+     * @param backCount 归还数量
+     */
+    public void setBackCount(Integer backCount) {
+        this.backCount = backCount;
+    }
+
+    /**
+     * 记账人
+     * @return book_keeper 记账人
+     */
+    public String getBookKeeper() {
+        return bookKeeper;
+    }
+
+    /**
+     * 记账人
+     * @param bookKeeper 记账人
+     */
+    public void setBookKeeper(String bookKeeper) {
+        this.bookKeeper = bookKeeper == null ? null : bookKeeper.trim();
+    }
+
+    /**
+     * 经手人
+     * @return handler 经手人
+     */
+    public String getHandler() {
+        return handler;
+    }
+
+    /**
+     * 经手人
+     * @param handler 经手人
+     */
+    public void setHandler(String handler) {
+        this.handler = handler == null ? null : handler.trim();
+    }
+
+    /**
+     * 领用到的仓房
+     * @return house_id 领用到的仓房
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 领用到的仓房
+     * @param houseId 领用到的仓房
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 设备编号
+     * @return number 设备编号
+     */
+    public String getNumber() {
+        return number;
+    }
+
+    /**
+     * 设备编号
+     * @param number 设备编号
+     */
+    public void setNumber(String number) {
+        this.number = number == null ? null : number.trim();
+    }
+
+    /**
+     * 核对人
+     * @return collator 核对人
+     */
+    public String getCollator() {
+        return collator;
+    }
+
+    /**
+     * 核对人
+     * @param collator 核对人
+     */
+    public void setCollator(String collator) {
+        this.collator = collator == null ? null : collator.trim();
+    }
+
+    /**
+     * 可用的数量
+     * @return use_count 可用的数量
+     */
+    public Integer getUseCount() {
+        return useCount;
+    }
+
+    /**
+     * 可用的数量
+     * @param useCount 可用的数量
+     */
+    public void setUseCount(Integer useCount) {
+        this.useCount = useCount;
+    }
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 关联入库的id
+     * @return input_id 关联入库的id
+     */
+    public Integer getInputId() {
+        return inputId;
+    }
+
+    /**
+     * 关联入库的id
+     * @param inputId 关联入库的id
+     */
+    public void setInputId(Integer inputId) {
+        this.inputId = inputId;
+    }
+
+    /**
+     * 组织id
+     * @return org_id 组织id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织id
+     * @param orgId 组织id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+}

src/main/java/com/chinaitop/depot/device/model/StorageDeviceinput.java

@@ -0,0 +1,458 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.Date;
+
+public class StorageDeviceinput {
+    private Integer id;
+
+    private Integer deviceType;
+
+    private String deviceName;
+
+    private String model;
+
+    private Integer useCount;
+
+    private String deviceManager;
+
+    private Date inputTime;
+
+    private String number;
+
+    private String unit;
+
+    private Long devicePrice;
+
+    private String storageRack;
+
+    private String storageRackCell;
+
+    private String handler;
+
+    private String bookKeeper;
+
+    private String producer;
+
+    private String remark;
+
+    private Long serviceLife;
+
+    private Integer parentId;
+
+    private String position;
+
+    private Integer status;
+
+    private Integer brokenCount;
+
+    private Date produceTime;
+
+    private Integer orgId;
+    
+    //业务字段
+    private String orgName;
+    
+    //入库的器材名称
+    private String inputDeviceName;
+    
+    //存放地方
+    private String positionName;
+    
+    
+    
+    
+    
+    
+
+    public String getPositionName() {
+		return positionName;
+	}
+
+	public void setPositionName(String positionName) {
+		this.positionName = positionName;
+	}
+
+	public String getInputDeviceName() {
+		return inputDeviceName;
+	}
+
+	public void setInputDeviceName(String inputDeviceName) {
+		this.inputDeviceName = inputDeviceName;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	/**
+     * 器材入库表
+     * @return id 器材入库表
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 器材入库表
+     * @param id 器材入库表
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 器材类型的id（4种、用id去关联）
+     * @return device_type 器材类型的id（4种、用id去关联）
+     */
+    public Integer getDeviceType() {
+        return deviceType;
+    }
+
+    /**
+     * 器材类型的id（4种、用id去关联）
+     * @param deviceType 器材类型的id（4种、用id去关联）
+     */
+    public void setDeviceType(Integer deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    /**
+     * 器材名称
+     * @return device_name 器材名称
+     */
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    /**
+     * 器材名称
+     * @param deviceName 器材名称
+     */
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName == null ? null : deviceName.trim();
+    }
+
+    /**
+     * 规格型号
+     * @return model 规格型号
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * 规格型号
+     * @param model 规格型号
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * 库存数量（可用数量）
+     * @return use_count 库存数量（可用数量）
+     */
+    public Integer getUseCount() {
+        return useCount;
+    }
+
+    /**
+     * 库存数量（可用数量）
+     * @param useCount 库存数量（可用数量）
+     */
+    public void setUseCount(Integer useCount) {
+        this.useCount = useCount;
+    }
+
+    /**
+     * 器材的保管员
+     * @return device_manager 器材的保管员
+     */
+    public String getDeviceManager() {
+        return deviceManager;
+    }
+
+    /**
+     * 器材的保管员
+     * @param deviceManager 器材的保管员
+     */
+    public void setDeviceManager(String deviceManager) {
+        this.deviceManager = deviceManager == null ? null : deviceManager.trim();
+    }
+
+    /**
+     * 入库时间
+     * @return input_time 入库时间
+     */
+    public Date getInputTime() {
+        return inputTime;
+    }
+
+    /**
+     * 入库时间
+     * @param inputTime 入库时间
+     */
+    public void setInputTime(Date inputTime) {
+        this.inputTime = inputTime;
+    }
+
+    /**
+     * 资产编号
+     * @return number 资产编号
+     */
+    public String getNumber() {
+        return number;
+    }
+
+    /**
+     * 资产编号
+     * @param number 资产编号
+     */
+    public void setNumber(String number) {
+        this.number = number == null ? null : number.trim();
+    }
+
+    /**
+     * 单位
+     * @return unit 单位
+     */
+    public String getUnit() {
+        return unit;
+    }
+
+    /**
+     * 单位
+     * @param unit 单位
+     */
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    /**
+     * 价格
+     * @return device_price 价格
+     */
+    public Long getDevicePrice() {
+        return devicePrice;
+    }
+
+    /**
+     * 价格
+     * @param devicePrice 价格
+     */
+    public void setDevicePrice(Long devicePrice) {
+        this.devicePrice = devicePrice;
+    }
+
+    /**
+     * 货架
+     * @return storage_rack 货架
+     */
+    public String getStorageRack() {
+        return storageRack;
+    }
+
+    /**
+     * 货架
+     * @param storageRack 货架
+     */
+    public void setStorageRack(String storageRack) {
+        this.storageRack = storageRack == null ? null : storageRack.trim();
+    }
+
+    /**
+     * 货位
+     * @return storage_rack_cell 货位
+     */
+    public String getStorageRackCell() {
+        return storageRackCell;
+    }
+
+    /**
+     * 货位
+     * @param storageRackCell 货位
+     */
+    public void setStorageRackCell(String storageRackCell) {
+        this.storageRackCell = storageRackCell == null ? null : storageRackCell.trim();
+    }
+
+    /**
+     * 经手人
+     * @return handler 经手人
+     */
+    public String getHandler() {
+        return handler;
+    }
+
+    /**
+     * 经手人
+     * @param handler 经手人
+     */
+    public void setHandler(String handler) {
+        this.handler = handler == null ? null : handler.trim();
+    }
+
+    /**
+     * 记账人
+     * @return book_keeper 记账人
+     */
+    public String getBookKeeper() {
+        return bookKeeper;
+    }
+
+    /**
+     * 记账人
+     * @param bookKeeper 记账人
+     */
+    public void setBookKeeper(String bookKeeper) {
+        this.bookKeeper = bookKeeper == null ? null : bookKeeper.trim();
+    }
+
+    /**
+     * 生产厂家
+     * @return producer 生产厂家
+     */
+    public String getProducer() {
+        return producer;
+    }
+
+    /**
+     * 生产厂家
+     * @param producer 生产厂家
+     */
+    public void setProducer(String producer) {
+        this.producer = producer == null ? null : producer.trim();
+    }
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 器材的使用年限
+     * @return service_life 器材的使用年限
+     */
+    public Long getServiceLife() {
+        return serviceLife;
+    }
+
+    /**
+     * 器材的使用年限
+     * @param serviceLife 器材的使用年限
+     */
+    public void setServiceLife(Long serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    /**
+     * 零配件与设备关联的id
+     * @return parent_id 零配件与设备关联的id
+     */
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    /**
+     * 零配件与设备关联的id
+     * @param parentId 零配件与设备关联的id
+     */
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    /**
+     * 存放位置
+     * @return position 存放位置
+     */
+    public String getPosition() {
+        return position;
+    }
+
+    /**
+     * 存放位置
+     * @param position 存放位置
+     */
+    public void setPosition(String position) {
+        this.position = position == null ? null : position.trim();
+    }
+
+    /**
+     * 设备状态（0：正常；1：报废; 2:保养；3：维修；4：领用；5：故障）
+     * @return status 设备状态（0：正常；1：报废; 2:保养；3：维修；4：领用；5：故障）
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设备状态（0：正常；1：报废; 2:保养；3：维修；4：领用；5：故障）
+     * @param status 设备状态（0：正常；1：报废; 2:保养；3：维修；4：领用；5：故障）
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 故障数量
+     * @return broken_count 故障数量
+     */
+    public Integer getBrokenCount() {
+        return brokenCount;
+    }
+
+    /**
+     * 故障数量
+     * @param brokenCount 故障数量
+     */
+    public void setBrokenCount(Integer brokenCount) {
+        this.brokenCount = brokenCount;
+    }
+
+    /**
+     * 生产时间
+     * @return produce_time 生产时间
+     */
+    public Date getProduceTime() {
+        return produceTime;
+    }
+
+    /**
+     * 生产时间
+     * @param produceTime 生产时间
+     */
+    public void setProduceTime(Date produceTime) {
+        this.produceTime = produceTime;
+    }
+
+    /**
+     * 组织id
+     * @return org_id 组织id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织id
+     * @param orgId 组织id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+}

src/main/java/com/chinaitop/depot/device/model/StorageDevicekeep.java

@@ -0,0 +1,237 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.Date;
+
+public class StorageDevicekeep {
+    private Integer id;
+
+    private Integer orgId;
+
+    private String deviceName;
+
+    private String model;
+
+    private Date keepStart;
+
+    private Date keepEnd;
+
+    private String keeper;
+
+    private String deviceManager;
+
+    private String number;
+
+    private Integer keepStatus;
+
+    private Integer inputId;
+    
+  //业务字段
+    private String depotName;
+    
+    private String enumName;
+    
+    private String orgName;
+
+    
+    
+
+    public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public String getEnumName() {
+		return enumName;
+	}
+
+	public void setEnumName(String enumName) {
+		this.enumName = enumName;
+	}
+
+	public String getDepotName() {
+		return depotName;
+	}
+
+	public void setDepotName(String depotName) {
+		this.depotName = depotName;
+	}
+
+    /**
+     * 保养表
+     * @return id 保养表
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 保养表
+     * @param id 保养表
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 组织id
+     * @return org_id 组织id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织id
+     * @param orgId 组织id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 器材名称
+     * @return device_name 器材名称
+     */
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    /**
+     * 器材名称
+     * @param deviceName 器材名称
+     */
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName == null ? null : deviceName.trim();
+    }
+
+    /**
+     * 规格型号
+     * @return model 规格型号
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * 规格型号
+     * @param model 规格型号
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * 保养开始时间
+     * @return keep_start 保养开始时间
+     */
+    public Date getKeepStart() {
+        return keepStart;
+    }
+
+    /**
+     * 保养开始时间
+     * @param keepStart 保养开始时间
+     */
+    public void setKeepStart(Date keepStart) {
+        this.keepStart = keepStart;
+    }
+
+    /**
+     * 保养结束时间
+     * @return keep_end 保养结束时间
+     */
+    public Date getKeepEnd() {
+        return keepEnd;
+    }
+
+    /**
+     * 保养结束时间
+     * @param keepEnd 保养结束时间
+     */
+    public void setKeepEnd(Date keepEnd) {
+        this.keepEnd = keepEnd;
+    }
+
+    /**
+     * 保养负责人
+     * @return keeper 保养负责人
+     */
+    public String getKeeper() {
+        return keeper;
+    }
+
+    /**
+     * 保养负责人
+     * @param keeper 保养负责人
+     */
+    public void setKeeper(String keeper) {
+        this.keeper = keeper == null ? null : keeper.trim();
+    }
+
+    /**
+     * 设备管理员
+     * @return device_manager 设备管理员
+     */
+    public String getDeviceManager() {
+        return deviceManager;
+    }
+
+    /**
+     * 设备管理员
+     * @param deviceManager 设备管理员
+     */
+    public void setDeviceManager(String deviceManager) {
+        this.deviceManager = deviceManager == null ? null : deviceManager.trim();
+    }
+
+    /**
+     * 设备编号
+     * @return number 设备编号
+     */
+    public String getNumber() {
+        return number;
+    }
+
+    /**
+     * 设备编号
+     * @param number 设备编号
+     */
+    public void setNumber(String number) {
+        this.number = number == null ? null : number.trim();
+    }
+
+    /**
+     * 保养状态（0：正常 ，1：保养中）
+     * @return keep_status 保养状态（0：正常 ，1：保养中）
+     */
+    public Integer getKeepStatus() {
+        return keepStatus;
+    }
+
+    /**
+     * 保养状态（0：正常 ，1：保养中）
+     * @param keepStatus 保养状态（0：正常 ，1：保养中）
+     */
+    public void setKeepStatus(Integer keepStatus) {
+        this.keepStatus = keepStatus;
+    }
+
+    /**
+     * 关联入库表
+     * @return input_id 关联入库表
+     */
+    public Integer getInputId() {
+        return inputId;
+    }
+
+    /**
+     * 关联入库表
+     * @param inputId 关联入库表
+     */
+    public void setInputId(Integer inputId) {
+        this.inputId = inputId;
+    }
+}

src/main/java/com/chinaitop/depot/device/model/StorageDevicekeepExample.java

@@ -0,0 +1,929 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class StorageDevicekeepExample {
+    /**
+     * storage_devicekeep
+     */
+    protected String orderByClause;
+
+    /**
+     * storage_devicekeep
+     */
+    protected boolean distinct;
+
+    /**
+     * storage_devicekeep
+     */
+    protected List<Criteria> oredCriteria;
+
+    public StorageDevicekeepExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * storage_devicekeep 2019-03-16
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameIsNull() {
+            addCriterion("device_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameIsNotNull() {
+            addCriterion("device_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameEqualTo(String value) {
+            addCriterion("device_name =", value, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameNotEqualTo(String value) {
+            addCriterion("device_name <>", value, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameGreaterThan(String value) {
+            addCriterion("device_name >", value, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameGreaterThanOrEqualTo(String value) {
+            addCriterion("device_name >=", value, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameLessThan(String value) {
+            addCriterion("device_name <", value, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameLessThanOrEqualTo(String value) {
+            addCriterion("device_name <=", value, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameLike(String value) {
+            addCriterion("device_name like", value, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameNotLike(String value) {
+            addCriterion("device_name not like", value, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameIn(List<String> values) {
+            addCriterion("device_name in", values, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameNotIn(List<String> values) {
+            addCriterion("device_name not in", values, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameBetween(String value1, String value2) {
+            addCriterion("device_name between", value1, value2, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceNameNotBetween(String value1, String value2) {
+            addCriterion("device_name not between", value1, value2, "deviceName");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIsNull() {
+            addCriterion("model is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIsNotNull() {
+            addCriterion("model is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelEqualTo(String value) {
+            addCriterion("model =", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotEqualTo(String value) {
+            addCriterion("model <>", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelGreaterThan(String value) {
+            addCriterion("model >", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelGreaterThanOrEqualTo(String value) {
+            addCriterion("model >=", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLessThan(String value) {
+            addCriterion("model <", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLessThanOrEqualTo(String value) {
+            addCriterion("model <=", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelLike(String value) {
+            addCriterion("model like", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotLike(String value) {
+            addCriterion("model not like", value, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelIn(List<String> values) {
+            addCriterion("model in", values, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotIn(List<String> values) {
+            addCriterion("model not in", values, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelBetween(String value1, String value2) {
+            addCriterion("model between", value1, value2, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelNotBetween(String value1, String value2) {
+            addCriterion("model not between", value1, value2, "model");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartIsNull() {
+            addCriterion("keep_start is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartIsNotNull() {
+            addCriterion("keep_start is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartEqualTo(Date value) {
+            addCriterion("keep_start =", value, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartNotEqualTo(Date value) {
+            addCriterion("keep_start <>", value, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartGreaterThan(Date value) {
+            addCriterion("keep_start >", value, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartGreaterThanOrEqualTo(Date value) {
+            addCriterion("keep_start >=", value, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartLessThan(Date value) {
+            addCriterion("keep_start <", value, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartLessThanOrEqualTo(Date value) {
+            addCriterion("keep_start <=", value, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartIn(List<Date> values) {
+            addCriterion("keep_start in", values, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartNotIn(List<Date> values) {
+            addCriterion("keep_start not in", values, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartBetween(Date value1, Date value2) {
+            addCriterion("keep_start between", value1, value2, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStartNotBetween(Date value1, Date value2) {
+            addCriterion("keep_start not between", value1, value2, "keepStart");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndIsNull() {
+            addCriterion("keep_end is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndIsNotNull() {
+            addCriterion("keep_end is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndEqualTo(Date value) {
+            addCriterion("keep_end =", value, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndNotEqualTo(Date value) {
+            addCriterion("keep_end <>", value, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndGreaterThan(Date value) {
+            addCriterion("keep_end >", value, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndGreaterThanOrEqualTo(Date value) {
+            addCriterion("keep_end >=", value, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndLessThan(Date value) {
+            addCriterion("keep_end <", value, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndLessThanOrEqualTo(Date value) {
+            addCriterion("keep_end <=", value, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndIn(List<Date> values) {
+            addCriterion("keep_end in", values, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndNotIn(List<Date> values) {
+            addCriterion("keep_end not in", values, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndBetween(Date value1, Date value2) {
+            addCriterion("keep_end between", value1, value2, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepEndNotBetween(Date value1, Date value2) {
+            addCriterion("keep_end not between", value1, value2, "keepEnd");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperIsNull() {
+            addCriterion("keeper is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperIsNotNull() {
+            addCriterion("keeper is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperEqualTo(String value) {
+            addCriterion("keeper =", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperNotEqualTo(String value) {
+            addCriterion("keeper <>", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperGreaterThan(String value) {
+            addCriterion("keeper >", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperGreaterThanOrEqualTo(String value) {
+            addCriterion("keeper >=", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperLessThan(String value) {
+            addCriterion("keeper <", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperLessThanOrEqualTo(String value) {
+            addCriterion("keeper <=", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperLike(String value) {
+            addCriterion("keeper like", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperNotLike(String value) {
+            addCriterion("keeper not like", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperIn(List<String> values) {
+            addCriterion("keeper in", values, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperNotIn(List<String> values) {
+            addCriterion("keeper not in", values, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperBetween(String value1, String value2) {
+            addCriterion("keeper between", value1, value2, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperNotBetween(String value1, String value2) {
+            addCriterion("keeper not between", value1, value2, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerIsNull() {
+            addCriterion("device_manager is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerIsNotNull() {
+            addCriterion("device_manager is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerEqualTo(String value) {
+            addCriterion("device_manager =", value, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerNotEqualTo(String value) {
+            addCriterion("device_manager <>", value, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerGreaterThan(String value) {
+            addCriterion("device_manager >", value, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerGreaterThanOrEqualTo(String value) {
+            addCriterion("device_manager >=", value, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerLessThan(String value) {
+            addCriterion("device_manager <", value, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerLessThanOrEqualTo(String value) {
+            addCriterion("device_manager <=", value, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerLike(String value) {
+            addCriterion("device_manager like", value, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerNotLike(String value) {
+            addCriterion("device_manager not like", value, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerIn(List<String> values) {
+            addCriterion("device_manager in", values, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerNotIn(List<String> values) {
+            addCriterion("device_manager not in", values, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerBetween(String value1, String value2) {
+            addCriterion("device_manager between", value1, value2, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceManagerNotBetween(String value1, String value2) {
+            addCriterion("device_manager not between", value1, value2, "deviceManager");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNull() {
+            addCriterion("number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIsNotNull() {
+            addCriterion("number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberEqualTo(String value) {
+            addCriterion("number =", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotEqualTo(String value) {
+            addCriterion("number <>", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThan(String value) {
+            addCriterion("number >", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("number >=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThan(String value) {
+            addCriterion("number <", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLessThanOrEqualTo(String value) {
+            addCriterion("number <=", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberLike(String value) {
+            addCriterion("number like", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotLike(String value) {
+            addCriterion("number not like", value, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberIn(List<String> values) {
+            addCriterion("number in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotIn(List<String> values) {
+            addCriterion("number not in", values, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberBetween(String value1, String value2) {
+            addCriterion("number between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberNotBetween(String value1, String value2) {
+            addCriterion("number not between", value1, value2, "number");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusIsNull() {
+            addCriterion("keep_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusIsNotNull() {
+            addCriterion("keep_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusEqualTo(Integer value) {
+            addCriterion("keep_status =", value, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusNotEqualTo(Integer value) {
+            addCriterion("keep_status <>", value, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusGreaterThan(Integer value) {
+            addCriterion("keep_status >", value, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("keep_status >=", value, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusLessThan(Integer value) {
+            addCriterion("keep_status <", value, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("keep_status <=", value, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusIn(List<Integer> values) {
+            addCriterion("keep_status in", values, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusNotIn(List<Integer> values) {
+            addCriterion("keep_status not in", values, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusBetween(Integer value1, Integer value2) {
+            addCriterion("keep_status between", value1, value2, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeepStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("keep_status not between", value1, value2, "keepStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdIsNull() {
+            addCriterion("input_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdIsNotNull() {
+            addCriterion("input_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdEqualTo(Integer value) {
+            addCriterion("input_id =", value, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdNotEqualTo(Integer value) {
+            addCriterion("input_id <>", value, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdGreaterThan(Integer value) {
+            addCriterion("input_id >", value, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("input_id >=", value, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdLessThan(Integer value) {
+            addCriterion("input_id <", value, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdLessThanOrEqualTo(Integer value) {
+            addCriterion("input_id <=", value, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdIn(List<Integer> values) {
+            addCriterion("input_id in", values, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdNotIn(List<Integer> values) {
+            addCriterion("input_id not in", values, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdBetween(Integer value1, Integer value2) {
+            addCriterion("input_id between", value1, value2, "inputId");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("input_id not between", value1, value2, "inputId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * storage_devicekeep
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * storage_devicekeep 2019-03-16
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/chinaitop/depot/device/model/StorageDevicerepair.java

@@ -0,0 +1,264 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.Date;
+
+public class StorageDevicerepair {
+    private Integer id;
+
+    private Integer orgId;
+
+    private String deviceName;
+
+    private String model;
+
+    private String number;
+
+    private Date repairStart;
+
+    private Date repairEnd;
+
+    private String repairer;
+
+    private String deviceManager;
+
+    private Integer repairSumnumber;
+
+    private Integer repairStatus;
+
+    private Integer repairNumber;
+
+    private String remark;
+    
+  //业务字段
+    private String depotName;
+    
+    private String orgName;
+
+    
+    
+
+    public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public String getDepotName() {
+		return depotName;
+	}
+
+	public void setDepotName(String depotName) {
+		this.depotName = depotName;
+	}
+
+
+    /**
+     * 维修表
+     * @return id 维修表
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 维修表
+     * @param id 维修表
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 组织id
+     * @return org_id 组织id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织id
+     * @param orgId 组织id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 器材名称
+     * @return device_name 器材名称
+     */
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    /**
+     * 器材名称
+     * @param deviceName 器材名称
+     */
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName == null ? null : deviceName.trim();
+    }
+
+    /**
+     * 规格型号
+     * @return model 规格型号
+     */
+    public String getModel() {
+        return model;
+    }
+
+    /**
+     * 规格型号
+     * @param model 规格型号
+     */
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    /**
+     * 设备编号
+     * @return number 设备编号
+     */
+    public String getNumber() {
+        return number;
+    }
+
+    /**
+     * 设备编号
+     * @param number 设备编号
+     */
+    public void setNumber(String number) {
+        this.number = number == null ? null : number.trim();
+    }
+
+    /**
+     * 维修开始时间
+     * @return repair_start 维修开始时间
+     */
+    public Date getRepairStart() {
+        return repairStart;
+    }
+
+    /**
+     * 维修开始时间
+     * @param repairStart 维修开始时间
+     */
+    public void setRepairStart(Date repairStart) {
+        this.repairStart = repairStart;
+    }
+
+    /**
+     * 维修结束时间
+     * @return repair_end 维修结束时间
+     */
+    public Date getRepairEnd() {
+        return repairEnd;
+    }
+
+    /**
+     * 维修结束时间
+     * @param repairEnd 维修结束时间
+     */
+    public void setRepairEnd(Date repairEnd) {
+        this.repairEnd = repairEnd;
+    }
+
+    /**
+     * 维修负责人
+     * @return repairer 维修负责人
+     */
+    public String getRepairer() {
+        return repairer;
+    }
+
+    /**
+     * 维修负责人
+     * @param repairer 维修负责人
+     */
+    public void setRepairer(String repairer) {
+        this.repairer = repairer == null ? null : repairer.trim();
+    }
+
+    /**
+     * 设备负责人
+     * @return device_manager 设备负责人
+     */
+    public String getDeviceManager() {
+        return deviceManager;
+    }
+
+    /**
+     * 设备负责人
+     * @param deviceManager 设备负责人
+     */
+    public void setDeviceManager(String deviceManager) {
+        this.deviceManager = deviceManager == null ? null : deviceManager.trim();
+    }
+
+    /**
+     * 可以维修的总数量
+     * @return repair_sumnumber 可以维修的总数量
+     */
+    public Integer getRepairSumnumber() {
+        return repairSumnumber;
+    }
+
+    /**
+     * 可以维修的总数量
+     * @param repairSumnumber 可以维修的总数量
+     */
+    public void setRepairSumnumber(Integer repairSumnumber) {
+        this.repairSumnumber = repairSumnumber;
+    }
+
+    /**
+     * 维修状态（0：正常，1：维修中，2：故障）
+     * @return repair_status 维修状态（0：正常，1：维修中，2：故障）
+     */
+    public Integer getRepairStatus() {
+        return repairStatus;
+    }
+
+    /**
+     * 维修状态（0：正常，1：维修中，2：故障）
+     * @param repairStatus 维修状态（0：正常，1：维修中，2：故障）
+     */
+    public void setRepairStatus(Integer repairStatus) {
+        this.repairStatus = repairStatus;
+    }
+
+    /**
+     * 要维修的数量
+     * @return repair_number 要维修的数量
+     */
+    public Integer getRepairNumber() {
+        return repairNumber;
+    }
+
+    /**
+     * 要维修的数量
+     * @param repairNumber 要维修的数量
+     */
+    public void setRepairNumber(Integer repairNumber) {
+        this.repairNumber = repairNumber;
+    }
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+}

src/main/java/com/chinaitop/depot/device/model/SystemLog.java

@@ -0,0 +1,383 @@
+package com.chinaitop.depot.device.model;
+
+import java.util.Date;
+
+public class SystemLog {
+    private String id;
+
+    private Integer orgId;
+
+    private Integer userId;
+
+    private String userZh;
+
+    private String userName;
+
+    private String userRole;
+
+    private String userAddress;
+
+    private Date dlTime;
+
+    private Date zxTime;
+
+    private Integer funcId;
+
+    private String funcName;
+
+    private Integer btnId;
+
+    private String methodName;
+
+    private String operResult;
+
+    private String parameter;
+
+    private String rtnParam;
+
+    private String describes;
+
+    private String type;
+
+    private String deviceIp;
+
+    private String systemIdentify;
+
+    private Date operationTime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * 机构id
+     * @return org_id 机构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 机构id
+     * @param orgId 机构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 用户id
+     * @return user_id 用户id
+     */
+    public Integer getUserId() {
+        return userId;
+    }
+
+    /**
+     * 用户id
+     * @param userId 用户id
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 用户账号
+     * @return user_zh 用户账号
+     */
+    public String getUserZh() {
+        return userZh;
+    }
+
+    /**
+     * 用户账号
+     * @param userZh 用户账号
+     */
+    public void setUserZh(String userZh) {
+        this.userZh = userZh == null ? null : userZh.trim();
+    }
+
+    /**
+     * 用户名称
+     * @return user_name 用户名称
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * 用户名称
+     * @param userName 用户名称
+     */
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    /**
+     * 用户角色
+     * @return user_role 用户角色
+     */
+    public String getUserRole() {
+        return userRole;
+    }
+
+    /**
+     * 用户角色
+     * @param userRole 用户角色
+     */
+    public void setUserRole(String userRole) {
+        this.userRole = userRole == null ? null : userRole.trim();
+    }
+
+    /**
+     * 用户所属机构行政区划
+     * @return user_address 用户所属机构行政区划
+     */
+    public String getUserAddress() {
+        return userAddress;
+    }
+
+    /**
+     * 用户所属机构行政区划
+     * @param userAddress 用户所属机构行政区划
+     */
+    public void setUserAddress(String userAddress) {
+        this.userAddress = userAddress == null ? null : userAddress.trim();
+    }
+
+    /**
+     * 登录时间
+     * @return dl_time 登录时间
+     */
+    public Date getDlTime() {
+        return dlTime;
+    }
+
+    /**
+     * 登录时间
+     * @param dlTime 登录时间
+     */
+    public void setDlTime(Date dlTime) {
+        this.dlTime = dlTime;
+    }
+
+    /**
+     * 注销时间
+     * @return zx_time 注销时间
+     */
+    public Date getZxTime() {
+        return zxTime;
+    }
+
+    /**
+     * 注销时间
+     * @param zxTime 注销时间
+     */
+    public void setZxTime(Date zxTime) {
+        this.zxTime = zxTime;
+    }
+
+    /**
+     * 功能id
+     * @return func_id 功能id
+     */
+    public Integer getFuncId() {
+        return funcId;
+    }
+
+    /**
+     * 功能id
+     * @param funcId 功能id
+     */
+    public void setFuncId(Integer funcId) {
+        this.funcId = funcId;
+    }
+
+    /**
+     * 菜单名称
+     * @return func_name 菜单名称
+     */
+    public String getFuncName() {
+        return funcName;
+    }
+
+    /**
+     * 菜单名称
+     * @param funcName 菜单名称
+     */
+    public void setFuncName(String funcName) {
+        this.funcName = funcName == null ? null : funcName.trim();
+    }
+
+    /**
+     * 按钮id
+     * @return btn_id 按钮id
+     */
+    public Integer getBtnId() {
+        return btnId;
+    }
+
+    /**
+     * 按钮id
+     * @param btnId 按钮id
+     */
+    public void setBtnId(Integer btnId) {
+        this.btnId = btnId;
+    }
+
+    /**
+     * 方法名
+     * @return method_name 方法名
+     */
+    public String getMethodName() {
+        return methodName;
+    }
+
+    /**
+     * 方法名
+     * @param methodName 方法名
+     */
+    public void setMethodName(String methodName) {
+        this.methodName = methodName == null ? null : methodName.trim();
+    }
+
+    /**
+     * 操作结果
+     * @return oper_result 操作结果
+     */
+    public String getOperResult() {
+        return operResult;
+    }
+
+    /**
+     * 操作结果
+     * @param operResult 操作结果
+     */
+    public void setOperResult(String operResult) {
+        this.operResult = operResult == null ? null : operResult.trim();
+    }
+
+    /**
+     * 请求参数
+     * @return parameter 请求参数
+     */
+    public String getParameter() {
+        return parameter;
+    }
+
+    /**
+     * 请求参数
+     * @param parameter 请求参数
+     */
+    public void setParameter(String parameter) {
+        this.parameter = parameter == null ? null : parameter.trim();
+    }
+
+    /**
+     * 返回参数
+     * @return rtn_param 返回参数
+     */
+    public String getRtnParam() {
+        return rtnParam;
+    }
+
+    /**
+     * 返回参数
+     * @param rtnParam 返回参数
+     */
+    public void setRtnParam(String rtnParam) {
+        this.rtnParam = rtnParam == null ? null : rtnParam.trim();
+    }
+
+    /**
+     * 日志描述
+     * @return describes 日志描述
+     */
+    public String getDescribes() {
+        return describes;
+    }
+
+    /**
+     * 日志描述
+     * @param describes 日志描述
+     */
+    public void setDescribes(String describes) {
+        this.describes = describes == null ? null : describes.trim();
+    }
+
+    /**
+     * 日志类型：1 登录 2 访问 3 操作
+     * @return type 日志类型：1 登录 2 访问 3 操作
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 日志类型：1 登录 2 访问 3 操作
+     * @param type 日志类型：1 登录 2 访问 3 操作
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * 设备ip
+     * @return device_ip 设备ip
+     */
+    public String getDeviceIp() {
+        return deviceIp;
+    }
+
+    /**
+     * 设备ip
+     * @param deviceIp 设备ip
+     */
+    public void setDeviceIp(String deviceIp) {
+        this.deviceIp = deviceIp == null ? null : deviceIp.trim();
+    }
+
+    /**
+     * 系统标识：库级系统
+     * @return system_identify 系统标识：库级系统
+     */
+    public String getSystemIdentify() {
+        return systemIdentify;
+    }
+
+    /**
+     * 系统标识：库级系统
+     * @param systemIdentify 系统标识：库级系统
+     */
+    public void setSystemIdentify(String systemIdentify) {
+        this.systemIdentify = systemIdentify == null ? null : systemIdentify.trim();
+    }
+
+    /**
+     * 操作时间
+     * @return operation_time 操作时间
+     */
+    public Date getOperationTime() {
+        return operationTime;
+    }
+
+    /**
+     * 操作时间
+     * @param operationTime 操作时间
+     */
+    public void setOperationTime(Date operationTime) {
+        this.operationTime = operationTime;
+    }
+}

src/main/java/com/chinaitop/depot/device/service/BasicEquipmentEquipmentPoolService.java

@@ -0,0 +1,56 @@
+package com.chinaitop.depot.device.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool;
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample;
+
+public interface BasicEquipmentEquipmentPoolService {
+
+	/**
+	 * 新增
+	 * 
+	 * @param record 数据对象
+	 */
+	void add(BasicEquipmentEquipmentPool record);
+
+	/**
+	 * 修改
+	 * 
+	 * @param record
+	 *            数据对象
+	 */
+	void update(BasicEquipmentEquipmentPool record);
+
+	/**
+	 * 删除
+	 * 
+	 * @param id 数据ID
+	 */
+	void remove(Integer id);
+
+	/**
+	 * 查询一条数据
+	 * 
+	 * @param id 数据ID
+	 * @return
+	 */
+	BasicEquipmentEquipmentPool findByIdObj(Integer id);
+
+	/**
+	 * 查询一组数据
+	 * 
+	 * @param example 查询条件
+	 * @return
+	 */
+	List<BasicEquipmentEquipmentPool> findByCondition(BasicEquipmentEquipmentPoolExample example);
+
+	/**
+	 * 导入
+	 * 
+	 * @param list
+	 * @param depotInfo
+	 * @return
+	 */
+	String importData(List<List<String>> list, Integer orgId);
+}

src/main/java/com/chinaitop/depot/device/service/StorageDeviceBackService.java

@@ -0,0 +1,22 @@
+package com.chinaitop.depot.device.service;
+
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.device.model.StorageDeviceback;
+
+@Service
+public interface StorageDeviceBackService {
+
+	StorageDeviceback selectByPrimaryKey(Integer id);
+
+	void save(StorageDeviceback storageDeviceback);
+
+	List<StorageDeviceback> selectBygetId(Integer id);
+
+
+	
+
+}

src/main/java/com/chinaitop/depot/device/service/StorageDeviceCheckService.java

@@ -0,0 +1,48 @@
+package com.chinaitop.depot.device.service;
+
+import com.chinaitop.depot.device.model.StorageDevicecheck;
+import com.chinaitop.depot.device.model.StorageDevicecheckExample;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
+
+import java.util.List;
+import java.util.Map;
+
+public interface StorageDeviceCheckService {
+
+
+	/**
+	 * 分页查询盘点单
+	 * @param storageDevicecheckExample
+	 * @return
+	 */
+	List<StorageDevicecheck> queryByExample(StorageDevicecheckExample storageDevicecheckExample);
+
+	/**
+	 * 按照主键移除
+	 * @param depotId
+	 */
+	void remove(Integer depotId,String checkNum);
+
+    /**
+     * 新增
+     * @param json
+     */
+	void add(String json,String type);
+
+	/**
+	 * 根据depotId查询对应数据
+	 * @param depotId
+	 * @return
+	 */
+	List<StorageDevicecheck> loadDataByDepotId(Integer depotId,String pddh);
+
+
+	List<StorageDeviceinput> childZlList(StorageDeviceinputExample storageDeviceinputExample);
+
+    /**
+     * 获取当天的总盘点记录数
+     * @return
+     */
+	int getCountForDate(Map<String,Object> map);
+}

src/main/java/com/chinaitop/depot/device/service/StorageDeviceGetService.java

@@ -0,0 +1,28 @@
+package com.chinaitop.depot.device.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.device.model.StorageDeviceget;
+import com.chinaitop.depot.device.model.StorageDevicegetExample;
+
+
+public interface StorageDeviceGetService {
+
+	List<StorageDeviceget> queryByDevice(StorageDevicegetExample storageDevicegetExample);
+
+	void save(StorageDeviceget storageDeviceget);
+
+	StorageDeviceget selectByPrimaryKey(int id);
+
+	void updateByPrimaryKeySelective(StorageDeviceget storageDeviceget);
+
+	List<StorageDeviceget> selectByHouseId(Integer houseId);
+
+	List<Map<String, Object>> queryCountByType();
+
+
+
+	
+
+}

src/main/java/com/chinaitop/depot/device/service/StorageDeviceInputService.java

@@ -0,0 +1,78 @@
+package com.chinaitop.depot.device.service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.device.model.ContentBean;
+import com.chinaitop.depot.device.model.HouseNameBean;
+import com.chinaitop.depot.device.model.HouseTypeBean;
+import com.chinaitop.depot.device.model.ShelfContentBean;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
+
+
+public interface StorageDeviceInputService {
+
+	
+	List<StorageDeviceinput> queryByDevice(StorageDeviceinputExample storageDeviceinputExample);
+
+	void remove(Integer id);
+
+	void save(StorageDeviceinput storageDeviceinput);
+
+	StorageDeviceinput loadDataById(int id);
+
+	List<HouseNameBean> getHouseList();
+
+	List<HouseTypeBean> getTypeList(Integer depotId);
+
+	List<ShelfContentBean> getNameList(Integer depotTypeId);
+
+	ContentBean getcontentGetList(String deviceName);
+
+	List<ContentBean> getShelfGetList(String deviceName);
+
+	List<StorageDeviceinput> getDeviceInputList(Integer depotId);
+
+	List<StorageDeviceinput> getModelList(String deviceName);
+
+	List<StorageDeviceinput> getNumberList(String deviceModel);
+
+	List<StorageDeviceinput> getCountList(String number);
+
+	List<StorageDeviceinput> queryByNumber(StorageDeviceinputExample storageDeviceinputExample2);
+
+	void updateByPrimaryKeySelective(StorageDeviceinput storageDeviceinput);
+
+	List<StorageDeviceinput> getAllList(String number);
+
+	List<ContentBean> getModelGetList(Map<String, Object> map);
+
+	List<StorageDeviceinput> getNumberGetList(Map<String, Object> map);
+
+	List<StorageDeviceinput> getUseCountGetList(String number);
+
+	List<StorageDeviceinput> getDeviceModelList(String deviceName);
+
+	StorageDeviceinput selectById(Integer number);
+
+	List<StorageDeviceinput> getdevieName();
+
+	List<StorageDeviceinput> getRepairNameList();
+
+	List<StorageDeviceinput> getUseCount(Map<String, Object> map);
+
+	List<StorageDeviceinput> queryDevice(HashMap<Object, Object> map);
+
+	List<StorageDeviceinput> getDeviceModelRepair(String deviceName);
+
+	List<StorageDeviceinput> getDeviceModelListRepair(String deviceName);
+
+	List<Map<String, Object>> queryCountByType();
+
+	List<StorageDeviceinput> queryDeviceAccount(StorageDeviceinputExample storageDeviceinputExample);
+
+
+
+}

src/main/java/com/chinaitop/depot/device/service/StorageDeviceKeepService.java

@@ -0,0 +1,26 @@
+package com.chinaitop.depot.device.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.device.model.StorageDevicekeep;
+import com.chinaitop.depot.device.model.StorageDevicekeepExample;
+
+public interface StorageDeviceKeepService {
+
+	List<StorageDevicekeep> queryByDevice(StorageDevicekeepExample storageDevicekeepExample);
+
+	void remove(Integer id);
+
+	void end(StorageDevicekeep storageDevicekeep);
+
+	void save(StorageDevicekeep storageDevicekeep);
+
+	StorageDevicekeep loadDataById(int id);
+	
+	void updateByPrimaryKeySelective(StorageDevicekeep storageDevicekeep);
+
+	List<StorageDevicekeep> getDeviceNameList();
+
+	StorageDevicekeep selectById(Integer id);
+
+}

src/main/java/com/chinaitop/depot/device/service/StorageDeviceRepairService.java

@@ -0,0 +1,22 @@
+package com.chinaitop.depot.device.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.device.model.StorageDevicerepair;
+import com.chinaitop.depot.device.model.StorageDevicerepairExample;
+
+
+public interface StorageDeviceRepairService {
+
+	List<StorageDevicerepair> queryByDevice(StorageDevicerepairExample storageDevicerepairExample);
+
+	void save(StorageDevicerepair storageDevicerepair);
+
+	void updateByPrimaryKeySelective(StorageDevicerepair storageDevicerepair);
+
+	StorageDevicerepair loadDataById(int id);
+
+
+
+
+}

src/main/java/com/chinaitop/depot/device/service/impl/BasicEquipmentEquipmentPoolServiceImpl.java

@@ -0,0 +1,117 @@
+package com.chinaitop.depot.device.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.device.mapper.BasicEquipmentEquipmentPoolMapper;
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool;
+import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPoolExample;
+import com.chinaitop.depot.device.service.BasicEquipmentEquipmentPoolService;
+
+@Service
+public class BasicEquipmentEquipmentPoolServiceImpl implements BasicEquipmentEquipmentPoolService {
+
+	@Resource
+	private BasicEquipmentEquipmentPoolMapper mapper;
+
+	@Override
+	public void add(BasicEquipmentEquipmentPool record) {
+		mapper.insertSelective(record);
+	}
+
+	@Override
+	public void update(BasicEquipmentEquipmentPool record) {
+		mapper.updateByPrimaryKeySelective(record);
+	}
+
+	@Override
+	public void remove(Integer id) {
+		mapper.deleteByPrimaryKey(id);
+	}
+
+	@Override
+	public BasicEquipmentEquipmentPool findByIdObj(Integer id) {
+		return mapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public List<BasicEquipmentEquipmentPool> findByCondition(BasicEquipmentEquipmentPoolExample example) {
+		return mapper.selectByExample(example);
+	}
+
+	@Override
+	public String importData(List<List<String>> list, Integer orgId) {
+		Date date = new Date();
+		String msg = "";
+    	int len = 0;
+		BasicEquipmentEquipmentPool pool = null;
+        
+        for (int i = 0; i < list.size(); i++) {
+            List<String> revList = list.get(i);
+            
+            for (int j = 0; j < revList.size(); j++) {
+            	switch(j) {
+            		case 0:
+            			if (revList.get(j) != null && !"".equals(revList.get(j))) {
+            				len = revList.get(j).length();
+                    		if (len > 50) {
+                    			msg = "第 "+(i+1)+" 行第 1 列的值的长度不能超过50！";
+                    			return msg;
+                    		}
+            				pool = new BasicEquipmentEquipmentPool();
+            				pool.setPutPosition(revList.get(j));
+            				pool.setOrgId(orgId);
+            			}
+                		break;
+            		case 1:
+            			if (pool != null) {
+            				len = revList.get(j).length();
+                    		if (len > 50) {
+                    			msg = "第 "+(i+1)+" 行第 2 列的值的长度不能超过50！";
+                    			return msg;
+                    		}
+            				pool.setShelfId(revList.get(j));
+            			}
+            			break;
+            		case 2:
+            			if (revList.get(j) != null && !"".equals(revList.get(j))) {
+            				len = revList.get(j).length();
+                    		if (len > 50) {
+                    			msg = "第 "+(i+1)+" 行第 3 列的值的长度不能超过50！";
+                    			return msg;
+                    		}
+            				if (pool != null) {
+	            				pool.setWarehouseId(revList.get(j));
+            				}
+            			}
+            			break;
+            		case 3:
+            			if (revList.get(j) != null && !"".equals(revList.get(j))) {
+            				len = revList.get(j).length();
+                    		if (len > 255) {
+                    			msg = "第 "+(i+1)+" 行第 4 列的值的长度不能超过255！";
+                    			return msg;
+                    		}
+            				if (pool != null) {
+	            				pool.setRemark(revList.get(j));
+	            				pool.setOrgId(orgId);
+	            				pool.setInputDate(date);
+	            				mapper.insertSelective(pool);
+            				}
+            			}
+            			pool = null;
+            			break;
+            		default :
+            			break;
+            	}
+            }
+           
+        }
+        return msg;
+	}
+
+}

src/main/java/com/chinaitop/depot/device/service/impl/ImportServiceImpl.java

@@ -0,0 +1,161 @@
+package com.chinaitop.depot.device.service.impl;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.chinaitop.depot.utils.ExcelImportUtils;
+import com.chinaitop.depot.utils.ParameterUtil;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @auther mafy
+ * @createtime 2017/10/26 0026
+ * 导入公共类，直接调用importFile方法即可
+ */
+@Service
+public class ImportServiceImpl {
+
+
+
+    public String importFile(MultipartFile file, String fileType, HttpServletRequest request,String[] titleArr,boolean[] emptyArr,List<List<String>> lists) throws Exception{
+
+        // 服务器路径
+        String rootPath = request.getSession().getServletContext().getRealPath("");
+        // 文件相对路径
+        String relativePath = "/upload/" + fileType;
+        //创建临时文件
+        createTemp(file,request,rootPath,relativePath);
+        //读取临时文件，并且返回错误信息
+        String fileAllpath = rootPath+relativePath+"/"+file.getOriginalFilename();
+
+        String retVal = readExcelValue(fileAllpath,titleArr,emptyArr,lists);
+
+        return retVal;
+    }
+
+    /**
+     * 创建临时文件
+     * @param file 上传过来的文件流
+     * @param request 请求
+     * @param rootPath 根目录
+     * @param relativePath 相对路径
+     * @throws Exception
+     */
+    public void createTemp(MultipartFile file, HttpServletRequest request,String rootPath,String relativePath) throws Exception{
+        // 如路径不存在，则创建它
+        File directory = new File(rootPath + relativePath);
+        if (!directory.exists()) {
+            directory.mkdirs();
+        }
+        String filePath = relativePath + "/" + file.getOriginalFilename();
+        // 复制 文件
+        file.transferTo(new File(rootPath + filePath));
+    }
+
+
+    /**
+     * 解析Excel里面的数据，目前只支持1个sheet
+     * @param fileName
+     * @return
+     */
+    public String readExcelValue(String fileName,String[] titleArr,boolean[] emptyArr,List<List<String>> list){
+
+        //获取File
+        File tempFile = new File(fileName);
+
+        StringBuilder errorMSG = new StringBuilder("");//错误信息收集器
+        int sheetNum = 1;//sheet的总数
+        //循环每一个sheet
+        for (int i = 0; i < sheetNum; i++) {
+            String err = everySheet(getWorkbook(tempFile,fileName).getSheetAt(i),titleArr,emptyArr,list);
+            if(ParameterUtil.isnotnull(err)){
+                errorMSG.append("第"+(i+1)+"个sheet，名称为："+getWorkbook(tempFile,fileName).getSheetName(i)+"，错误信息："+err);
+            }
+        }
+
+        //删除临时文件
+        if(tempFile.exists()){ tempFile.delete(); }
+
+        return errorMSG.toString();
+    }
+
+
+    //获取workbook
+    private Workbook getWorkbook(File file ,String FileName){
+        Workbook wb = null;
+        try {
+            InputStream is = new FileInputStream(file);
+            if(ExcelImportUtils.isExcel2007(FileName))
+                wb = new XSSFWorkbook(is);
+            else
+                wb = new HSSFWorkbook(is);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return wb;
+    }
+
+
+    //遍历每一个sheet，获取值和错误信息
+    private String  everySheet(Sheet sheet,String[] titleArr,boolean[] emptyArr,List<List<String>> list){
+        String errorMsg = "", br = "<br/>";
+        //得到当前sheet的Excel的行数
+        int totalRows=sheet.getPhysicalNumberOfRows();
+        //总列数
+        int totalCells = 0;
+        //得到Excel的列数(前提是有行数)，从第二行算起
+        if(totalRows>=2 && sheet.getRow(1) != null){
+            totalCells=sheet.getRow(0).getPhysicalNumberOfCells();
+        }else{
+            return "请确认excel的数据";
+        }
+
+        if (!ExcelImportUtils.isSame(sheet.getRow(0),totalCells,titleArr)){ return "导入excel和模板不一致"; }//判断标题是否正确
+
+        //开始处理数据，循环Excel行数,从第二行开始。标题不入库
+        for(int r=1;r<totalRows;r++){
+            List<String> rowList = new ArrayList<String>();
+            String rowMessage = "";
+            Row row = sheet.getRow(r);
+            if (row == null){
+                errorMsg += br+"第"+(r+1)+"行数据异常，请仔细检查！";
+                continue;
+            }
+
+            //循环Excel的列
+            for(int c = 0; c <totalCells; c++){
+                Cell cell = row.getCell(c);
+                if(cell == null){
+                    rowList.add("");
+                }else{
+                    cell.setCellType(Cell.CELL_TYPE_STRING);
+                    String cellVal = cell.getStringCellValue();
+                    if((StringUtils.isEmpty(cellVal) && !emptyArr[c])){
+                        errorMsg+=br+"第"+(r+1)+"行，第"+(c+1)+"列数据不可为空或者数据异常";
+                        rowList.add("error");
+                    }else{
+                        //正常数据处理
+                        rowList.add(cellVal);
+                    }
+                }
+                if(c == totalCells-1) list.add(rowList);//将每一行的数据添加到list中
+            }
+        }
+        return errorMsg;
+    }
+}
+

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceBackServiceImpl.java

@@ -0,0 +1,35 @@
+package com.chinaitop.depot.device.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.device.mapper.StorageDevicebackMapper;
+import com.chinaitop.depot.device.model.StorageDeviceback;
+import com.chinaitop.depot.device.service.StorageDeviceBackService;
+
+@Service
+public class StorageDeviceBackServiceImpl implements StorageDeviceBackService{
+
+	@Resource
+	private StorageDevicebackMapper deviceBackMapper;
+	
+	public StorageDeviceback selectByPrimaryKey(Integer id) {
+		// TODO Auto-generated method stub
+		return deviceBackMapper.selectByPrimaryKey(id);
+	}
+
+	public void save(StorageDeviceback storageDeviceback) {
+		// TODO Auto-generated method stub
+		deviceBackMapper.insertSelective(storageDeviceback);
+	}
+
+	@Override
+	public List<StorageDeviceback> selectBygetId(Integer id) {
+		// TODO Auto-generated method stub
+		return deviceBackMapper.selectBygetId(id);
+	}
+
+}

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceCheckServiceImpl.java

@@ -0,0 +1,139 @@
+package com.chinaitop.depot.device.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.device.mapper.StorageDevicecheckMapper;
+import com.chinaitop.depot.device.mapper.StorageDeviceinputMapper;
+import com.chinaitop.depot.device.model.StorageDevicecheck;
+import com.chinaitop.depot.device.model.StorageDevicecheckExample;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
+import com.chinaitop.depot.device.service.StorageDeviceCheckService;
+import com.chinaitop.depot.utils.ParameterUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.beans.Transient;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther mafy
+ * @createtime 2018/1/3 0003
+ */
+@Service
+public class StorageDeviceCheckServiceImpl implements StorageDeviceCheckService {
+
+    @Resource
+    private StorageDevicecheckMapper storageDevicecheckMapper;
+
+    @Resource
+    private StorageDeviceinputMapper storageDeviceinputMapper;
+
+    /**
+     * 分页查询盘点单
+     * @param storageDevicecheckExample
+     * @return
+     */
+    @Override
+    public List<StorageDevicecheck> queryByExample(StorageDevicecheckExample storageDevicecheckExample) {
+        return storageDevicecheckMapper.selectBySql(storageDevicecheckExample);
+    }
+
+
+    /**
+     * 新增的时候查询input表里面的数据
+     * @param storageDeviceinputExample
+     * @return
+     */
+    @Override
+    public List<StorageDeviceinput> childZlList(StorageDeviceinputExample storageDeviceinputExample) {
+        return storageDeviceinputMapper.selectByExample(storageDeviceinputExample);
+    }
+
+    /**
+     * 根据depotId查询对应数据
+     *
+     * @param depotId
+     * @return
+     */
+    @Override
+    public List<StorageDevicecheck> loadDataByDepotId(Integer depotId,String pddh) {
+
+        StorageDevicecheckExample storageDevicecheckExample = new StorageDevicecheckExample();
+        StorageDevicecheckExample.Criteria criteria = storageDevicecheckExample.createCriteria();
+        criteria.andDepotIdEqualTo(depotId);
+        criteria.andCheckNumberEqualTo(pddh);
+
+        return storageDevicecheckMapper.selectByExample(storageDevicecheckExample);
+    }
+
+    /**
+     * 获取当天的总盘点记录数
+     *
+     * @return
+     */
+    @Override
+    public int getCountForDate(Map<String,Object> map) {
+        return storageDevicecheckMapper.getCountForDate(map).size();
+    }
+
+    /**
+     * 按照主键移除
+     * @param depotId
+     */
+    @Override
+    public void remove(Integer depotId,String checkNum) {
+        StorageDevicecheckExample storageDevicecheckExample = new StorageDevicecheckExample();
+        StorageDevicecheckExample.Criteria criteria = storageDevicecheckExample.createCriteria();
+        criteria.andDepotIdEqualTo(depotId);
+        criteria.andCheckNumberEqualTo(checkNum);
+        storageDevicecheckMapper.deleteByExample(storageDevicecheckExample);
+    }
+
+    /**
+     * 新增
+     * @param json
+     */
+    @Override
+    @Transient
+    public void add(String json,String type) {
+
+
+
+        String cfid = null,checkNum = null;
+        JSONArray jsonArray = JSONArray.parseArray(json);
+        StringBuilder sql = new StringBuilder();
+        sql.append("INSERT INTO storage_devicecheck(check_number,check_date,depot_id,check_person,device_type,device_name,model,store_count,really_count,check_result,reason,org_id) VALUES");
+        for (int i = 0; i < jsonArray.size(); i++) {
+            sql.append("(");
+                JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
+                sql.append("\"").append(jsonObject.get("check_number")).append("\",");
+                sql.append("\"").append(jsonObject.get("check_date")).append("\",");
+                sql.append("\"").append(jsonObject.get("depot_id")).append("\",");
+                sql.append("\"").append(jsonObject.get("check_person")).append("\",");
+                sql.append("\"").append(jsonObject.get("device_type")).append("\",");
+                sql.append("\"").append(jsonObject.get("device_name")).append("\",");
+                sql.append("\"").append(jsonObject.get("model")).append("\",");
+                sql.append("\"").append(jsonObject.get("store_count")).append("\",");
+                sql.append("\"").append(jsonObject.get("really_count")).append("\",");
+                sql.append("\"").append(jsonObject.get("check_result")).append("\",");
+                sql.append("\"").append(jsonObject.get("reason")).append("\",");
+                sql.append("\"").append(jsonObject.get("org_id")).append("\"");
+            sql.append(")");
+            if (i != jsonArray.size()-1) sql.append(",");
+            cfid =jsonObject.get("depot_id").toString();//仓id，删数据所用
+            checkNum = jsonObject.get("check_number").toString();
+        }
+        System.out.println(sql.toString());
+
+        if (ParameterUtil.isequal("edit",type)){
+            // 新增之前，把原来的对应仓的盘点信息删掉
+            remove(Integer.parseInt(cfid),checkNum);
+        }
+        Map<String,Object> map = new HashMap<>();
+        map.put("sql",sql.toString());
+        storageDevicecheckMapper.insertBySql(map);
+    }
+}

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceGetServiceImpl.java

@@ -0,0 +1,67 @@
+package com.chinaitop.depot.device.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.device.mapper.StorageDevicegetMapper;
+import com.chinaitop.depot.device.model.StorageDeviceback;
+import com.chinaitop.depot.device.model.StorageDeviceget;
+import com.chinaitop.depot.device.model.StorageDevicegetExample;
+import com.chinaitop.depot.device.service.StorageDeviceGetService;
+
+@Service
+public class StorageDeviceGetServiceImpl implements StorageDeviceGetService{
+
+	@Resource
+	private StorageDevicegetMapper deviceGetMapper;
+	
+	/**
+	 * 分页获取列表数据
+	 */
+	@Override
+	public List<StorageDeviceget> queryByDevice(StorageDevicegetExample storageDevicegetExample) {
+		// TODO Auto-generated method stub
+		return deviceGetMapper.selectByExample(storageDevicegetExample);
+	}
+
+	/**
+	 * 提交修改和新增
+	 */
+	@Override
+	public void save(StorageDeviceget storageDeviceget) {
+		// TODO Auto-generated method stub
+		deviceGetMapper.insert(storageDeviceget);// 新增数据
+	}
+
+	@Override
+	public StorageDeviceget selectByPrimaryKey(int id) {
+		// TODO Auto-generated method stub
+		return deviceGetMapper.selectByPrimaryKey(id);
+	}
+
+	//增加归还信息
+	@Override
+	public void updateByPrimaryKeySelective(StorageDeviceget storageDeviceget) {
+		// TODO Auto-generated method stub
+		deviceGetMapper.updateByPrimaryKeySelective(storageDeviceget);
+	}
+
+	//app端
+	@Override
+	public List<StorageDeviceget> selectByHouseId(Integer houseId) {
+		// TODO Auto-generated method stub
+		return deviceGetMapper.selectByHouseId(houseId);
+	}
+
+	@Override
+	public List<Map<String, Object>> queryCountByType() {
+		// TODO Auto-generated method stub
+		return deviceGetMapper.queryCountByType();
+	}
+
+	
+}

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceInputServiceImpl.java

@@ -0,0 +1,242 @@
+package com.chinaitop.depot.device.service.impl;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.device.mapper.StorageDeviceinputMapper;
+import com.chinaitop.depot.device.model.ContentBean;
+import com.chinaitop.depot.device.model.HouseNameBean;
+import com.chinaitop.depot.device.model.HouseTypeBean;
+import com.chinaitop.depot.device.model.ShelfContentBean;
+import com.chinaitop.depot.device.model.StorageDeviceinput;
+import com.chinaitop.depot.device.model.StorageDeviceinputExample;
+import com.chinaitop.depot.device.service.StorageDeviceInputService;
+
+
+@Service
+public class StorageDeviceInputServiceImpl implements StorageDeviceInputService{
+
+	@Resource
+	private StorageDeviceinputMapper deviceInputMapper;
+	
+	/**
+	 * 分页获取器材信息
+	 */
+	@Override
+	public List<StorageDeviceinput> queryByDevice(StorageDeviceinputExample storageDeviceinputExample) {
+		// TODO Auto-generated method stub
+	        return deviceInputMapper.selectByExample(storageDeviceinputExample);
+	}
+
+	/**
+	 * 根据id删除数据
+	 */
+	@Override
+	public void remove(Integer id) {
+		// TODO Auto-generated method stub
+		deviceInputMapper.deleteByPrimaryKey(id);
+	}
+
+	/**
+	 * 提交修改和新增
+	 */
+	@Override
+	public void save(StorageDeviceinput storageDeviceinput) {
+		// TODO Auto-generated method stub
+		if (storageDeviceinput.getId() == null) {
+			deviceInputMapper.insertSelective(storageDeviceinput);// 新增数据
+		} else {
+			deviceInputMapper.updateByPrimaryKeySelective(storageDeviceinput);// 修改数据
+		}
+	}
+
+	/**
+	 * 根据id查询数据
+	 */
+	@Override
+	public StorageDeviceinput loadDataById(int id) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.selectByPrimaryKey(id);
+	}
+
+	 /**
+     * 获取入库的仓房名
+     */
+	@Override
+	public List<HouseNameBean> getHouseList() {
+		// TODO Auto-generated method stub
+		
+		return deviceInputMapper.getHouseList();
+	}
+
+	@Override
+	public List<HouseTypeBean> getTypeList(Integer depotId) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getTypeList(depotId);
+	}
+	
+	//根据类型获取名称
+	@Override
+	public List<ShelfContentBean> getNameList(Integer depotTypeId) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getNameList(depotTypeId);
+	}
+	
+	@Override
+	public ContentBean getcontentGetList(String deviceName) {
+		// TODO Auto-generated method stub
+		Map<String, Object> map  = new HashMap<>();
+		map.put("deviceName", deviceName);
+		return deviceInputMapper.getcontentGetList(map);
+	}
+	
+	//根据类型获取货架
+	@Override
+	public List<ContentBean> getShelfGetList(String deviceName) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getShelfGetList(deviceName);
+	}
+
+	@Override
+	public List<StorageDeviceinput> queryByNumber(StorageDeviceinputExample example) {
+		return deviceInputMapper.selectByExample(example);
+	}
+
+	//查询仓房对应的设备名称
+	@Override
+	public List<StorageDeviceinput> getDeviceInputList(Integer depotId) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getDeviceInputList(depotId);
+	}
+
+	//查询设备名称对应的型号
+	@Override
+	public List<StorageDeviceinput> getModelList(String deviceName) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getModelList(deviceName);
+	}
+	
+	//查询型号对应的编号
+	@Override
+	public List<StorageDeviceinput> getNumberList(String deviceModel) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getNumberList(deviceModel);
+	}
+
+	//查询型号对应的数量
+	@Override
+	public List<StorageDeviceinput> getCountList(String number) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getCountList(number);
+	}
+
+	//报废
+	@Override
+	public void updateByPrimaryKeySelective(StorageDeviceinput storageDeviceinput) {
+		// TODO Auto-generated method stub
+		deviceInputMapper.updateByPrimaryKeySelective(storageDeviceinput);
+	}
+
+	@Override
+	public List<StorageDeviceinput> getAllList(String number) {
+		return deviceInputMapper.getAllList(number);
+	}
+
+	// 获取货架获取规格型号getModelGetList
+	@Override
+	public List<ContentBean> getModelGetList(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getModelGetList(map);
+	}
+
+	//获取规格型号对应的编号getNumberGetList
+	@Override
+	public List<StorageDeviceinput> getNumberGetList(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getNumberGetList(map);
+	}
+
+	//根据编号获取可用数量
+	@Override
+	public List<StorageDeviceinput> getUseCountGetList(String number) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getUseCountGetList(number);
+	}
+
+	//获取编号和规格型号
+	@Override
+	public List<StorageDeviceinput> getDeviceModelList(String deviceName) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getDeviceModelList(deviceName);
+	}
+
+	//查询原有数量
+	@Override
+	public StorageDeviceinput selectById(Integer number) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.selectByPrimaryKey(number);
+	}
+
+	//获取保养名称
+	@Override
+	public List<StorageDeviceinput> getdevieName() {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getdevieName();
+	}
+
+	//获取维修名称
+	@Override
+	public List<StorageDeviceinput> getRepairNameList() {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getRepairNameList();
+	}
+
+	//领用时，根据规格型号和编号获取可用数量
+	@Override
+	public List<StorageDeviceinput> getUseCount(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getUseCount(map);
+	}
+
+	
+	//获取设备数据
+	@Override
+	public List<StorageDeviceinput> queryDevice(HashMap<Object, Object> map) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.queryDevice(map);
+	}
+
+	//获取维修的规格型号和编号
+	@Override
+	public List<StorageDeviceinput> getDeviceModelRepair(String deviceName) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getDeviceModelRepair(deviceName);
+	}
+
+	@Override
+	public List<StorageDeviceinput> getDeviceModelListRepair(String deviceName) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.getDeviceModelListRepair(deviceName);
+	}
+
+	//获取每一类型入库的总数量
+	@Override
+	public List<Map<String, Object>> queryCountByType() {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.queryCountByType();
+	}
+
+	@Override
+	public List<StorageDeviceinput> queryDeviceAccount(StorageDeviceinputExample storageDeviceinputExample) {
+		// TODO Auto-generated method stub
+		return deviceInputMapper.queryDeviceAccount(storageDeviceinputExample);
+	}
+	
+
+	
+
+}

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceKeepServiceImpl.java

@@ -0,0 +1,83 @@
+package com.chinaitop.depot.device.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.device.mapper.StorageDevicekeepMapper;
+import com.chinaitop.depot.device.model.StorageDevicekeep;
+import com.chinaitop.depot.device.model.StorageDevicekeepExample;
+import com.chinaitop.depot.device.model.StorageDevicekeepExample.Criteria;
+import com.chinaitop.depot.device.service.StorageDeviceKeepService;
+
+@Service
+public class StorageDeviceKeepServiceImpl implements StorageDeviceKeepService{
+
+	@Resource
+	private StorageDevicekeepMapper storageDeviceKeepMapper;
+	/**
+	 * 分页获取 
+	 */
+	@Override
+	public List<StorageDevicekeep> queryByDevice(StorageDevicekeepExample storageDevicekeepExample) {
+		// TODO Auto-generated method stub
+		return storageDeviceKeepMapper.selectByExample(storageDevicekeepExample);
+	}
+	
+	/**
+	 * 移除数据
+	 */
+	@Override
+	public void remove(Integer id) {
+		// TODO Auto-generated method stub
+		storageDeviceKeepMapper.deleteByPrimaryKey(id);
+	}
+
+	/**
+	 * 结束保养
+	 */
+	@Override
+	public void end(StorageDevicekeep storageDevicekeep) {
+		// TODO Auto-generated method stub
+		storageDeviceKeepMapper.updateByPrimaryKey(storageDevicekeep);
+	}
+
+	/**
+	 * 新增保养
+	 */
+	@Override
+	public void save(StorageDevicekeep storageDevicekeep) {
+		// TODO Auto-generated method stub
+		storageDeviceKeepMapper.insertSelective(storageDevicekeep);
+	}
+
+	/**
+	 * 根据id获取数据
+	 */
+	@Override
+	public StorageDevicekeep loadDataById(int id) {
+		// TODO Auto-generated method stub
+		return storageDeviceKeepMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public void updateByPrimaryKeySelective(StorageDevicekeep storageDevicekeep) {
+		// TODO Auto-generated method stub
+		storageDeviceKeepMapper.updateByPrimaryKeySelective(storageDevicekeep);
+	}
+
+	@Override
+	public List<StorageDevicekeep> getDeviceNameList() {
+		// TODO Auto-generated method stub
+		return storageDeviceKeepMapper.selectEnumNameList();
+	}
+
+	@Override
+	public StorageDevicekeep selectById(Integer id) {
+		// TODO Auto-generated method stub
+		return storageDeviceKeepMapper.selectByPrimaryKey(id);
+	}
+
+}

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceRepairServiceImpl.java

@@ -0,0 +1,55 @@
+package com.chinaitop.depot.device.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.device.mapper.StorageDevicerepairMapper;
+import com.chinaitop.depot.device.model.StorageDevicerepair;
+import com.chinaitop.depot.device.model.StorageDevicerepairExample;
+import com.chinaitop.depot.device.service.StorageDeviceRepairService;
+
+@Service
+public class StorageDeviceRepairServiceImpl implements StorageDeviceRepairService{
+
+	@Resource
+	private StorageDevicerepairMapper deviceRepairMapper;
+
+	/**
+	 * 分页获取数据
+	 */
+	@Override
+	public List<StorageDevicerepair> queryByDevice(StorageDevicerepairExample storageDevicerepairExample) {
+		// TODO Auto-generated method stub
+		return deviceRepairMapper.selectByExample(storageDevicerepairExample);
+	}
+
+	/**
+	 * 提交新增和修改
+	 */
+	@Override
+	public void save(StorageDevicerepair storageDevicerepair) {
+		// TODO Auto-generated method stub
+		if (storageDevicerepair.getId() == null) {
+			deviceRepairMapper.insertSelective(storageDevicerepair);// 新增数据
+		} else {
+			deviceRepairMapper.updateByPrimaryKeySelective(storageDevicerepair);// 修改数据
+		}
+	}
+
+	//结束维修
+	@Override
+	public void updateByPrimaryKeySelective(StorageDevicerepair storageDevicerepair) {
+		// TODO Auto-generated method stub
+		deviceRepairMapper.updateByPrimaryKeySelective(storageDevicerepair);
+	}
+
+	//根据id加载对应数据
+	@Override
+	public StorageDevicerepair loadDataById(int id) {
+		// TODO Auto-generated method stub
+		return deviceRepairMapper.selectByPrimaryKey(id);
+	}
+
+}

src/main/java/com/chinaitop/depot/utils/CustomFilter.java

@@ -0,0 +1,44 @@
+package com.chinaitop.depot.utils;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.ObjectUtils;
+
+public class CustomFilter implements Filter {
+
+	@Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+ 
+    }
+	
+	@Override
+	public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2)
+			throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) arg0;
+		HttpSession session = request.getSession();
+		String orgId = "";
+		if (session != null){
+			orgId = ObjectUtils.toString(session.getAttribute("orgId"),"");
+		}
+		if (!orgId.isEmpty()) {
+			DataPolicyEngine.set(orgId);
+		}
+		arg2.doFilter(arg0, arg1);
+		DataPolicyEngine.remove();
+	}
+	
+	@Override
+    public void destroy() {
+ 
+    }
+
+}

src/main/java/com/chinaitop/depot/utils/DataPolicyEngine.java

@@ -0,0 +1,61 @@
+package com.chinaitop.depot.utils;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * 
+ * @author hf
+ * 
+ * @description 数据策略（数据权限控制使用）
+ * 
+ * 
+ */
+public class DataPolicyEngine {
+	//log信息输出对象
+	protected static final Log log = LogFactory.getLog(DataPolicyEngine.class); 
+
+	//本地线程，用于存储线程公共对象
+	private static ThreadLocal threadLocalSession = new ThreadLocal();
+	
+	
+	/**
+	 * @description 获取本地执行线程
+	 *
+	 * @return ThreadLocal 
+	 * 
+	 */
+	public static ThreadLocal getThreadLocalSession() {
+		return threadLocalSession;
+	}
+	
+	/**
+	 * @description 在线程内设置存储对象
+	 * 
+	 */
+	public static void set(Object obj) {
+		threadLocalSession.set(obj);
+
+	}
+	
+	/**
+	 * @description 获取在线程内设置存储的对象
+	 * 
+	 */
+	public static Object get() {
+		return threadLocalSession.get();
+
+	}
+
+	/**
+	 * @description 移除在线程内设置存储的对象
+	 * 
+	 */
+	public static void remove() {
+		threadLocalSession.remove();
+
+	}
+	
+	
+}

src/main/java/com/chinaitop/depot/utils/ExcelImportUtils.java

@@ -0,0 +1,48 @@
+package com.chinaitop.depot.utils;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+
+/**
+ * @auther mafy
+ * @createtime 2017/10/26 0026
+ */
+public class ExcelImportUtils{
+
+    //是否是2003的excel，返回true是2003
+    public static boolean isExcel2003(String filePath)  {
+        return filePath.matches("^.+\\.(?i)(xls)$");
+    }
+
+    //是否是2007的excel，返回true是2007
+    public static boolean isExcel2007(String filePath)  {
+        return filePath.matches("^.+\\.(?i)(xlsx)$");
+    }
+
+    /**
+     * 验证EXCEL文件
+     * @param filePath
+     * @return
+     */
+    public static boolean validateExcel(String filePath){
+        if (filePath == null || !(isExcel2003(filePath) || isExcel2007(filePath))){
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean isEmpty(String type,int index,boolean[] NotEmpty){//判断是否可为空
+        return NotEmpty[index];
+    }
+
+    //判断导入的excel是否和模板相同
+    public  static boolean isSame(Row row, int totalCells,String[] titleArr){
+        for (int i = 0; i < totalCells; i++) {
+            Cell cell = row.getCell(i);//第一行的每一列
+            if(!ParameterUtil.isequal(cell.getStringCellValue(),titleArr[i]) || (totalCells != titleArr.length)){
+                return false;
+            }
+        }
+        return true;
+    }
+}

src/main/java/com/chinaitop/depot/utils/ParameterUtil.java

@@ -0,0 +1,170 @@
+package com.chinaitop.depot.utils;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+
+public class ParameterUtil {
+
+    public static String getSysDateTime(){
+        String temp_str="";
+        Date dt = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        temp_str=sdf.format(dt);
+        System.out.println("获取当前时间"+temp_str);
+        return temp_str;
+    }
+    
+    public static String getDateYMDHMS(Date date) {
+    	String str = "";
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        str=sdf.format(date);
+        System.out.println("获取当前时间"+str);
+        return str;
+    }
+    
+    public static String getSysDate(){
+        String temp_str="";
+        Date dt = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        temp_str=sdf.format(dt);
+        return temp_str;
+    }
+
+    public static Date string2datetime(String dateTime){
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = null;
+        try {
+            date = dateFormat.parse(dateTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+    public static Date string2date(String dateTime){
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = null;
+        try {
+            date = dateFormat.parse(dateTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
+    public static String date2string(Date date){
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+        String str=sdf.format(date);
+        return str;
+    }
+
+    /**
+     * 获取指定时间的时间戳
+     * @param datatime
+     * @return
+     */
+    public static String getTimeStamp(String datatime){
+        long timeStamp = 0;
+        SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date date = format.parse(datatime);
+            timeStamp = date.getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return String.valueOf(timeStamp);
+    }
+
+    /*
+     * 将时间戳转换为时间
+     */
+    public static String stampToDate(String s){
+        String res;
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long lt = new Long(s);
+        Date date = new Date(lt);
+        res = simpleDateFormat.format(date);
+        return res;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(stampToDate("1504689208643"));
+        System.out.println(getTimeStamp(getSysDateTime()));
+    }
+    public static String getBHS(String BHS){
+        String[] str = BHS.split(",");
+        StringBuffer sb = new StringBuffer();
+        for(int i=0;i<str.length;i++){
+            sb.append("'").append(str[i]).append("'").append(",");
+        }
+        String s=sb.toString();
+        String t=s.substring(0,s.length()-1);
+        return t;
+    }
+
+    //判断字段值是为空 不为空返回ture
+    public static boolean isnotnull(Object name){
+        return (null!=name&&!"".equals(name) && !"null".equals(name) && "null" != name);
+    }
+    
+    //判断字段值是为空,为空返回ture
+    public static boolean isnull(Object name){
+        return (null==name || "".equals(name) || "null".equals(name) || "null" == name);
+    }
+
+    //判断字段值是相等  相等返回ture
+    public static boolean isequal(Object name,Object value){
+        if(name==value||name.equals(value)){
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 判断list和str数组是否全等
+     * @param list
+     * @param str
+     * @return
+     */
+    public static boolean isAllequal(List<String> list,String[] str){
+        boolean isbz = true;
+        for(int z=0;z<str.length;z++){
+            if(!isequal(list.get(z),str[z])){
+                isbz = false;
+                break;
+            }
+        }
+        return !isbz || !(str.length == list.size());
+    }
+
+    //判断字段值是否在某个集合里  在返回ture
+    public static boolean isallequal(Object name,String[] value){
+        for(int i=0;i<value.length;i++){
+            if(name==value[i]||name.equals(value[i])){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 从properties得到路径
+     * @param filePath
+     * @return
+     */
+    public static Properties readProperties(String filePath) {
+        Properties props = new Properties();
+        try {
+            InputStream in = new BufferedInputStream(ParameterUtil.class.getResourceAsStream(filePath));
+            props.load(in);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return props;
+    }
+
+}

src/main/java/com/chinaitop/depot/utils/RedisConfig.java

@@ -0,0 +1,66 @@
+package com.chinaitop.depot.utils;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.ListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.SetOperations;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.core.ZSetOperations;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+    @Autowired
+    private RedisConnectionFactory factory;
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate() {
+        Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<Object>(Object.class);
+        ObjectMapper om = new ObjectMapper();
+        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
+        jackson2JsonRedisSerializer.setObjectMapper(om);
+        RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
+        template.setConnectionFactory(factory);
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setValueSerializer(jackson2JsonRedisSerializer);
+        template.setHashKeySerializer(jackson2JsonRedisSerializer);
+        template.setHashValueSerializer(jackson2JsonRedisSerializer);
+        template.setDefaultSerializer(new StringRedisSerializer());
+        template.afterPropertiesSet();
+        return template;
+    }
+
+    @Bean
+    public HashOperations<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForHash();
+    }
+
+    @Bean
+    public ValueOperations<String, String> valueOperations(RedisTemplate<String, String> redisTemplate) {
+        return redisTemplate.opsForValue();
+    }
+
+    @Bean
+    public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForList();
+    }
+
+    @Bean
+    public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForSet();
+    }
+
+    @Bean
+    public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
+        return redisTemplate.opsForZSet();
+    }
+}

src/main/java/com/chinaitop/depot/utils/RedisUtil.java

@@ -0,0 +1,547 @@
+package com.chinaitop.depot.utils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.ListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.SetOperations;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+@Component
+public class RedisUtil {
+
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+    @Autowired
+    private ValueOperations<String, String> valueOperations;
+    @Autowired
+    private HashOperations<String, String, Object> hashOperations;
+    @Autowired
+    private ListOperations<String, Object> listOperations;
+    @Autowired
+    private SetOperations<String, Object> setOperations;
+
+    //=============================common============================
+    /**
+     * 指定缓存失效时间
+     * @param key 键
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean expire(String key,long time){
+        try {
+            if(time>0){
+                redisTemplate.expire(key, time, TimeUnit.SECONDS);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 根据key 获取过期时间
+     * @param key 键 不能为null
+     * @return 时间(秒) 返回0代表为永久有效
+     */
+    public long getExpire(String key){
+        return redisTemplate.getExpire(key,TimeUnit.SECONDS);
+    }
+
+    /**
+     * 判断key是否存在
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public boolean hasKey(String key){
+        try {
+            return redisTemplate.hasKey(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 删除缓存
+     * @param key 可以传一个值 或多个
+     */
+    @SuppressWarnings("unchecked")
+    public void del(String ... key){
+        if(key!=null&&key.length>0){
+            if(key.length==1){
+                redisTemplate.delete(key[0]);
+            }else{
+                redisTemplate.delete(CollectionUtils.arrayToList(key));
+            }
+        }
+    }
+
+    //============================String=============================
+    /**
+     * 普通缓存获取
+     * @param key 键
+     * @return 值
+     */
+    public Object get(String key){
+        return key==null?null:valueOperations.get(key);
+    }
+
+    /**
+     * 普通缓存放入
+     * @param key 键
+     * @param value 值
+     * @return true成功 false失败
+     */
+    public boolean set(String key,String value) {
+        try {
+            valueOperations.set(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+
+    }
+
+    /**
+     * 普通缓存放入并设置时间
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期
+     * @return true成功 false 失败
+     */
+    public boolean set(String key,String value,long time){
+        try {
+            if(time>0){
+                valueOperations.set(key, value, time, TimeUnit.SECONDS);
+            }else{
+                set(key, value);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 递增
+     * @param key 键
+     * @param by 要增加几(大于0)
+     * @return
+     */
+    public long incr(String key, long delta){
+        if(delta<0){
+            throw new RuntimeException("递增因子必须大于0");
+        }
+        return valueOperations.increment(key, delta);
+    }
+
+    /**
+     * 递减
+     * @param key 键
+     * @param by 要减少几(小于0)
+     * @return
+     */
+    public long decr(String key, long delta){
+        if(delta<0){
+            throw new RuntimeException("递减因子必须大于0");
+        }
+        return valueOperations.increment(key, -delta);
+    }
+
+    //================================Map=================================
+    /**
+     * HashGet
+     * @param key 键 不能为null
+     * @param item 项 不能为null
+     * @return 值
+     */
+    public Object hget(String key,String item){
+        return hashOperations.get(key, item);
+    }
+
+    /**
+     * 获取hashKey对应的所有键值
+     * @param key 键
+     * @return 对应的多个键值
+     */
+    public Map<String, Object> hmget(String key){
+        return hashOperations.entries(key);
+    }
+
+    /**
+     * HashSet
+     * @param key 键
+     * @param map 对应多个键值
+     * @return true 成功 false 失败
+     */
+    public boolean hmset(String key, Map<String,Object> map){
+        try {
+            hashOperations.putAll(key, map);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * HashSet 并设置时间
+     * @param key 键
+     * @param map 对应多个键值
+     * @param time 时间(秒)
+     * @return true成功 false失败
+     */
+    public boolean hmset(String key, Map<String,Object> map, long time){
+        try {
+            hashOperations.putAll(key, map);
+            if(time>0){
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     * @param key 键
+     * @param item 项
+     * @param value 值
+     * @return true 成功 false失败
+     */
+    public boolean hset(String key,String item,Object value) {
+        try {
+            hashOperations.put(key, item, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     * @param key 键
+     * @param item 项
+     * @param value 值
+     * @param time 时间(秒)  注意:如果已存在的hash表有时间,这里将会替换原有的时间
+     * @return true 成功 false失败
+     */
+    public boolean hset(String key,String item,Object value,long time) {
+        try {
+            hashOperations.put(key, item, value);
+            if(time>0){
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 删除hash表中的值
+     * @param key 键 不能为null
+     * @param item 项 可以使多个 不能为null
+     */
+    public void hdel(String key, Object... item){
+        hashOperations.delete(key,item);
+    }
+
+    /**
+     * 判断hash表中是否有该项的值
+     * @param key 键 不能为null
+     * @param item 项 不能为null
+     * @return true 存在 false不存在
+     */
+    public boolean hHasKey(String key, String item){
+        return hashOperations.hasKey(key, item);
+    }
+
+    /**
+     * hash递增 如果不存在,就会创建一个 并把新增后的值返回
+     * @param key 键
+     * @param item 项
+     * @param by 要增加几(大于0)
+     * @return
+     */
+    public double hincr(String key, String item,double by){
+        return hashOperations.increment(key, item, by);
+    }
+
+    /**
+     * hash递减
+     * @param key 键
+     * @param item 项
+     * @param by 要减少记(小于0)
+     * @return
+     */
+    public double hdecr(String key, String item,double by){
+        return hashOperations.increment(key, item,-by);
+    }
+
+    //============================set=============================
+    /**
+     * 根据key获取Set中的所有值
+     * @param key 键
+     * @return
+     */
+    public Set<Object> sGet(String key){
+        try {
+            return setOperations.members(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 根据value从一个set中查询,是否存在
+     * @param key 键
+     * @param value 值
+     * @return true 存在 false不存在
+     */
+    public boolean sHasKey(String key,Object value){
+        try {
+            return setOperations.isMember(key, value);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将数据放入set缓存
+     * @param key 键
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSet(String key, Object...values) {
+        try {
+            return setOperations.add(key, values);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 将set数据放入缓存
+     * @param key 键
+     * @param time 时间(秒)
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSetAndTime(String key,long time,Object...values) {
+        try {
+            Long count = setOperations.add(key, values);
+            if(time>0) expire(key, time);
+            return count;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 获取set缓存的长度
+     * @param key 键
+     * @return
+     */
+    public long sGetSetSize(String key){
+        try {
+            return setOperations.size(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 移除值为value的
+     * @param key 键
+     * @param values 值 可以是多个
+     * @return 移除的个数
+     */
+    public long setRemove(String key, Object ...values) {
+        try {
+            Long count = setOperations.remove(key, values);
+            return count;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+    //===============================list=================================
+
+    /**
+     * 获取list缓存的内容
+     * @param key 键
+     * @param start 开始
+     * @param end 结束  0 到 -1代表所有值
+     * @return
+     */
+    public List<Object> lGet(String key, long start, long end){
+        try {
+            return listOperations.range(key, start, end);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 获取list缓存的所有内容
+     * @param key
+     * @return
+     */
+    public List<Object> lGetAll(String key){
+        return lGet(key,0,-1);
+    }
+
+    /**
+     * 获取list缓存的长度
+     * @param key 键
+     * @return
+     */
+    public long lGetListSize(String key){
+        try {
+            return listOperations.size(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 通过索引 获取list中的值
+     * @param key 键
+     * @param index 索引  index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
+     * @return
+     */
+    public Object lGetIndex(String key,long index){
+        try {
+            return listOperations.index(key, index);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean lSet(String key, Object value) {
+        try {
+            listOperations.rightPush(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean lSet(String key, Object value, long time) {
+        try {
+            listOperations.rightPush(key, value);
+            if (time > 0) expire(key, time);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean lSet(String key, List<Object> value) {
+        try {
+            listOperations.rightPushAll(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean lSet(String key, List<Object> value, long time) {
+        try {
+            listOperations.rightPushAll(key, value);
+            if (time > 0) expire(key, time);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 根据索引修改list中的某条数据
+     * @param key 键
+     * @param index 索引
+     * @param value 值
+     * @return
+     */
+    public boolean lUpdateIndex(String key, long index,Object value) {
+        try {
+            listOperations.set(key, index, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 移除N个值为value
+     * @param key 键
+     * @param count 移除多少个
+     * @param value 值
+     * @return 移除的个数
+     */
+    public long lRemove(String key,long count,Object value) {
+        try {
+            Long remove = listOperations.remove(key, count, value);
+            return remove;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+}

src/main/java/com/chinaitop/depot/utils/SecurityCode.java

@@ -0,0 +1,82 @@
+package com.chinaitop.depot.utils;
+  
+
+import java.util.Arrays;
+
+public class SecurityCode {
+    
+    /**
+     * 验证码难度级别，Simple只包含数字，Medium包含数字和小写英文，Hard包含数字和大小写英文
+     */
+    public enum SecurityCodeLevel {Simple,Medium,Hard};
+    
+    /**
+     * 产生默认验证码，4位中等难度
+     * @return  String 验证码
+     */
+    public static String getSecurityCode(){
+        return getSecurityCode(4,SecurityCodeLevel.Medium,false);
+    }
+    
+    /**
+     * 产生长度和难度任意的验证码
+     * @param length  长度
+     * @param level   难度级别
+     * @param isCanRepeat  是否能够出现重复的字符，如果为true，则可能出现 5578这样包含两个5,如果为false，则不可能出现这种情况
+     * @return  String 验证码
+     */
+    public static String getSecurityCode(int length,SecurityCodeLevel level,boolean isCanRepeat){
+        
+        //随机抽取len个字符
+        int len=length;
+
+        char[] codes={'1','2','3','4','5','6','7','8','9'};
+        
+        //根据不同的难度截取字符数组
+        if(level==SecurityCodeLevel.Simple){
+            codes=Arrays.copyOfRange(codes, 0,9);
+        }else if(level==SecurityCodeLevel.Medium){
+            codes=Arrays.copyOfRange(codes, 0,33);
+        }
+        
+        //字符集合长度
+        int n=codes.length;
+        
+        //抛出运行时异常
+        if(len>n&&isCanRepeat==false){
+            throw new RuntimeException(
+                    String.format("调用SecurityCode.getSecurityCode(%1$s,%2$s,%3$s)出现异常，" +
+                                   "当isCanRepeat为%3$s时，传入参数%1$s不能大于%4$s",
+                                   len,level,isCanRepeat,n));
+        }
+        
+        //存放抽取出来的字符
+        char[] result=new char[len];
+        
+        //判断能否出现重复的字符
+        if(isCanRepeat){
+            for(int i=0;i<result.length;i++){
+                //索引 0 and n-1
+                int r=(int)(Math.random()*n);
+            
+                //将result中的第i个元素设置为codes[r]存放的数值
+                result[i]=codes[r];
+            }
+        }else{
+            for(int i=0;i<result.length;i++){
+                //索引 0 and n-1
+                int r=(int)(Math.random()*n);
+                
+                //将result中的第i个元素设置为codes[r]存放的数值
+                result[i]=codes[r];
+                
+                //必须确保不会再次抽取到那个字符，因为所有抽取的字符必须不相同。
+                //因此，这里用数组中的最后一个字符改写codes[r]，并将n减1
+                codes[r]=codes[n-1];
+                n--;
+            }
+        }
+        
+        return String.valueOf(result);
+    }
+}

src/main/java/com/chinaitop/depot/utils/SecurityImage.java

@@ -0,0 +1,70 @@
+package com.chinaitop.depot.utils;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+public class SecurityImage {
+
+	/**
+	 * 生成验证码图片
+	 * 
+	 * @param securityCode
+	 *            验证码字符
+	 * @return BufferedImage 图片
+	 */
+	public static BufferedImage createImage(String securityCode, Integer fontSize, Integer widths, Integer heigths) {
+
+		// 验证码长度
+		int codeLength = securityCode.length();
+		// 字体大小
+		int fSize = fontSize;
+		// 图片宽度
+		int width = widths;
+		// 图片高度
+		int height = heigths;
+
+		// 图片
+		BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+		Graphics g = image.createGraphics();
+
+		// 设置背景色
+		g.setColor(Color.WHITE);
+		// 填充背景
+		g.fillRect(0, 0, width, height);
+
+		// 设置边框颜色
+		g.setColor(Color.LIGHT_GRAY);
+		// 边框字体样式
+		g.setFont(new Font("Arial", Font.BOLD, height - 2));
+		// 绘制边框
+		g.drawRect(0, 0, width - 1, height - 1);
+
+		// 绘制噪点
+		Random rand = new Random();
+		// 设置噪点颜色
+		g.setColor(Color.LIGHT_GRAY);
+		for (int i = 0; i < codeLength * 6; i++) {
+			int x = rand.nextInt(width);
+			int y = rand.nextInt(height);
+			// 绘制1*1大小的矩形
+			g.drawRect(x, y, 1, 1);
+		}
+
+		// 绘制验证码
+		int codeY = height - 10;
+		// 设置字体颜色和样式
+		g.setColor(new Color(19, 148, 246));
+		g.setFont(new Font("Georgia", Font.BOLD, fSize));
+		for (int i = 0; i < codeLength; i++) {
+			g.drawString(String.valueOf(securityCode.charAt(i)), i * 16 + 5, codeY);
+		}
+		// 关闭资源
+		g.dispose();
+
+		return image;
+	}
+
+}

src/main/java/com/chinaitop/depot/utils/WebConfig.java

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.utils;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @desc 注册bean, 将自定义过滤器添加到过滤器链中
+ * @Author hf
+ * @date 2019/3/11
+ * @return
+ */
+@Configuration
+public class WebConfig {
+
+   /**
+    * 注册过滤器,有两种方式：
+    * 1) 使用 @Component 注解<br>
+    * 2) 添加到过滤器链中，此方式适用于使用第三方的过滤器。将过滤器写到 WebConfig 类中，如下：
+    */
+   @Bean
+   public FilterRegistrationBean filterRegistrationBean() {
+
+      FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+
+      CustomFilter filter = new CustomFilter();
+      registrationBean.setFilter(filter);
+
+      //设置过滤器拦截请求
+      List<String> urls = new ArrayList<>();
+      urls.add("/*");
+      registrationBean.setUrlPatterns(urls);
+
+      return registrationBean;
+   }
+
+}