.

Dockerfile

@@ -0,0 +1,6 @@
+FROM 192.168.123.25:31104/unis/java:8
+
+ADD ./target/depot-grain-analysis.jar /root
+CMD ["sh", "-c", "cd /root; java -Djava.security.egd=file:/dev/./urandom -jar /root/depot-grain-analysis.jar --depot-grain-analysis.server.enable-self-preservation=false"]
+EXPOSE 9013
+

pom.xml

@@ -0,0 +1,159 @@
+<?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-grain-analysis</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>depot-grainAnalysis</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>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</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>
+		</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>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>
+
+		<!-- 阿里巴巴json -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.37</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>
+	</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>

src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

@@ -0,0 +1,152 @@
+package com.chinaitop.depot;
+
+import com.chinaitop.depot.utils.DataPolicyEngine;
+import com.chinaitop.depot.utils.RedisUtil;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.util.TablesNamesFinder;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.DefaultReflectorFactory;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.ReflectorFactory;
+import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
+import org.apache.ibatis.reflection.factory.ObjectFactory;
+import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
+import org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * Sql执行时间记录拦截器
+ */
+@Intercepts({ @Signature(type = StatementHandler.class, method = "prepare", args = { Connection.class, Integer.class })})
+@Component
+public class DatePermissionInterceptor implements Interceptor {
+	
+	private static final ObjectFactory DEFAULT_OBJECT_FACTORY = new DefaultObjectFactory();
+    private static final ObjectWrapperFactory DEFAULT_OBJECT_WRAPPER_FACTORY = new DefaultObjectWrapperFactory();
+    private static final ReflectorFactory DEFAULT_REFLECTOR_FACTORY = new DefaultReflectorFactory();
+
+	@Autowired
+	private RedisUtil redisUtil;
+	
+	@Override
+	public Object intercept(Invocation invocation) throws Throwable {
+		
+		StatementHandler statementHandler = (StatementHandler) invocation.getTarget();
+        MetaObject metaStatementHandler = MetaObject.forObject(statementHandler, DEFAULT_OBJECT_FACTORY,
+                DEFAULT_OBJECT_WRAPPER_FACTORY, DEFAULT_REFLECTOR_FACTORY);
+        
+        MappedStatement mappedStatement = (MappedStatement) metaStatementHandler.getValue("delegate.mappedStatement");
+        
+		final BoundSql boundSql = statementHandler.getBoundSql();
+		String bouString = boundSql.getSql();// 获取执行sql 
+		
+		//sql是查询的才进行权限过滤
+	    if(mappedStatement.getSqlCommandType().toString().equals("select".toUpperCase())) {
+	    
+			//通过本地线程获取库id
+			Object threadLocalObj = DataPolicyEngine.get();
+			String orgId = null;
+			if(threadLocalObj != null) {
+				orgId = ObjectUtils.toString(threadLocalObj);
+			}
+			if(orgId!=null) {
+				//解析sql中的表名
+				Statement statement = CCJSqlParserUtil.parse(bouString);
+			    Select selectStatement = (Select)statement;
+			    TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
+			    List<String> result = tablesNamesFinder.getTableList(selectStatement);
+				
+				Set<String> tableNames = new HashSet<String>();// 定义需要替换的table信息列表
+				//获取业务表信息数据
+				List<String> tableList = (List<String>)redisUtil.lGetAll("tableList").get(0);
+				for(int i=0;i<result.size();i++) {
+					for (int j = 0; j < tableList.size(); j++) {// 处理查看sql中是否有业务表
+						if (result.get(i).equals(ObjectUtils.toString(tableList.get(j)))) {// 是否存在业务表
+							tableNames.add(result.get(i));
+						}
+					}
+				}
+				
+				if (tableNames != null && tableNames.size() > 0) {// sql中存在业务表进行sql拼接数据重新检索
+					if(result.size() >= 2) {//sql中存在2张及以上表
+						for (String table : tableNames) {// 进行业务表的数据权限替换
+							table += " ";//表名后面加空格，防止两个表名一部分相似，导致替换出错
+							bouString = bouString.replaceAll(table, "(SELECT * from " + table
+									+ " WHERE org_id = '"+orgId+"') ");
+						}
+					}else {//sql中是单表
+						for (String table : tableNames) {// 进行业务表的数据权限替换
+							if(bouString.contains(table+" ")) {//防止是单表查询，表后面没有空格的时候替换不了
+								table += " ";//表名后面加空格，防止两个表名一部分相似，导致替换出错
+							}
+							bouString = bouString.replaceAll(table, "(SELECT * from " + table
+									+ " WHERE org_id = '"+orgId+"') "+table+" ");
+						}
+					}
+					
+					/*bouString = bouString.replaceAll(table, "(SELECT b.* from " + table
+							+ " b,user_business u WHERE b.org_id = u.org_id AND u .user_id ='"+userId+"' AND u.business_type = '"+table+"') ");*/
+					
+				}
+				
+				//metaStatementHandler.setValue("delegate.boundSql.sql", bouString);
+				
+				Field field = getField(boundSql, "sql");
+				if (field != null) {
+					try {
+						field.setAccessible(true);
+						field.set(boundSql, bouString);
+					} catch (IllegalArgumentException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (IllegalAccessException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		
+	    }
+			
+		return invocation.proceed();
+		
+
+	}
+
+	private static Field getField(Object obj, String fieldName) {
+		Field field = null;
+		for (Class<?> clazz = obj.getClass(); clazz != Object.class; clazz = clazz.getSuperclass()) {
+			try {
+				field = clazz.getDeclaredField(fieldName);
+				break;
+			} catch (NoSuchFieldException e) {
+				// 这里不用做处理，子类没有该字段可能对应的父类有，都没有就返回null。
+			}
+		}
+		return field;
+	}
+
+	@Override
+	public Object plugin(Object target) {
+		return Plugin.wrap(target, this);
+	}
+
+	@Override
+	public void setProperties(Properties properties) {
+	}
+
+}

src/main/java/com/chinaitop/depot/DepotGrainAnalysisApplication.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+
+@EnableEurekaClient
+@EnableDiscoveryClient
+@SpringBootApplication
+@MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
+public class DepotGrainAnalysisApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DepotGrainAnalysisApplication.class, args);
+	}
+}

src/main/java/com/chinaitop/depot/HelloWebXml.java

@@ -0,0 +1,12 @@
+package com.chinaitop.depot;
+ 
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+public class HelloWebXml extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(DepotGrainAnalysisApplication.class);
+    }
+ 
+}

src/main/java/com/chinaitop/depot/SwaggerGrainAnalysisConfig.java

@@ -0,0 +1,35 @@
+package com.chinaitop.depot;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerGrainAnalysisConfig {
+
+	@Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.chinaitop.depot.grainAnalysis.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("智能粮库管理平台api文档")
+                .description("粮情分析报告")
+                .termsOfServiceUrl("http://192.168.80.25:9001")
+                .version("1.0")
+                .build();
+    }
+}

src/main/java/com/chinaitop/depot/grainAnalysis/controller/MonthStorageGrainAnalysisController.java

@@ -0,0 +1,254 @@
+package com.chinaitop.depot.grainAnalysis.controller;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import com.chinaitop.utils.ParameterUtil;
+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.grainAnalysis.service.StorageGrainAnalysisService;
+import com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
+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 = "/monthStorageGrainAnalysis")
+@Api(value= "MonthStorageGrainAnalysisController", description = "月粮情分析控制类")
+public class MonthStorageGrainAnalysisController {
+
+	@Resource
+	private StorageGrainAnalysisService analysisService;
+
+	/**
+	 * 月分析查询列表
+	 * 
+	 * @param pageNum
+	 * @param pageSize
+	 * @param storehouseId
+	 * @param year
+	 * @param month
+	 * @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="storehouseId", value="仓房ID", paramType="query"),
+    	@ApiImplicitParam(name="year", value="年份", paramType="query"),
+    	@ApiImplicitParam(name="month", value="月份", paramType="query")
+    })
+	public PageInfo<StorageGrainAnalysis> getList(Integer pageNum, Integer pageSize, Integer storehouseId,
+			Integer year, Integer month) {
+
+		StorageGrainAnalysisExample analysisExample = new StorageGrainAnalysisExample();
+		StorageGrainAnalysisExample.Criteria analysisCriteria = analysisExample.createCriteria();
+
+		if (null != storehouseId && !"".equals(storehouseId)) {
+			analysisCriteria.andStorehouseIdEqualTo(storehouseId);
+		}
+
+		if (null != year && !"".equals(year)) {
+			analysisCriteria.andYearEqualTo(year);
+		}
+
+		if (null != month && !"".equals(month)) {
+			analysisCriteria.andMonthEqualTo(month);
+		}
+
+		if (null != pageNum && null != pageSize) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+
+		analysisCriteria.andAnalysisTypeEqualTo(1); //只查询月粮情分析
+		
+		analysisExample.setOrderByClause(" id desc");
+
+		List<StorageGrainAnalysis> list = analysisService.findByCondition(analysisExample);
+		PageInfo<StorageGrainAnalysis> pageInfo = new PageInfo<StorageGrainAnalysis>(list);
+
+		return pageInfo;
+	}
+
+	/**
+	 * 查询月粮情详细数据
+	 *
+	 * @param id
+	 * @param analysisType
+	 * @return
+	 */
+	@RequestMapping(value="/edit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一条月粮情分析数据", notes = "查询一条月粮情详细的分析数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="id", value="数据ID", paramType="query"),
+    	@ApiImplicitParam(name="analysisType", value="数据类型", paramType="query")
+    })
+	public Map<String, Object> edit(Integer id, Integer analysisType) {
+
+		Map<String, Object> map = new HashMap<>();
+
+		if (null != id && !"".equals(id)) {
+			map = analysisService.findByIdAnalysisObj(id, analysisType, map);
+		} else {
+			StorageGrainAnalysis grain = new StorageGrainAnalysis();
+			map.put("grain", grain);
+		}
+
+		return map;
+	}
+
+	/**
+	 * 查询三温检查数据
+	 *
+	 * @param houseId
+	 * @param wareId
+	 * @return
+	 */
+	@RequestMapping(value="/getThreeTempDate", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一条三温检查数据", notes = "查询一条三温检查数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="houseId", value="仓房ID", paramType="query"),
+    	@ApiImplicitParam(name="wareId", value="货位ID", paramType="query"),
+    	@ApiImplicitParam(name="year", value="年份", paramType="query"),
+    	@ApiImplicitParam(name="month", value="月份", paramType="query"),
+		@ApiImplicitParam(name="orgId", value="组织机构ID", paramType="query")
+    })
+	public Map<String, Object> getThreeTempDate(Integer houseId, Integer wareId, Integer year, Integer month, Integer orgId) {
+		Map<String, Object> map = new HashMap<>();
+		map = analysisService.getMonthThreeTempDate(houseId, wareId, year, month, orgId, map);
+		return map;
+	}
+
+	/**
+	 * 查询三温检查数据
+	 *
+	 * @param threeList
+	 * @return
+	 */
+	@RequestMapping(value="/getThreeTempDateTwo", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一条三温检查数据", notes = "查询一条三温检查数据")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name="threeList", value="需要查询三温的集合", paramType="query")
+	})
+	public Map<String, Object> getThreeTempDateTwo(String[] threeList) {
+		Map<String, Object> map = new HashMap<>();
+
+		if (null != threeList && threeList.length > 0) {
+			List<StorageExceptionAndOnfore> exceptionAndOnforeList = new ArrayList<>();
+			StorageExceptionAndOnfore exceptionAndOnfore = new StorageExceptionAndOnfore();
+			for (Object obj : threeList) {
+//				exceptionAndOnfore.setCheckDate(ParameterUtil.string2date(obj + " 00:00:00"));
+				exceptionAndOnforeList.add(exceptionAndOnfore);
+
+				if(ParameterUtil.isnull(threeList[1])){
+					break;
+				}
+			}
+			map.put("exceptionAndOnforeList", exceptionAndOnforeList);
+		}
+
+		return map;
+	}
+
+	/**
+	 * 提交
+	 * 
+	 * @param grainJson 主表数据
+	 * @param exceptionJson 从表数据
+	 * @param type 分析类型
+	 * @param orgId 组织机构ID
+	 * @param userId 用户ID
+	 * @return
+	 */
+	@RequestMapping(value="/update", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存月粮情分析数据", notes = "保存月粮情分析数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="grainJson", value="主表数据", paramType="form"),
+    	@ApiImplicitParam(name="exceptionJson", value="字表数据", paramType="form"),
+    	@ApiImplicitParam(name="type", value="分析类型", paramType="form"),
+		@ApiImplicitParam(name="orgId", value="组织机构ID", paramType="form"),
+		@ApiImplicitParam(name="userId", value="用户ID", paramType="form")
+    })
+	public Map<String, Object> update(String grainJson, String exceptionJson, Integer type, Integer orgId, Integer userId) {
+		Map<String, Object> map = new HashMap<>();
+		
+		map = analysisService.updateGrainAndException(grainJson, exceptionJson, map, type, orgId, userId);
+		
+		return map;
+	}
+
+	/**
+	 * 审核提交
+	 * 
+	 * @param grainJson
+	 * @return
+	 */
+	@RequestMapping(value="/auditor_submit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="审核提交", notes = "审核提交")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="grainJson", value="主表数据", paramType="form")
+    })
+	public Map<String, Object> auditor_submit(String grainJson) {
+		Map<String, Object> map = new HashMap<>();
+
+		try {
+			ObjectMapper mappers = new ObjectMapper();
+			StorageGrainAnalysis grain = mappers.readValue(grainJson, StorageGrainAnalysis.class);
+			grain.setAuditorStatus(1); // 新数据设置为已审核状态
+			analysisService.update(grain);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		map.put("status", "success");
+		map.put("msg", "审核成功！");
+		
+		return map;
+	}
+
+	/**
+	 * 以月份为条件查询三温数据
+	 *
+	 * @param houseId 仓房ID
+	 * @param wareId 货位ID
+	 * @param year 年
+	 * @param month 月
+	 * @param orgId 粮库ID
+	 * @return
+	 */
+	@RequestMapping(value="/getMonithThreeTempDate", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询三温数据", notes = "以月份为条件查询三温数据")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name="houseId", value="仓房ID", paramType="query"),
+			@ApiImplicitParam(name="wareId", value="货位ID", paramType="query"),
+			@ApiImplicitParam(name="year", value="年份", paramType="query"),
+			@ApiImplicitParam(name="month", value="月份", paramType="query"),
+			@ApiImplicitParam(name="orgId", value="组织机构ID", paramType="query")
+	})
+	public Map<String, Object> getMonithThreeTempDate(Integer houseId, Integer wareId, Integer year, Integer month,Integer orgId) {
+
+		Map<String, Object> map = new HashMap<>();
+
+		map = analysisService.getMonthThreeTempDate(houseId, wareId, year, month, orgId, map);
+
+		return map;
+	}
+}
+

src/main/java/com/chinaitop/depot/grainAnalysis/controller/StorageGrainAnalysisController.java

@@ -0,0 +1,189 @@
+package com.chinaitop.depot.grainAnalysis.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 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.grainAnalysis.model.StorageExceptionAndOnfore;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
+import com.chinaitop.depot.grainAnalysis.service.StorageGrainAnalysisService;
+import com.chinaitop.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;
+
+/**
+ * 周粮情分析controller
+ * @author User
+ */
+@RestController
+@RequestMapping(value = "/weekStorageGrainAnalysis")
+@Api(value= "StorageGrainAnalysisController", description = "周粮情分析控制类")
+public class StorageGrainAnalysisController {
+
+	@Resource
+	private StorageGrainAnalysisService analysisService;
+
+	@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="storehouseId", value="仓房ID", paramType="query"),
+    	@ApiImplicitParam(name="storehouseCode", value="仓房编码", paramType="query"),
+    	@ApiImplicitParam(name="startTime", value="起始时间", paramType="query"),
+    	@ApiImplicitParam(name="endTime", value="结束时间", paramType="query")
+    })
+	public PageInfo<StorageGrainAnalysis> getList(Integer pageNum, Integer pageSize, Integer storehouseId,
+			String storehouseCode, String startTime, String endTime) {
+
+		StorageGrainAnalysisExample analysisExample = new StorageGrainAnalysisExample();
+		StorageGrainAnalysisExample.Criteria analysisCriteria = analysisExample.createCriteria();
+
+		if (null != storehouseId && !"".equals(storehouseId)) {
+			analysisCriteria.andStorehouseIdEqualTo(storehouseId);
+		}
+
+		if (null != storehouseCode && !"".equals(storehouseCode)) {
+			analysisCriteria.andStorehouseCodeLike("%"+storehouseCode+"%");
+		}
+
+		if (ParameterUtil.isnotnull(startTime)) {
+			Date starDate = ParameterUtil.string2datetime(startTime + " 00:00:00");
+			analysisCriteria.andCheckDateStartGreaterThanOrEqualTo(starDate);
+		}
+
+		if (ParameterUtil.isnotnull(endTime)) {
+			Date endDate = ParameterUtil.string2datetime(endTime + " 23:59:59");
+			analysisCriteria.andCheckDateStartLessThanOrEqualTo(endDate);
+		}
+
+		if (null != pageNum && null != pageSize) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+
+		analysisCriteria.andAnalysisTypeEqualTo(0); //只查询周粮情分析
+
+		analysisExample.setOrderByClause(" id desc");
+
+		List<StorageGrainAnalysis> list = analysisService.findByCondition(analysisExample);
+		PageInfo<StorageGrainAnalysis> pageInfo = new PageInfo<StorageGrainAnalysis>(list);
+
+		return pageInfo;
+	}
+	
+	@RequestMapping(value="/edit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一条周粮情分析数据", notes = "查询一条周粮情分析数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="id", value="数据ID", paramType="query"),
+    	@ApiImplicitParam(name="analysisType", value="粮情分析类型数据", paramType="query")
+    })
+	public Map<String, Object> edit(Integer id, Integer analysisType) {
+
+		Map<String, Object> map = new HashMap<>();
+
+		if (null != id && !"".equals(id)) {
+			map = analysisService.findByIdAnalysisObj(id, analysisType, map);
+		} else {
+			StorageGrainAnalysis grain = new StorageGrainAnalysis();
+			map.put("grain", grain);
+		}
+
+		return map;
+	}
+
+	@RequestMapping(value="/getThreeTempDate", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一条三温检查数据", notes = "查询一条三温检查数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="threeTempList", value="温度数组", paramType="query")
+    })
+	public Map<String, Object> getThreeTempDate(String[] threeTempList) {
+		Map<String, Object> map = new HashMap<>();
+
+		if (null != threeTempList && threeTempList.length > 0) {
+			List<StorageExceptionAndOnfore> exceptionAndOnforeList = new ArrayList<>();
+			StorageExceptionAndOnfore exceptionAndOnfore = new StorageExceptionAndOnfore();
+			for (Object obj : threeTempList) {
+//				exceptionAndOnfore.setCheckDate(ParameterUtil.string2date(obj + " 00:00:00"));
+				exceptionAndOnforeList.add(exceptionAndOnfore);
+
+				if(ParameterUtil.isnull(threeTempList[1])){
+					break;
+				}
+			}
+			map.put("exceptionAndOnforeList", exceptionAndOnforeList);
+		}
+
+		return map;
+	}
+
+	/**
+	 * 提交
+	 * 
+	 * @param grainJson 主表数据
+	 * @param exceptionJson 从表数据
+	 * @param type 分析类型
+	 * @param orgId 组织机构ID
+	 * @param userId 用户ID
+	 * @return
+	 */
+	@RequestMapping(value="/update", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存周粮情分析数据", notes = "保存周粮情分析数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="grainJson", value="主表数据", paramType="form"),
+    	@ApiImplicitParam(name="exceptionJson", value="字表数据", paramType="form"),
+    	@ApiImplicitParam(name="type", value="分析类型", paramType="form"),
+    	@ApiImplicitParam(name="orgId", value="组织机构ID", paramType="form"),
+    	@ApiImplicitParam(name="userId", value="用户ID", paramType="form")
+    })
+	public Map<String, Object> update( String grainJson, String exceptionJson, Integer type, Integer orgId, Integer userId) {
+		Map<String, Object> map = new HashMap<>();
+		
+		map = analysisService.updateGrainAndException(grainJson, exceptionJson, map, type, orgId, userId);
+		
+		return map;
+	}
+
+	/**
+	 * 审核提交
+	 * 
+	 * @param grainJson
+	 * @return
+	 */
+	@RequestMapping(value="/auditor_submit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="审核提交", notes = "审核提交")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="grainJson", value="主表数据", paramType="form")
+    })
+	public Map<String, Object> auditor_submit(String grainJson) {
+		Map<String, Object> map = new HashMap<>();
+		
+		ObjectMapper mappers = new ObjectMapper();
+		try {
+			StorageGrainAnalysis grain = mappers.readValue(grainJson, StorageGrainAnalysis.class);
+			grain.setAuditorStatus(1); // 新数据设置为已审核状态
+			analysisService.update(grain);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		map.put("status", "success");
+		map.put("msg", "审核成功！");
+		
+		return map;
+	}
+}

src/main/java/com/chinaitop/depot/grainAnalysis/controller/YearStorageGrainAnalysisController.java

@@ -0,0 +1,207 @@
+package com.chinaitop.depot.grainAnalysis.controller;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.utils.ParameterUtil;
+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.grainAnalysis.model.StorageExceptionAndOnfore;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
+import com.chinaitop.depot.grainAnalysis.service.StorageGrainAnalysisService;
+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 = "/yearStorageGrainAnalysis")
+@Api(value= "YearStorageGrainAnalysisController", description = "年粮情分析控制类")
+public class YearStorageGrainAnalysisController {
+
+	@Resource
+	private StorageGrainAnalysisService analysisService;
+
+	/**
+	 * 年分析查询列表
+	 * 
+	 * @param pageNum
+	 * @param pageSize
+	 * @param storehouseId
+	 * @param year
+	 * @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="storehouseId", value="仓房ID", paramType="query"),
+    	@ApiImplicitParam(name="year", value="年份", paramType="query")
+    })
+	public PageInfo<StorageGrainAnalysis> getList(Integer pageNum, Integer pageSize, Integer storehouseId,
+			Integer year) {
+
+		StorageGrainAnalysisExample analysisExample = new StorageGrainAnalysisExample();
+		StorageGrainAnalysisExample.Criteria analysisCriteria = analysisExample.createCriteria();
+
+		if (null != storehouseId && !"".equals(storehouseId)) {
+			analysisCriteria.andStorehouseIdEqualTo(storehouseId);
+		}
+
+		if (null != year && !"".equals(year)) {
+			analysisCriteria.andYearEqualTo(year);
+		}
+
+		if (null != pageNum && null != pageSize) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+
+		analysisCriteria.andAnalysisTypeEqualTo(2); //只查询年粮情分析
+
+		analysisExample.setOrderByClause(" id desc");
+
+		List<StorageGrainAnalysis> list = analysisService.findByCondition(analysisExample);
+		PageInfo<StorageGrainAnalysis> pageInfo = new PageInfo<StorageGrainAnalysis>(list);
+
+		return pageInfo;
+	}
+
+	@RequestMapping(value="/edit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一条年粮情分析数据", notes = "查询一条年粮情分析数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="id", value="数据ID", paramType="query"),
+    	@ApiImplicitParam(name="analysisType", value="数据类型", paramType="query")
+    })
+	public Map<String, Object> edit(Integer id, Integer analysisType) {
+
+		Map<String, Object> map = new HashMap<>();
+
+		if (null != id && !"".equals(id)) {
+			map = analysisService.findByIdAnalysisObj(id, analysisType, map);
+		} else {
+			StorageGrainAnalysis grain = new StorageGrainAnalysis();
+			map.put("grain", grain);
+		}
+
+		return map;
+	}
+
+	@RequestMapping(value="/getThreeTempDate", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一条三温检查数据", notes = "查询一条三温检查数据")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name="houseId", value="仓房ID", paramType="query"),
+			@ApiImplicitParam(name="wareId", value="货位ID", paramType="query"),
+			@ApiImplicitParam(name="year", value="年份", paramType="query"),
+			@ApiImplicitParam(name="orgId", value="组织机构ID", paramType="query")
+	})
+	public Map<String, Object> getThreeTempDate(Integer houseId, Integer wareId, Integer year, Integer orgId) {
+		Map<String, Object> map = new HashMap<>();
+
+		if (houseId == null || wareId == null) {
+			map.put("status", false);
+			map.put("msg", "请录入仓房编号和货位编号！");
+			return map;
+		}
+		map = analysisService.getYearThreeTempDate(houseId, wareId, year, orgId, map);
+
+		return map;
+	}
+
+	@RequestMapping(value="/getThreeTempDateTwo", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="查询一条三温检查数据", notes = "查询一条三温检查数据")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name="threeList", value="需要查询三温的集合", paramType="query")
+	})
+	public Map<String, Object> getThreeTempDateTwo(String threeList) {
+		Map<String, Object> map = new HashMap<>();
+
+		JSONObject jsonMap = JSON.parseObject(threeList, JSONObject.class);
+
+		List<StorageExceptionAndOnfore> exceptionAndOnforeList = new ArrayList<>();
+		StorageExceptionAndOnfore exceptionAndOnfore = new StorageExceptionAndOnfore();
+		exceptionAndOnfore.setCheckDate(ParameterUtil.stringTodatetime(jsonMap.getString("checkDate")));
+		exceptionAndOnforeList.add(exceptionAndOnfore);
+
+		map.put("exceptionAndOnforeList", exceptionAndOnforeList);
+
+		map.put("status", true);
+
+		return map;
+
+	}
+
+	/**
+	 * 提交
+	 * 
+	 * @param grainJson 主表数据
+	 * @param exceptionJson 从表数据
+	 * @param type 分析类型
+	 * @param orgId 组织机构ID
+	 * @param userId 用户ID
+	 * @return
+	 */
+	@RequestMapping(value="/update", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存周粮情分析数据", notes = "保存周粮情分析数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="grainJson", value="主表数据", paramType="form"),
+    	@ApiImplicitParam(name="exceptionJson", value="字表数据", paramType="form"),
+    	@ApiImplicitParam(name="type", value="分析类型", paramType="form"),
+		@ApiImplicitParam(name="orgId", value="组织机构ID", paramType="form"),
+		@ApiImplicitParam(name="userId", value="用户ID", paramType="form")
+    })
+	public Map<String, Object> update(String grainJson, String exceptionJson, Integer type, Integer orgId, Integer userId) {
+		Map<String, Object> map = new HashMap<>();
+		
+		map = analysisService.updateGrainAndException(grainJson, exceptionJson, map, type, orgId, userId);
+		
+		return map;
+	}
+
+	/**
+	 * 审核提交
+	 * 
+	 * @param grainJson
+	 * @return
+	 */
+	@RequestMapping(value="/auditor_submit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="审核提交", notes = "审核提交")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="grainJson", value="主表数据", paramType="form")
+    })
+	public Map<String, Object> auditor_submit(String grainJson) {
+		Map<String, Object> map = new HashMap<>();
+		
+		ObjectMapper mappers = new ObjectMapper();
+		StorageGrainAnalysis grain = null;
+		try {
+			grain = mappers.readValue(grainJson, StorageGrainAnalysis.class);
+			grain.setAuditorStatus(1); // 新数据设置为已审核状态
+			analysisService.update(grain);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		map.put("status", "success");
+		map.put("msg", "审核成功！");
+		
+		return map;
+	}
+}

src/main/java/com/chinaitop/depot/grainAnalysis/mapper/StorageExceptionAndOnforeMapper.java

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

src/main/java/com/chinaitop/depot/grainAnalysis/mapper/StorageExceptionAndOnforeMapper.xml

@@ -0,0 +1,371 @@
+<?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.grainAnalysis.mapper.StorageExceptionAndOnforeMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="analysis_id" property="analysisId" jdbcType="VARCHAR" />
+    <result column="check_date" property="checkDate" jdbcType="TIMESTAMP" />
+    <result column="check_type" property="checkType" jdbcType="VARCHAR" />
+    <result column="check_part" property="checkPart" jdbcType="VARCHAR" />
+    <result column="check_range" property="checkRange" jdbcType="VARCHAR" />
+    <result column="foodstuff_temp" property="foodstuffTemp" jdbcType="DECIMAL" />
+    <result column="foodstuff_water" property="foodstuffWater" jdbcType="DECIMAL" />
+    <result column="rat_bird_situation" property="ratBirdSituation" jdbcType="VARCHAR" />
+    <result column="pest_situation" property="pestSituation" jdbcType="VARCHAR" />
+    <result column="bad_situation" property="badSituation" jdbcType="VARCHAR" />
+    <result column="accident_situation" property="accidentSituation" jdbcType="VARCHAR" />
+    <result column="handle_plan_or_result" property="handlePlanOrResult" jdbcType="VARCHAR" />
+    <result column="input_date" property="inputDate" jdbcType="TIMESTAMP" />
+    <result column="input_person" property="inputPerson" 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, analysis_id, check_date, check_type, check_part, check_range, foodstuff_temp, 
+    foodstuff_water, rat_bird_situation, pest_situation, bad_situation, accident_situation, 
+    handle_plan_or_result, input_date, input_person
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnforeExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_exception_and_onfore
+    <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_exception_and_onfore
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from storage_exception_and_onfore
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnforeExample" >
+    delete from storage_exception_and_onfore
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore" >
+    insert into storage_exception_and_onfore (id, analysis_id, check_date, 
+      check_type, check_part, check_range, 
+      foodstuff_temp, foodstuff_water, rat_bird_situation, 
+      pest_situation, bad_situation, accident_situation, 
+      handle_plan_or_result, input_date, input_person
+      )
+    values (#{id,jdbcType=INTEGER}, #{analysisId,jdbcType=VARCHAR}, #{checkDate,jdbcType=TIMESTAMP}, 
+      #{checkType,jdbcType=VARCHAR}, #{checkPart,jdbcType=VARCHAR}, #{checkRange,jdbcType=VARCHAR}, 
+      #{foodstuffTemp,jdbcType=DECIMAL}, #{foodstuffWater,jdbcType=DECIMAL}, #{ratBirdSituation,jdbcType=VARCHAR}, 
+      #{pestSituation,jdbcType=VARCHAR}, #{badSituation,jdbcType=VARCHAR}, #{accidentSituation,jdbcType=VARCHAR}, 
+      #{handlePlanOrResult,jdbcType=VARCHAR}, #{inputDate,jdbcType=TIMESTAMP}, #{inputPerson,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore" >
+    insert into storage_exception_and_onfore
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="analysisId != null" >
+        analysis_id,
+      </if>
+      <if test="checkDate != null" >
+        check_date,
+      </if>
+      <if test="checkType != null" >
+        check_type,
+      </if>
+      <if test="checkPart != null" >
+        check_part,
+      </if>
+      <if test="checkRange != null" >
+        check_range,
+      </if>
+      <if test="foodstuffTemp != null" >
+        foodstuff_temp,
+      </if>
+      <if test="foodstuffWater != null" >
+        foodstuff_water,
+      </if>
+      <if test="ratBirdSituation != null" >
+        rat_bird_situation,
+      </if>
+      <if test="pestSituation != null" >
+        pest_situation,
+      </if>
+      <if test="badSituation != null" >
+        bad_situation,
+      </if>
+      <if test="accidentSituation != null" >
+        accident_situation,
+      </if>
+      <if test="handlePlanOrResult != null" >
+        handle_plan_or_result,
+      </if>
+      <if test="inputDate != null" >
+        input_date,
+      </if>
+      <if test="inputPerson != null" >
+        input_person,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="analysisId != null" >
+        #{analysisId,jdbcType=VARCHAR},
+      </if>
+      <if test="checkDate != null" >
+        #{checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkType != null" >
+        #{checkType,jdbcType=VARCHAR},
+      </if>
+      <if test="checkPart != null" >
+        #{checkPart,jdbcType=VARCHAR},
+      </if>
+      <if test="checkRange != null" >
+        #{checkRange,jdbcType=VARCHAR},
+      </if>
+      <if test="foodstuffTemp != null" >
+        #{foodstuffTemp,jdbcType=DECIMAL},
+      </if>
+      <if test="foodstuffWater != null" >
+        #{foodstuffWater,jdbcType=DECIMAL},
+      </if>
+      <if test="ratBirdSituation != null" >
+        #{ratBirdSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="pestSituation != null" >
+        #{pestSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="badSituation != null" >
+        #{badSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="accidentSituation != null" >
+        #{accidentSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="handlePlanOrResult != null" >
+        #{handlePlanOrResult,jdbcType=VARCHAR},
+      </if>
+      <if test="inputDate != null" >
+        #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="inputPerson != null" >
+        #{inputPerson,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnforeExample" resultType="java.lang.Integer" >
+    select count(*) from storage_exception_and_onfore
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update storage_exception_and_onfore
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.analysisId != null" >
+        analysis_id = #{record.analysisId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.checkDate != null" >
+        check_date = #{record.checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.checkType != null" >
+        check_type = #{record.checkType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.checkPart != null" >
+        check_part = #{record.checkPart,jdbcType=VARCHAR},
+      </if>
+      <if test="record.checkRange != null" >
+        check_range = #{record.checkRange,jdbcType=VARCHAR},
+      </if>
+      <if test="record.foodstuffTemp != null" >
+        foodstuff_temp = #{record.foodstuffTemp,jdbcType=DECIMAL},
+      </if>
+      <if test="record.foodstuffWater != null" >
+        foodstuff_water = #{record.foodstuffWater,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ratBirdSituation != null" >
+        rat_bird_situation = #{record.ratBirdSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pestSituation != null" >
+        pest_situation = #{record.pestSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.badSituation != null" >
+        bad_situation = #{record.badSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accidentSituation != null" >
+        accident_situation = #{record.accidentSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.handlePlanOrResult != null" >
+        handle_plan_or_result = #{record.handlePlanOrResult,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputDate != null" >
+        input_date = #{record.inputDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.inputPerson != null" >
+        input_person = #{record.inputPerson,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update storage_exception_and_onfore
+    set id = #{record.id,jdbcType=INTEGER},
+      analysis_id = #{record.analysisId,jdbcType=VARCHAR},
+      check_date = #{record.checkDate,jdbcType=TIMESTAMP},
+      check_type = #{record.checkType,jdbcType=VARCHAR},
+      check_part = #{record.checkPart,jdbcType=VARCHAR},
+      check_range = #{record.checkRange,jdbcType=VARCHAR},
+      foodstuff_temp = #{record.foodstuffTemp,jdbcType=DECIMAL},
+      foodstuff_water = #{record.foodstuffWater,jdbcType=DECIMAL},
+      rat_bird_situation = #{record.ratBirdSituation,jdbcType=VARCHAR},
+      pest_situation = #{record.pestSituation,jdbcType=VARCHAR},
+      bad_situation = #{record.badSituation,jdbcType=VARCHAR},
+      accident_situation = #{record.accidentSituation,jdbcType=VARCHAR},
+      handle_plan_or_result = #{record.handlePlanOrResult,jdbcType=VARCHAR},
+      input_date = #{record.inputDate,jdbcType=TIMESTAMP},
+      input_person = #{record.inputPerson,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore" >
+    update storage_exception_and_onfore
+    <set >
+      <if test="analysisId != null" >
+        analysis_id = #{analysisId,jdbcType=VARCHAR},
+      </if>
+      <if test="checkDate != null" >
+        check_date = #{checkDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkType != null" >
+        check_type = #{checkType,jdbcType=VARCHAR},
+      </if>
+      <if test="checkPart != null" >
+        check_part = #{checkPart,jdbcType=VARCHAR},
+      </if>
+      <if test="checkRange != null" >
+        check_range = #{checkRange,jdbcType=VARCHAR},
+      </if>
+      <if test="foodstuffTemp != null" >
+        foodstuff_temp = #{foodstuffTemp,jdbcType=DECIMAL},
+      </if>
+      <if test="foodstuffWater != null" >
+        foodstuff_water = #{foodstuffWater,jdbcType=DECIMAL},
+      </if>
+      <if test="ratBirdSituation != null" >
+        rat_bird_situation = #{ratBirdSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="pestSituation != null" >
+        pest_situation = #{pestSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="badSituation != null" >
+        bad_situation = #{badSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="accidentSituation != null" >
+        accident_situation = #{accidentSituation,jdbcType=VARCHAR},
+      </if>
+      <if test="handlePlanOrResult != null" >
+        handle_plan_or_result = #{handlePlanOrResult,jdbcType=VARCHAR},
+      </if>
+      <if test="inputDate != null" >
+        input_date = #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="inputPerson != null" >
+        input_person = #{inputPerson,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore" >
+    update storage_exception_and_onfore
+    set analysis_id = #{analysisId,jdbcType=VARCHAR},
+      check_date = #{checkDate,jdbcType=TIMESTAMP},
+      check_type = #{checkType,jdbcType=VARCHAR},
+      check_part = #{checkPart,jdbcType=VARCHAR},
+      check_range = #{checkRange,jdbcType=VARCHAR},
+      foodstuff_temp = #{foodstuffTemp,jdbcType=DECIMAL},
+      foodstuff_water = #{foodstuffWater,jdbcType=DECIMAL},
+      rat_bird_situation = #{ratBirdSituation,jdbcType=VARCHAR},
+      pest_situation = #{pestSituation,jdbcType=VARCHAR},
+      bad_situation = #{badSituation,jdbcType=VARCHAR},
+      accident_situation = #{accidentSituation,jdbcType=VARCHAR},
+      handle_plan_or_result = #{handlePlanOrResult,jdbcType=VARCHAR},
+      input_date = #{inputDate,jdbcType=TIMESTAMP},
+      input_person = #{inputPerson,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/grainAnalysis/mapper/StorageGrainAnalysisMapper.java

@@ -0,0 +1,40 @@
+package com.chinaitop.depot.grainAnalysis.mapper;
+
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageGrainAnalysisMapper {
+    int countByExample(StorageGrainAnalysisExample example);
+
+    int deleteByExample(StorageGrainAnalysisExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StorageGrainAnalysis record);
+
+    int insertSelective(StorageGrainAnalysis record);
+
+    List<StorageGrainAnalysis> selectByExample(StorageGrainAnalysisExample example);
+
+    StorageGrainAnalysis selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") StorageGrainAnalysis record, @Param("example") StorageGrainAnalysisExample example);
+
+    int updateByExample(@Param("record") StorageGrainAnalysis record, @Param("example") StorageGrainAnalysisExample example);
+
+    int updateByPrimaryKeySelective(StorageGrainAnalysis record);
+
+    int updateByPrimaryKey(StorageGrainAnalysis record);
+
+    /**
+     * 查询一条仓房信息
+     * 
+     * @param map
+     * @return
+     */
+    Map<String, Object> selectStoreHouseObj(Map<String, Object> map);
+}

src/main/java/com/chinaitop/depot/grainAnalysis/mapper/StorageGrainAnalysisMapper.xml

@@ -0,0 +1,563 @@
+<?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.grainAnalysis.mapper.StorageGrainAnalysisMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="analysis_id" jdbcType="VARCHAR" property="analysisId" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="org_name" jdbcType="VARCHAR" property="orgName" />
+    <result column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
+    <result column="storehouse_code" jdbcType="VARCHAR" property="storehouseCode" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="storehouse_type" jdbcType="INTEGER" property="storehouseType" />
+    <result column="foodstuff_type" jdbcType="INTEGER" property="foodstuffType" />
+    <result column="keeper_name" jdbcType="VARCHAR" property="keeperName" />
+    <result column="analysis_type" jdbcType="INTEGER" property="analysisType" />
+    <result column="check_date_start" jdbcType="TIMESTAMP" property="checkDateStart" />
+    <result column="check_date_end" jdbcType="TIMESTAMP" property="checkDateEnd" />
+    <result column="year" jdbcType="INTEGER" property="year" />
+    <result column="month" jdbcType="INTEGER" property="month" />
+    <result column="submit_person" jdbcType="VARCHAR" property="submitPerson" />
+    <result column="submit_date" jdbcType="TIMESTAMP" property="submitDate" />
+    <result column="grain_analysis" jdbcType="VARCHAR" property="grainAnalysis" />
+    <result column="grain_state" jdbcType="VARCHAR" property="grainState" />
+    <result column="conclusion" jdbcType="VARCHAR" property="conclusion" />
+    <result column="chief_opinion" jdbcType="VARCHAR" property="chiefOpinion" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="auditor" jdbcType="VARCHAR" property="auditor" />
+    <result column="auditor_date" jdbcType="TIMESTAMP" property="auditorDate" />
+    <result column="auditor_opinion" jdbcType="VARCHAR" property="auditorOpinion" />
+    <result column="auditor_status" jdbcType="INTEGER" property="auditorStatus" />
+    <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, analysis_id, org_id, org_name, storehouse_id, storehouse_code, warehouse_id, 
+    storehouse_type, foodstuff_type, keeper_name, analysis_type, check_date_start, check_date_end, 
+    year, month, submit_person, submit_date, grain_analysis, grain_state, conclusion, 
+    chief_opinion, remark, auditor, auditor_date, auditor_opinion, auditor_status, input_date
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_grain_analysis
+    <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_grain_analysis
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from storage_grain_analysis
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample">
+    delete from storage_grain_analysis
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" keyProperty="id" useGeneratedKeys="true" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis">
+    insert into storage_grain_analysis (id, analysis_id, org_id, 
+      org_name, storehouse_id, storehouse_code, 
+      warehouse_id, storehouse_type, foodstuff_type, 
+      keeper_name, analysis_type, check_date_start, 
+      check_date_end, year, month, 
+      submit_person, submit_date, grain_analysis, 
+      grain_state, conclusion, chief_opinion, 
+      remark, auditor, auditor_date, 
+      auditor_opinion, auditor_status, input_date
+      )
+    values (#{id,jdbcType=INTEGER}, #{analysisId,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, 
+      #{orgName,jdbcType=VARCHAR}, #{storehouseId,jdbcType=INTEGER}, #{storehouseCode,jdbcType=VARCHAR}, 
+      #{warehouseId,jdbcType=INTEGER}, #{storehouseType,jdbcType=INTEGER}, #{foodstuffType,jdbcType=INTEGER}, 
+      #{keeperName,jdbcType=VARCHAR}, #{analysisType,jdbcType=INTEGER}, #{checkDateStart,jdbcType=TIMESTAMP}, 
+      #{checkDateEnd,jdbcType=TIMESTAMP}, #{year,jdbcType=INTEGER}, #{month,jdbcType=INTEGER}, 
+      #{submitPerson,jdbcType=VARCHAR}, #{submitDate,jdbcType=TIMESTAMP}, #{grainAnalysis,jdbcType=VARCHAR}, 
+      #{grainState,jdbcType=VARCHAR}, #{conclusion,jdbcType=VARCHAR}, #{chiefOpinion,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{auditor,jdbcType=VARCHAR}, #{auditorDate,jdbcType=TIMESTAMP}, 
+      #{auditorOpinion,jdbcType=VARCHAR}, #{auditorStatus,jdbcType=INTEGER}, #{inputDate,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" keyProperty="id" useGeneratedKeys="true" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis">
+    insert into storage_grain_analysis
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="analysisId != null">
+        analysis_id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="orgName != null">
+        org_name,
+      </if>
+      <if test="storehouseId != null">
+        storehouse_id,
+      </if>
+      <if test="storehouseCode != null">
+        storehouse_code,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="storehouseType != null">
+        storehouse_type,
+      </if>
+      <if test="foodstuffType != null">
+        foodstuff_type,
+      </if>
+      <if test="keeperName != null">
+        keeper_name,
+      </if>
+      <if test="analysisType != null">
+        analysis_type,
+      </if>
+      <if test="checkDateStart != null">
+        check_date_start,
+      </if>
+      <if test="checkDateEnd != null">
+        check_date_end,
+      </if>
+      <if test="year != null">
+        year,
+      </if>
+      <if test="month != null">
+        month,
+      </if>
+      <if test="submitPerson != null">
+        submit_person,
+      </if>
+      <if test="submitDate != null">
+        submit_date,
+      </if>
+      <if test="grainAnalysis != null">
+        grain_analysis,
+      </if>
+      <if test="grainState != null">
+        grain_state,
+      </if>
+      <if test="conclusion != null">
+        conclusion,
+      </if>
+      <if test="chiefOpinion != null">
+        chief_opinion,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="auditor != null">
+        auditor,
+      </if>
+      <if test="auditorDate != null">
+        auditor_date,
+      </if>
+      <if test="auditorOpinion != null">
+        auditor_opinion,
+      </if>
+      <if test="auditorStatus != null">
+        auditor_status,
+      </if>
+      <if test="inputDate != null">
+        input_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="analysisId != null">
+        #{analysisId,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="orgName != null">
+        #{orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="storehouseId != null">
+        #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseCode != null">
+        #{storehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseType != null">
+        #{storehouseType,jdbcType=INTEGER},
+      </if>
+      <if test="foodstuffType != null">
+        #{foodstuffType,jdbcType=INTEGER},
+      </if>
+      <if test="keeperName != null">
+        #{keeperName,jdbcType=VARCHAR},
+      </if>
+      <if test="analysisType != null">
+        #{analysisType,jdbcType=INTEGER},
+      </if>
+      <if test="checkDateStart != null">
+        #{checkDateStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkDateEnd != null">
+        #{checkDateEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="year != null">
+        #{year,jdbcType=INTEGER},
+      </if>
+      <if test="month != null">
+        #{month,jdbcType=INTEGER},
+      </if>
+      <if test="submitPerson != null">
+        #{submitPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="submitDate != null">
+        #{submitDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="grainAnalysis != null">
+        #{grainAnalysis,jdbcType=VARCHAR},
+      </if>
+      <if test="grainState != null">
+        #{grainState,jdbcType=VARCHAR},
+      </if>
+      <if test="conclusion != null">
+        #{conclusion,jdbcType=VARCHAR},
+      </if>
+      <if test="chiefOpinion != null">
+        #{chiefOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="auditor != null">
+        #{auditor,jdbcType=VARCHAR},
+      </if>
+      <if test="auditorDate != null">
+        #{auditorDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="auditorOpinion != null">
+        #{auditorOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="auditorStatus != null">
+        #{auditorStatus,jdbcType=INTEGER},
+      </if>
+      <if test="inputDate != null">
+        #{inputDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample" resultType="java.lang.Integer">
+    select count(*) from storage_grain_analysis
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_grain_analysis
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.analysisId != null">
+        analysis_id = #{record.analysisId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgName != null">
+        org_name = #{record.orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storehouseId != null">
+        storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.storehouseCode != null">
+        storehouse_code = #{record.storehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.storehouseType != null">
+        storehouse_type = #{record.storehouseType,jdbcType=INTEGER},
+      </if>
+      <if test="record.foodstuffType != null">
+        foodstuff_type = #{record.foodstuffType,jdbcType=INTEGER},
+      </if>
+      <if test="record.keeperName != null">
+        keeper_name = #{record.keeperName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.analysisType != null">
+        analysis_type = #{record.analysisType,jdbcType=INTEGER},
+      </if>
+      <if test="record.checkDateStart != null">
+        check_date_start = #{record.checkDateStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.checkDateEnd != null">
+        check_date_end = #{record.checkDateEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.year != null">
+        year = #{record.year,jdbcType=INTEGER},
+      </if>
+      <if test="record.month != null">
+        month = #{record.month,jdbcType=INTEGER},
+      </if>
+      <if test="record.submitPerson != null">
+        submit_person = #{record.submitPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.submitDate != null">
+        submit_date = #{record.submitDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.grainAnalysis != null">
+        grain_analysis = #{record.grainAnalysis,jdbcType=VARCHAR},
+      </if>
+      <if test="record.grainState != null">
+        grain_state = #{record.grainState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.conclusion != null">
+        conclusion = #{record.conclusion,jdbcType=VARCHAR},
+      </if>
+      <if test="record.chiefOpinion != null">
+        chief_opinion = #{record.chiefOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditor != null">
+        auditor = #{record.auditor,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditorDate != null">
+        auditor_date = #{record.auditorDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.auditorOpinion != null">
+        auditor_opinion = #{record.auditorOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditorStatus != null">
+        auditor_status = #{record.auditorStatus,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 storage_grain_analysis
+    set id = #{record.id,jdbcType=INTEGER},
+      analysis_id = #{record.analysisId,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      org_name = #{record.orgName,jdbcType=VARCHAR},
+      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      storehouse_code = #{record.storehouseCode,jdbcType=VARCHAR},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      storehouse_type = #{record.storehouseType,jdbcType=INTEGER},
+      foodstuff_type = #{record.foodstuffType,jdbcType=INTEGER},
+      keeper_name = #{record.keeperName,jdbcType=VARCHAR},
+      analysis_type = #{record.analysisType,jdbcType=INTEGER},
+      check_date_start = #{record.checkDateStart,jdbcType=TIMESTAMP},
+      check_date_end = #{record.checkDateEnd,jdbcType=TIMESTAMP},
+      year = #{record.year,jdbcType=INTEGER},
+      month = #{record.month,jdbcType=INTEGER},
+      submit_person = #{record.submitPerson,jdbcType=VARCHAR},
+      submit_date = #{record.submitDate,jdbcType=TIMESTAMP},
+      grain_analysis = #{record.grainAnalysis,jdbcType=VARCHAR},
+      grain_state = #{record.grainState,jdbcType=VARCHAR},
+      conclusion = #{record.conclusion,jdbcType=VARCHAR},
+      chief_opinion = #{record.chiefOpinion,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      auditor = #{record.auditor,jdbcType=VARCHAR},
+      auditor_date = #{record.auditorDate,jdbcType=TIMESTAMP},
+      auditor_opinion = #{record.auditorOpinion,jdbcType=VARCHAR},
+      auditor_status = #{record.auditorStatus,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.grainAnalysis.model.StorageGrainAnalysis">
+    update storage_grain_analysis
+    <set>
+      <if test="analysisId != null">
+        analysis_id = #{analysisId,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="orgName != null">
+        org_name = #{orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="storehouseId != null">
+        storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseCode != null">
+        storehouse_code = #{storehouseCode,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseType != null">
+        storehouse_type = #{storehouseType,jdbcType=INTEGER},
+      </if>
+      <if test="foodstuffType != null">
+        foodstuff_type = #{foodstuffType,jdbcType=INTEGER},
+      </if>
+      <if test="keeperName != null">
+        keeper_name = #{keeperName,jdbcType=VARCHAR},
+      </if>
+      <if test="analysisType != null">
+        analysis_type = #{analysisType,jdbcType=INTEGER},
+      </if>
+      <if test="checkDateStart != null">
+        check_date_start = #{checkDateStart,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkDateEnd != null">
+        check_date_end = #{checkDateEnd,jdbcType=TIMESTAMP},
+      </if>
+      <if test="year != null">
+        year = #{year,jdbcType=INTEGER},
+      </if>
+      <if test="month != null">
+        month = #{month,jdbcType=INTEGER},
+      </if>
+      <if test="submitPerson != null">
+        submit_person = #{submitPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="submitDate != null">
+        submit_date = #{submitDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="grainAnalysis != null">
+        grain_analysis = #{grainAnalysis,jdbcType=VARCHAR},
+      </if>
+      <if test="grainState != null">
+        grain_state = #{grainState,jdbcType=VARCHAR},
+      </if>
+      <if test="conclusion != null">
+        conclusion = #{conclusion,jdbcType=VARCHAR},
+      </if>
+      <if test="chiefOpinion != null">
+        chief_opinion = #{chiefOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="auditor != null">
+        auditor = #{auditor,jdbcType=VARCHAR},
+      </if>
+      <if test="auditorDate != null">
+        auditor_date = #{auditorDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="auditorOpinion != null">
+        auditor_opinion = #{auditorOpinion,jdbcType=VARCHAR},
+      </if>
+      <if test="auditorStatus != null">
+        auditor_status = #{auditorStatus,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.grainAnalysis.model.StorageGrainAnalysis">
+    update storage_grain_analysis
+    set analysis_id = #{analysisId,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      org_name = #{orgName,jdbcType=VARCHAR},
+      storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      storehouse_code = #{storehouseCode,jdbcType=VARCHAR},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      storehouse_type = #{storehouseType,jdbcType=INTEGER},
+      foodstuff_type = #{foodstuffType,jdbcType=INTEGER},
+      keeper_name = #{keeperName,jdbcType=VARCHAR},
+      analysis_type = #{analysisType,jdbcType=INTEGER},
+      check_date_start = #{checkDateStart,jdbcType=TIMESTAMP},
+      check_date_end = #{checkDateEnd,jdbcType=TIMESTAMP},
+      year = #{year,jdbcType=INTEGER},
+      month = #{month,jdbcType=INTEGER},
+      submit_person = #{submitPerson,jdbcType=VARCHAR},
+      submit_date = #{submitDate,jdbcType=TIMESTAMP},
+      grain_analysis = #{grainAnalysis,jdbcType=VARCHAR},
+      grain_state = #{grainState,jdbcType=VARCHAR},
+      conclusion = #{conclusion,jdbcType=VARCHAR},
+      chief_opinion = #{chiefOpinion,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      auditor = #{auditor,jdbcType=VARCHAR},
+      auditor_date = #{auditorDate,jdbcType=TIMESTAMP},
+      auditor_opinion = #{auditorOpinion,jdbcType=VARCHAR},
+      auditor_status = #{auditorStatus,jdbcType=INTEGER},
+      input_date = #{inputDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectStoreHouseObj" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT * FROM basic_storehouse WHERE storehouse_id=#{house_id}
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/grainAnalysis/model/StorageExceptionAndOnfore.java

@@ -0,0 +1,276 @@
+package com.chinaitop.depot.grainAnalysis.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class StorageExceptionAndOnfore {
+    private Integer id;
+
+    private String analysisId;
+
+    private Date checkDate;
+
+    private String checkType;
+
+    private String checkPart;
+
+    private String checkRange;
+
+    private BigDecimal foodstuffTemp;
+
+    private BigDecimal foodstuffWater;
+
+    private String ratBirdSituation;
+
+    private String pestSituation;
+
+    private String badSituation;
+
+    private String accidentSituation;
+
+    private String handlePlanOrResult;
+
+    private Date inputDate;
+
+    private Integer inputPerson;
+
+    /**
+     * 主键ID
+     * @return id 主键ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键ID
+     * @param id 主键ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 分析编号
+     * @return analysis_id 分析编号
+     */
+    public String getAnalysisId() {
+        return analysisId;
+    }
+
+    /**
+     * 分析编号
+     * @param analysisId 分析编号
+     */
+    public void setAnalysisId(String analysisId) {
+        this.analysisId = analysisId == null ? null : analysisId.trim();
+    }
+
+    /**
+     * 检查时间
+     * @return check_date 检查时间
+     */
+    public Date getCheckDate() {
+        return checkDate;
+    }
+
+    /**
+     * 检查时间
+     * @param checkDate 检查时间
+     */
+    public void setCheckDate(Date checkDate) {
+        this.checkDate = checkDate;
+    }
+
+    /**
+     * 检查类型
+     * @return check_type 检查类型
+     */
+    public String getCheckType() {
+        return checkType;
+    }
+
+    /**
+     * 检查类型
+     * @param checkType 检查类型
+     */
+    public void setCheckType(String checkType) {
+        this.checkType = checkType == null ? null : checkType.trim();
+    }
+
+    /**
+     * 检查部位
+     * @return check_part 检查部位
+     */
+    public String getCheckPart() {
+        return checkPart;
+    }
+
+    /**
+     * 检查部位
+     * @param checkPart 检查部位
+     */
+    public void setCheckPart(String checkPart) {
+        this.checkPart = checkPart == null ? null : checkPart.trim();
+    }
+
+    /**
+     * 检查范围
+     * @return check_range 检查范围
+     */
+    public String getCheckRange() {
+        return checkRange;
+    }
+
+    /**
+     * 检查范围
+     * @param checkRange 检查范围
+     */
+    public void setCheckRange(String checkRange) {
+        this.checkRange = checkRange == null ? null : checkRange.trim();
+    }
+
+    /**
+     * 粮温(℃)
+     * @return foodstuff_temp 粮温(℃)
+     */
+    public BigDecimal getFoodstuffTemp() {
+        return foodstuffTemp;
+    }
+
+    /**
+     * 粮温(℃)
+     * @param foodstuffTemp 粮温(℃)
+     */
+    public void setFoodstuffTemp(BigDecimal foodstuffTemp) {
+        this.foodstuffTemp = foodstuffTemp;
+    }
+
+    /**
+     * 水分(%)
+     * @return foodstuff_water 水分(%)
+     */
+    public BigDecimal getFoodstuffWater() {
+        return foodstuffWater;
+    }
+
+    /**
+     * 水分(%)
+     * @param foodstuffWater 水分(%)
+     */
+    public void setFoodstuffWater(BigDecimal foodstuffWater) {
+        this.foodstuffWater = foodstuffWater;
+    }
+
+    /**
+     * 鼠雀情况
+     * @return rat_bird_situation 鼠雀情况
+     */
+    public String getRatBirdSituation() {
+        return ratBirdSituation;
+    }
+
+    /**
+     * 鼠雀情况
+     * @param ratBirdSituation 鼠雀情况
+     */
+    public void setRatBirdSituation(String ratBirdSituation) {
+        this.ratBirdSituation = ratBirdSituation == null ? null : ratBirdSituation.trim();
+    }
+
+    /**
+     * 害虫情况
+     * @return pest_situation 害虫情况
+     */
+    public String getPestSituation() {
+        return pestSituation;
+    }
+
+    /**
+     * 害虫情况
+     * @param pestSituation 害虫情况
+     */
+    public void setPestSituation(String pestSituation) {
+        this.pestSituation = pestSituation == null ? null : pestSituation.trim();
+    }
+
+    /**
+     * 变质情况
+     * @return bad_situation 变质情况
+     */
+    public String getBadSituation() {
+        return badSituation;
+    }
+
+    /**
+     * 变质情况
+     * @param badSituation 变质情况
+     */
+    public void setBadSituation(String badSituation) {
+        this.badSituation = badSituation == null ? null : badSituation.trim();
+    }
+
+    /**
+     * 事故情况
+     * @return accident_situation 事故情况
+     */
+    public String getAccidentSituation() {
+        return accidentSituation;
+    }
+
+    /**
+     * 事故情况
+     * @param accidentSituation 事故情况
+     */
+    public void setAccidentSituation(String accidentSituation) {
+        this.accidentSituation = accidentSituation == null ? null : accidentSituation.trim();
+    }
+
+    /**
+     * 处理方案或处理效果
+     * @return handle_plan_or_result 处理方案或处理效果
+     */
+    public String getHandlePlanOrResult() {
+        return handlePlanOrResult;
+    }
+
+    /**
+     * 处理方案或处理效果
+     * @param handlePlanOrResult 处理方案或处理效果
+     */
+    public void setHandlePlanOrResult(String handlePlanOrResult) {
+        this.handlePlanOrResult = handlePlanOrResult == null ? null : handlePlanOrResult.trim();
+    }
+
+    /**
+     * 录入时间
+     * @return input_date 录入时间
+     */
+    public Date getInputDate() {
+        return inputDate;
+    }
+
+    /**
+     * 录入时间
+     * @param inputDate 录入时间
+     */
+    public void setInputDate(Date inputDate) {
+        this.inputDate = inputDate;
+    }
+
+    /**
+     * 录入人
+     * @return input_person 录入人
+     */
+    public Integer getInputPerson() {
+        return inputPerson;
+    }
+
+    /**
+     * 录入人
+     * @param inputPerson 录入人
+     */
+    public void setInputPerson(Integer inputPerson) {
+        this.inputPerson = inputPerson;
+    }
+}

src/main/java/com/chinaitop/depot/grainAnalysis/model/StorageGrainAnalysis.java

@@ -0,0 +1,491 @@
+package com.chinaitop.depot.grainAnalysis.model;
+
+import java.util.Date;
+
+public class StorageGrainAnalysis {
+    private Integer id;
+
+    private String analysisId;
+
+    private Integer orgId;
+
+    private String orgName;
+
+    private Integer storehouseId;
+
+    private String storehouseCode;
+
+    private Integer warehouseId;
+
+    private Integer storehouseType;
+
+    private Integer foodstuffType;
+
+    private String keeperName;
+
+    private Integer analysisType;
+
+    private Date checkDateStart;
+
+    private Date checkDateEnd;
+
+    private Integer year;
+
+    private Integer month;
+
+    private String submitPerson;
+
+    private Date submitDate;
+
+    private String grainAnalysis;
+
+    private String grainState;
+
+    private String conclusion;
+
+    private String chiefOpinion;
+
+    private String remark;
+
+    private String auditor;
+
+    private Date auditorDate;
+
+    private String auditorOpinion;
+
+    private Integer auditorStatus;
+
+    private Date inputDate;
+
+    /**
+     * 主键ID
+     * @return id 主键ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键ID
+     * @param id 主键ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 分析编号
+     * @return analysis_id 分析编号
+     */
+    public String getAnalysisId() {
+        return analysisId;
+    }
+
+    /**
+     * 分析编号
+     * @param analysisId 分析编号
+     */
+    public void setAnalysisId(String analysisId) {
+        this.analysisId = analysisId == null ? null : analysisId.trim();
+    }
+
+    /**
+     * 粮库ID
+     * @return org_id 粮库ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 粮库ID
+     * @param orgId 粮库ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 粮库名称
+     * @return org_name 粮库名称
+     */
+    public String getOrgName() {
+        return orgName;
+    }
+
+    /**
+     * 粮库名称
+     * @param orgName 粮库名称
+     */
+    public void setOrgName(String orgName) {
+        this.orgName = orgName == null ? null : orgName.trim();
+    }
+
+    /**
+     * 仓房名称
+     * @return storehouse_id 仓房名称
+     */
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    /**
+     * 仓房名称
+     * @param storehouseId 仓房名称
+     */
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    /**
+     * 仓房编号
+     * @return storehouse_code 仓房编号
+     */
+    public String getStorehouseCode() {
+        return storehouseCode;
+    }
+
+    /**
+     * 仓房编号
+     * @param storehouseCode 仓房编号
+     */
+    public void setStorehouseCode(String storehouseCode) {
+        this.storehouseCode = storehouseCode == null ? null : storehouseCode.trim();
+    }
+
+    /**
+     * 货位ID
+     * @return warehouse_id 货位ID
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位ID
+     * @param warehouseId 货位ID
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 仓房类型
+     * @return storehouse_type 仓房类型
+     */
+    public Integer getStorehouseType() {
+        return storehouseType;
+    }
+
+    /**
+     * 仓房类型
+     * @param storehouseType 仓房类型
+     */
+    public void setStorehouseType(Integer storehouseType) {
+        this.storehouseType = storehouseType;
+    }
+
+    /**
+     * 粮食品种
+     * @return foodstuff_type 粮食品种
+     */
+    public Integer getFoodstuffType() {
+        return foodstuffType;
+    }
+
+    /**
+     * 粮食品种
+     * @param foodstuffType 粮食品种
+     */
+    public void setFoodstuffType(Integer foodstuffType) {
+        this.foodstuffType = foodstuffType;
+    }
+
+    /**
+     * 责任保管员
+     * @return keeper_name 责任保管员
+     */
+    public String getKeeperName() {
+        return keeperName;
+    }
+
+    /**
+     * 责任保管员
+     * @param keeperName 责任保管员
+     */
+    public void setKeeperName(String keeperName) {
+        this.keeperName = keeperName == null ? null : keeperName.trim();
+    }
+
+    /**
+     * 分析类型(0周分析，1月分析，2年分析)
+     * @return analysis_type 分析类型(0周分析，1月分析，2年分析)
+     */
+    public Integer getAnalysisType() {
+        return analysisType;
+    }
+
+    /**
+     * 分析类型(0周分析，1月分析，2年分析)
+     * @param analysisType 分析类型(0周分析，1月分析，2年分析)
+     */
+    public void setAnalysisType(Integer analysisType) {
+        this.analysisType = analysisType;
+    }
+
+    /**
+     * 检查起始日期
+     * @return check_date_start 检查起始日期
+     */
+    public Date getCheckDateStart() {
+        return checkDateStart;
+    }
+
+    /**
+     * 检查起始日期
+     * @param checkDateStart 检查起始日期
+     */
+    public void setCheckDateStart(Date checkDateStart) {
+        this.checkDateStart = checkDateStart;
+    }
+
+    /**
+     * 检查结束日期
+     * @return check_date_end 检查结束日期
+     */
+    public Date getCheckDateEnd() {
+        return checkDateEnd;
+    }
+
+    /**
+     * 检查结束日期
+     * @param checkDateEnd 检查结束日期
+     */
+    public void setCheckDateEnd(Date checkDateEnd) {
+        this.checkDateEnd = checkDateEnd;
+    }
+
+    /**
+     * 年
+     * @return year 年
+     */
+    public Integer getYear() {
+        return year;
+    }
+
+    /**
+     * 年
+     * @param year 年
+     */
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    /**
+     * 月
+     * @return month 月
+     */
+    public Integer getMonth() {
+        return month;
+    }
+
+    /**
+     * 月
+     * @param month 月
+     */
+    public void setMonth(Integer month) {
+        this.month = month;
+    }
+
+    /**
+     * 提交人
+     * @return submit_person 提交人
+     */
+    public String getSubmitPerson() {
+        return submitPerson;
+    }
+
+    /**
+     * 提交人
+     * @param submitPerson 提交人
+     */
+    public void setSubmitPerson(String submitPerson) {
+        this.submitPerson = submitPerson == null ? null : submitPerson.trim();
+    }
+
+    /**
+     * 提交时间
+     * @return submit_date 提交时间
+     */
+    public Date getSubmitDate() {
+        return submitDate;
+    }
+
+    /**
+     * 提交时间
+     * @param submitDate 提交时间
+     */
+    public void setSubmitDate(Date submitDate) {
+        this.submitDate = submitDate;
+    }
+
+    /**
+     * 粮情分析
+     * @return grain_analysis 粮情分析
+     */
+    public String getGrainAnalysis() {
+        return grainAnalysis;
+    }
+
+    /**
+     * 粮情分析
+     * @param grainAnalysis 粮情分析
+     */
+    public void setGrainAnalysis(String grainAnalysis) {
+        this.grainAnalysis = grainAnalysis == null ? null : grainAnalysis.trim();
+    }
+
+    /**
+     * 粮情状况
+     * @return grain_state 粮情状况
+     */
+    public String getGrainState() {
+        return grainState;
+    }
+
+    /**
+     * 粮情状况
+     * @param grainState 粮情状况
+     */
+    public void setGrainState(String grainState) {
+        this.grainState = grainState == null ? null : grainState.trim();
+    }
+
+    /**
+     * 结论
+     * @return conclusion 结论
+     */
+    public String getConclusion() {
+        return conclusion;
+    }
+
+    /**
+     * 结论
+     * @param conclusion 结论
+     */
+    public void setConclusion(String conclusion) {
+        this.conclusion = conclusion == null ? null : conclusion.trim();
+    }
+
+    /**
+     * 仓储科长意见
+     * @return chief_opinion 仓储科长意见
+     */
+    public String getChiefOpinion() {
+        return chiefOpinion;
+    }
+
+    /**
+     * 仓储科长意见
+     * @param chiefOpinion 仓储科长意见
+     */
+    public void setChiefOpinion(String chiefOpinion) {
+        this.chiefOpinion = chiefOpinion == null ? null : chiefOpinion.trim();
+    }
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 审核人
+     * @return auditor 审核人
+     */
+    public String getAuditor() {
+        return auditor;
+    }
+
+    /**
+     * 审核人
+     * @param auditor 审核人
+     */
+    public void setAuditor(String auditor) {
+        this.auditor = auditor == null ? null : auditor.trim();
+    }
+
+    /**
+     * 审核时间
+     * @return auditor_date 审核时间
+     */
+    public Date getAuditorDate() {
+        return auditorDate;
+    }
+
+    /**
+     * 审核时间
+     * @param auditorDate 审核时间
+     */
+    public void setAuditorDate(Date auditorDate) {
+        this.auditorDate = auditorDate;
+    }
+
+    /**
+     * 审核意见
+     * @return auditor_opinion 审核意见
+     */
+    public String getAuditorOpinion() {
+        return auditorOpinion;
+    }
+
+    /**
+     * 审核意见
+     * @param auditorOpinion 审核意见
+     */
+    public void setAuditorOpinion(String auditorOpinion) {
+        this.auditorOpinion = auditorOpinion == null ? null : auditorOpinion.trim();
+    }
+
+    /**
+     * 审批状态
+     * @return auditor_status 审批状态
+     */
+    public Integer getAuditorStatus() {
+        return auditorStatus;
+    }
+
+    /**
+     * 审批状态
+     * @param auditorStatus 审批状态
+     */
+    public void setAuditorStatus(Integer auditorStatus) {
+        this.auditorStatus = auditorStatus;
+    }
+
+    /**
+     * 录入时间
+     * @return input_date 录入时间
+     */
+    public Date getInputDate() {
+        return inputDate;
+    }
+
+    /**
+     * 录入时间
+     * @param inputDate 录入时间
+     */
+    public void setInputDate(Date inputDate) {
+        this.inputDate = inputDate;
+    }
+}

src/main/java/com/chinaitop/depot/grainAnalysis/service/StorageGrainAnalysisService.java

@@ -0,0 +1,94 @@
+package com.chinaitop.depot.grainAnalysis.service;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
+
+public interface StorageGrainAnalysisService {
+
+	/**
+	 * 新增
+	 * 
+	 * @param storageGrainAnalysis
+	 */
+	void add(StorageGrainAnalysis storageGrainAnalysis);
+
+	/**
+	 * 删除
+	 * 
+	 * @param id
+	 */
+	void remove(Integer id);
+
+	/**
+	 * 修改
+	 * 
+	 * @param storageGrainAnalysis
+	 */
+	void update(StorageGrainAnalysis storageGrainAnalysis);
+
+	/**
+	 * 查询一条数据
+	 * 
+	 * @param id 数据ID
+	 * @return
+	 */
+	StorageGrainAnalysis findByParmaryKey(Integer id);
+
+	/**
+	 * 查询一组数据
+	 * 
+	 * @param example 条件
+	 * @return
+	 */
+	List<StorageGrainAnalysis> findByCondition(StorageGrainAnalysisExample example);
+
+	/**
+	 * 查询一条分析记录的所有关联信息
+	 * 
+	 * @param id 数据ID
+	 * @param analysisType 分析类型
+	 * @param map 返回对象
+	 */
+	Map<String, Object> findByIdAnalysisObj(Integer id, Integer analysisType, Map<String, Object> map);
+
+	/**
+	 * 更新粮情分析和异常四无情况数据
+	 * 
+	 * @param grainJson 主表数据
+	 * @param exceptionJson 从表数据
+	 * @return
+	 */
+	Map<String, Object> updateGrainAndException(String grainJson, String exceptionJson, Map<String, Object> map, Integer type,Integer orgId, Integer userId);
+
+	/**
+	 * 以月份为条件查询三温数据
+	 * 
+	 * @param houseId 仓房ID
+	 * @param wareId 货位ID
+	 * @param year 年
+	 * @param month 月
+	 * @param orgId 粮库ID
+	 * @param map 返回对象
+	 * @return
+	 */
+	Map<String, Object> getMonthThreeTempDate(Integer houseId, Integer wareId, Integer year, Integer month,
+			Integer orgId, Map<String, Object> map);
+
+	/**
+	 * 以年为条件查询三温数据
+	 * 
+	 * @param houseId 仓房ID
+	 * @param wareId 货位ID
+	 * @param year 年
+	 * @param orgId 粮库ID
+	 * @param map 返回对象
+	 * @return
+	 */
+	Map<String, Object> getYearThreeTempDate(Integer houseId, Integer wareId, Integer year, Integer orgId,
+			Map<String, Object> map);
+}

src/main/java/com/chinaitop/depot/grainAnalysis/service/impl/StorageGrainAnalysisServiceImpl.java

@@ -0,0 +1,266 @@
+package com.chinaitop.depot.grainAnalysis.service.impl;
+
+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 org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.grainAnalysis.mapper.StorageExceptionAndOnforeMapper;
+import com.chinaitop.depot.grainAnalysis.mapper.StorageGrainAnalysisMapper;
+import com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnfore;
+import com.chinaitop.depot.grainAnalysis.model.StorageExceptionAndOnforeExample;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysis;
+import com.chinaitop.depot.grainAnalysis.model.StorageGrainAnalysisExample;
+import com.chinaitop.depot.grainAnalysis.service.StorageGrainAnalysisService;
+import com.chinaitop.utils.ParameterUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Service
+public class StorageGrainAnalysisServiceImpl implements StorageGrainAnalysisService {
+
+	@Resource
+	private StorageGrainAnalysisMapper analysisMapper;
+
+	@Resource
+	private StorageExceptionAndOnforeMapper exceptionAndOnforeMapper;
+
+	@Override
+	public void add(StorageGrainAnalysis storageGrainAnalysis) {
+		analysisMapper.insertSelective(storageGrainAnalysis);
+	}
+
+	@Override
+	public void remove(Integer id) {
+		analysisMapper.deleteByPrimaryKey(id);
+	}
+
+	@Override
+	public void update(StorageGrainAnalysis storageGrainAnalysis) {
+		analysisMapper.updateByPrimaryKeySelective(storageGrainAnalysis);
+	}
+
+	@Override
+	public StorageGrainAnalysis findByParmaryKey(Integer id) {
+		return analysisMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public List<StorageGrainAnalysis> findByCondition(StorageGrainAnalysisExample example) {
+		return analysisMapper.selectByExample(example);
+	}
+
+	@Override
+	public Map<String, Object> findByIdAnalysisObj(Integer id, Integer analysisType, Map<String, Object> map) {
+
+		// 查询主表数据
+		StorageGrainAnalysis grain = analysisMapper.selectByPrimaryKey(id);
+		map.put("grain", grain);
+
+		// 查询三温检查数据
+		Integer houseId = grain.getStorehouseId();
+		Integer wareId = grain.getWarehouseId();
+		if (analysisType == 0) {// 周分析
+			map.put("houseId",grain.getStorehouseId());
+			map.put("wareId",grain.getWarehouseId());
+			map.put("orgId",grain.getOrgId());
+			map.put("startDate",ParameterUtil.date2string(grain.getCheckDateStart()));
+			map.put("endDate",ParameterUtil.date2string(grain.getCheckDateEnd()));
+		} else if (analysisType == 1) {// 月分析
+			getMonthThreeTempDate(houseId, wareId, grain.getYear(), grain.getMonth(),
+					grain.getOrgId(), map);
+		} else if (analysisType == 2) {//年分析
+			getYearThreeTempDate(houseId, wareId, grain.getYear(), grain.getOrgId(), map);
+		}
+		
+		
+		// 查询粮情异常和四无情况数据
+		getExceptionAndOnfore(grain.getAnalysisId(), map);
+
+		return map;
+	}
+
+	@Override
+	public Map<String, Object> getMonthThreeTempDate(Integer houseId, Integer wareId, Integer year, Integer month,
+			Integer orgId, Map<String, Object> map) {
+		/**
+		 * 思路：1、将当前月的所有周分析数据拿到；
+		 * 2、然后按照每条周分析数据的检查时间范围来查询每周对应的三温检查数据；
+		 * 3、将每周的三温检查数据取到第一条作为一周的代表数据；
+		 * 4、将每周的三温检查代表数据放入集合中返回
+		 */
+
+		List list = new ArrayList();
+
+		//将当前月的所有周分析数据拿到；
+		StorageGrainAnalysisExample grainExample = new StorageGrainAnalysisExample();
+		StorageGrainAnalysisExample.Criteria grainCriteria = grainExample.createCriteria();
+		grainCriteria.andYearEqualTo(year);
+		if (month.toString().length() == 1) {
+			month = Integer.parseInt("0" + month.toString());
+		}
+		grainCriteria.andMonthEqualTo(month);
+		grainCriteria.andStorehouseIdEqualTo(houseId);
+		grainCriteria.andWarehouseIdEqualTo(wareId);
+		grainCriteria.andAnalysisTypeEqualTo(0);
+		grainExample.setOrderByClause("id asc");
+		List<StorageGrainAnalysis> grainList = analysisMapper.selectByExample(grainExample);
+
+		Map<String, Object> param_map = new HashMap<String, Object>();
+		param_map.put("house_id", houseId);
+		Map<String, Object> house_map = analysisMapper.selectStoreHouseObj(param_map);
+		String houseCode = house_map.get("storehouse_code")+"";
+		
+		//然后按照每条周分析数据的检查时间范围来查询每周对应的三温检查数据,每周的取一条数据组成集合返回；
+		if (null != grainList && grainList.size() > 0) {
+			for (StorageGrainAnalysis grain : grainList) {
+				Date startDate = grain.getCheckDateStart();
+				String startDate_str = ParameterUtil.date2string(startDate);
+
+				Date endDate = grain.getCheckDateEnd();
+				String endDate_str = ParameterUtil.date2string(endDate);
+
+				Map<String, Object> dateMap = new HashMap<>();
+				dateMap.put("houseId",houseCode);
+				dateMap.put("startDate",startDate_str);
+				dateMap.put("endDate",endDate_str);
+				dateMap.put("orgId",orgId);
+				list.add(dateMap);
+			}
+			
+			if (null == list || list.size() == 0) {
+				list = new ArrayList();
+			}
+		} else {
+			list = new ArrayList();
+		}
+		map.put("threeTempCheckList", list);
+
+		return map;
+	}
+	
+	@Override
+	public Map<String, Object> getYearThreeTempDate(Integer houseId, Integer wareId, Integer year, Integer orgId,
+			Map<String, Object> map) {
+		/**
+		 * 思路：1、将当前年份的所有月分析数据拿到；
+		 * 2、将每月的三温检查数据取到第一条作为一月的代表数据；
+		 * 3、将每月的三温检查代表数据放入集合中返回
+		 */
+
+		List list = new ArrayList();
+		
+		//将当前月的所有周分析数据拿到；
+		StorageGrainAnalysisExample grainExample = new StorageGrainAnalysisExample();
+		StorageGrainAnalysisExample.Criteria grainCriteria = grainExample.createCriteria();
+		grainCriteria.andYearEqualTo(year);
+		grainCriteria.andStorehouseIdEqualTo(houseId);
+		grainCriteria.andWarehouseIdEqualTo(wareId);
+		grainCriteria.andAnalysisTypeEqualTo(1);
+		grainExample.setOrderByClause("id asc");
+		List<StorageGrainAnalysis> grainYearList = analysisMapper.selectByExample(grainExample);
+		
+		//然后按照每条周分析数据的检查时间范围来查询每周对应的三温检查数据,每周的取一条数据组成集合返回；
+		if (null != grainYearList && grainYearList.size() > 0) {
+			list = new ArrayList();
+			Integer month = null;
+			Map<String, Object> monthMap = new HashMap<>();
+			for (StorageGrainAnalysis grain : grainYearList) {
+
+				//获取每个月的月分析数据
+//				monthMap = getMonthThreeTempDate(houseId, wareId, year, month, grain.getOrgId(), monthMap);
+				
+				//取月数据的第一条为代当前月的代表数据，最后结果是有几个月的分析数据就返回几条数据
+//				StorageThreetempcheck threetempcheck = ((List<StorageThreetempcheck>) monthMap.get("threeTempCheckList")).get(0);
+				list.add(grain.getMonth());
+			}
+			
+			if (null == list || list.size() == 0) {
+				list = new ArrayList();
+			}
+		} else {
+			list = new ArrayList();
+		}
+		map.put("threeTempCheckList", list);
+
+		return map;
+	}
+	
+	private Map<String, Object> getExceptionAndOnfore(String analysisId, Map<String, Object> map) {
+		StorageExceptionAndOnforeExample example = new StorageExceptionAndOnforeExample();
+		StorageExceptionAndOnforeExample.Criteria criteria = example.createCriteria();
+		criteria.andAnalysisIdEqualTo(analysisId);
+		example.setOrderByClause("id asc");
+
+		List<StorageExceptionAndOnfore> list = exceptionAndOnforeMapper.selectByExample(example);
+
+		map.put("exceptionAndOnforeList", list);
+
+		return map;
+	}
+
+	@Override
+	public Map<String, Object> updateGrainAndException(String grainJson,String exceptionJson,
+			Map<String, Object> map, Integer type,Integer orgId, Integer userId) {
+
+		ObjectMapper mappers = new ObjectMapper();
+		try {
+			StorageGrainAnalysis grain = mappers.readValue(grainJson, StorageGrainAnalysis.class);
+			if (grain.getId() == null || "".equals(grain.getId())) {
+
+				if (type == 0) {
+					Date startDate = grain.getCheckDateStart();
+					String startDate_str = ParameterUtil.date2string(startDate);
+					String year = startDate_str.substring(0, 4);
+			        String month = startDate_str.substring(5, 7);
+			        grain.setYear(Integer.parseInt(year));
+					grain.setMonth(Integer.parseInt(month));
+				}
+
+				grain.setOrgId(orgId);
+				grain.setInputDate(new Date());
+				grain.setAuditorStatus(0); // 新数据设置为未审核状态
+				grain.setAnalysisType(type); //分析类型：0周分析，1月分析，2年分析
+				analysisMapper.insertSelective(grain);
+			} else {
+				analysisMapper.updateByPrimaryKeySelective(grain);
+			}
+
+			//更新粮食异常和四无分析信息
+			List<StorageExceptionAndOnfore> exceptionList = mappers.readValue(exceptionJson,
+					new TypeReference<List<StorageExceptionAndOnfore>>() {
+					});
+			editException(exceptionList, grain.getAnalysisId(), userId);
+			map.put("status", "success");
+			map.put("msg", "提交成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return map;
+	}
+
+	/**
+	 * 更新粮食异常和四无分析信息
+	 * 
+	 * @param edcationList
+	 * @param analysisId
+	 * @param userId
+	 */
+	private void editException(List<StorageExceptionAndOnfore> edcationList, String analysisId, Integer userId) {
+		for (StorageExceptionAndOnfore obj : edcationList) {
+			if (null == obj.getId() || "".equals(obj.getId())) {
+				obj.setAnalysisId(analysisId);
+				obj.setInputPerson(userId);
+				exceptionAndOnforeMapper.insertSelective(obj);
+			} else {
+				exceptionAndOnforeMapper.updateByPrimaryKeySelective(obj);
+			}
+		}
+	}
+
+}

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/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/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;
+   }
+
+}

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

@@ -0,0 +1,198 @@
+package com.chinaitop.utils;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+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 stringTodatetime(String dateTime){
+        dateTime = dateTime.substring(0,19);
+        dateTime = dateTime.replace("T"," ");
+
+        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()));
+    	String ip = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";   
+    	Pattern pattern = Pattern.compile(ip);  
+    	Matcher matcher = pattern.matcher("172.16.10.150");  
+    	matcher.matches();  
+    	//System.out.println(matcher.matches());
+
+    	String a = "1.16.10.1";
+    	boolean isNum = a.matches(ip);
+    	System.out.println(isNum);
+    }
+    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/resources/bootstrap.yml

@@ -0,0 +1,51 @@
+server:
+  port: 9013
+  tomcat:
+    uri-encoding: utf-8
+
+# 注册中心配置
+eureka:
+  client:
+    service-url:
+      defaultZone: http://eureka-depot-yn:9001/eureka/
+  instance:
+    prefer-ip-address: true
+    # 每隔10s发送一次心跳(默认30s)
+    lease-renewal-interval-in-seconds: 10
+    # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
+    lease-expiration-duration-in-seconds: 30
+
+spring:
+  application:
+    name: depot-keeper-house
+  # 数据库配置
+  datasource:
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.123.38:3306/depot_yunnan?useUnicode=true&characterEncoding=utf-8
+    username: root
+    password: 123456
+  # 缓存配置
+  session:
+    store-type: redis
+  redis:
+    database: 0
+    host: 192.168.123.98
+    port: 6666
+    password: depotredis
+    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}
+ 
+web:
+  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+
+  jackson:
+    date-format: yyyy-MM-dd
+    time-zone: GMT+8