模块整理

@@ -21,7 +21,7 @@ public class Yu2leLoginToken implements Serializable {
     private String parentUserNickName; //上级用户昵称
     private String parentUserNickName; //上级用户昵称
     private JSONObject date; //数据
     private JSONObject date; //数据
     private Integer createTime; //生成时间
     private Integer createTime; //生成时间
-    private String key = "LiuYuLeXX"; //密钥
+    private static String key = "LiuYuLeXX"; //密钥
     private Integer userType; //用户类型（0普通用户，1管理员）
     private Integer userType; //用户类型（0普通用户，1管理员）
     private Integer isOperation = 1;         //有无操作权限 (0无，1有)
     private Integer isOperation = 1;         //有无操作权限 (0无，1有)
 
 

@@ -4,6 +4,7 @@ import com.ruoyi.common.enums.UserStatus;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.entity.SysUser;
 import com.ruoyi.system.domain.entity.SysUser;
 import com.zhonglai.luhui.security.dto.SysLoginUser;
 import com.zhonglai.luhui.security.dto.SysLoginUser;
 import com.zhonglai.luhui.sys.service.ISysUserService;
 import com.zhonglai.luhui.sys.service.ISysUserService;
@@ -13,25 +14,21 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
 
 
 /**
 /**
  * 用户验证处理
  * 用户验证处理
  *
  *
  * @author ruoyi
  * @author ruoyi
  */
  */
-@Service
-public class AdminDetailsServiceImpl implements UserDetailsService
+public abstract class AdminDetailsService implements UserDetailsService
 {
 {
-    private static final Logger log = LoggerFactory.getLogger(AdminDetailsServiceImpl.class);
-
-    @Autowired
-    private ISysUserService userService;
+    private static final Logger log = LoggerFactory.getLogger(AdminDetailsService.class);
 
 
 
 
     @Override
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
     {
     {
+        ISysUserService userService = SpringUtils.getBean(ISysUserService.class);
         SysUser user = userService.selectUserByUserName(username);
         SysUser user = userService.selectUserByUserName(username);
         if (StringUtils.isNull(user))
         if (StringUtils.isNull(user))
         {
         {

@@ -3,31 +3,31 @@ package com.zhonglai.luhui.security.service;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.zhonglai.luhui.dao.service.PublicService;
 import com.zhonglai.luhui.dao.service.PublicService;
 import com.zhonglai.luhui.security.dto.ApiLoginUser;
 import com.zhonglai.luhui.security.dto.ApiLoginUser;
 import com.zhonglai.luhui.security.dto.Yu2leUserInfo;
 import com.zhonglai.luhui.security.dto.Yu2leUserInfo;
 import com.zhonglai.luhui.security.dto.Yu2leUserLogin;
 import com.zhonglai.luhui.security.dto.Yu2leUserLogin;
+import com.zhonglai.luhui.sys.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
 
 
 /**
 /**
  * 用户验证处理
  * 用户验证处理
  *
  *
  * @author ruoyi
  * @author ruoyi
  */
  */
-@Service
-public class ApiDetailsServiceImpl implements UserDetailsService
+public class ApiDetailsService implements UserDetailsService
 {
 {
-    private static final Logger log = LoggerFactory.getLogger(ApiDetailsServiceImpl.class);
-    @Autowired
-    private PublicService publicService;
+    private static final Logger log = LoggerFactory.getLogger(ApiDetailsService.class);
     @Override
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        PublicService publicService = SpringUtils.getBean(PublicService.class);
+
         Yu2leUserLogin yu2leUserLogin = publicService.getObjectForTableName(Yu2leUserLogin.class,"loginName",username,"`liu_yu_le`.`user_login`");
         Yu2leUserLogin yu2leUserLogin = publicService.getObjectForTableName(Yu2leUserLogin.class,"loginName",username,"`liu_yu_le`.`user_login`");
         Yu2leUserInfo yu2leUserInfo = publicService.getObjectForTableName(Yu2leUserInfo.class,"loginName",username,"`liu_yu_le`.`user_info`");;
         Yu2leUserInfo yu2leUserInfo = publicService.getObjectForTableName(Yu2leUserInfo.class,"loginName",username,"`liu_yu_le`.`user_info`");;
         if (StringUtils.isNull(yu2leUserLogin) || StringUtils.isNull(yu2leUserInfo))
         if (StringUtils.isNull(yu2leUserLogin) || StringUtils.isNull(yu2leUserInfo))

 package com.zhonglai.luhui.afms.config;
 package com.zhonglai.luhui.afms.config;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.utils.GsonConstructor;
 import com.ruoyi.common.utils.GsonConstructor;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
@@ -9,7 +8,7 @@ import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
 import com.zhonglai.luhui.security.dto.BaseLoginUser;
 import com.zhonglai.luhui.security.dto.BaseLoginUser;
 import com.zhonglai.luhui.security.filter.JwtAuthenticationTokenFilter;
 import com.zhonglai.luhui.security.filter.JwtAuthenticationTokenFilter;
 import com.zhonglai.luhui.security.handle.LogoutSuccessHandlerImpl;
 import com.zhonglai.luhui.security.handle.LogoutSuccessHandlerImpl;
-import com.zhonglai.luhui.security.service.AdminDetailsServiceImpl;
+import com.zhonglai.luhui.security.service.AdminDetailsService;
 import com.zhonglai.luhui.security.service.SecurityConfigService;
 import com.zhonglai.luhui.security.service.SecurityConfigService;
 import com.zhonglai.luhui.security.service.TokenService;
 import com.zhonglai.luhui.security.service.TokenService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -35,7 +34,7 @@ public class AdminConfigurerAdapter extends DefaultSecurityConfig {
     private static final Logger log = LoggerFactory.getLogger(AdminConfigurerAdapter.class);
     private static final Logger log = LoggerFactory.getLogger(AdminConfigurerAdapter.class);
 
 
     @Autowired
     @Autowired
-    private AdminDetailsServiceImpl adminDetailsService;
+    private AdminDetailsService adminDetailsService;
 
 
     @Autowired
     @Autowired
     private SecurityConfigService securityConfigService;
     private SecurityConfigService securityConfigService;

 package com.zhonglai.luhui.afms.config;
 package com.zhonglai.luhui.afms.config;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.utils.GsonConstructor;
 import com.ruoyi.common.utils.GsonConstructor;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
@@ -9,7 +8,7 @@ import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
 import com.zhonglai.luhui.security.dto.BaseLoginUser;
 import com.zhonglai.luhui.security.dto.BaseLoginUser;
 import com.zhonglai.luhui.security.filter.JwtAuthenticationTokenFilter;
 import com.zhonglai.luhui.security.filter.JwtAuthenticationTokenFilter;
 import com.zhonglai.luhui.security.handle.LogoutSuccessHandlerImpl;
 import com.zhonglai.luhui.security.handle.LogoutSuccessHandlerImpl;
-import com.zhonglai.luhui.security.service.ApiDetailsServiceImpl;
+import com.zhonglai.luhui.security.service.ApiDetailsService;
 import com.zhonglai.luhui.security.service.SecurityConfigService;
 import com.zhonglai.luhui.security.service.SecurityConfigService;
 import com.zhonglai.luhui.security.service.TokenService;
 import com.zhonglai.luhui.security.service.TokenService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -34,7 +33,7 @@ public class ApiConfigurerAdapter extends DefaultSecurityConfig {
     private static final Logger log = LoggerFactory.getLogger(ApiConfigurerAdapter.class);
     private static final Logger log = LoggerFactory.getLogger(ApiConfigurerAdapter.class);
 
 
     @Autowired
     @Autowired
-    private ApiDetailsServiceImpl apiDetailsService;
+    private ApiDetailsService apiDetailsService;
 
 
     @Autowired
     @Autowired
     private SecurityConfigService securityConfigService;
     private SecurityConfigService securityConfigService;

 package com.zhonglai.luhui.login.config;
 package com.zhonglai.luhui.login.config;
 
 
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
 import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
-import com.zhonglai.luhui.security.dto.BaseLoginUser;
-import com.zhonglai.luhui.security.filter.JwtAuthenticationTokenFilter;
-import com.zhonglai.luhui.security.service.AdminDetailsServiceImpl;
+import com.zhonglai.luhui.security.service.AdminDetailsService;
 import com.zhonglai.luhui.security.service.SecurityConfigService;
 import com.zhonglai.luhui.security.service.SecurityConfigService;
-import com.zhonglai.luhui.security.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
 /**
 /**
  * app接口安全策略. 没有{@link Order}注解优先级比上面低
  * app接口安全策略. 没有{@link Order}注解优先级比上面低
  */
  */
@@ -29,7 +20,7 @@ import java.io.IOException;
 public class AdminConfigurerAdapter extends DefaultSecurityConfig {
 public class AdminConfigurerAdapter extends DefaultSecurityConfig {
 
 
     @Autowired
     @Autowired
-    private AdminDetailsServiceImpl adminDetailsService;
+    private AdminDetailsService adminDetailsService;
 
 
     @Autowired
     @Autowired
     private SecurityConfigService securityConfigService;
     private SecurityConfigService securityConfigService;

@@ -3,7 +3,7 @@ package com.zhonglai.luhui.login.config;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
 import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
-import com.zhonglai.luhui.security.service.ApiDetailsServiceImpl;
+import com.zhonglai.luhui.security.service.ApiDetailsService;
 import com.zhonglai.luhui.security.service.SecurityConfigService;
 import com.zhonglai.luhui.security.service.SecurityConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
@@ -18,7 +18,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 @Configuration
 @Configuration
 public class ApiConfigurerAdapter extends DefaultSecurityConfig {
 public class ApiConfigurerAdapter extends DefaultSecurityConfig {
     @Autowired
     @Autowired
-    private ApiDetailsServiceImpl apiDetailsService;
+    private ApiDetailsService apiDetailsService;
 
 
     @Autowired
     @Autowired
     private SecurityConfigService securityConfigService;
     private SecurityConfigService securityConfigService;

@@ -4,7 +4,10 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.zhonglai.luhui.action.BaseController;
 import com.zhonglai.luhui.action.BaseController;
+import com.zhonglai.luhui.dao.service.PublicService;
 import com.zhonglai.luhui.login.service.LoginService;
 import com.zhonglai.luhui.login.service.LoginService;
+import com.zhonglai.luhui.security.dto.Yu2leLoginToken;
+import com.zhonglai.luhui.security.dto.Yu2leUserInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiImplicitParams;
@@ -23,6 +26,9 @@ public class ApiLoginController extends BaseController {
     @Autowired
     @Autowired
     private LoginService loginService;
     private LoginService loginService;
 
 
+    @Autowired
+    private PublicService publicService;
+
     @ApiOperation("账号密码登陆")
     @ApiOperation("账号密码登陆")
     @ApiImplicitParams({
     @ApiImplicitParams({
             @ApiImplicitParam(value = "账号",name = "user"),
             @ApiImplicitParam(value = "账号",name = "user"),
@@ -53,4 +59,25 @@ public class ApiLoginController extends BaseController {
         ajax.put(Constants.TOKEN, token);
         ajax.put(Constants.TOKEN, token);
         return ajax;
         return ajax;
     }
     }
+
+    @ApiOperation("流水鱼token登陆")
+    @ApiImplicitParam(value = "流水鱼token",name = "loginToken")
+    @PostMapping("/getYuerleByruningfishLogin")
+    public AjaxResult getYuerleByruningfishLogin(@RequestHeader String loginToken)
+    {
+        if(StringUtils.isEmpty(loginToken))
+        {
+            return AjaxResult.error("请输入鱼儿乐令牌");
+        }
+        AjaxResult ajax = AjaxResult.success();
+
+        Yu2leLoginToken yu2leLoginToken = new Yu2leLoginToken(loginToken);
+        Yu2leUserInfo userInfo = publicService.getObjectForTableName(Yu2leUserInfo.class,"loginName",yu2leLoginToken.getUserLoginName()+"","`liu_yu_le`.`user_info`");
+        if(null == userInfo)
+        {
+            return AjaxResult.error("该用户没有注册鱼儿乐");
+        }
+        ajax.put(Constants.TOKEN, new Yu2leLoginToken(userInfo.getId(),userInfo.getLoginName(),userInfo.getNickname(),0).get());
+        return ajax;
+    }
 }
 }

+package com.zhonglai.luhui.login.service;
+
+import com.zhonglai.luhui.security.service.AdminDetailsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AdminDetailsServiceImpl extends AdminDetailsService {
+}

+package com.zhonglai.luhui.login.service;
+
+import com.zhonglai.luhui.security.service.ApiDetailsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ApiDetailsServiceImpl extends ApiDetailsService {
+}

@@ -11,8 +11,6 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.entity.SysUser;
 import com.ruoyi.system.domain.entity.SysUser;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.ruoyi.common.tool.SysLogininforType;
 import com.zhonglai.luhui.dao.service.PublicService;
 import com.zhonglai.luhui.dao.service.PublicService;
-import com.zhonglai.luhui.login.config.AdminConfigurerAdapter;
-import com.zhonglai.luhui.login.config.ApiConfigurerAdapter;
 import com.zhonglai.luhui.redis.service.RedisCache;
 import com.zhonglai.luhui.redis.service.RedisCache;
 import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
 import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
 import com.zhonglai.luhui.security.dto.*;
 import com.zhonglai.luhui.security.dto.*;
@@ -87,7 +85,7 @@ public class LoginService {
 
 
     public String openaiLoginByPass(String user,String pass) {
     public String openaiLoginByPass(String user,String pass) {
         // 用户验证
         // 用户验证
-        Authentication authentication = userPasswordVerification(user,pass,SpringUtils.getBean("apiConfigurerAdapter"));
+        Authentication authentication = userPasswordVerification(user,pass,SpringUtils.getBean("openAiConfigurerAdapter"));
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(user, SysLogininforType.openAi, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(user, SysLogininforType.openAi, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         OpenAiLoginUser loginUser = (OpenAiLoginUser) authentication.getPrincipal();
         OpenAiLoginUser loginUser = (OpenAiLoginUser) authentication.getPrincipal();
         loginUser.setSysLogininforType(SysLogininforType.openAi);
         loginUser.setSysLogininforType(SysLogininforType.openAi);

@@ -16,7 +16,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
  * app接口安全策略. 没有{@link Order}注解优先级比上面低
  * app接口安全策略. 没有{@link Order}注解优先级比上面低
  */
  */
 @Configuration
 @Configuration
-public class ApiConfigurerAdapter extends DefaultSecurityConfig {
+public class OpenAiConfigurerAdapter extends DefaultSecurityConfig {
     @Autowired
     @Autowired
     private ChatgptDetailsServiceImpl chatgptDetailsService;
     private ChatgptDetailsServiceImpl chatgptDetailsService;
 
 

+<?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>
+    <parent>
+        <groupId>com.zhonglai.luhui</groupId>
+        <artifactId>lh-modules</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>lh-runingfish</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>lh-jar-sys-service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>lh-common-swagger</artifactId>
+        </dependency>
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+        </dependency>
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>lh-jar-action</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+    </dependencies>
+</project>

+package com.zhonglai.luhui.runingfish;
+
+import com.ruoyi.framework.config.ResourcesConfig;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@ComponentScan(basePackages = {
+        "com.ruoyi.common",
+        "com.ruoyi.framework",
+        "com.zhonglai.luhui.datasource",
+        "com.zhonglai.luhui.dao",
+        "com.zhonglai.luhui.sys",
+        "com.zhonglai.luhui.redis",
+        "com.zhonglai.luhui.security",
+        "com.zhonglai.luhui.runingfish",
+}
+)
+@EnableScheduling
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+public class Main {
+    public static void main(String[] args) {
+        SpringApplication.run(Main.class,args);
+        System.out.println("启动成功");
+    }
+}

+package com.zhonglai.luhui.runingfish.config;
+
+import com.ruoyi.common.tool.SysLogininforType;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.zhonglai.luhui.runingfish.service.RuningfishDetailsServiceImpl;
+import com.zhonglai.luhui.security.config.DefaultSecurityConfig;
+import com.zhonglai.luhui.security.service.SecurityConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+/**
+ * app接口安全策略. 没有{@link Order}注解优先级比上面低
+ */
+@Configuration
+public class ApiConfigurerAdapter extends DefaultSecurityConfig {
+    @Autowired
+    private UserDetailsService userDetailsService;
+
+    @Autowired
+    private SecurityConfigService securityConfigService;
+
+    @Override
+    public UserDetailsService getUserDetailsService() {
+        return userDetailsService;
+    }
+
+    @Override
+    public void configHttpSecurity(HttpSecurity httpSecurity) throws Exception {
+        securityConfigService.configHttpSecurity(httpSecurity);
+    }
+
+    @Override
+    public PasswordEncoder bCryptPasswordEncoder() {
+        return SpringUtils.getBean("bCryptPasswordEncoder");
+    }
+
+    @Override
+    public SysLogininforType sysLogininforType() {
+        return SysLogininforType.lhAdmin;
+    }
+}

+package com.zhonglai.luhui.runingfish.config;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+    /** 系统基础配置 */
+    @Autowired
+    private RuoYiConfig ruoyiConfig;
+	@Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("流水鱼")
+                .apiInfo(
+                        new ApiInfoBuilder().title("标题：流水鱼")
+                        .description("流水鱼")
+                        .contact(new Contact(ruoyiConfig.getName(), null, null))
+                        .version("版本号:" + ruoyiConfig.getVersion())
+                        .build()
+                )
+                .select()
+                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+
+}

+package com.zhonglai.luhui.runingfish.domain.alarm;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :告警SQL配置
+ * @Date: Created in 11:15 2016/12/20
+ */
+public class DeviceAlarmSqlConfig extends BaseBean {
+
+    private Integer deviceSqlConfigId;			//主键id
+    private String sqlConfigKey;				//规则字段名
+    private Integer deviceConfigId;				//告警设置id
+    private String sqlConfigValue;				//规则字段值
+    private String sqlConfigView;				//显示名称
+
+    public Integer getDeviceSqlConfigId() {
+        return deviceSqlConfigId;
+    }
+
+    public void setDeviceSqlConfigId(Integer deviceSqlConfigId) {
+        this.deviceSqlConfigId = deviceSqlConfigId;
+    }
+
+    public String getSqlConfigKey() {
+        return sqlConfigKey;
+    }
+
+    public void setSqlConfigKey(String sqlConfigKey) {
+        this.sqlConfigKey = sqlConfigKey;
+    }
+
+    public Integer getDeviceConfigId() {
+        return deviceConfigId;
+    }
+
+    public void setDeviceConfigId(Integer deviceConfigId) {
+        this.deviceConfigId = deviceConfigId;
+    }
+
+    public String getSqlConfigValue() {
+        return sqlConfigValue;
+    }
+
+    public void setSqlConfigValue(String sqlConfigValue) {
+        this.sqlConfigValue = sqlConfigValue;
+    }
+
+    public String getSqlConfigView() {
+        return sqlConfigView;
+    }
+
+    public void setSqlConfigView(String sqlConfigView) {
+        this.sqlConfigView = sqlConfigView;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.alarm;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :告警规则key
+ * @Date: Created in 11:24 2016/12/20
+ */
+public class DeviceAlarmSqlConfigKey extends BaseBean {
+    private String key;				//规则字段名
+    private String view;			//显示名称
+    private String sql;				//规则sql
+    private String valusName;		//参数名称，分割
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getView() {
+        return view;
+    }
+
+    public void setView(String view) {
+        this.view = view;
+    }
+
+    public String getSql() {
+        return sql;
+    }
+
+    public void setSql(String sql) {
+        this.sql = sql;
+    }
+
+    public String getValusName() {
+        return valusName;
+    }
+
+    public void setValusName(String valusName) {
+        this.valusName = valusName;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.alarm;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 系统告警SQL
+ * Created by Administrator on 2017/1/7.
+ */
+public class DeviceAlarmSyssqlConfig extends BaseBean {
+    private Integer deviceConfigId;//
+    private String alarmCode;//
+    private Integer isOpen;//
+    private String configWhereSql;//
+    private Integer createTime;//
+
+    public Integer getDeviceConfigId() {
+        return deviceConfigId;
+    }
+
+    public void setDeviceConfigId(Integer deviceConfigId) {
+        this.deviceConfigId = deviceConfigId;
+    }
+
+    public String getAlarmCode() {
+        return alarmCode;
+    }
+
+    public void setAlarmCode(String alarmCode) {
+        this.alarmCode = alarmCode;
+    }
+
+    public Integer getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(Integer isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    public String getConfigWhereSql() {
+        return configWhereSql;
+    }
+
+    public void setConfigWhereSql(String configWhereSql) {
+        this.configWhereSql = configWhereSql;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.alarm;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description : 告警类型表
+ * @Date: Created in 10:57 2016/12/20
+ */
+public class DeviceAlarmType extends BaseBean {
+    private String alarmCode;			//告警代码
+    private String alarmTypeName;		//告警名字
+    private String alarmMethod;			//告警解决方法
+    private String alarmType;			//告警类型
+
+    public String getAlarmCode() {
+        return alarmCode;
+    }
+
+    public void setAlarmCode(String alarmCode) {
+        this.alarmCode = alarmCode;
+    }
+
+    public String getAlarmTypeName() {
+        return alarmTypeName;
+    }
+
+    public void setAlarmTypeName(String alarmTypeName) {
+        this.alarmTypeName = alarmTypeName;
+    }
+
+    public String getAlarmMethod() {
+        return alarmMethod;
+    }
+
+    public void setAlarmMethod(String alarmMethod) {
+        this.alarmMethod = alarmMethod;
+    }
+
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :告警开关状态配置
+ * @Date: Created in 13:54 2016/12/17
+ */
+public class DeviceAlarmConfig extends BaseBean {
+
+    private Integer id;				//主键id
+    private String deviceInfoId;		//设备信息表id
+    private String alarmCode;		//告警代码
+    private Integer isOpen;			//告警开关(0打开，1关闭)
+    private Integer intervalTime;	//间隔时间
+    private String configWhereSql;	//配置sql条件
+    private Integer createTime;		//创建时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDeviceInfoId() {
+        return deviceInfoId;
+    }
+
+    public void setDeviceInfoId(String deviceInfoId) {
+        this.deviceInfoId = deviceInfoId;
+    }
+
+    public String getAlarmCode() {
+        return alarmCode;
+    }
+
+    public void setAlarmCode(String alarmCode) {
+        this.alarmCode = alarmCode;
+    }
+
+    public Integer getIsOpen() {
+        return isOpen;
+    }
+
+    public void setIsOpen(Integer isOpen) {
+        this.isOpen = isOpen;
+    }
+
+    public Integer getIntervalTime() {
+        return intervalTime;
+    }
+
+    public void setIntervalTime(Integer intervalTime) {
+        this.intervalTime = intervalTime;
+    }
+
+    public String getConfigWhereSql() {
+        return configWhereSql;
+    }
+
+    public void setConfigWhereSql(String configWhereSql) {
+        this.configWhereSql = configWhereSql;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :301设备指令信息
+ * @Date: Created in 12:02 2016/12/17
+ */
+public class DeviceCommand301 extends BaseBean {
+    private String frameHead; //帧头
+    private String addressBits; //地址位
+    private String commandWord; //命令字
+    private String date; //数据
+    private String checkCode; //校验码
+
+    public String getHeadString()
+    {
+        return this.frameHead+this.addressBits+this.commandWord+this.date
+                + calculationCheckCode();
+    }
+
+    public String calculationCheckCode()
+    {
+        String str = this.addressBits+this.commandWord+this.date;
+        char[] achar = str.toCharArray();
+        int toll= 0 ;
+        for(int i=0;i<achar.length;i+=2)
+        {
+            toll += Integer.valueOf(achar[i]+""+achar[i+1],16);
+        }
+        str = Integer.toHexString(toll);
+        if(str.length()<2)
+        {
+            str = "0"+str;
+        }else{
+            str =str.substring(str.length()-2, str.length());
+        }
+        return str;
+    }
+
+
+    public DeviceCommand301() {
+        super();
+    }
+
+    public DeviceCommand301(String frameHead, String addressBits,
+                            String commandWord, String date) {
+        super();
+        this.frameHead = frameHead;
+        this.addressBits = addressBits;
+        this.commandWord = commandWord;
+        this.date = date;
+    }
+
+    public String getFrameHead() {
+        return frameHead;
+    }
+    public void setFrameHead(String frameHead) {
+        this.frameHead = frameHead;
+    }
+    public String getAddressBits() {
+        return addressBits;
+    }
+    public void setAddressBits(String addressBits) {
+        this.addressBits = addressBits;
+    }
+    public String getCommandWord() {
+        return commandWord;
+    }
+    public void setCommandWord(String commandWord) {
+        this.commandWord = commandWord;
+    }
+    public String getDate() {
+        return date;
+    }
+    public void setDate(String date) {
+        this.date = date;
+    }
+    public String getCheckCode() {
+        return checkCode;
+    }
+    public void setCheckCode(String checkCode) {
+        this.checkCode = checkCode;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :设备用电情况
+ * @Date: Created in 15:14 2016/12/20
+ */
+public class DeviceElectricity extends BaseBean {
+
+    private String deviceId;                   //主键设备ID（不含编号）
+    private Integer updateTime;                //更新时间
+    private Integer cityElectricityText;      //市电检测（1-有市电）
+    private Integer cityElectricityUse;       //使用市电（1-使用市电）
+    private Integer alternatorUser;            //使用发电机（1-使用发电机）
+    private Integer electricityGenerationText;//发电检测（1-发电）
+    private Integer powerFailureAlarm;        //停电报警（1-停电告警）
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Integer updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getCityElectricityText() {
+        return cityElectricityText;
+    }
+
+    public void setCityElectricityText(Integer cityElectricityText) {
+        this.cityElectricityText = cityElectricityText;
+    }
+
+    public Integer getCityElectricityUse() {
+        return cityElectricityUse;
+    }
+
+    public void setCityElectricityUse(Integer cityElectricityUse) {
+        this.cityElectricityUse = cityElectricityUse;
+    }
+
+    public Integer getAlternatorUser() {
+        return alternatorUser;
+    }
+
+    public void setAlternatorUser(Integer alternatorUser) {
+        this.alternatorUser = alternatorUser;
+    }
+
+    public Integer getElectricityGenerationText() {
+        return electricityGenerationText;
+    }
+
+    public void setElectricityGenerationText(Integer electricityGenerationText) {
+        this.electricityGenerationText = electricityGenerationText;
+    }
+
+    public Integer getPowerFailureAlarm() {
+        return powerFailureAlarm;
+    }
+
+    public void setPowerFailureAlarm(Integer powerFailureAlarm) {
+        this.powerFailureAlarm = powerFailureAlarm;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :设备信息表
+ * @Date: Created in 22:05 2016/12/7
+ */
+public class DeviceInfo extends BaseBean {
+
+    private String id;                      //设备主键ID(设备IMEI号加编号)
+    private String deviceName;              //设备名称
+    private Integer userId;                 //用户ID
+    private String userLoginName;           //用户登录名
+    private Integer baseId;                 //主塘口ID
+    private String baseName;                //主口名称
+    private Integer pondType;               //塘口类型（0-外塘，1-水槽）
+    private Integer pondId;                 //水槽或外塘ID
+    private String pondName;                //水槽或外塘名称
+    private String deviceType;              //设备类型（PLC_001，YU2LE_301）
+    private Integer deviceTerminalTypeKey;  //终端类型（0-排污，1-投饵，2-增氧，3-鱼儿乐，4-曝气，5-水流计量）
+    private String deviceTerminalType;      //终端名称
+    private String dataValue;               //数据值（json字符串）
+    private String alarmCode;               //告警代码（正常-00）
+    private Integer alarmTime;              //告警时间
+    private String online;                  //设备在线状态(00-不在线,01-在线)
+    private Integer updateTime;             //更新时间
+    private String deviceServiceIp;         //设备服务器IP
+    private Integer createTime;             //创建时间
+    private String remark;                  //备注
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Integer getBaseId() {
+        return baseId;
+    }
+
+    public void setBaseId(Integer baseId) {
+        this.baseId = baseId;
+    }
+
+    public String getBaseName() {
+        return baseName;
+    }
+
+    public void setBaseName(String baseName) {
+        this.baseName = baseName;
+    }
+
+    public Integer getPondType() {
+        return pondType;
+    }
+
+    public void setPondType(Integer pondType) {
+        this.pondType = pondType;
+    }
+
+    public Integer getPondId() {
+        return pondId;
+    }
+
+    public void setPondId(Integer pondId) {
+        this.pondId = pondId;
+    }
+
+    public String getPondName() {
+        return pondName;
+    }
+
+    public void setPondName(String pondName) {
+        this.pondName = pondName;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public Integer getDeviceTerminalTypeKey() {
+        return deviceTerminalTypeKey;
+    }
+
+    public void setDeviceTerminalTypeKey(Integer deviceTerminalTypeKey) {
+        this.deviceTerminalTypeKey = deviceTerminalTypeKey;
+    }
+
+    public String getDeviceTerminalType() {
+        return deviceTerminalType;
+    }
+
+    public void setDeviceTerminalType(String deviceTerminalType) {
+        this.deviceTerminalType = deviceTerminalType;
+    }
+
+    public String getDataValue() {
+        return dataValue;
+    }
+
+    public void setDataValue(String dataValue) {
+        this.dataValue = dataValue;
+    }
+
+    public String getAlarmCode() {
+        return alarmCode;
+    }
+
+    public void setAlarmCode(String alarmCode) {
+        this.alarmCode = alarmCode;
+    }
+
+    public String getOnline() {
+        return online;
+    }
+
+    public void setOnline(String online) {
+        this.online = online;
+    }
+
+    public Integer getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Integer updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getDeviceServiceIp() {
+        return deviceServiceIp;
+    }
+
+    public void setDeviceServiceIp(String deviceServiceIp) {
+        this.deviceServiceIp = deviceServiceIp;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getAlarmTime() {
+        return alarmTime;
+    }
+
+    public void setAlarmTime(Integer alarmTime) {
+        this.alarmTime = alarmTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * PLC设备循环
+ * Created by Administrator on 2017/3/13.
+ */
+public class DeviceLoop extends BaseBean {
+
+    private String deviceInfoId;//设备信息表id
+    private Integer openTime;//开启时间（单位分钟）
+    private Integer stopTime;//停止时间（单位分钟）
+    private Integer state;//状态（0-有效，1-无效）
+    private Integer createTime;//创建时间
+
+    public String getDeviceInfoId() {
+        return deviceInfoId;
+    }
+
+    public void setDeviceInfoId(String deviceInfoId) {
+        this.deviceInfoId = deviceInfoId;
+    }
+
+    public Integer getOpenTime() {
+        return openTime;
+    }
+
+    public void setOpenTime(Integer openTime) {
+        this.openTime = openTime;
+    }
+
+    public Integer getStopTime() {
+        return stopTime;
+    }
+
+    public void setStopTime(Integer stopTime) {
+        this.stopTime = stopTime;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+/**
+ * 设备参数信息 数据实体
+ */
+public class DeviceParam {
+    private String deviceInfoId;//设备信息表id
+    private String pumpCurrent;//水泵电流
+    private String leakageCurrent;//L泄露电流
+    private String magnification;//放大倍数
+    private String sensorSensitivity;//传感器灵敏度
+    private String sensorAccuracy;//传感器准确度
+    private Integer createTime;//添加时间
+    public String getDeviceInfoId() {
+        return deviceInfoId;
+    }
+    public void setDeviceInfoId(String deviceInfoId) {
+        this.deviceInfoId = deviceInfoId;
+    }
+    public String getPumpCurrent() {
+        return pumpCurrent;
+    }
+    public void setPumpCurrent(String pumpCurrent) {
+        this.pumpCurrent = pumpCurrent;
+    }
+    public String getLeakageCurrent() {
+        return leakageCurrent;
+    }
+    public void setLeakageCurrent(String leakageCurrent) {
+        this.leakageCurrent = leakageCurrent;
+    }
+    public String getMagnification() {
+        return magnification;
+    }
+    public void setMagnification(String magnification) {
+        this.magnification = magnification;
+    }
+    public String getSensorSensitivity() {
+        return sensorSensitivity;
+    }
+    public void setSensorSensitivity(String sensorSensitivity) {
+        this.sensorSensitivity = sensorSensitivity;
+    }
+    public String getSensorAccuracy() {
+        return sensorAccuracy;
+    }
+    public void setSensorAccuracy(String sensorAccuracy) {
+        this.sensorAccuracy = sensorAccuracy;
+    }
+    public Integer getCreateTime() {
+        return createTime;
+    }
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+    public DeviceParam(String deviceInfoId, String pumpCurrent, String leakageCurrent, String magnification,
+                       String sensorSensitivity, String sensorAccuracy, Integer createTime) {
+        super();
+        this.deviceInfoId = deviceInfoId;
+        this.pumpCurrent = pumpCurrent;
+        this.leakageCurrent = leakageCurrent;
+        this.magnification = magnification;
+        this.sensorSensitivity = sensorSensitivity;
+        this.sensorAccuracy = sensorAccuracy;
+        this.createTime = createTime;
+    }
+    public DeviceParam() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :
+ * @Date: Created in 11:06 2016/12/17
+ */
+public class DeviceParameterConfig extends BaseBean {
+    private Integer userId;				//用户id
+    private String userLonginName;		//用户名
+    private Integer pondId;				//塘口id
+    private String deviceInfoId;		//设备信息表id
+    private Integer creatTime;			//创建时间
+    private String oxygenHighLimit;		//溶氧高限
+    private String oxygenLowLimit;		//溶氧低限
+    private String oxygenCeiling;		//溶氧上限
+    private String salinity;			//盐度
+    private Integer alarmLevel;			//报警级别（设备）
+    private String noonOxygenatingStart;//午间补氧开始(时 分)
+    private String noonOxygenatingEnd;	//午间补氧结束(时 分)
+    private String nightOxygenatingStart;//夜间补氧开始(时 分)
+    private String nightOxygenatingEnd;	//夜间补氧结束(时 分)
+    private String oxygenLow2;			//氧下限二 5-下限
+    private String oxygenLowWarn;		//氧报警限 5-下限
+    private String oxygenSwitch;		//补氧开关
+    private String fouceSwitch;			//强开开关
+    private String pumpElectricity;		//水泵电流
+    private String leakElectricity;		//泄漏电流
+    private String enlargementFactor;	//放大倍数
+    private String spl;					//灵敏度
+    private String accuracy;			//准确度
+    private String voltage;				//电压
+    private String temperatureCeiling;	//温度上限
+    private String temperatureLimit;	//温度下限
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLonginName() {
+        return userLonginName;
+    }
+
+    public void setUserLonginName(String userLonginName) {
+        this.userLonginName = userLonginName;
+    }
+
+    public Integer getPondId() {
+        return pondId;
+    }
+
+    public void setPondId(Integer pondId) {
+        this.pondId = pondId;
+    }
+
+    public String getDeviceInfoId() {
+        return deviceInfoId;
+    }
+
+    public void setDeviceInfoId(String deviceInfoId) {
+        this.deviceInfoId = deviceInfoId;
+    }
+
+    public Integer getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Integer creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public String getOxygenHighLimit() {
+        return oxygenHighLimit;
+    }
+
+    public void setOxygenHighLimit(String oxygenHighLimit) {
+        this.oxygenHighLimit = oxygenHighLimit;
+    }
+
+    public String getOxygenLowLimit() {
+        return oxygenLowLimit;
+    }
+
+    public void setOxygenLowLimit(String oxygenLowLimit) {
+        this.oxygenLowLimit = oxygenLowLimit;
+    }
+
+    public String getOxygenCeiling() {
+        return oxygenCeiling;
+    }
+
+    public void setOxygenCeiling(String oxygenCeiling) {
+        this.oxygenCeiling = oxygenCeiling;
+    }
+
+    public String getSalinity() {
+        return salinity;
+    }
+
+    public void setSalinity(String salinity) {
+        this.salinity = salinity;
+    }
+
+    public Integer getAlarmLevel() {
+        return alarmLevel;
+    }
+
+    public void setAlarmLevel(Integer alarmLevel) {
+        this.alarmLevel = alarmLevel;
+    }
+
+    public String getNoonOxygenatingStart() {
+        return noonOxygenatingStart;
+    }
+
+    public void setNoonOxygenatingStart(String noonOxygenatingStart) {
+        this.noonOxygenatingStart = noonOxygenatingStart;
+    }
+
+    public String getNoonOxygenatingEnd() {
+        return noonOxygenatingEnd;
+    }
+
+    public void setNoonOxygenatingEnd(String noonOxygenatingEnd) {
+        this.noonOxygenatingEnd = noonOxygenatingEnd;
+    }
+
+    public String getNightOxygenatingStart() {
+        return nightOxygenatingStart;
+    }
+
+    public void setNightOxygenatingStart(String nightOxygenatingStart) {
+        this.nightOxygenatingStart = nightOxygenatingStart;
+    }
+
+    public String getNightOxygenatingEnd() {
+        return nightOxygenatingEnd;
+    }
+
+    public void setNightOxygenatingEnd(String nightOxygenatingEnd) {
+        this.nightOxygenatingEnd = nightOxygenatingEnd;
+    }
+
+    public String getOxygenLow2() {
+        return oxygenLow2;
+    }
+
+    public void setOxygenLow2(String oxygenLow2) {
+        this.oxygenLow2 = oxygenLow2;
+    }
+
+    public String getOxygenLowWarn() {
+        return oxygenLowWarn;
+    }
+
+    public void setOxygenLowWarn(String oxygenLowWarn) {
+        this.oxygenLowWarn = oxygenLowWarn;
+    }
+
+    public String getOxygenSwitch() {
+        return oxygenSwitch;
+    }
+
+    public void setOxygenSwitch(String oxygenSwitch) {
+        this.oxygenSwitch = oxygenSwitch;
+    }
+
+    public String getFouceSwitch() {
+        return fouceSwitch;
+    }
+
+    public void setFouceSwitch(String fouceSwitch) {
+        this.fouceSwitch = fouceSwitch;
+    }
+
+    public String getPumpElectricity() {
+        return pumpElectricity;
+    }
+
+    public void setPumpElectricity(String pumpElectricity) {
+        this.pumpElectricity = pumpElectricity;
+    }
+
+    public String getLeakElectricity() {
+        return leakElectricity;
+    }
+
+    public void setLeakElectricity(String leakElectricity) {
+        this.leakElectricity = leakElectricity;
+    }
+
+    public String getEnlargementFactor() {
+        return enlargementFactor;
+    }
+
+    public void setEnlargementFactor(String enlargementFactor) {
+        this.enlargementFactor = enlargementFactor;
+    }
+
+    public String getSpl() {
+        return spl;
+    }
+
+    public void setSpl(String spl) {
+        this.spl = spl;
+    }
+
+    public String getAccuracy() {
+        return accuracy;
+    }
+
+    public void setAccuracy(String accuracy) {
+        this.accuracy = accuracy;
+    }
+
+    public String getVoltage() {
+        return voltage;
+    }
+
+    public void setVoltage(String voltage) {
+        this.voltage = voltage;
+    }
+
+    public String getTemperatureCeiling() {
+        return temperatureCeiling;
+    }
+
+    public void setTemperatureCeiling(String temperatureCeiling) {
+        this.temperatureCeiling = temperatureCeiling;
+    }
+
+    public String getTemperatureLimit() {
+        return temperatureLimit;
+    }
+
+    public void setTemperatureLimit(String temperatureLimit) {
+        this.temperatureLimit = temperatureLimit;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * PLC 开关定时器
+ * Created by Administrator on 2017/2/6.
+ */
+public class DeviceTimer extends BaseBean {
+
+    private Integer id;             //主键id
+    private String imei;            //IMEI号
+    private String number;          //编号（多个用|分开）
+    private String deviceName;      //设备名称（多个用|分开）
+    private Integer serialNumber;   //控制序号
+    private Integer baseId;          //基地id
+    private String baseName;         //基地名称
+    private Integer userId;          //用户id
+    private String userLogin;      //用户登录名
+    private Integer startTime;      //开始时间
+    private Integer endTime;        //结束时间
+    private Integer createTime;     //创建时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getImei() {
+        return imei;
+    }
+
+    public void setImei(String imei) {
+        this.imei = imei;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public Integer getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Integer startTime) {
+        this.startTime = startTime;
+    }
+
+    public Integer getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Integer endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLogin() {
+        return userLogin;
+    }
+
+    public void setUserLogin(String userLogin) {
+        this.userLogin = userLogin;
+    }
+
+    public Integer getBaseId() {
+        return baseId;
+    }
+
+    public void setBaseId(Integer baseId) {
+        this.baseId = baseId;
+    }
+
+    public String getBaseName() {
+        return baseName;
+    }
+
+    public void setBaseName(String baseName) {
+        this.baseName = baseName;
+    }
+
+    public Integer getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(Integer serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+}
+
++    

+package com.zhonglai.luhui.runingfish.domain.device;
+
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 电耗统计
+ * @author Administrator
+ */
+public class DeviceWorkTime extends BaseBean {
+
+	private Integer id;//主键id
+	private String deviceId;//设备信息表id
+	private Integer jannury;//一月（单位：分钟）
+	private Integer february;//二月（单位：分钟）
+	private Integer march;//三月（单位：分钟）
+	private Integer april;//四月（单位：分钟）
+	private Integer may;//五月（单位：分钟）
+	private Integer june;//六月（单位：分钟）
+	private Integer july;//七月（单位：分钟）
+	private Integer august;//八月（单位：分钟）
+	private Integer september;//九月（单位：分钟）
+	private Integer october;//十月（单位：分钟）
+	private Integer november;//十一月（单位：分钟）
+	private Integer december;//十二月（单位：分钟）
+	private Integer year;//年（单位：分钟）
+	private Integer years;//年分
+	
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getDeviceId() {
+		return deviceId;
+	}
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+	public Integer getJannury() {
+		return jannury;
+	}
+	public void setJannury(Integer jannury) {
+		this.jannury = jannury;
+	}
+	public Integer getFebruary() {
+		return february;
+	}
+	public void setFebruary(Integer february) {
+		this.february = february;
+	}
+	public Integer getMarch() {
+		return march;
+	}
+	public void setMarch(Integer march) {
+		this.march = march;
+	}
+	public Integer getApril() {
+		return april;
+	}
+	public void setApril(Integer april) {
+		this.april = april;
+	}
+	public Integer getMay() {
+		return may;
+	}
+	public void setMay(Integer may) {
+		this.may = may;
+	}
+	public Integer getJune() {
+		return june;
+	}
+	public void setJune(Integer june) {
+		this.june = june;
+	}
+	public Integer getJuly() {
+		return july;
+	}
+	public void setJuly(Integer july) {
+		this.july = july;
+	}
+	public Integer getAugust() {
+		return august;
+	}
+	public void setAugust(Integer august) {
+		this.august = august;
+	}
+	public Integer getSeptember() {
+		return september;
+	}
+	public void setSeptember(Integer september) {
+		this.september = september;
+	}
+	public Integer getOctober() {
+		return october;
+	}
+	public void setOctober(Integer october) {
+		this.october = october;
+	}
+	public Integer getNovember() {
+		return november;
+	}
+	public void setNovember(Integer november) {
+		this.november = november;
+	}
+	public Integer getDecember() {
+		return december;
+	}
+	public void setDecember(Integer december) {
+		this.december = december;
+	}
+	public Integer getYear() {
+		return year;
+	}
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+	public Integer getYears() {
+		return years;
+	}
+	public void setYears(Integer years) {
+		this.years = years;
+	}
+	
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :设备操作日志记录表
+ * @Date: Created in 16:57 2016/12/27
+ */
+public class LogDeviceOperation extends BaseBean {
+    private Integer deviceOperationId;			//设备操作日志id
+    private String deviceId;				    //设备id
+    private Integer deviceOperationTime;		//设备操作时间
+    private String operationInstruction;		//设备操作指令
+    private String operationDescribe;			//设备操作描述
+    private String deviceOldState;				//设备操作前状态
+    private String deviceNewState;				//设备操作后的状态
+    private String deviceOperationType;		//设备操作类型
+    private String sensorOrController;			//传感器或控制器编号（控制器以00_开头）
+    private Integer isStateChange;				//是否有状态改变(0否，1是)
+
+    public Integer getDeviceOperationId() {
+        return deviceOperationId;
+    }
+
+    public void setDeviceOperationId(Integer deviceOperationId) {
+        this.deviceOperationId = deviceOperationId;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public Integer getDeviceOperationTime() {
+        return deviceOperationTime;
+    }
+
+    public void setDeviceOperationTime(Integer deviceOperationTime) {
+        this.deviceOperationTime = deviceOperationTime;
+    }
+
+    public String getOperationInstruction() {
+        return operationInstruction;
+    }
+
+    public void setOperationInstruction(String operationInstruction) {
+        this.operationInstruction = operationInstruction;
+    }
+
+    public String getOperationDescribe() {
+        return operationDescribe;
+    }
+
+    public void setOperationDescribe(String operationDescribe) {
+        this.operationDescribe = operationDescribe;
+    }
+
+    public String getDeviceOldState() {
+        return deviceOldState;
+    }
+
+    public void setDeviceOldState(String deviceOldState) {
+        this.deviceOldState = deviceOldState;
+    }
+
+    public String getDeviceNewState() {
+        return deviceNewState;
+    }
+
+    public void setDeviceNewState(String deviceNewState) {
+        this.deviceNewState = deviceNewState;
+    }
+
+    public String getDeviceOperationType() {
+        return deviceOperationType;
+    }
+
+    public void setDeviceOperationType(String deviceOperationType) {
+        this.deviceOperationType = deviceOperationType;
+    }
+
+    public String getSensorOrController() {
+        return sensorOrController;
+    }
+
+    public void setSensorOrController(String sensorOrController) {
+        this.sensorOrController = sensorOrController;
+    }
+
+    public Integer getIsStateChange() {
+        return isStateChange;
+    }
+
+    public void setIsStateChange(Integer isStateChange) {
+        this.isStateChange = isStateChange;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :用户摄像头设备信息表
+ * @Date: Created in 10:43 2016/12/22
+ */
+public class UserCameraDevice extends BaseBean {
+
+    private Integer id;						//主键id
+    private Integer userId;					//用户id
+    private String userLoginName;			//用户登录
+    private Integer pondId;					//塘口id
+    private String pondName;				//塘口名称
+    private String cameraName;				//摄像头名称
+    private String cameraModel;				//摄像头型号
+    private String cameraPower;				//摄像头电源
+    private String cameraVerificationCode;	//摄像头验证码
+    private String cameraProductStandards;	//摄像头产品执行标准
+    private String cameeraSerialNumber;		//摄像头序列号
+    private String cameeraQrCode;			//摄像头二维码
+    private Integer createTime;				//创建时间
+    private Integer usedTime;				//使用时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Integer getPondId() {
+        return pondId;
+    }
+
+    public void setPondId(Integer pondId) {
+        this.pondId = pondId;
+    }
+
+    public String getPondName() {
+        return pondName;
+    }
+
+    public void setPondName(String pondName) {
+        this.pondName = pondName;
+    }
+
+    public String getCameraName() {
+        return cameraName;
+    }
+
+    public void setCameraName(String cameraName) {
+        this.cameraName = cameraName;
+    }
+
+    public String getCameraModel() {
+        return cameraModel;
+    }
+
+    public void setCameraModel(String cameraModel) {
+        this.cameraModel = cameraModel;
+    }
+
+    public String getCameraPower() {
+        return cameraPower;
+    }
+
+    public void setCameraPower(String cameraPower) {
+        this.cameraPower = cameraPower;
+    }
+
+    public String getCameraVerificationCode() {
+        return cameraVerificationCode;
+    }
+
+    public void setCameraVerificationCode(String cameraVerificationCode) {
+        this.cameraVerificationCode = cameraVerificationCode;
+    }
+
+    public String getCameraProductStandards() {
+        return cameraProductStandards;
+    }
+
+    public void setCameraProductStandards(String cameraProductStandards) {
+        this.cameraProductStandards = cameraProductStandards;
+    }
+
+    public String getCameeraSerialNumber() {
+        return cameeraSerialNumber;
+    }
+
+    public void setCameeraSerialNumber(String cameeraSerialNumber) {
+        this.cameeraSerialNumber = cameeraSerialNumber;
+    }
+
+    public String getCameeraQrCode() {
+        return cameeraQrCode;
+    }
+
+    public void setCameeraQrCode(String cameeraQrCode) {
+        this.cameeraQrCode = cameeraQrCode;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getUsedTime() {
+        return usedTime;
+    }
+
+    public void setUsedTime(Integer usedTime) {
+        this.usedTime = usedTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 摄像头信息
+ * Created by Administrator on 2017/1/14.
+ */
+public class UserCameraInfo extends BaseBean {
+    private String deviceSerial;				//设备序列号
+    private String channelNo;					//通道号
+    private String channelName;					//通道名
+    private Integer status;						//在线状态：1-在线，2-不在线
+    private String isShared;					//分享状态：1-分享所有者，0-未分享，2-分享接受者（表示此摄像头是别人分享给我的）
+    private String picUrl;						//图片地址（大图），若在萤石客户端设置封面则返回封面图片，未设置则返回默认图片
+    private Integer isEncrypt;					//是否加密，0：不加密，1：加密
+    private Integer videoLevel;					//视频质量：0-流畅，1-均衡，2-高清，3-超清
+
+    public String getDeviceSerial() {
+        return deviceSerial;
+    }
+
+    public void setDeviceSerial(String deviceSerial) {
+        this.deviceSerial = deviceSerial;
+    }
+
+    public String getChannelNo() {
+        return channelNo;
+    }
+
+    public void setChannelNo(String channelNo) {
+        this.channelNo = channelNo;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getIsShared() {
+        return isShared;
+    }
+
+    public void setIsShared(String isShared) {
+        this.isShared = isShared;
+    }
+
+    public String getPicUrl() {
+        return picUrl;
+    }
+
+    public void setPicUrl(String picUrl) {
+        this.picUrl = picUrl;
+    }
+
+    public Integer getIsEncrypt() {
+        return isEncrypt;
+    }
+
+    public void setIsEncrypt(Integer isEncrypt) {
+        this.isEncrypt = isEncrypt;
+    }
+
+    public Integer getVideoLevel() {
+        return videoLevel;
+    }
+
+    public void setVideoLevel(Integer videoLevel) {
+        this.videoLevel = videoLevel;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :摄像头流量表
+ * @Date: Created in 10:45 2016/12/22
+ */
+public class UserCameraRecharge extends BaseBean {
+
+    private Integer id;					//主键id
+    private Integer userId;				//用户id
+    private String userLoginName;		//用户登录名
+    private String rechargeFlow;		//充值流量
+    private Integer expirationTime;		//到期时间
+    private String usedFlow;			//使用流量
+    private String residueFlow;			//剩余流量
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public String getRechargeFlow() {
+        return rechargeFlow;
+    }
+
+    public void setRechargeFlow(String rechargeFlow) {
+        this.rechargeFlow = rechargeFlow;
+    }
+
+    public Integer getExpirationTime() {
+        return expirationTime;
+    }
+
+    public void setExpirationTime(Integer expirationTime) {
+        this.expirationTime = expirationTime;
+    }
+
+    public String getUsedFlow() {
+        return usedFlow;
+    }
+
+    public void setUsedFlow(String usedFlow) {
+        this.usedFlow = usedFlow;
+    }
+
+    public String getResidueFlow() {
+        return residueFlow;
+    }
+
+    public void setResidueFlow(String residueFlow) {
+        this.residueFlow = residueFlow;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.device;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 摄像头流量充值记录表
+ * Created by Administrator on 2017/1/14.
+ */
+public class UserCameraRechargeLog extends BaseBean {
+
+    private Integer id;					//主键id
+    private Integer userId;				//用户id
+    private String userLoginName;		//用户登录名
+    private String rechargeAmount;		//充值金额
+    private String rechargeFlow;		//充值流量
+    private Integer rechargeDays;		//充值天数(月)
+    private Integer rechargeTime;		//充值时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public String getRechargeAmount() {
+        return rechargeAmount;
+    }
+
+    public void setRechargeAmount(String rechargeAmount) {
+        this.rechargeAmount = rechargeAmount;
+    }
+
+    public String getRechargeFlow() {
+        return rechargeFlow;
+    }
+
+    public void setRechargeFlow(String rechargeFlow) {
+        this.rechargeFlow = rechargeFlow;
+    }
+
+    public Integer getRechargeDays() {
+        return rechargeDays;
+    }
+
+    public void setRechargeDays(Integer rechargeDays) {
+        this.rechargeDays = rechargeDays;
+    }
+
+    public Integer getRechargeTime() {
+        return rechargeTime;
+    }
+
+    public void setRechargeTime(Integer rechargeTime) {
+        this.rechargeTime = rechargeTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 售后
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderCustomerService extends BaseBean {
+
+    private Integer id;							//主键
+    private String customerUserPhone;			//售后申请人手机号
+    private String customerUserName;			//售后申请人姓名
+    private String serviceUserLoginname;		//处理人登录名
+    private Integer customerServiceState;		//售后状态（0创建,1受理,2处理中,3处理完成,4结束）
+    private String customerListId;				//售后清单id
+    private String customerListInfo;			//售后清单列表
+    private String detailDescription;			//详情描述
+    private Integer customerServiceType;		//售后服务类型
+    private String customerExpressId;			//客户快递单号
+    private String serviceExpressId;			//客服快递单号
+    private Integer createTime;					//创建时间
+    private Integer updateTime;					//修改时间
+    private String deviceImei;					//设备imei号，多个用逗号隔开
+    private String orderSim;					//sim卡号，多个用逗号分割
+    private String address;						//地址
+    private String customerUserImgurl;			//客户图片地址,分割
+    private String serviceUserImgurl;			//处理人图片地址,分割
+    private String causesRework;				//返修原因
+    private String charge;						//收费
+    private String maintenanceMan;				//维修员
+    private String processingMethod;			//解决方法
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCustomerUserPhone() {
+        return customerUserPhone;
+    }
+
+    public void setCustomerUserPhone(String customerUserPhone) {
+        this.customerUserPhone = customerUserPhone;
+    }
+
+    public String getCustomerUserName() {
+        return customerUserName;
+    }
+
+    public void setCustomerUserName(String customerUserName) {
+        this.customerUserName = customerUserName;
+    }
+
+    public String getServiceUserLoginname() {
+        return serviceUserLoginname;
+    }
+
+    public void setServiceUserLoginname(String serviceUserLoginname) {
+        this.serviceUserLoginname = serviceUserLoginname;
+    }
+
+    public Integer getCustomerServiceState() {
+        return customerServiceState;
+    }
+
+    public void setCustomerServiceState(Integer customerServiceState) {
+        this.customerServiceState = customerServiceState;
+    }
+
+    public String getCustomerListId() {
+        return customerListId;
+    }
+
+    public void setCustomerListId(String customerListId) {
+        this.customerListId = customerListId;
+    }
+
+    public String getCustomerListInfo() {
+        return customerListInfo;
+    }
+
+    public void setCustomerListInfo(String customerListInfo) {
+        this.customerListInfo = customerListInfo;
+    }
+
+    public String getDetailDescription() {
+        return detailDescription;
+    }
+
+    public void setDetailDescription(String detailDescription) {
+        this.detailDescription = detailDescription;
+    }
+
+    public Integer getCustomerServiceType() {
+        return customerServiceType;
+    }
+
+    public void setCustomerServiceType(Integer customerServiceType) {
+        this.customerServiceType = customerServiceType;
+    }
+
+    public String getCustomerExpressId() {
+        return customerExpressId;
+    }
+
+    public void setCustomerExpressId(String customerExpressId) {
+        this.customerExpressId = customerExpressId;
+    }
+
+    public String getServiceExpressId() {
+        return serviceExpressId;
+    }
+
+    public void setServiceExpressId(String serviceExpressId) {
+        this.serviceExpressId = serviceExpressId;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Integer updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getDeviceImei() {
+        return deviceImei;
+    }
+
+    public void setDeviceImei(String deviceImei) {
+        this.deviceImei = deviceImei;
+    }
+
+    public String getOrderSim() {
+        return orderSim;
+    }
+
+    public void setOrderSim(String orderSim) {
+        this.orderSim = orderSim;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getCustomerUserImgurl() {
+        return customerUserImgurl;
+    }
+
+    public void setCustomerUserImgurl(String customerUserImgurl) {
+        this.customerUserImgurl = customerUserImgurl;
+    }
+
+    public String getServiceUserImgurl() {
+        return serviceUserImgurl;
+    }
+
+    public void setServiceUserImgurl(String serviceUserImgurl) {
+        this.serviceUserImgurl = serviceUserImgurl;
+    }
+
+    public String getCausesRework() {
+        return causesRework;
+    }
+
+    public void setCausesRework(String causesRework) {
+        this.causesRework = causesRework;
+    }
+
+    public String getCharge() {
+        return charge;
+    }
+
+    public void setCharge(String charge) {
+        this.charge = charge;
+    }
+
+    public String getMaintenanceMan() {
+        return maintenanceMan;
+    }
+
+    public void setMaintenanceMan(String maintenanceMan) {
+        this.maintenanceMan = maintenanceMan;
+    }
+
+    public String getProcessingMethod() {
+        return processingMethod;
+    }
+
+    public void setProcessingMethod(String processingMethod) {
+        this.processingMethod = processingMethod;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 设备套装
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderDeviceAssemble extends BaseBean {
+
+    private Integer id;					//主键id
+    private String assembleName;		//组装名称
+    private String assemblePartId;		//组装部件id
+    private String assemblePartName;	//组装部件名称
+    private Integer assembleTime;		//组装时间
+    private String assembleDescribe;	//组装描述
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAssembleName() {
+        return assembleName;
+    }
+
+    public void setAssembleName(String assembleName) {
+        this.assembleName = assembleName;
+    }
+
+    public String getAssemblePartId() {
+        return assemblePartId;
+    }
+
+    public void setAssemblePartId(String assemblePartId) {
+        this.assemblePartId = assemblePartId;
+    }
+
+    public String getAssemblePartName() {
+        return assemblePartName;
+    }
+
+    public void setAssemblePartName(String assemblePartName) {
+        this.assemblePartName = assemblePartName;
+    }
+
+    public Integer getAssembleTime() {
+        return assembleTime;
+    }
+
+    public void setAssembleTime(Integer assembleTime) {
+        this.assembleTime = assembleTime;
+    }
+
+    public String getAssembleDescribe() {
+        return assembleDescribe;
+    }
+
+    public void setAssembleDescribe(String assembleDescribe) {
+        this.assembleDescribe = assembleDescribe;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :设备DTU表
+ * @Date: Created in 10:26 2016/12/25
+ */
+public class OrderDtu extends BaseBean {
+
+    private Integer orderDtuId;				//dtu主键
+    private String orderDtuImei;			//设备的imei
+    private String orderDtuSim;				//卡号
+    private String deviceType;				//设备类型
+    private Integer orderDtuCreateTime;		//记录时间
+    private Integer userLoginId;			//登录表主键id（数据级联登录表插入）
+    private String userLoginName;			//登录名（唯一，数据级联登录表插入）
+    private Integer purchaseGoodsId;		//采购商品id
+    private Integer purchaseId;				//采购id
+    private String orderDtuSimId;			//sim卡id编号
+    private Integer orderDtuState;			//设备库存状态（0库存，1销售，2售后）
+    private Integer orderWorkState;			//设备工作状态（0正常，1异常）
+
+    public Integer getOrderDtuId() {
+        return orderDtuId;
+    }
+
+    public void setOrderDtuId(Integer orderDtuId) {
+        this.orderDtuId = orderDtuId;
+    }
+
+    public String getOrderDtuImei() {
+        return orderDtuImei;
+    }
+
+    public void setOrderDtuImei(String orderDtuImei) {
+        this.orderDtuImei = orderDtuImei;
+    }
+
+    public String getOrderDtuSim() {
+        return orderDtuSim;
+    }
+
+    public void setOrderDtuSim(String orderDtuSim) {
+        this.orderDtuSim = orderDtuSim;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public Integer getOrderDtuCreateTime() {
+        return orderDtuCreateTime;
+    }
+
+    public void setOrderDtuCreateTime(Integer orderDtuCreateTime) {
+        this.orderDtuCreateTime = orderDtuCreateTime;
+    }
+
+    public Integer getUserLoginId() {
+        return userLoginId;
+    }
+
+    public void setUserLoginId(Integer userLoginId) {
+        this.userLoginId = userLoginId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Integer getPurchaseGoodsId() {
+        return purchaseGoodsId;
+    }
+
+    public void setPurchaseGoodsId(Integer purchaseGoodsId) {
+        this.purchaseGoodsId = purchaseGoodsId;
+    }
+
+    public Integer getPurchaseId() {
+        return purchaseId;
+    }
+
+    public void setPurchaseId(Integer purchaseId) {
+        this.purchaseId = purchaseId;
+    }
+
+    public String getOrderDtuSimId() {
+        return orderDtuSimId;
+    }
+
+    public void setOrderDtuSimId(String orderDtuSimId) {
+        this.orderDtuSimId = orderDtuSimId;
+    }
+
+    public Integer getOrderDtuState() {
+        return orderDtuState;
+    }
+
+    public void setOrderDtuState(Integer orderDtuState) {
+        this.orderDtuState = orderDtuState;
+    }
+
+    public Integer getOrderWorkState() {
+        return orderWorkState;
+    }
+
+    public void setOrderWorkState(Integer orderWorkState) {
+        this.orderWorkState = orderWorkState;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * order采购信息表
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderPurchase extends BaseBean {
+
+    private Integer id;						//主键
+    private Integer purchaseSuppliers;		//采购供应商
+    private String purchaseSuppliersName;	//采购供应商名称
+    private Integer purchaseCreateTime;		//采购创建时间
+    private Integer purchaseTime;			//采购时间
+    private Integer deliveryTime;			//发货时间
+    private String orderNumber;				//订单编号
+    private String purchaseUserName;		//采购员名称
+    private String purchaseDiscountRate;	//折扣率
+    private String purchaseDiscountAmount;	//折扣额
+    private String orderAmount;				//订单金额
+    private String purchaseRemarks;			//备注
+    private String purchaseContractTerms;	//合同条款
+    private String purchaseInfo;			//采购供应商名称
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPurchaseSuppliers() {
+        return purchaseSuppliers;
+    }
+
+    public void setPurchaseSuppliers(Integer purchaseSuppliers) {
+        this.purchaseSuppliers = purchaseSuppliers;
+    }
+
+    public String getPurchaseSuppliersName() {
+        return purchaseSuppliersName;
+    }
+
+    public void setPurchaseSuppliersName(String purchaseSuppliersName) {
+        this.purchaseSuppliersName = purchaseSuppliersName;
+    }
+
+    public Integer getPurchaseCreateTime() {
+        return purchaseCreateTime;
+    }
+
+    public void setPurchaseCreateTime(Integer purchaseCreateTime) {
+        this.purchaseCreateTime = purchaseCreateTime;
+    }
+
+    public Integer getPurchaseTime() {
+        return purchaseTime;
+    }
+
+    public void setPurchaseTime(Integer purchaseTime) {
+        this.purchaseTime = purchaseTime;
+    }
+
+    public Integer getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(Integer deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getPurchaseUserName() {
+        return purchaseUserName;
+    }
+
+    public void setPurchaseUserName(String purchaseUserName) {
+        this.purchaseUserName = purchaseUserName;
+    }
+
+    public String getPurchaseDiscountRate() {
+        return purchaseDiscountRate;
+    }
+
+    public void setPurchaseDiscountRate(String purchaseDiscountRate) {
+        this.purchaseDiscountRate = purchaseDiscountRate;
+    }
+
+    public String getPurchaseDiscountAmount() {
+        return purchaseDiscountAmount;
+    }
+
+    public void setPurchaseDiscountAmount(String purchaseDiscountAmount) {
+        this.purchaseDiscountAmount = purchaseDiscountAmount;
+    }
+
+    public String getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(String orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public String getPurchaseRemarks() {
+        return purchaseRemarks;
+    }
+
+    public void setPurchaseRemarks(String purchaseRemarks) {
+        this.purchaseRemarks = purchaseRemarks;
+    }
+
+    public String getPurchaseContractTerms() {
+        return purchaseContractTerms;
+    }
+
+    public void setPurchaseContractTerms(String purchaseContractTerms) {
+        this.purchaseContractTerms = purchaseContractTerms;
+    }
+
+    public String getPurchaseInfo() {
+        return purchaseInfo;
+    }
+
+    public void setPurchaseInfo(String purchaseInfo) {
+        this.purchaseInfo = purchaseInfo;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 采购物品信息
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderPurchaseGoods extends BaseBean {
+
+    private Integer purchaseGoodsId;		//主键
+    private String purchaseGoodsName;		//采购商品名称
+    private Integer purchaseId;				//采购id
+    private String company;					//单位
+    private Integer number;					//数量
+    private String unitPrice;				//单价
+    private String discountRate;			//折扣率
+    private String discountAmount;			//折扣金额
+    private String amountOfMoney;			//金额
+    private String taxRate;					//税率
+    private String totalAdValoremTax;		//价税合计
+    private String remarks;					//备注
+    private String purchaseDeviceIds;		//采购是模块设备imei号
+    private Integer stockId;				//库存id
+    private Integer purchaseGoodsType;		//采购商品类型（1通讯模块，0配件）
+
+    public Integer getPurchaseGoodsId() {
+        return purchaseGoodsId;
+    }
+
+    public void setPurchaseGoodsId(Integer purchaseGoodsId) {
+        this.purchaseGoodsId = purchaseGoodsId;
+    }
+
+    public String getPurchaseGoodsName() {
+        return purchaseGoodsName;
+    }
+
+    public void setPurchaseGoodsName(String purchaseGoodsName) {
+        this.purchaseGoodsName = purchaseGoodsName;
+    }
+
+    public Integer getPurchaseId() {
+        return purchaseId;
+    }
+
+    public void setPurchaseId(Integer purchaseId) {
+        this.purchaseId = purchaseId;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(String unitPrice) {
+        this.unitPrice = unitPrice;
+    }
+
+    public String getDiscountRate() {
+        return discountRate;
+    }
+
+    public void setDiscountRate(String discountRate) {
+        this.discountRate = discountRate;
+    }
+
+    public String getDiscountAmount() {
+        return discountAmount;
+    }
+
+    public void setDiscountAmount(String discountAmount) {
+        this.discountAmount = discountAmount;
+    }
+
+    public String getAmountOfMoney() {
+        return amountOfMoney;
+    }
+
+    public void setAmountOfMoney(String amountOfMoney) {
+        this.amountOfMoney = amountOfMoney;
+    }
+
+    public String getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(String taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    public String getTotalAdValoremTax() {
+        return totalAdValoremTax;
+    }
+
+    public void setTotalAdValoremTax(String totalAdValoremTax) {
+        this.totalAdValoremTax = totalAdValoremTax;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getPurchaseDeviceIds() {
+        return purchaseDeviceIds;
+    }
+
+    public void setPurchaseDeviceIds(String purchaseDeviceIds) {
+        this.purchaseDeviceIds = purchaseDeviceIds;
+    }
+
+    public Integer getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(Integer stockId) {
+        this.stockId = stockId;
+    }
+
+    public Integer getPurchaseGoodsType() {
+        return purchaseGoodsType;
+    }
+
+    public void setPurchaseGoodsType(Integer purchaseGoodsType) {
+        this.purchaseGoodsType = purchaseGoodsType;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 杂项商品采购表
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderPurchaseGroceries extends BaseBean {
+
+    private Integer id;						//主键id
+    private String supplierName;			//供应商名称
+    private String groceriesName;			//商品名称
+    private String groceriesUnit;			//商品单位
+    private String groceriesPrice;			//商品单价
+    private String purchaseMoney;			//采购金额
+    private String purchaseAmount;			//采购数量
+    private Integer purchaseTime;			//采购时间
+    private Integer createTime;				//创建时间
+    private String remark;					//备注
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getGroceriesName() {
+        return groceriesName;
+    }
+
+    public void setGroceriesName(String groceriesName) {
+        this.groceriesName = groceriesName;
+    }
+
+    public String getGroceriesUnit() {
+        return groceriesUnit;
+    }
+
+    public void setGroceriesUnit(String groceriesUnit) {
+        this.groceriesUnit = groceriesUnit;
+    }
+
+    public String getGroceriesPrice() {
+        return groceriesPrice;
+    }
+
+    public void setGroceriesPrice(String groceriesPrice) {
+        this.groceriesPrice = groceriesPrice;
+    }
+
+    public String getPurchaseMoney() {
+        return purchaseMoney;
+    }
+
+    public void setPurchaseMoney(String purchaseMoney) {
+        this.purchaseMoney = purchaseMoney;
+    }
+
+    public String getPurchaseAmount() {
+        return purchaseAmount;
+    }
+
+    public void setPurchaseAmount(String purchaseAmount) {
+        this.purchaseAmount = purchaseAmount;
+    }
+
+    public Integer getPurchaseTime() {
+        return purchaseTime;
+    }
+
+    public void setPurchaseTime(Integer purchaseTime) {
+        this.purchaseTime = purchaseTime;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 销售信息
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderSale extends BaseBean {
+
+    private Integer id;						//主键
+    private String buyers;					//买家
+    private String buyersPhoneNumber;		//买家手机号
+    private Integer saleCreateTime;			//销售创建时间
+    private Integer saleTime;				//销售时间
+    private Integer deliveryTime;			//发货时间
+    private String orderNumber;				//订单编号
+    private String saleUserName;			//销售员名称
+    private String saleDiscountRate;		//折扣率
+    private String saleDiscountAmount;		//折扣额
+    private String orderAmount;				//订单金额
+    private String saleRemarks;				//备注
+    private String saleContractTerms;		//合同条款
+    private String address;					//买家地址
+    private String courierNumber;			//快递单号
+    private Integer parentsId;				//销售上级id
+    private String supplementaryInstruction;//解释说明
+    private String saleInfo;				//销售信息
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getBuyers() {
+        return buyers;
+    }
+
+    public void setBuyers(String buyers) {
+        this.buyers = buyers;
+    }
+
+    public String getBuyersPhoneNumber() {
+        return buyersPhoneNumber;
+    }
+
+    public void setBuyersPhoneNumber(String buyersPhoneNumber) {
+        this.buyersPhoneNumber = buyersPhoneNumber;
+    }
+
+    public Integer getSaleCreateTime() {
+        return saleCreateTime;
+    }
+
+    public void setSaleCreateTime(Integer saleCreateTime) {
+        this.saleCreateTime = saleCreateTime;
+    }
+
+    public Integer getSaleTime() {
+        return saleTime;
+    }
+
+    public void setSaleTime(Integer saleTime) {
+        this.saleTime = saleTime;
+    }
+
+    public Integer getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(Integer deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getSaleUserName() {
+        return saleUserName;
+    }
+
+    public void setSaleUserName(String saleUserName) {
+        this.saleUserName = saleUserName;
+    }
+
+    public String getSaleDiscountRate() {
+        return saleDiscountRate;
+    }
+
+    public void setSaleDiscountRate(String saleDiscountRate) {
+        this.saleDiscountRate = saleDiscountRate;
+    }
+
+    public String getSaleDiscountAmount() {
+        return saleDiscountAmount;
+    }
+
+    public void setSaleDiscountAmount(String saleDiscountAmount) {
+        this.saleDiscountAmount = saleDiscountAmount;
+    }
+
+    public String getOrderAmount() {
+        return orderAmount;
+    }
+
+    public void setOrderAmount(String orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    public String getSaleRemarks() {
+        return saleRemarks;
+    }
+
+    public void setSaleRemarks(String saleRemarks) {
+        this.saleRemarks = saleRemarks;
+    }
+
+    public String getSaleContractTerms() {
+        return saleContractTerms;
+    }
+
+    public void setSaleContractTerms(String saleContractTerms) {
+        this.saleContractTerms = saleContractTerms;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getCourierNumber() {
+        return courierNumber;
+    }
+
+    public void setCourierNumber(String courierNumber) {
+        this.courierNumber = courierNumber;
+    }
+
+    public Integer getParentsId() {
+        return parentsId;
+    }
+
+    public void setParentsId(Integer parentsId) {
+        this.parentsId = parentsId;
+    }
+
+    public String getSupplementaryInstruction() {
+        return supplementaryInstruction;
+    }
+
+    public void setSupplementaryInstruction(String supplementaryInstruction) {
+        this.supplementaryInstruction = supplementaryInstruction;
+    }
+
+    public String getSaleInfo() {
+        return saleInfo;
+    }
+
+    public void setSaleInfo(String saleInfo) {
+        this.saleInfo = saleInfo;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 销售商品
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderSaleGoods extends BaseBean {
+
+    private Integer saleGoodsId;			//主键
+    private String saleGoodsName;			//销售商品名称
+    private Integer saleId;					//销售id
+    private String unitPrice;				//单价
+    private String discountRate;			//折扣率
+    private String discountAmount;			//折扣金额
+    private String amountOfMoney;			//金额
+    private String taxRate;					//税率
+    private String totalAdValoremTax;		//价税合计
+    private String remarks;					//备注
+    private Integer number;					//数量
+    private String deviceIds;				//设备id集合
+    private Integer saleGoodsType;			//销售商品类别（0配件，1设备,2sim卡）
+    private Integer stockId;				//库存id
+
+    public Integer getSaleGoodsId() {
+        return saleGoodsId;
+    }
+
+    public void setSaleGoodsId(Integer saleGoodsId) {
+        this.saleGoodsId = saleGoodsId;
+    }
+
+    public String getSaleGoodsName() {
+        return saleGoodsName;
+    }
+
+    public void setSaleGoodsName(String saleGoodsName) {
+        this.saleGoodsName = saleGoodsName;
+    }
+
+    public Integer getSaleId() {
+        return saleId;
+    }
+
+    public void setSaleId(Integer saleId) {
+        this.saleId = saleId;
+    }
+
+    public String getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(String unitPrice) {
+        this.unitPrice = unitPrice;
+    }
+
+    public String getDiscountRate() {
+        return discountRate;
+    }
+
+    public void setDiscountRate(String discountRate) {
+        this.discountRate = discountRate;
+    }
+
+    public String getDiscountAmount() {
+        return discountAmount;
+    }
+
+    public void setDiscountAmount(String discountAmount) {
+        this.discountAmount = discountAmount;
+    }
+
+    public String getAmountOfMoney() {
+        return amountOfMoney;
+    }
+
+    public void setAmountOfMoney(String amountOfMoney) {
+        this.amountOfMoney = amountOfMoney;
+    }
+
+    public String getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(String taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    public String getTotalAdValoremTax() {
+        return totalAdValoremTax;
+    }
+
+    public void setTotalAdValoremTax(String totalAdValoremTax) {
+        this.totalAdValoremTax = totalAdValoremTax;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getDeviceIds() {
+        return deviceIds;
+    }
+
+    public void setDeviceIds(String deviceIds) {
+        this.deviceIds = deviceIds;
+    }
+
+    public Integer getSaleGoodsType() {
+        return saleGoodsType;
+    }
+
+    public void setSaleGoodsType(Integer saleGoodsType) {
+        this.saleGoodsType = saleGoodsType;
+    }
+
+    public Integer getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(Integer stockId) {
+        this.stockId = stockId;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * sim卡充值
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderSimRecharge extends BaseBean {
+
+    private Integer id;						//主键
+    private String orderSim;				//sim卡号
+    private Integer beforExpirationTime;	//充值前到期时间
+    private Integer afterExpirationTime;	//充值后到期时间
+    private String rechargeAmount;			//充值金额
+    private Integer rechargeTime;			//充值时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getOrderSim() {
+        return orderSim;
+    }
+
+    public void setOrderSim(String orderSim) {
+        this.orderSim = orderSim;
+    }
+
+    public Integer getBeforExpirationTime() {
+        return beforExpirationTime;
+    }
+
+    public void setBeforExpirationTime(Integer beforExpirationTime) {
+        this.beforExpirationTime = beforExpirationTime;
+    }
+
+    public Integer getAfterExpirationTime() {
+        return afterExpirationTime;
+    }
+
+    public void setAfterExpirationTime(Integer afterExpirationTime) {
+        this.afterExpirationTime = afterExpirationTime;
+    }
+
+    public String getRechargeAmount() {
+        return rechargeAmount;
+    }
+
+    public void setRechargeAmount(String rechargeAmount) {
+        this.rechargeAmount = rechargeAmount;
+    }
+
+    public Integer getRechargeTime() {
+        return rechargeTime;
+    }
+
+    public void setRechargeTime(Integer rechargeTime) {
+        this.rechargeTime = rechargeTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * sim卡信息
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderSimWarn extends BaseBean {
+
+    private Integer orderSimId;				//主键
+    private String orderSim;				//sim卡号
+    private Integer orderSimStartdate;		//开始时间
+    private Integer orderSimEnddate;		//结束时间
+    private String userLoginId;				//用户id
+    private String orderSimWarnState;		//告警状态
+    private Integer orderSimState;			//处理状态（0库存，1销售，2售后）
+    private Integer orderSimWorkState;		//sim卡工作状态（0-有效，1-失效，2-作废）
+    private Integer orderSimTime;			//sim卡有效期（单位秒）
+    private String orderSimNumber;			//sim卡编号
+
+    public Integer getOrderSimId() {
+        return orderSimId;
+    }
+
+    public void setOrderSimId(Integer orderSimId) {
+        this.orderSimId = orderSimId;
+    }
+
+    public String getOrderSim() {
+        return orderSim;
+    }
+
+    public void setOrderSim(String orderSim) {
+        this.orderSim = orderSim;
+    }
+
+    public Integer getOrderSimStartdate() {
+        return orderSimStartdate;
+    }
+
+    public void setOrderSimStartdate(Integer orderSimStartdate) {
+        this.orderSimStartdate = orderSimStartdate;
+    }
+
+    public Integer getOrderSimEnddate() {
+        return orderSimEnddate;
+    }
+
+    public void setOrderSimEnddate(Integer orderSimEnddate) {
+        this.orderSimEnddate = orderSimEnddate;
+    }
+
+    public String getUserLoginId() {
+        return userLoginId;
+    }
+
+    public void setUserLoginId(String userLoginId) {
+        this.userLoginId = userLoginId;
+    }
+
+    public String getOrderSimWarnState() {
+        return orderSimWarnState;
+    }
+
+    public void setOrderSimWarnState(String orderSimWarnState) {
+        this.orderSimWarnState = orderSimWarnState;
+    }
+
+    public Integer getOrderSimState() {
+        return orderSimState;
+    }
+
+    public void setOrderSimState(Integer orderSimState) {
+        this.orderSimState = orderSimState;
+    }
+
+    public Integer getOrderSimWorkState() {
+        return orderSimWorkState;
+    }
+
+    public void setOrderSimWorkState(Integer orderSimWorkState) {
+        this.orderSimWorkState = orderSimWorkState;
+    }
+
+    public Integer getOrderSimTime() {
+        return orderSimTime;
+    }
+
+    public void setOrderSimTime(Integer orderSimTime) {
+        this.orderSimTime = orderSimTime;
+    }
+
+    public String getOrderSimNumber() {
+        return orderSimNumber;
+    }
+
+    public void setOrderSimNumber(String orderSimNumber) {
+        this.orderSimNumber = orderSimNumber;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 库存
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderStock extends BaseBean {
+
+    private Integer stockId;			//主键
+    private Integer type;				//商品类型
+    private String name;				//类型名称
+    private Integer number;				//商品库存
+    private String company;				//单位
+    private String stockInfo;			//库存详情
+
+    public Integer getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(Integer stockId) {
+        this.stockId = stockId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getStockInfo() {
+        return stockInfo;
+    }
+
+    public void setStockInfo(String stockInfo) {
+        this.stockInfo = stockInfo;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.dtu;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * 供应商
+ * Created by Administrator on 2017/1/17.
+ */
+public class OrderSuppliers extends BaseBean {
+
+    private Integer suppliersId;				//主键
+    private String suppliersName;				//供应商名称
+    private Integer suppliersRelationship;		//与公司关系
+    private String suppliersStaffSize;			//人员规模
+    private String suppliersCategory;			//企业类别
+    private String suppliersAnnualTurnover;	//年营业额
+    private String mailbox;						//邮箱
+    private String telephone;					//电话
+    private String fax;							//传真
+    private String area;						//地区
+    private String address;						//地址
+    private String remarks;						//备注
+    private String contactPersonFullName;		//姓名
+    private Integer contactPersonGender;		//性别(0男，1女)
+    private String contactPersonCall;			//称呼
+    private String contactPersonDepartment;		//部门
+    private String contactPersonPosition;		//职位
+    private String contactPersonTelephone;		//电话
+    private String contactPersonMobilephone;	//手机
+    private String contactPersonMailbox;		//邮箱
+    private String contactPersonQq;				//QQ
+    private String contactPersonId;				//身份证
+    private String contactPersonContactaddress;	//联系地址
+    private String contactPersonRemarks;		//备注
+    private Integer createTime;					//创建时间
+
+    public Integer getSuppliersId() {
+        return suppliersId;
+    }
+
+    public void setSuppliersId(Integer suppliersId) {
+        this.suppliersId = suppliersId;
+    }
+
+    public String getSuppliersName() {
+        return suppliersName;
+    }
+
+    public void setSuppliersName(String suppliersName) {
+        this.suppliersName = suppliersName;
+    }
+
+    public Integer getSuppliersRelationship() {
+        return suppliersRelationship;
+    }
+
+    public void setSuppliersRelationship(Integer suppliersRelationship) {
+        this.suppliersRelationship = suppliersRelationship;
+    }
+
+    public String getSuppliersStaffSize() {
+        return suppliersStaffSize;
+    }
+
+    public void setSuppliersStaffSize(String suppliersStaffSize) {
+        this.suppliersStaffSize = suppliersStaffSize;
+    }
+
+    public String getSuppliersCategory() {
+        return suppliersCategory;
+    }
+
+    public void setSuppliersCategory(String suppliersCategory) {
+        this.suppliersCategory = suppliersCategory;
+    }
+
+    public String getSuppliersAnnualTurnover() {
+        return suppliersAnnualTurnover;
+    }
+
+    public void setSuppliersAnnualTurnover(String suppliersAnnualTurnover) {
+        this.suppliersAnnualTurnover = suppliersAnnualTurnover;
+    }
+
+    public String getMailbox() {
+        return mailbox;
+    }
+
+    public void setMailbox(String mailbox) {
+        this.mailbox = mailbox;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getContactPersonFullName() {
+        return contactPersonFullName;
+    }
+
+    public void setContactPersonFullName(String contactPersonFullName) {
+        this.contactPersonFullName = contactPersonFullName;
+    }
+
+    public Integer getContactPersonGender() {
+        return contactPersonGender;
+    }
+
+    public void setContactPersonGender(Integer contactPersonGender) {
+        this.contactPersonGender = contactPersonGender;
+    }
+
+    public String getContactPersonCall() {
+        return contactPersonCall;
+    }
+
+    public void setContactPersonCall(String contactPersonCall) {
+        this.contactPersonCall = contactPersonCall;
+    }
+
+    public String getContactPersonDepartment() {
+        return contactPersonDepartment;
+    }
+
+    public void setContactPersonDepartment(String contactPersonDepartment) {
+        this.contactPersonDepartment = contactPersonDepartment;
+    }
+
+    public String getContactPersonPosition() {
+        return contactPersonPosition;
+    }
+
+    public void setContactPersonPosition(String contactPersonPosition) {
+        this.contactPersonPosition = contactPersonPosition;
+    }
+
+    public String getContactPersonTelephone() {
+        return contactPersonTelephone;
+    }
+
+    public void setContactPersonTelephone(String contactPersonTelephone) {
+        this.contactPersonTelephone = contactPersonTelephone;
+    }
+
+    public String getContactPersonMobilephone() {
+        return contactPersonMobilephone;
+    }
+
+    public void setContactPersonMobilephone(String contactPersonMobilephone) {
+        this.contactPersonMobilephone = contactPersonMobilephone;
+    }
+
+    public String getContactPersonMailbox() {
+        return contactPersonMailbox;
+    }
+
+    public void setContactPersonMailbox(String contactPersonMailbox) {
+        this.contactPersonMailbox = contactPersonMailbox;
+    }
+
+    public String getContactPersonQq() {
+        return contactPersonQq;
+    }
+
+    public void setContactPersonQq(String contactPersonQq) {
+        this.contactPersonQq = contactPersonQq;
+    }
+
+    public String getContactPersonId() {
+        return contactPersonId;
+    }
+
+    public void setContactPersonId(String contactPersonId) {
+        this.contactPersonId = contactPersonId;
+    }
+
+    public String getContactPersonContactaddress() {
+        return contactPersonContactaddress;
+    }
+
+    public void setContactPersonContactaddress(String contactPersonContactaddress) {
+        this.contactPersonContactaddress = contactPersonContactaddress;
+    }
+
+    public String getContactPersonRemarks() {
+        return contactPersonRemarks;
+    }
+
+    public void setContactPersonRemarks(String contactPersonRemarks) {
+        this.contactPersonRemarks = contactPersonRemarks;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.farming;
+
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :日常日志
+ * @Date: Created in 13:50 2016/12/6
+ * @Modified By:
+ */
+public class FarmingDaily extends BaseBean {
+
+    private Integer id;                //日常养殖id主键
+    private Integer pondId;            //塘口id主键
+    private String pondName;           //塘口名称
+    private Integer pondType;          //塘口类型（0-外塘，1-水槽）
+    private Integer userId;            //用户id主键
+    private String userLoginName;      //用户登录名
+    private Integer date;              //日期
+    private String weather;            //天气
+    private String weatherKey;         //天气key
+    private String waterTemperature;   //水温
+    private String oxy;                //溶氧值
+    private String eat;                //吃食情况
+    private String foodWeight;         //食物重量
+    private String drug;               //用药情况
+    private String remark;             //备注
+    private Integer createTime;        //创建时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPondId() {
+        return pondId;
+    }
+
+    public void setPondId(Integer pondId) {
+        this.pondId = pondId;
+    }
+
+    public String getPondName() {
+        return pondName;
+    }
+
+    public void setPondName(String pondName) {
+        this.pondName = pondName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Integer getDate() {
+        return date;
+    }
+
+    public void setDate(Integer date) {
+        this.date = date;
+    }
+
+    public String getWeather() {
+        return weather;
+    }
+
+    public void setWeather(String weather) {
+        this.weather = weather;
+    }
+
+    public String getWeatherKey() {
+        return weatherKey;
+    }
+
+    public void setWeatherKey(String weatherKey) {
+        this.weatherKey = weatherKey;
+    }
+
+    public String getWaterTemperature() {
+        return waterTemperature;
+    }
+
+    public void setWaterTemperature(String waterTemperature) {
+        this.waterTemperature = waterTemperature;
+    }
+
+    public String getOxy() {
+        return oxy;
+    }
+
+    public void setOxy(String oxy) {
+        this.oxy = oxy;
+    }
+
+    public String getEat() {
+        return eat;
+    }
+
+    public void setEat(String eat) {
+        this.eat = eat;
+    }
+
+    public String getFoodWeight() {
+        return foodWeight;
+    }
+
+    public void setFoodWeight(String foodWeight) {
+        this.foodWeight = foodWeight;
+    }
+
+    public String getDrug() {
+        return drug;
+    }
+
+    public void setDrug(String drug) {
+        this.drug = drug;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getPondType() {
+        return pondType;
+    }
+
+    public void setPondType(Integer pondType) {
+        this.pondType = pondType;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.farming;
+
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :水产病害报表
+ * @Date: Created in 13:51 2016/12/6
+ * @Modified By:
+ */
+public class FarmingDiseaseReport extends BaseBean {
+
+    private Integer id;                   //主键id
+    private Integer userId;               //用户id
+    private String userName;              //用户登录名
+    private Integer surveyDate;     	  //调查日期
+    private String surveyAddress;		  //调查地点
+    private String surveyName;			  //调查人
+    private String waterAssessment;		  //水质评估
+    private String farmlandPesticide;	  //周围农田施药
+    private String waterDeep;			  //水深（米）
+    private String size;				  //面积（亩）
+    private String situationAlgae;        //水中藻类情况
+    private String situationRainfall;     //降雨情况
+    private String situationBottom;       //底质情况
+    private String waterColour;			  //水色和透明度
+    private String ph;					  //pH值
+    private String oxy;					  //溶解氧含量
+    private String ammonia;				  //氨氮（mg/L）
+    private String nitrite;				  //亚硝酸盐（mg/L）
+    private String waterTemperature;	  //水温
+    private String sulfide;				  //硫化物
+    private String clearDate;			  //上次清塘时间
+    private String clearMethods;		  //清塘方法
+    private String grazingSpecies;		  //品种
+    private String grazingSource;		  //来源
+    private String density;				  //投放密度（尾/亩）
+    private String feedName;			  //饵料品牌和型号
+    private String feedProvide;			  //日均投放量（kg）
+    private String diseaseDate;		  //发病时间
+    private String diseaseSpecies;		  //发病鱼种
+    private String diseaseSpecifications; //发病规格
+    private String dailyDeath;			  //日死亡量
+    private String totalDeath;			  //累积死亡量
+    private String medicineUsed;		  //曾用药、剂量
+    private String medicineEffect;		  //曾用药效果评估
+    private String diseaseCause;		  //疑似病因
+    private String remark;				  //备注
+    private String contactName;			  //联系人
+    private String contactPhone;		  //联系电话
+    private String contactAddress;		  //联系地址
+    private Integer createTime;			  //创建时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Integer getSurveyDate() {
+        return surveyDate;
+    }
+
+    public void setSurveyDate(Integer surveyDate) {
+        this.surveyDate = surveyDate;
+    }
+
+    public String getSurveyAddress() {
+        return surveyAddress;
+    }
+
+    public void setSurveyAddress(String surveyAddress) {
+        this.surveyAddress = surveyAddress;
+    }
+
+    public String getSurveyName() {
+        return surveyName;
+    }
+
+    public void setSurveyName(String surveyName) {
+        this.surveyName = surveyName;
+    }
+
+    public String getWaterAssessment() {
+        return waterAssessment;
+    }
+
+    public void setWaterAssessment(String waterAssessment) {
+        this.waterAssessment = waterAssessment;
+    }
+
+    public String getFarmlandPesticide() {
+        return farmlandPesticide;
+    }
+
+    public void setFarmlandPesticide(String farmlandPesticide) {
+        this.farmlandPesticide = farmlandPesticide;
+    }
+
+    public String getWaterDeep() {
+        return waterDeep;
+    }
+
+    public void setWaterDeep(String waterDeep) {
+        this.waterDeep = waterDeep;
+    }
+
+    public String getSize() {
+        return size;
+    }
+
+    public void setSize(String size) {
+        this.size = size;
+    }
+
+    public String getSituationAlgae() {
+        return situationAlgae;
+    }
+
+    public void setSituationAlgae(String situationAlgae) {
+        this.situationAlgae = situationAlgae;
+    }
+
+    public String getSituationRainfall() {
+        return situationRainfall;
+    }
+
+    public void setSituationRainfall(String situationRainfall) {
+        this.situationRainfall = situationRainfall;
+    }
+
+    public String getSituationBottom() {
+        return situationBottom;
+    }
+
+    public void setSituationBottom(String situationBottom) {
+        this.situationBottom = situationBottom;
+    }
+
+    public String getWaterColour() {
+        return waterColour;
+    }
+
+    public void setWaterColour(String waterColour) {
+        this.waterColour = waterColour;
+    }
+
+    public String getPh() {
+        return ph;
+    }
+
+    public void setPh(String ph) {
+        this.ph = ph;
+    }
+
+    public String getOxy() {
+        return oxy;
+    }
+
+    public void setOxy(String oxy) {
+        this.oxy = oxy;
+    }
+
+    public String getAmmonia() {
+        return ammonia;
+    }
+
+    public void setAmmonia(String ammonia) {
+        this.ammonia = ammonia;
+    }
+
+    public String getNitrite() {
+        return nitrite;
+    }
+
+    public void setNitrite(String nitrite) {
+        this.nitrite = nitrite;
+    }
+
+    public String getWaterTemperature() {
+        return waterTemperature;
+    }
+
+    public void setWaterTemperature(String waterTemperature) {
+        this.waterTemperature = waterTemperature;
+    }
+
+    public String getSulfide() {
+        return sulfide;
+    }
+
+    public void setSulfide(String sulfide) {
+        this.sulfide = sulfide;
+    }
+
+    public String getClearDate() {
+        return clearDate;
+    }
+
+    public void setClearDate(String clearDate) {
+        this.clearDate = clearDate;
+    }
+
+    public String getClearMethods() {
+        return clearMethods;
+    }
+
+    public void setClearMethods(String clearMethods) {
+        this.clearMethods = clearMethods;
+    }
+
+    public String getGrazingSpecies() {
+        return grazingSpecies;
+    }
+
+    public void setGrazingSpecies(String grazingSpecies) {
+        this.grazingSpecies = grazingSpecies;
+    }
+
+    public String getGrazingSource() {
+        return grazingSource;
+    }
+
+    public void setGrazingSource(String grazingSource) {
+        this.grazingSource = grazingSource;
+    }
+
+    public String getDensity() {
+        return density;
+    }
+
+    public void setDensity(String density) {
+        this.density = density;
+    }
+
+    public String getFeedName() {
+        return feedName;
+    }
+
+    public void setFeedName(String feedName) {
+        this.feedName = feedName;
+    }
+
+    public String getFeedProvide() {
+        return feedProvide;
+    }
+
+    public void setFeedProvide(String feedProvide) {
+        this.feedProvide = feedProvide;
+    }
+
+    public String getDiseaseDate() {
+        return diseaseDate;
+    }
+
+    public void setDiseaseDate(String diseaseDate) {
+        this.diseaseDate = diseaseDate;
+    }
+
+    public String getDiseaseSpecies() {
+        return diseaseSpecies;
+    }
+
+    public void setDiseaseSpecies(String diseaseSpecies) {
+        this.diseaseSpecies = diseaseSpecies;
+    }
+
+    public String getDiseaseSpecifications() {
+        return diseaseSpecifications;
+    }
+
+    public void setDiseaseSpecifications(String diseaseSpecifications) {
+        this.diseaseSpecifications = diseaseSpecifications;
+    }
+
+    public String getDailyDeath() {
+        return dailyDeath;
+    }
+
+    public void setDailyDeath(String dailyDeath) {
+        this.dailyDeath = dailyDeath;
+    }
+
+    public String getTotalDeath() {
+        return totalDeath;
+    }
+
+    public void setTotalDeath(String totalDeath) {
+        this.totalDeath = totalDeath;
+    }
+
+    public String getMedicineUsed() {
+        return medicineUsed;
+    }
+
+    public void setMedicineUsed(String medicineUsed) {
+        this.medicineUsed = medicineUsed;
+    }
+
+    public String getMedicineEffect() {
+        return medicineEffect;
+    }
+
+    public void setMedicineEffect(String medicineEffect) {
+        this.medicineEffect = medicineEffect;
+    }
+
+    public String getDiseaseCause() {
+        return diseaseCause;
+    }
+
+    public void setDiseaseCause(String diseaseCause) {
+        this.diseaseCause = diseaseCause;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getContactAddress() {
+        return contactAddress;
+    }
+
+    public void setContactAddress(String contactAddress) {
+        this.contactAddress = contactAddress;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.farming;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :起捕放养
+ * @Date: Created in 13:52 2016/12/6
+ * @Modified By:
+ */
+public class FarmingHarvest extends BaseBean {
+
+    private Integer id;                     //主键id
+    private Integer pondId;					//塘口id
+    private String pondName;				//塘口名称
+    private Integer pondType;          //塘口类型（0-外塘，1-水槽）
+    private Integer userId;					//用户id
+    private String userLoginName;			//用户登陆名
+    private Integer grazingDate;			//放养日期
+    private String grazingSpeciesKey;		//放养鱼种key
+    private String grazingSpecies;			//放养鱼种
+    private String grazingWeight;			//放养重量
+    private String grazingNumber;			//放养尾数
+    private String grazingSpecifications;	//苗种规格
+    private String grazingSource;			//苗种来源
+    private Integer catchingDate;			//收捕日期
+    private String catchingWeight;			//收获重量
+    private String catchingNumber;			//收获尾数
+    private String salesAddress;			//销往何处
+    private String remark;					//备注
+    private Integer createTime;				//创建时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPondId() {
+        return pondId;
+    }
+
+    public void setPondId(Integer pondId) {
+        this.pondId = pondId;
+    }
+
+    public String getPondName() {
+        return pondName;
+    }
+
+    public void setPondName(String pondName) {
+        this.pondName = pondName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Integer getGrazingDate() {
+        return grazingDate;
+    }
+
+    public void setGrazingDate(Integer grazingDate) {
+        this.grazingDate = grazingDate;
+    }
+
+    public String getGrazingSpeciesKey() {
+        return grazingSpeciesKey;
+    }
+
+    public void setGrazingSpeciesKey(String grazingSpeciesKey) {
+        this.grazingSpeciesKey = grazingSpeciesKey;
+    }
+
+    public String getGrazingSpecies() {
+        return grazingSpecies;
+    }
+
+    public void setGrazingSpecies(String grazingSpecies) {
+        this.grazingSpecies = grazingSpecies;
+    }
+
+    public String getGrazingWeight() {
+        return grazingWeight;
+    }
+
+    public void setGrazingWeight(String grazingWeight) {
+        this.grazingWeight = grazingWeight;
+    }
+
+    public String getGrazingNumber() {
+        return grazingNumber;
+    }
+
+    public void setGrazingNumber(String grazingNumber) {
+        this.grazingNumber = grazingNumber;
+    }
+
+    public String getGrazingSpecifications() {
+        return grazingSpecifications;
+    }
+
+    public void setGrazingSpecifications(String grazingSpecifications) {
+        this.grazingSpecifications = grazingSpecifications;
+    }
+
+    public String getGrazingSource() {
+        return grazingSource;
+    }
+
+    public void setGrazingSource(String grazingSource) {
+        this.grazingSource = grazingSource;
+    }
+
+    public Integer getCatchingDate() {
+        return catchingDate;
+    }
+
+    public void setCatchingDate(Integer catchingDate) {
+        this.catchingDate = catchingDate;
+    }
+
+    public String getCatchingWeight() {
+        return catchingWeight;
+    }
+
+    public void setCatchingWeight(String catchingWeight) {
+        this.catchingWeight = catchingWeight;
+    }
+
+    public String getCatchingNumber() {
+        return catchingNumber;
+    }
+
+    public void setCatchingNumber(String catchingNumber) {
+        this.catchingNumber = catchingNumber;
+    }
+
+    public String getSalesAddress() {
+        return salesAddress;
+    }
+
+    public void setSalesAddress(String salesAddress) {
+        this.salesAddress = salesAddress;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getPondType() {
+        return pondType;
+    }
+
+    public void setPondType(Integer pondType) {
+        this.pondType = pondType;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.farming;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :药品管理
+ * @Date: Created in 13:53 2016/12/6
+ * @Modified By:
+ */
+public class FarmingMedication extends BaseBean {
+
+    private Integer id;				//主键id
+    private Integer pondId;			//塘口id
+    private String pondName;		//塘口名称
+    private Integer pondType;          //塘口类型（0-外塘，1-水槽）
+    private Integer userId;			//用户id
+    private String userLoginName;	//用户登陆名
+    private Integer date;			//日期
+    private String diseaseSymptoms;	//病害症状
+    private String preventionMethods;//L预防方法
+    private String treatmentProcess;//治疗过程
+    private String medicineRecord;	//用药记录
+    private String medicineNames;	//药物名称
+    private String medicineIntroduce;//药性说明
+    private String medicineEffect;	//L药物作用
+    private String medicineUsed;	//用量用法
+    private String medicineSource;	//来源
+    private String purchaseNumber;	//采购数量
+    private String procurement;		//采购人
+    private String remark;			//备注
+    private Integer createTime;		//创建时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPondId() {
+        return pondId;
+    }
+
+    public void setPondId(Integer pondId) {
+        this.pondId = pondId;
+    }
+
+    public String getPondName() {
+        return pondName;
+    }
+
+    public void setPondName(String pondName) {
+        this.pondName = pondName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Integer getDate() {
+        return date;
+    }
+
+    public void setDate(Integer date) {
+        this.date = date;
+    }
+
+    public String getDiseaseSymptoms() {
+        return diseaseSymptoms;
+    }
+
+    public void setDiseaseSymptoms(String diseaseSymptoms) {
+        this.diseaseSymptoms = diseaseSymptoms;
+    }
+
+    public String getPreventionMethods() {
+        return preventionMethods;
+    }
+
+    public void setPreventionMethods(String preventionMethods) {
+        this.preventionMethods = preventionMethods;
+    }
+
+    public String getTreatmentProcess() {
+        return treatmentProcess;
+    }
+
+    public void setTreatmentProcess(String treatmentProcess) {
+        this.treatmentProcess = treatmentProcess;
+    }
+
+    public String getMedicineRecord() {
+        return medicineRecord;
+    }
+
+    public void setMedicineRecord(String medicineRecord) {
+        this.medicineRecord = medicineRecord;
+    }
+
+    public String getMedicineNames() {
+        return medicineNames;
+    }
+
+    public void setMedicineNames(String medicineNames) {
+        this.medicineNames = medicineNames;
+    }
+
+    public String getMedicineIntroduce() {
+        return medicineIntroduce;
+    }
+
+    public void setMedicineIntroduce(String medicineIntroduce) {
+        this.medicineIntroduce = medicineIntroduce;
+    }
+
+    public String getMedicineEffect() {
+        return medicineEffect;
+    }
+
+    public void setMedicineEffect(String medicineEffect) {
+        this.medicineEffect = medicineEffect;
+    }
+
+    public String getMedicineUsed() {
+        return medicineUsed;
+    }
+
+    public void setMedicineUsed(String medicineUsed) {
+        this.medicineUsed = medicineUsed;
+    }
+
+    public String getMedicineSource() {
+        return medicineSource;
+    }
+
+    public void setMedicineSource(String medicineSource) {
+        this.medicineSource = medicineSource;
+    }
+
+    public String getPurchaseNumber() {
+        return purchaseNumber;
+    }
+
+    public void setPurchaseNumber(String purchaseNumber) {
+        this.purchaseNumber = purchaseNumber;
+    }
+
+    public String getProcurement() {
+        return procurement;
+    }
+
+    public void setProcurement(String procurement) {
+        this.procurement = procurement;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getPondType() {
+        return pondType;
+    }
+
+    public void setPondType(Integer pondType) {
+        this.pondType = pondType;
+    }
+}

+package com.zhonglai.luhui.runingfish.domain.farming;
+
+import com.zhonglai.luhui.runingfish.dto.BaseBean;
+
+/**
+ * @Author: fuchao
+ * @Description :水质检测
+ * @Date: Created in 13:54 2016/12/6
+ * @Modified By:
+ */
+public class FarmingWater extends BaseBean {
+
+    private Integer id;                     //水质监测id主键
+    private Integer pondId;                 //塘口id主键
+    private String pondName;                //塘口名称
+    private Integer pondType;          //塘口类型（0-外塘，1-水槽）
+    private Integer userId;                 //用户id主键
+    private String userLoginName;           //用户登录名
+    private Integer date;                   //日期
+    private String waterColor;              //水色
+    private String waterColorKey;           //水色key
+    private String waterTemperature;        //水温
+    private String oxy;                     //溶氧值
+    private String salt;                    //盐度值
+    private String ph;                      //ph值
+    private String ammonia;                 //氨氮值
+    private String nitrite;                 //亚硝酸盐值
+    private String remark;                  //备注
+    private Integer createTime;             //创建时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPondId() {
+        return pondId;
+    }
+
+    public void setPondId(Integer pondId) {
+        this.pondId = pondId;
+    }
+
+    public String getPondName() {
+        return pondName;
+    }
+
+    public void setPondName(String pondName) {
+        this.pondName = pondName;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserLoginName() {
+        return userLoginName;
+    }
+
+    public void setUserLoginName(String userLoginName) {
+        this.userLoginName = userLoginName;
+    }
+
+    public Integer getDate() {
+        return date;
+    }
+
+    public void setDate(Integer date) {
+        this.date = date;
+    }
+
+    public String getWaterColor() {
+        return waterColor;
+    }
+
+    public void setWaterColor(String waterColor) {
+        this.waterColor = waterColor;
+    }
+
+    public String getWaterColorKey() {
+        return waterColorKey;
+    }
+
+    public void setWaterColorKey(String waterColorKey) {
+        this.waterColorKey = waterColorKey;
+    }
+
+    public String getWaterTemperature() {
+        return waterTemperature;
+    }
+
+    public void setWaterTemperature(String waterTemperature) {
+        this.waterTemperature = waterTemperature;
+    }
+
+    public String getOxy() {
+        return oxy;
+    }
+
+    public void setOxy(String oxy) {
+        this.oxy = oxy;
+    }
+
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
+    public String getPh() {
+        return ph;
+    }
+
+    public void setPh(String ph) {
+        this.ph = ph;
+    }
+
+    public String getAmmonia() {
+        return ammonia;
+    }
+
+    public void setAmmonia(String ammonia) {
+        this.ammonia = ammonia;
+    }
+
+    public String getNitrite() {
+        return nitrite;
+    }
+
+    public void setNitrite(String nitrite) {
+        this.nitrite = nitrite;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Integer createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getPondType() {
+        return pondType;
+    }
+
+    public void setPondType(Integer pondType) {
+        this.pondType = pondType;
+    }
+}