Merge branch 'HQPT_USER' of 118.31.66.166:zp260/imf_cloud_wearhouse

@@ -2,7 +2,7 @@
 web:
 web:
   upload-path: upload/
   upload-path: upload/
 server:
 server:
-  port: 7003
+  port: 8002
   servlet:
   servlet:
     context-path: ${SERVER_CONTEXTPATH:}
     context-path: ${SERVER_CONTEXTPATH:}
 spring:
 spring:
@@ -12,12 +12,15 @@ spring:
     #静态资源，设置上传文件的访问，
     #静态资源，设置上传文件的访问，
     static-path-pattern: /**
     static-path-pattern: /**
 
 
+
   resources:
   resources:
     static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}
     static-locations: classpath:/META-INF/resources/,classpath:/static,classpath:/resources/,file:${web.upload-path}
 
 
   application:
   application:
-    name: tianbo.base.dev.devkit
-
+    name: hqpt-user-center
+  redis:
+    host: 192.168.1.53
+    port: 6379
   jackson:
   jackson:
     serialization:
     serialization:
       FAIL_ON_EMPTY_BEANS: false
       FAIL_ON_EMPTY_BEANS: false
@@ -32,12 +35,12 @@ spring:
   #eureka主机名，会在控制页面中显示
   #eureka主机名，会在控制页面中显示
   #DEV环境关闭注册。
   #DEV环境关闭注册。
     features:
     features:
-      enabled: false
+      enabled: true
     discovery:
     discovery:
-      enabled: false
+      enabled: true
     service-registry:
     service-registry:
       auto-registration:
       auto-registration:
-        enabled: false
+        enabled: true
 
 
   datasource:
   datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         type: com.alibaba.druid.pool.DruidDataSource
@@ -47,9 +50,9 @@ spring:
         #username=CGOETL
         #username=CGOETL
         #password=1q2w3e4r
         #password=1q2w3e4r
         #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
         #spring datasource mysql，注意编码配置，缺少数据库编码配置容易引起中文入库乱码
-        url: jdbc:mysql://127.0.0.1:3307/statistics?useUnicode=true&characterEncoding=utf8
-        username: root
-        password:
+        url: jdbc:mysql://118.31.66.166:3306/HQPT_USER?useUnicode=true&characterEncoding=utf8
+        username: 110
+        password: QAHqCJf2kFYCLirM
         driver-class-name: com.mysql.jdbc.Driver
         driver-class-name: com.mysql.jdbc.Driver
         max-idle: 10
         max-idle: 10
         max-wait: 10000
         max-wait: 10000
@@ -85,7 +88,7 @@ eureka:
   client:
   client:
     #eureka注册中心服务器地址
     #eureka注册中心服务器地址
     service-url:
     service-url:
-      defaultZone: http://10.50.3.82:19527/eureka/
+      defaultZone: http://192.168.1.53:12345/eureka/
     registry-fetch-interval-seconds:  30
     registry-fetch-interval-seconds:  30
     lease-renewal-interval-in-seconds: 15
     lease-renewal-interval-in-seconds: 15
     lease-expiration-duration-in-seconds: 45
     lease-expiration-duration-in-seconds: 45
@@ -100,6 +103,7 @@ pagehelper:
   #auto-runtime-dialect: true
   #auto-runtime-dialect: true
   helper-dialect: mysql
   helper-dialect: mysql
   reasonable: true
   reasonable: true
+
   support-methods-arguments: true
   support-methods-arguments: true
   params: count=countSql
   params: count=countSql
 
 
@@ -120,4 +124,4 @@ logging:
   #日志配置,输出到文本，
   #日志配置,输出到文本，
 #Java Web Token 时效时间,单位秒
 #Java Web Token 时效时间,单位秒
 jwt:
 jwt:
-  max-alive: 300
+  max-alive: 30000

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.service.CompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/company")
+public class CompanyController {
+
+    @Autowired
+    CompanyService companyService;
+
+    @GetMapping("/list")
+    public PageInfo<Company> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                             int pageNum,
+                                  @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                             int pageSize,
+                                  @RequestParam(value = "companyName", required = false) String companyName){
+        return companyService.findAll(pageNum,pageSize, companyName);
+
+    }
+
+    @LogAnnotation(moduleName = "公司管理",operate = "公司添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody Company company){
+
+        int i =companyService.insertSelective(company);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "公司管理",operate = "公司修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid Company company){
+
+        int i =companyService.updateByPrimaryKeySelective(company);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "公司管理",operate = "公司删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody Company company, HttpServletRequest request, HttpServletResponse response){
+
+        int i =companyService.deleteByPrimaryKey(company.getCompanyId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "公司管理",operate = "公司批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (companyService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Department;
+import com.tianbo.warehouse.service.CompanyService;
+import com.tianbo.warehouse.service.DepartmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/department")
+public class DeparmentController {
+
+    @Autowired
+    DepartmentService departmentService;
+
+    @GetMapping("/list")
+    public PageInfo<Department> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                             int pageNum,
+                                     @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                             int pageSize,
+                                     @RequestParam(value = "departmentName", required = false) String departmentName){
+        return departmentService.findAll(pageNum,pageSize, departmentName);
+
+    }
+
+    @LogAnnotation(moduleName = "部门管理",operate = "部门添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody Department department){
+
+        int i =departmentService.insertSelective(department);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "部门管理",operate = "部门修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid Department department){
+
+        int i =departmentService.updateByPrimaryKeySelective(department);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "部门管理",operate = "部门删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody Department department, HttpServletRequest request, HttpServletResponse response){
+
+        int i =departmentService.deleteByPrimaryKey(department.getDepartmentId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "部门管理",operate = "部门批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (departmentService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.Department;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.service.DepartmentService;
+import com.tianbo.warehouse.service.GroupCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/group")
+public class GroupCompanyController {
+
+    @Autowired
+    GroupCompanyService groupCompanyService;
+
+    @GetMapping("/list")
+    public PageInfo<Group_company> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                             int pageNum,
+                                        @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                             int pageSize,
+                                        @RequestParam(value = "groupName") String groupName){
+        return groupCompanyService.findAll(pageNum,pageSize, groupName);
+
+    }
+
+    @LogAnnotation(moduleName = "集团管理",operate = "集团添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody Group_company group_company){
+
+        int i =groupCompanyService.insertSelective(group_company);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "集团管理",operate = "集团修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid Group_company group_company){
+
+        int i =groupCompanyService.updateByPrimaryKeySelective(group_company);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "集团管理",operate = "集团删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody Group_company group_company, HttpServletRequest request, HttpServletResponse response){
+
+        int i =groupCompanyService.deleteByPrimaryKey(group_company.getGroupId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "集团管理",operate = "集团批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (groupCompanyService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

@@ -19,7 +19,9 @@ public class LogController {
     public PageInfo<LOGWithBLOBs> systemLog(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
     public PageInfo<LOGWithBLOBs> systemLog(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                                int pageNum,
                                                int pageNum,
                                             @RequestParam(value = "pageSize",required = false,defaultValue = "5")
                                             @RequestParam(value = "pageSize",required = false,defaultValue = "5")
-                                               int pageSize){
-        return logService.selectAll(pageNum,pageSize);
+                                               int pageSize,
+                                            @RequestParam(value = "username", required = false) String username,
+                                            @RequestParam(value = "modelnamecn", required = false) String modelnamecn){
+        return logService.selectAll(pageNum,pageSize, username, modelnamecn);
     }
     }
 }
 }

@@ -12,33 +12,83 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 
 
 @RestController()
 @RestController()
+@RequestMapping("/perm")
 public class PermssionController {
 public class PermssionController {
 
 
     @Autowired
     @Autowired
     PermissionService permissionService;
     PermissionService permissionService;
 
 
-    @GetMapping("/perm/list")
+    @GetMapping("/list")
     public PageInfo<PERMISSION> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
     public PageInfo<PERMISSION> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                              int pageNum,
                                              int pageNum,
                                      @RequestParam(value = "pageSize",required = false,defaultValue = "5")
                                      @RequestParam(value = "pageSize",required = false,defaultValue = "5")
-                                             int pageSize){
-        return permissionService.findAll(pageNum,pageSize);
+                                             int pageSize,
+                                     @RequestParam(value = "name", required = false) String name){
+        return permissionService.findAll(pageNum,pageSize, name);
 
 
     }
     }
 
 
     @LogAnnotation(moduleName = "权限管理",operate = "权限添加")
     @LogAnnotation(moduleName = "权限管理",operate = "权限添加")
-    @PostMapping("/perm/add")
+    @PostMapping("/add")
     public ResultJson add(@RequestBody PERMISSION permission){
     public ResultJson add(@RequestBody PERMISSION permission){
         int i =permissionService.insertSelective(permission);
         int i =permissionService.insertSelective(permission);
 
 
         ResultJson resultJson = new ResultJson();
         ResultJson resultJson = new ResultJson();
         if (1==i){
         if (1==i){
-            resultJson = new ResultJson("200","添加账户成功");
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "权限管理",operate = "权限修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid PERMISSION permission){
+
+        int i =permissionService.updateByPrimaryKeySelective(permission);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "权限管理",operate = "权限删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody PERMISSION permission, HttpServletRequest request, HttpServletResponse response){
+
+        int i =permissionService.deleteByPrimaryKey(permission.getPermissionId().toString());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "权限管理",operate = "权限批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (permissionService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
         }else {
         }else {
             resultJson = new ResultJson("500","insert faild");
             resultJson = new ResultJson("500","insert faild");
         }
         }

@@ -9,22 +9,30 @@ import com.tianbo.warehouse.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
 @RestController()
 @RestController()
+@RequestMapping("/role")
 public class RoleController {
 public class RoleController {
 
 
     @Autowired
     @Autowired
     RoleService roleService;
     RoleService roleService;
 
 
-    @GetMapping("/role/list")
+    @GetMapping("/list")
     public PageInfo<ROLE> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
     public PageInfo<ROLE> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                         int pageNum,
                                         int pageNum,
-                               @RequestParam(value = "pageSize",required = false,defaultValue = "5")
-                                        int pageSize){
-        return roleService.findAll(pageNum,pageSize);
+                               @RequestParam(value = "pageSize",required = false,defaultValue = "10")
+                                        int pageSize,
+                               @RequestParam(value = "roleName",required = false)
+                                           String roleName){
+
+        return roleService.findAll(pageNum,pageSize, roleName);
     }
     }
 
 
-    @LogAnnotation(moduleName = "角色管理",operate = "角色添加")
-    @PostMapping("/role/add")
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色添加")
+    @PostMapping("/add")
     public ResultJson add(@RequestBody ROLE role){
     public ResultJson add(@RequestBody ROLE role){
         int i =roleService.insertSelective(role);
         int i =roleService.insertSelective(role);
         return i==1 ? new ResultJson("200","添加权限成功") :new ResultJson("500","insert faild");
         return i==1 ? new ResultJson("200","添加权限成功") :new ResultJson("500","insert faild");
@@ -35,10 +43,56 @@ public class RoleController {
      * 设置角色的权限
      * 设置角色的权限
      * @return
      * @return
      */
      */
-    @LogAnnotation(moduleName = "角色管理",operate = "权限设置")
-    @PutMapping("/role/permSet")
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "权限设置")
+    @PutMapping("/permSet")
     public ResultJson permissionSet(@RequestBody RolePermission rolePermission){
     public ResultJson permissionSet(@RequestBody RolePermission rolePermission){
         int i = roleService.setRolePermissoin(rolePermission);
         int i = roleService.setRolePermissoin(rolePermission);
         return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败");
         return i==1 ? new ResultJson("200","设置权限成功") :new ResultJson("500","设置权限失败");
     }
     }
+
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid ROLE role){
+
+        int i =roleService.updateByPrimaryKeySelective(role);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody ROLE role, HttpServletRequest request, HttpServletResponse response){
+
+        int i =roleService.deleteByPrimaryKey(role.getRoleId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "岗位/角色管理",operate = "岗位/角色批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (roleService.deleteByPrimaryKey(Integer.valueOf(ids))>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
 }
 }

@@ -39,13 +39,11 @@ public class UserController {
                                         int pageNum,
                                         int pageNum,
                                 @RequestParam(value = "pageSize",required = false,defaultValue = "5")
                                 @RequestParam(value = "pageSize",required = false,defaultValue = "5")
                                         int pageSize,
                                         int pageSize,
-                                @RequestParam(value = "username",required = false) String username,
-                                @RequestParam(value = "realname",required = false) String realname)
+                                @RequestParam(value = "userName",required = false) String username,
+                                @RequestParam(value = "realName",required = false) String realname)
     {
     {
-        USERS user = new USERS();
-        user.setUsername(username);
-        user.setRealname(realname);
-        PageInfo<USERS> usersPageInfo = userService.selectAllUser(pageNum,pageSize,user);
+
+        PageInfo<USERS> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username,  realname);
         return new ResultJson("200","success",usersPageInfo);
         return new ResultJson("200","success",usersPageInfo);
     }
     }
 
 

+package com.tianbo.warehouse.controller.staff;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+import com.tianbo.warehouse.model.StaffApartmentMaintain;
+import com.tianbo.warehouse.service.satff.ComeCarService;
+import com.tianbo.warehouse.service.satff.MaintainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/come_car")
+public class ComeCarController {
+
+    @Autowired
+    ComeCarService comeCarService;
+
+    @GetMapping("/list")
+    public PageInfo<StaffApartmentComeCar> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                          int pageNum,
+                                                @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                          int pageSize,
+                                                @RequestParam(value = "cometovisitname", required = false)
+                                                  String comeToVisitName){
+        return comeCarService.findAll(pageNum,pageSize,comeToVisitName);
+
+    }
+
+    @LogAnnotation(moduleName = "职工公寓人员，车辆来访登记",operate = "职工公寓人员，车辆来访登记添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody StaffApartmentComeCar staffApartmentComeCar){
+
+        int i =comeCarService.insertSelective(staffApartmentComeCar);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓人员，车辆来访登记",operate = "职工公寓人员，车辆来访登记修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid StaffApartmentComeCar staffApartmentComeCar){
+
+        int i =comeCarService.updateByPrimaryKeySelective(staffApartmentComeCar);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓人员，车辆来访登记",operate = "职工公寓人员，车辆来访登记删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody StaffApartmentComeCar staffApartmentComeCar, HttpServletRequest request, HttpServletResponse response){
+
+        int i =comeCarService.deleteByPrimaryKey(staffApartmentComeCar.getId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓人员，车辆来访登记",operate = "职工公寓人员，车辆来访登记删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (comeCarService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller.staff;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.StaffApartmentSpareKey;
+import com.tianbo.warehouse.model.StaffSecurityInspection;
+import com.tianbo.warehouse.service.satff.KeyService;
+import com.tianbo.warehouse.service.satff.StaffSecurityInspectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/key")
+public class KeyController {
+
+    @Autowired
+    KeyService keyService;
+
+    @GetMapping("/list")
+    public PageInfo<StaffApartmentSpareKey> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                          int pageNum,
+                                                  @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                          int pageSize,
+                                                  @RequestParam(value = "staffname", required = false)
+                                                  String staffname){
+        return keyService.findAll(pageNum,pageSize,staffname);
+
+    }
+
+    @LogAnnotation(moduleName = "职工公寓备用钥匙使用记录管理",operate = "职工公寓备用钥匙使用记录添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody StaffApartmentSpareKey staffApartmentSpareKey){
+
+        int i =keyService.insertSelective(staffApartmentSpareKey);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓备用钥匙使用记录管理",operate = "职工公寓备用钥匙使用记录修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid StaffApartmentSpareKey staffApartmentSpareKey){
+
+        int i =keyService.updateByPrimaryKeySelective(staffApartmentSpareKey);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓备用钥匙使用记录管理",operate = "职工公寓备用钥匙使用记录删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody StaffApartmentSpareKey staffApartmentSpareKey, HttpServletRequest request, HttpServletResponse response){
+
+        int i =keyService.deleteByPrimaryKey(staffApartmentSpareKey.getId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓备用钥匙使用记录管理",operate = "职工公寓备用钥匙使用记录删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (keyService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller.staff;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.StaffApartmentMaintain;
+import com.tianbo.warehouse.model.StaffApartmentSpareKey;
+import com.tianbo.warehouse.service.satff.KeyService;
+import com.tianbo.warehouse.service.satff.MaintainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/maintain")
+public class MaintainController {
+
+    @Autowired
+    MaintainService maintainService;
+
+    @GetMapping("/list")
+    public PageInfo<StaffApartmentMaintain> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                          int pageNum,
+                                                 @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                          int pageSize,
+                                                 @RequestParam(value = "repairsname", required = false)
+                                                  String repairsname){
+        return maintainService.findAll(pageNum,pageSize,repairsname);
+
+    }
+
+    @LogAnnotation(moduleName = "职工公寓设施设备维修记录管理",operate = "职工公寓设施设备维修记录添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody StaffApartmentMaintain staffApartmentMaintain){
+
+        int i =maintainService.insertSelective(staffApartmentMaintain);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓设施设备维修记录管理",operate = "职工公寓设施设备维修记录修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid StaffApartmentMaintain staffApartmentMaintain){
+
+        int i =maintainService.updateByPrimaryKeySelective(staffApartmentMaintain);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓设施设备维修记录管理",operate = "职工公寓设施设备维修记录删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody StaffApartmentMaintain staffApartmentMaintain, HttpServletRequest request, HttpServletResponse response){
+
+        int i =maintainService.deleteByPrimaryKey(staffApartmentMaintain.getId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓设施设备维修记录管理",operate = "职工公寓设施设备维修记录删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (maintainService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller.staff;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.StaffApartmentMaintain;
+import com.tianbo.warehouse.model.StaffApartmentOnduty;
+import com.tianbo.warehouse.service.satff.MaintainService;
+import com.tianbo.warehouse.service.satff.OnDutyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/on_duty")
+public class OnDutyController {
+
+    @Autowired
+    OnDutyService onDutyService;
+
+    @GetMapping("/list")
+    public PageInfo<StaffApartmentOnduty> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                          int pageNum,
+                                               @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                          int pageSize,
+                                               @RequestParam(value = "warchkeeper", required = false)
+                                                  String warchkeeper){
+        return onDutyService.findAll(pageNum,pageSize,warchkeeper);
+
+    }
+
+    @LogAnnotation(moduleName = "职工公寓值班巡视管理",operate = "职工公寓值班巡视添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody StaffApartmentOnduty staffApartmentOnduty){
+
+        int i =onDutyService.insertSelective(staffApartmentOnduty);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓值班巡视管理",operate = "职工公寓值班巡视修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid StaffApartmentOnduty staffApartmentOnduty){
+
+        int i =onDutyService.updateByPrimaryKeySelective(staffApartmentOnduty);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓值班巡视管理",operate = "职工公寓值班巡视删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody StaffApartmentOnduty staffApartmentOnduty, HttpServletRequest request, HttpServletResponse response){
+
+        int i =onDutyService.deleteByPrimaryKey(staffApartmentOnduty.getId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓值班巡视管理",operate = "职工公寓值班巡视删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (onDutyService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller.staff;
+
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.StaffSecurityInspection;
+import com.tianbo.warehouse.service.satff.StaffSecurityInspectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/inspection")
+public class StaffSecurityInspectionController {
+
+    @Autowired
+    StaffSecurityInspectionService staffSecurityInspectionService;
+
+    @GetMapping("/list")
+    public PageInfo<StaffSecurityInspection> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                          int pageNum,
+                                                  @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                          int pageSize,
+                                                  @RequestParam(value = "securityInspectionName", required = false)
+                                                  String securityInspectionName){
+        return staffSecurityInspectionService.findAll(pageNum,pageSize,securityInspectionName);
+
+    }
+
+    @LogAnnotation(moduleName = "职工公寓安全巡视管理",operate = "职工公寓安全巡视添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody StaffSecurityInspection staffSecurityInspection){
+
+        int i =staffSecurityInspectionService.insertSelective(staffSecurityInspection);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓安全巡视管理",operate = "职工公寓安全巡视修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid StaffSecurityInspection staffSecurityInspection){
+
+        int i =staffSecurityInspectionService.updateByPrimaryKeySelective(staffSecurityInspection);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓安全巡视管理",operate = "职工公寓安全巡视删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody StaffSecurityInspection staffSecurityInspection, HttpServletRequest request, HttpServletResponse response){
+
+        int i =staffSecurityInspectionService.deleteByPrimaryKey(staffSecurityInspection.getSecurityInspectionId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "职工公寓安全巡视管理",operate = "职工公寓安全巡视删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (staffSecurityInspectionService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.controller.water;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.annotation.LogAnnotation;
+import com.tianbo.warehouse.controller.response.ResultJson;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.WaterStationsPatrol;
+import com.tianbo.warehouse.service.CompanyService;
+import com.tianbo.warehouse.service.water.WaterStationsPatrolService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/water_stations_patrol")
+public class WaterStationsPatrolController {
+
+    @Autowired
+    WaterStationsPatrolService waterStationsPatrolService;
+
+    @GetMapping("/list")
+    public PageInfo<WaterStationsPatrol> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                             int pageNum,
+                                              @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                             int pageSize){
+        return waterStationsPatrolService.findAll(pageNum,pageSize);
+
+    }
+
+    @LogAnnotation(moduleName = "二水厂-水站巡视记录单管理",operate = "二水厂-水站巡视记录单管理添加")
+    @PostMapping("/add")
+    public ResultJson add(@RequestBody WaterStationsPatrol waterStationsPatrol){
+
+        int i =waterStationsPatrolService.insertSelective(waterStationsPatrol);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","添加成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "二水厂-水站巡视记录单管理",operate = "二水厂-水站巡视记录单管理修改")
+    @PutMapping("/edit")
+    @ResponseBody
+    public ResultJson edit(@RequestBody @Valid WaterStationsPatrol waterStationsPatrol){
+
+        int i =waterStationsPatrolService.updateByPrimaryKeySelective(waterStationsPatrol);
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","修改成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "二水厂-水站巡视记录单管理",operate = "二水厂-水站巡视记录单管理删除")
+    @DeleteMapping("/del")
+    public ResultJson reomve(@RequestBody WaterStationsPatrol waterStationsPatrol, HttpServletRequest request, HttpServletResponse response){
+
+        int i =waterStationsPatrolService.deleteByPrimaryKey(waterStationsPatrol.getId());
+
+        ResultJson resultJson = new ResultJson();
+        if (1==i){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+    @LogAnnotation(moduleName = "二水厂-水站巡视记录单管理",operate = "二水厂-水站巡视记录单管理批量删除")
+    @GetMapping("/batchremove")
+    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+
+        ResultJson resultJson = new ResultJson();
+
+        if (waterStationsPatrolService.deleteByPrimaryKey(ids)>0){
+            resultJson = new ResultJson("200","删除成功");
+        }else {
+            resultJson = new ResultJson("500","insert faild");
+        }
+        return resultJson;
+    }
+
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.Company;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CompanyMapper {
+    int deleteByPrimaryKey(String companyId);
+
+    int insert(Company record);
+
+    int insertSelective(Company record);
+
+    Company selectByPrimaryKey(String companyId);
+
+    int updateByPrimaryKeySelective(Company record);
+
+    int updateByPrimaryKey(Company record);
+
+    List<Company> findAll(@Param("companyName") String companyName);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.Department;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface DepartmentMapper {
+    int deleteByPrimaryKey(String departmentId);
+
+    int insert(Department record);
+
+    int insertSelective(Department record);
+
+    Department selectByPrimaryKey(String departmentId);
+
+    int updateByPrimaryKeySelective(Department record);
+
+    int updateByPrimaryKey(Department record);
+
+    List<Department> findAll(@Param("departmentName") String departmentName);
+
+    int count(String departmentId);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.Group_company;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface Group_companyMapper {
+    int deleteByPrimaryKey(String groupId);
+
+    int insert(Group_company record);
+
+    int insertSelective(Group_company record);
+
+    Group_company selectByPrimaryKey(String groupId);
+
+    int updateByPrimaryKeySelective(Group_company record);
+
+    int updateByPrimaryKey(Group_company record);
+
+    List<Group_company> findAll(@Param("groupName") String groupName);
+}

@@ -2,6 +2,7 @@ package com.tianbo.warehouse.dao;
 
 
 import com.tianbo.warehouse.model.LOG;
 import com.tianbo.warehouse.model.LOG;
 import com.tianbo.warehouse.model.LOGWithBLOBs;
 import com.tianbo.warehouse.model.LOGWithBLOBs;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -14,7 +15,7 @@ public interface LOGMapper {
 
 
     LOGWithBLOBs selectByPrimaryKey(Integer logid);
     LOGWithBLOBs selectByPrimaryKey(Integer logid);
 
 
-    List<LOGWithBLOBs> selectAll();
+    List<LOGWithBLOBs> selectAll(@Param("username") String username, @Param("modelnamecn") String modelnamecn);
 
 
     int updateByPrimaryKeySelective(LOGWithBLOBs record);
     int updateByPrimaryKeySelective(LOGWithBLOBs record);
 
 

 package com.tianbo.warehouse.dao;
 package com.tianbo.warehouse.dao;
 
 
 import com.tianbo.warehouse.model.PERMISSION;
 import com.tianbo.warehouse.model.PERMISSION;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.List;
@@ -18,7 +19,7 @@ public interface PERMISSIONMapper {
 
 
     int updateByPrimaryKey(PERMISSION record);
     int updateByPrimaryKey(PERMISSION record);
 
 
-    List<PERMISSION> findAll();
+    List<PERMISSION> findAll(@Param("name") String name);
 
 
     List<PERMISSION> getAllMenus();
     List<PERMISSION> getAllMenus();
 
 

 package com.tianbo.warehouse.dao;
 package com.tianbo.warehouse.dao;
 
 
-import com.tianbo.warehouse.model.PERMISSION;
 import com.tianbo.warehouse.model.ROLE;
 import com.tianbo.warehouse.model.ROLE;
+import org.apache.ibatis.annotations.Param;
 
 
-import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 
 
 public interface ROLEMapper {
 public interface ROLEMapper {
     int deleteByPrimaryKey(Integer roleId);
     int deleteByPrimaryKey(Integer roleId);
@@ -17,13 +14,11 @@ public interface ROLEMapper {
 
 
     ROLE selectByPrimaryKey(Integer roleId);
     ROLE selectByPrimaryKey(Integer roleId);
 
 
-    int updateByPrimaryKeySelective(ROLE record);
-
-    int updateByPrimaryKey(ROLE record);
-
     List<ROLE> findRolesByUserId(Integer userId);
     List<ROLE> findRolesByUserId(Integer userId);
 
 
-    List<ROLE> findAll();
+    List<ROLE> findAll(@Param("roleName") String roleName);
 
 
+    int updateByPrimaryKeySelective(ROLE record);
 
 
+    int updateByPrimaryKey(ROLE record);
 }
 }

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StaffApartmentComeCarMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(StaffApartmentComeCar record);
+
+    int insertSelective(StaffApartmentComeCar record);
+
+    StaffApartmentComeCar selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(StaffApartmentComeCar record);
+
+    int updateByPrimaryKey(StaffApartmentComeCar record);
+
+    List<StaffApartmentComeCar> findAll(@Param("comeToVisitName") String comeToVisitName);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.StaffApartmentMaintain;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StaffApartmentMaintainMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(StaffApartmentMaintain record);
+
+    int insertSelective(StaffApartmentMaintain record);
+
+    StaffApartmentMaintain selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(StaffApartmentMaintain record);
+
+    int updateByPrimaryKey(StaffApartmentMaintain record);
+
+    List<StaffApartmentMaintain> findAll(@Param("repairsname") String repairsname);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.StaffApartmentOnduty;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StaffApartmentOndutyMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(StaffApartmentOnduty record);
+
+    int insertSelective(StaffApartmentOnduty record);
+
+    StaffApartmentOnduty selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(StaffApartmentOnduty record);
+
+    int updateByPrimaryKey(StaffApartmentOnduty record);
+
+    List<StaffApartmentOnduty> findAll(@Param("warchkeeper") String warchkeeper);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.StaffApartmentSpareKey;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StaffApartmentSpareKeyMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(StaffApartmentSpareKey record);
+
+    int insertSelective(StaffApartmentSpareKey record);
+
+    StaffApartmentSpareKey selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(StaffApartmentSpareKey record);
+
+    int updateByPrimaryKey(StaffApartmentSpareKey record);
+
+    List<StaffApartmentSpareKey> findAll(@Param("staffname") String staffname);
+}

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.StaffSecurityInspection;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface StaffSecurityInspectionMapper {
+    int deleteByPrimaryKey(String securityInspectionId);
+
+    int insert(StaffSecurityInspection record);
+
+    int insertSelective(StaffSecurityInspection record);
+
+    StaffSecurityInspection selectByPrimaryKey(String securityInspectionId);
+
+    int updateByPrimaryKeySelective(StaffSecurityInspection record);
+
+    int updateByPrimaryKey(StaffSecurityInspection record);
+
+    List<StaffSecurityInspection>findAll(@Param("securityInspectionName") String securityInspectionName);
+}

 package com.tianbo.warehouse.dao;
 package com.tianbo.warehouse.dao;
 
 
 import com.tianbo.warehouse.model.USERS;
 import com.tianbo.warehouse.model.USERS;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -19,5 +20,5 @@ public interface USERSMapper {
 
 
     List<USERS> selectByUsername(String userName);
     List<USERS> selectByUsername(String userName);
 
 
-    List<USERS> selectAllUser(USERS record);
+    List<USERS> selectAllUser(USERS users);
 }
 }

+package com.tianbo.warehouse.dao;
+
+import com.tianbo.warehouse.model.WaterStationsPatrol;
+
+import java.util.List;
+
+public interface WaterStationsPatrolMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(WaterStationsPatrol record);
+
+    int insertSelective(WaterStationsPatrol record);
+
+    WaterStationsPatrol selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(WaterStationsPatrol record);
+
+    int updateByPrimaryKey(WaterStationsPatrol record);
+
+    List<WaterStationsPatrol> findAll();
+}

-package com.tianbo.warehouse.imf;
-
-import com.caac.imf.api.IMFClient;
-import com.tianbo.warehouse.imf.handle.IMFSaveHandle;
-import com.tianbo.warehouse.imf.schedul.IMF_Task;
-import org.apache.log4j.Logger;
-
-public class IMF_Reader extends Thread{
-    protected static final Logger logger = Logger.getLogger(IMF_Reader.class);
-    private IMFClient client;
-    public static  boolean isrunning;
-
-    public IMF_Reader(IMFClient client) {
-        this.client = client;
-    }
-
-    @Override
-    public void run() {
-        try{
-            isrunning =true;
-            while(true) {
-                if (IMF_Task.LOGIN_OK) {
-                        String message = this.client.getMSG();
-                        if (message != null) {
-                            IMFSaveHandle imfSaveHandle = new IMFSaveHandle();
-                            imfSaveHandle.handle(message);
-                        }
-
-                } else {
-                    //logger.info("***");
-                }
-
-                try {
-                    Thread.sleep(500L);
-                } catch (InterruptedException var3) {
-                    var3.printStackTrace();
-
-                }
-            }
-
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        isrunning=false;
-        logger.info("****************读取线程不在了****************");
-    }
-}

-package com.tianbo.warehouse.imf;
-
-import com.caac.imf.api.IMFClient;
-import com.tianbo.warehouse.imf.schedul.IMF_Task;
-import com.tianbo.warehouse.util.Date.DateUtil;
-import com.tianbo.warehouse.util.IO.FileTool;
-import com.tianbo.warehouse.util.XML.MakeImfMeta;
-import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
-
-import java.io.*;
-import java.util.Iterator;
-import java.util.List;
-
-public class IMF_Sender extends Thread{
-
-    protected static final Logger logger = Logger.getLogger(IMF_Sender.class);
-    public static  boolean isrunning;
-    private IMFClient client;
-    private String content;
-
-    public IMF_Sender(IMFClient client) {
-        this.client = client;
-    }
-    public IMF_Sender(IMFClient client, String content) {
-        this.client = client;
-        this.content = content;
-    }
-
-    @Override
-    public void run(){
-
-            String sendDir   = FileTool.readProperties("readDirectory");
-            String SNDR = FileTool.readProperties("loginname");
-            String TYPE =  FileTool.readProperties("TYPE");
-            String STYP =  FileTool.readProperties("STYP");
-            String RCVR =  FileTool.readProperties("RCVR");
-            String DDTM = DateUtil.getDDTM();
-            String SEQN = DDTM;
-
-            if (this.client == null) {
-                logger.info("IMFClient has been closed");
-                return;
-            }
-            isrunning=true;
-            if(IMF_Task.isSuc){
-                if(IMF_Task.LOGIN_OK){
-                    while (true){
-                        //发送报文
-                        List<File> files = FileTool.readDirectoryFiles(new File(sendDir));
-                        String sendMsg = "";
-                        Iterator<File> it = files.iterator();
-                        while(it.hasNext()){
-                            File file = it.next();
-                            try {
-                                sendMsg = MakeImfMeta.makeImfDocument(SNDR,RCVR,TYPE,STYP,DDTM,SEQN,file);
-                                String returnMsg = this.client.sendMSG(sendMsg);
-                                if(returnMsg.indexOf("<CODE>9</CODE>")>=0){
-                                    FileUtils.forceDelete(file);
-                                }
-                            }catch (Exception e){
-                                e.printStackTrace();
-                            }
-                        }
-
-                        try {
-                            Thread.sleep(500L);
-                        } catch (InterruptedException var3) {
-                            var3.printStackTrace();
-                        }
-                    }
-                }else{
-                    logger.info("<<<<<<<<<<<登陆中>>>>>>>>>>>>");
-                }
-            }
-
-
-
-        isrunning=false;
-        logger.info("<<<<<<<<<<<发送线程结束>>>>>>>>>>>>");
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-}

-package com.tianbo.warehouse.imf.handle;
-
-import com.tianbo.warehouse.model.T_ETL_MESSAGE;
-import com.tianbo.warehouse.service.T_ETL_MESSAGEService;
-
-import com.tianbo.warehouse.util.Date.DateUtil;
-import com.tianbo.warehouse.util.IO.FileTool;
-import com.tianbo.warehouse.util.XML.XML2ENTITY;
-import org.apache.log4j.Logger;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 存储IMF过来的原始报文到数据仓库T_ELT_MESSAGE原始报文表中
- */
-@Component
-public class IMFSaveHandle {
-
-    @Autowired
-    protected T_ETL_MESSAGEService messageService;
-
-    private static IMFSaveHandle saveHandle;
-
-    protected static final Logger logger = Logger.getLogger(IMFSaveHandle.class);
-
-    @PostConstruct
-    public  void  init(){
-        saveHandle = this;
-        saveHandle.messageService = this.messageService;
-    }
-
-    public void handle(String xmlmessage){
-        try {
-            //有人发报文头部不按规范发
-//            xmlmessage = xmlmessage.replace("<Msg>","<MSG>")
-//                    .replace("<msg>","<MSG>")
-//                    .replace("</Msg>","</MSG>")
-//                    .replace("</msg>","</MSG>");
-
-
-            Document document = DocumentHelper.parseText(xmlmessage);
-            XML2ENTITY xml2ENTITY =new  XML2ENTITY();
-            Map xmlMap = xml2ENTITY.Dom2Map(document);
-
-            Map meta = (Map) xmlMap.get("META");
-
-            T_ETL_MESSAGE message = new T_ETL_MESSAGE();
-
-            String sndrm = meta.get("SNDR").toString();
-            String stypm = meta.get("STYP").toString();
-
-
-
-            if ("TXD".equals(sndrm)){
-                //读取配置文件的需要本地存储报文的节点
-                String saveStyp= FileTool.readProperties("saveStyp");
-                String[]  styps = saveStyp.split(",");
-                for (String item: styps) {
-                    if (item.equals(stypm)){
-                        //存储至备份目录
-                        FileTool.writeFileToBak(xmlmessage);
-                    }
-                }
-            }
-
-            String typem = meta.get("TYPE").toString();
-            String rcvr =  XML2ENTITY.getMap(meta,"RCVR").toString();
-            String ddtm =  meta.get("DDTM").toString();
-            String seqn =  meta.get("SEQN").toString();
-
-
-
-
-            message.setSndr(sndrm);
-            message.setRcvr(rcvr);
-            message.setType(typem);
-            message.setStyp(stypm);
-            message.setSeqn(seqn);
-
-
-            Date ddtmDate = DateUtil.formatByyyyyMMddHHmmss(ddtm);
-            message.setDdtm(ddtmDate);
-            message.setSntm(ddtmDate);
-            message.setOper("ALL");
-            message.setAppid("W");
-            message.setEtltim(new Date());
-
-
-
-            message.setContent(xmlmessage);
-
-            int i = saveHandle.messageService.insertSelective(message);
-        }catch (Exception e){
-            FileTool.writeFile("err",e.toString()+"\n"+xmlmessage,false);
-            logger.warn("*报文入库失败已存储成备份文件*");
-            logger.error(e);
-            logger.warn(e);
-        }
-
-
-
-    }
-}

-package com.tianbo.warehouse.imf.schedul;
-
-import com.caac.imf.api.IMFClient;
-import com.caac.imf.api.IMFClientFactory;
-import com.tianbo.warehouse.imf.IMF_Reader;
-import com.tianbo.warehouse.imf.IMF_Sender;
-import com.tianbo.warehouse.util.IO.FileTool;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-
-@Component
-public class IMF_Task {
-    protected static final Logger logger = Logger.getLogger(IMF_Task.class);
-    private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-    public static boolean LOGIN_OK = false;
-    public static boolean isSuc = true;
-    public static IMFClient client = null;
-    public static String loginname;
-    public static String loginpass;
-    public static String isNeedSend = "N";
-
-
-//    @Scheduled(fixedRate = 5000)
-    private static void start() throws Exception {
-        PropertyConfigurator.configure("config/log4j.properties");
-        client = IMFClientFactory.createInstance();
-        loginname= FileTool.readProperties("loginname");
-        loginpass= FileTool.readProperties("loginpass");
-        isNeedSend= FileTool.readProperties("isNeedSend");
-
-
-        //登录
-        if (!LOGIN_OK) {
-            loginIMF(client, loginname, loginpass, "config/imf_config.properties");
-        }
-
-        //启动读取线程
-        if (client != null) {
-            IMF_Reader reader = new IMF_Reader(client);
-
-            if (!IMF_Reader.isrunning) {
-                reader.start();
-                logger.info("*********读取线程已开启***********");
-            } else {
-                //                    logger.info("*********读取线程已开启-不再启动线程*********");
-            }
-
-            if("Y".equals(isNeedSend)){
-                IMF_Sender kako_sender = new IMF_Sender(client);
-                if(!IMF_Sender.isrunning) {
-                    kako_sender.start();
-                }
-            }
-
-        }
-
-    }
-
-    public void sendMsg(String msg){
-        if (!msg.equals(null) && !msg.isEmpty()){
-            if(LOGIN_OK){
-                IMF_Sender sender = new IMF_Sender(client,msg);
-                sender.setContent(msg);
-                sender.start();
-            }
-
-        }
-
-    }
-
-    private static void loginIMF(IMFClient client, String userName, String password, String confFileName) {
-        if (client.initial(confFileName)) {
-            String message = client.login(userName, password);
-            logger.info("message=" + message);
-            if (message.indexOf("<CODE>1</CODE>") > 0) {
-                logger.info("登陆成功");
-                LOGIN_OK = true;
-            } else {
-                int times = 0;
-
-                while(times <= 3) {
-                    logger.info("try connection...");
-                    ++times;
-                    logger.info("message.=" + message);
-                    if (message.indexOf("<CODE>1</CODE>") > 0) {
-                        logger.info("登陆成功");
-                        LOGIN_OK = true;
-                        break;
-                    }
-
-                    logger.info("登录失败~~~~");
-                    message = client.login(userName, password);
-
-                    try {
-                        Thread.sleep(4000L);
-                    } catch (InterruptedException var7) {
-                        var7.printStackTrace();
-                    }
-                }
-
-                if (!LOGIN_OK) {
-                    logger.info("多次尝试登录失败，退出登陆");
-                    client.disconnect();
-                    isSuc =false;
-                    System.exit(-1);
-                }
-            }
-        }
-
-    }
-
-}

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class Company {
+    private String companyId;
+
+    private String companyName;
+
+    private String groupId;
+
+    private Date creatTime;
+
+    private String companyStatus;
+
+    private String groupName;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId == null ? null : companyId.trim();
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName == null ? null : companyName.trim();
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public String getCompanyStatus() {
+        return companyStatus;
+    }
+
+    public void setCompanyStatus(String companyStatus) {
+        this.companyStatus = companyStatus == null ? null : companyStatus.trim();
+    }
+}

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class Department {
+    private String departmentId;
+
+    private String departmentName;
+
+    private Date creatTime;
+
+    private String companyId;
+
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId == null ? null : departmentId.trim();
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName == null ? null : departmentName.trim();
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId == null ? null : companyId.trim();
+    }
+}

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class Group_company {
+    private String groupId;
+
+    private String groupName;
+
+    private Date creatTime;
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName == null ? null : groupName.trim();
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+}

@@ -61,8 +61,8 @@ public class PERMISSION {
         return ismenu;
         return ismenu;
     }
     }
 
 
-    public void setIsmenu(Boolean ismenu) {
-        this.ismenu = ismenu;
+    public void setIsmenu(String ismenu) {
+        this.ismenu = "0".equals(ismenu)?false:true ;
     }
     }
 
 
     public Integer getParentId() {
     public Integer getParentId() {

@@ -5,6 +5,7 @@ import org.springframework.security.core.GrantedAuthority;
 import java.util.List;
 import java.util.List;
 
 
 public class ROLE implements GrantedAuthority {
 public class ROLE implements GrantedAuthority {
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     private Integer roleId;
     private Integer roleId;
@@ -15,8 +16,20 @@ public class ROLE implements GrantedAuthority {
 
 
     private String description;
     private String description;
 
 
+    private String departmentId;
+
+    private String departmentName;
+
     private List<PERMISSION> permissions;
     private List<PERMISSION> permissions;
 
 
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
     public Integer getRoleId() {
     public Integer getRoleId() {
         return roleId;
         return roleId;
     }
     }
@@ -49,6 +62,14 @@ public class ROLE implements GrantedAuthority {
         this.description = description == null ? null : description.trim();
         this.description = description == null ? null : description.trim();
     }
     }
 
 
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId == null ? null : departmentId.trim();
+    }
+
     public List<PERMISSION> getPermissions() {
     public List<PERMISSION> getPermissions() {
         return permissions;
         return permissions;
     }
     }

+package com.tianbo.warehouse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class StaffApartmentComeCar {
+    private String id;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date datetime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date cometovisitdate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date leavedate;
+
+    private String cometovisitname;
+
+    private String carnumber;
+
+    private String phone;
+
+    private String comematter;
+
+    private String warchkeeper;
+
+    private String remark1;
+
+    private String remark2;
+
+    private String remark3;
+
+    private Integer userid;
+
+    private Date createtime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public Date getDatetime() {
+        return datetime;
+    }
+
+    public void setDatetime(Date datetime) {
+        this.datetime = datetime;
+    }
+
+    public Date getCometovisitdate() {
+        return cometovisitdate;
+    }
+
+    public void setCometovisitdate(Date cometovisitdate) {
+        this.cometovisitdate = cometovisitdate;
+    }
+
+    public Date getLeavedate() {
+        return leavedate;
+    }
+
+    public void setLeavedate(Date leavedate) {
+        this.leavedate = leavedate;
+    }
+
+    public String getCometovisitname() {
+        return cometovisitname;
+    }
+
+    public void setCometovisitname(String cometovisitname) {
+        this.cometovisitname = cometovisitname == null ? null : cometovisitname.trim();
+    }
+
+    public String getCarnumber() {
+        return carnumber;
+    }
+
+    public void setCarnumber(String carnumber) {
+        this.carnumber = carnumber == null ? null : carnumber.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public String getComematter() {
+        return comematter;
+    }
+
+    public void setComematter(String comematter) {
+        this.comematter = comematter == null ? null : comematter.trim();
+    }
+
+    public String getWarchkeeper() {
+        return warchkeeper;
+    }
+
+    public void setWarchkeeper(String warchkeeper) {
+        this.warchkeeper = warchkeeper == null ? null : warchkeeper.trim();
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1 == null ? null : remark1.trim();
+    }
+
+    public String getRemark2() {
+        return remark2;
+    }
+
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2 == null ? null : remark2.trim();
+    }
+
+    public String getRemark3() {
+        return remark3;
+    }
+
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3 == null ? null : remark3.trim();
+    }
+
+    public Integer getUserid() {
+        return userid;
+    }
+
+    public void setUserid(Integer userid) {
+        this.userid = userid;
+    }
+
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+}

+package com.tianbo.warehouse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class StaffApartmentMaintain {
+    private String id;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date repairsdate;
+
+    private String repairscontent;
+
+    private String reflectway;
+
+    private String repairsdept;
+
+    private String answerthephonename;
+
+    private String repairsname;
+
+    private String repairsphone;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date maintaindate;
+
+    private String maintaincase;
+
+    private String cooperatemaintainname;
+
+    private Integer meno;
+
+    private String remark1;
+
+    private String remark2;
+
+    private String remark3;
+
+    private Integer createby;
+
+    private Date createtime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public Date getRepairsdate() {
+        return repairsdate;
+    }
+
+    public void setRepairsdate(Date repairsdate) {
+        this.repairsdate = repairsdate;
+    }
+
+    public String getRepairscontent() {
+        return repairscontent;
+    }
+
+    public void setRepairscontent(String repairscontent) {
+        this.repairscontent = repairscontent == null ? null : repairscontent.trim();
+    }
+
+    public String getReflectway() {
+        return reflectway;
+    }
+
+    public void setReflectway(String reflectway) {
+        this.reflectway = reflectway == null ? null : reflectway.trim();
+    }
+
+    public String getRepairsdept() {
+        return repairsdept;
+    }
+
+    public void setRepairsdept(String repairsdept) {
+        this.repairsdept = repairsdept == null ? null : repairsdept.trim();
+    }
+
+    public String getAnswerthephonename() {
+        return answerthephonename;
+    }
+
+    public void setAnswerthephonename(String answerthephonename) {
+        this.answerthephonename = answerthephonename == null ? null : answerthephonename.trim();
+    }
+
+    public String getRepairsname() {
+        return repairsname;
+    }
+
+    public void setRepairsname(String repairsname) {
+        this.repairsname = repairsname == null ? null : repairsname.trim();
+    }
+
+    public String getRepairsphone() {
+        return repairsphone;
+    }
+
+    public void setRepairsphone(String repairsphone) {
+        this.repairsphone = repairsphone == null ? null : repairsphone.trim();
+    }
+
+    public Date getMaintaindate() {
+        return maintaindate;
+    }
+
+    public void setMaintaindate(Date maintaindate) {
+        this.maintaindate = maintaindate;
+    }
+
+    public String getMaintaincase() {
+        return maintaincase;
+    }
+
+    public void setMaintaincase(String maintaincase) {
+        this.maintaincase = maintaincase == null ? null : maintaincase.trim();
+    }
+
+    public String getCooperatemaintainname() {
+        return cooperatemaintainname;
+    }
+
+    public void setCooperatemaintainname(String cooperatemaintainname) {
+        this.cooperatemaintainname = cooperatemaintainname == null ? null : cooperatemaintainname.trim();
+    }
+
+    public Integer getMeno() {
+        return meno;
+    }
+
+    public void setMeno(Integer meno) {
+        this.meno = meno;
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1 == null ? null : remark1.trim();
+    }
+
+    public String getRemark2() {
+        return remark2;
+    }
+
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2 == null ? null : remark2.trim();
+    }
+
+    public String getRemark3() {
+        return remark3;
+    }
+
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3 == null ? null : remark3.trim();
+    }
+
+    public Integer getCreateby() {
+        return createby;
+    }
+
+    public void setCreateby(Integer createby) {
+        this.createby = createby;
+    }
+
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+}

+package com.tianbo.warehouse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class StaffApartmentOnduty {
+    private String id;
+
+    private String warchkeeper;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date handovershifttime;
+
+    private String publiclighting;
+
+    private String carpark;
+
+    private String campusafforestation;
+
+    private String firefightingequipment;
+
+    private String equipmentfacilities;
+
+    private String publicsanitation;
+
+    private String property;
+
+    private String securitydanger;
+
+    private String rests;
+
+    private String handovermatters;
+
+    private Date creatime;
+
+    private Integer userid;
+
+    private String remberk1;
+
+    private String remberk2;
+
+    private String remberk3;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getWarchkeeper() {
+        return warchkeeper;
+    }
+
+    public void setWarchkeeper(String warchkeeper) {
+        this.warchkeeper = warchkeeper == null ? null : warchkeeper.trim();
+    }
+
+    public Date getHandovershifttime() {
+        return handovershifttime;
+    }
+
+    public void setHandovershifttime(Date handovershifttime) {
+        this.handovershifttime = handovershifttime;
+    }
+
+    public String getPubliclighting() {
+        return publiclighting;
+    }
+
+    public void setPubliclighting(String publiclighting) {
+        this.publiclighting = publiclighting == null ? null : publiclighting.trim();
+    }
+
+    public String getCarpark() {
+        return carpark;
+    }
+
+    public void setCarpark(String carpark) {
+        this.carpark = carpark == null ? null : carpark.trim();
+    }
+
+    public String getCampusafforestation() {
+        return campusafforestation;
+    }
+
+    public void setCampusafforestation(String campusafforestation) {
+        this.campusafforestation = campusafforestation == null ? null : campusafforestation.trim();
+    }
+
+    public String getFirefightingequipment() {
+        return firefightingequipment;
+    }
+
+    public void setFirefightingequipment(String firefightingequipment) {
+        this.firefightingequipment = firefightingequipment == null ? null : firefightingequipment.trim();
+    }
+
+    public String getEquipmentfacilities() {
+        return equipmentfacilities;
+    }
+
+    public void setEquipmentfacilities(String equipmentfacilities) {
+        this.equipmentfacilities = equipmentfacilities == null ? null : equipmentfacilities.trim();
+    }
+
+    public String getPublicsanitation() {
+        return publicsanitation;
+    }
+
+    public void setPublicsanitation(String publicsanitation) {
+        this.publicsanitation = publicsanitation == null ? null : publicsanitation.trim();
+    }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property == null ? null : property.trim();
+    }
+
+    public String getSecuritydanger() {
+        return securitydanger;
+    }
+
+    public void setSecuritydanger(String securitydanger) {
+        this.securitydanger = securitydanger == null ? null : securitydanger.trim();
+    }
+
+    public String getRests() {
+        return rests;
+    }
+
+    public void setRests(String rests) {
+        this.rests = rests == null ? null : rests.trim();
+    }
+
+    public String getHandovermatters() {
+        return handovermatters;
+    }
+
+    public void setHandovermatters(String handovermatters) {
+        this.handovermatters = handovermatters == null ? null : handovermatters.trim();
+    }
+
+    public Date getCreatime() {
+        return creatime;
+    }
+
+    public void setCreatime(Date creatime) {
+        this.creatime = creatime;
+    }
+
+    public Integer getUserid() {
+        return userid;
+    }
+
+    public void setUserid(Integer userid) {
+        this.userid = userid;
+    }
+
+    public String getRemberk1() {
+        return remberk1;
+    }
+
+    public void setRemberk1(String remberk1) {
+        this.remberk1 = remberk1 == null ? null : remberk1.trim();
+    }
+
+    public String getRemberk2() {
+        return remberk2;
+    }
+
+    public void setRemberk2(String remberk2) {
+        this.remberk2 = remberk2 == null ? null : remberk2.trim();
+    }
+
+    public String getRemberk3() {
+        return remberk3;
+    }
+
+    public void setRemberk3(String remberk3) {
+        this.remberk3 = remberk3 == null ? null : remberk3.trim();
+    }
+}

+package com.tianbo.warehouse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class StaffApartmentSpareKey {
+    private String id;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date usedate;
+
+    private String roomnum;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date usetime;
+
+    private String staffname;
+
+    private String dept;
+
+    private String phone;
+
+    private String ictype;
+
+    private String iccard;
+
+    private String roomduty;
+
+    private String remark1;
+
+    private String remark2;
+
+    private String remark3;
+
+    private Integer createby;
+
+    private Date createtime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public Date getUsedate() {
+        return usedate;
+    }
+
+    public void setUsedate(Date usedate) {
+        this.usedate = usedate;
+    }
+
+    public String getRoomnum() {
+        return roomnum;
+    }
+
+    public void setRoomnum(String roomnum) {
+        this.roomnum = roomnum == null ? null : roomnum.trim();
+    }
+
+    public Date getUsetime() {
+        return usetime;
+    }
+
+    public void setUsetime(Date usetime) {
+        this.usetime = usetime;
+    }
+
+    public String getStaffname() {
+        return staffname;
+    }
+
+    public void setStaffname(String staffname) {
+        this.staffname = staffname == null ? null : staffname.trim();
+    }
+
+    public String getDept() {
+        return dept;
+    }
+
+    public void setDept(String dept) {
+        this.dept = dept == null ? null : dept.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public String getIctype() {
+        return ictype;
+    }
+
+    public void setIctype(String ictype) {
+        this.ictype = ictype == null ? null : ictype.trim();
+    }
+
+    public String getIccard() {
+        return iccard;
+    }
+
+    public void setIccard(String iccard) {
+        this.iccard = iccard == null ? null : iccard.trim();
+    }
+
+    public String getRoomduty() {
+        return roomduty;
+    }
+
+    public void setRoomduty(String roomduty) {
+        this.roomduty = roomduty == null ? null : roomduty.trim();
+    }
+
+    public String getRemark1() {
+        return remark1;
+    }
+
+    public void setRemark1(String remark1) {
+        this.remark1 = remark1 == null ? null : remark1.trim();
+    }
+
+    public String getRemark2() {
+        return remark2;
+    }
+
+    public void setRemark2(String remark2) {
+        this.remark2 = remark2 == null ? null : remark2.trim();
+    }
+
+    public String getRemark3() {
+        return remark3;
+    }
+
+    public void setRemark3(String remark3) {
+        this.remark3 = remark3 == null ? null : remark3.trim();
+    }
+
+    public Integer getCreateby() {
+        return createby;
+    }
+
+    public void setCreateby(Integer createby) {
+        this.createby = createby;
+    }
+
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+}

+package com.tianbo.warehouse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class StaffSecurityInspection {
+    private String securityInspectionId;
+
+    private String securityInspectionName;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date securityInspectionDate;
+
+    private String fireName;
+
+    private String securityElectro;
+
+    private String fireproofing;
+
+    private String doubtfulPerson;
+
+    private String violationsCar;
+
+    private String builders;
+
+    private String otherSituations;
+
+    private Integer userId;
+
+    private String realname;
+
+    private Date optTime;
+
+    public String getSecurityInspectionId() {
+        return securityInspectionId;
+    }
+
+    public void setSecurityInspectionId(String securityInspectionId) {
+        this.securityInspectionId = securityInspectionId == null ? null : securityInspectionId.trim();
+    }
+
+    public String getSecurityInspectionName() {
+        return securityInspectionName;
+    }
+
+    public void setSecurityInspectionName(String securityInspectionName) {
+        this.securityInspectionName = securityInspectionName == null ? null : securityInspectionName.trim();
+    }
+
+    public Date getSecurityInspectionDate() {
+        return securityInspectionDate;
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+    public void setSecurityInspectionDate(Date securityInspectionDate) {
+        this.securityInspectionDate = securityInspectionDate;
+    }
+
+    public String getFireName() {
+        return fireName;
+    }
+
+    public void setFireName(String fireName) {
+        this.fireName = fireName == null ? null : fireName.trim();
+    }
+
+    public String getSecurityElectro() {
+        return securityElectro;
+    }
+
+    public void setSecurityElectro(String securityElectro) {
+        this.securityElectro = securityElectro == null ? null : securityElectro.trim();
+    }
+
+    public String getFireproofing() {
+        return fireproofing;
+    }
+
+    public void setFireproofing(String fireproofing) {
+        this.fireproofing = fireproofing == null ? null : fireproofing.trim();
+    }
+
+    public String getDoubtfulPerson() {
+        return doubtfulPerson;
+    }
+
+    public void setDoubtfulPerson(String doubtfulPerson) {
+        this.doubtfulPerson = doubtfulPerson == null ? null : doubtfulPerson.trim();
+    }
+
+    public String getViolationsCar() {
+        return violationsCar;
+    }
+
+    public void setViolationsCar(String violationsCar) {
+        this.violationsCar = violationsCar == null ? null : violationsCar.trim();
+    }
+
+    public String getBuilders() {
+        return builders;
+    }
+
+    public void setBuilders(String builders) {
+        this.builders = builders == null ? null : builders.trim();
+    }
+
+    public String getOtherSituations() {
+        return otherSituations;
+    }
+
+    public void setOtherSituations(String otherSituations) {
+        this.otherSituations = otherSituations == null ? null : otherSituations.trim();
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getRealname() {
+        return realname;
+    }
+
+    public void setRealname(String realname) {
+        this.realname = realname == null ? null : realname.trim();
+    }
+
+    public Date getOptTime() {
+        return optTime;
+    }
+
+    public void setOptTime(Date optTime) {
+        this.optTime = optTime;
+    }
+}

@@ -39,7 +39,7 @@ public class USERS implements UserDetails {
 
 
     private Boolean state;
     private Boolean state;
 
 
-    @Length(min = 11, max = 11, message = "mobilephone 长度必须为11位")
+//    @Length(min = 11, max = 11, message = "mobilephone 长度必须为11位")
     private String mobilephone;
     private String mobilephone;
 
 
     private Date creattime;
     private Date creattime;
@@ -49,7 +49,7 @@ public class USERS implements UserDetails {
     private String userface;
     private String userface;
 
 
     private String realname;
     private String realname;
-    @Pattern(regexp="[a-za-z0-9._%+-]+@[a-za-z0-9.-]+\\.[a-za-z]{2,4}", message="邮件格式错误")
+//    @Pattern(regexp="[a-za-z0-9._%+-]+@[a-za-z0-9.-]+\\.[a-za-z]{2,4}", message="邮件格式错误")
     private String email;
     private String email;
 
 
     private Integer age;
     private Integer age;

+package com.tianbo.warehouse.model;
+
+import java.util.Date;
+
+public class WaterStationsPatrol {
+    private String id;
+
+    private String checkprojectcontrolrommwatersupplysystem;
+
+    private String checkprojectcontrolrommsecuritysystem;
+
+    private String checkprojectcontrolrommrunningrecord;
+
+    private String checkprojectcontrolrommdocumentholder;
+
+    private String checkprojectcontrolrommground;
+
+    private String checkprojectcontrolrommresponsibleperson;
+
+    private String checkprojectcontrolrommnote;
+
+    private String checkprojectfrequencyconversionshow;
+
+    private String checkprojectfrequencyconversionclose;
+
+    private String checkprojectfrequencyconversionsanitation;
+
+    private String checkprojectfrequencyconversionresponsibleperson;
+
+    private String checkprojectfrequencyconversionnote;
+
+    private String checkprojectmeterbetweenturbidityinstrumentpowersupply;
+
+    private String checkprojectmeterbetweenturbidityinstrumentshow;
+
+    private String checkprojectmeterbetweenturbidityinstrumentappearance;
+
+    private String checkprojectmeterbetweenturbidityinstrumentrange;
+
+    private String checkprojectmeterbetweenturbidityinstrumentdetection;
+
+    private String checkprojectmeterbetweenturbidityinstrumentresponsibleperson;
+
+    private String checkprojectmeterbetweenturbidityinstrumentnote;
+
+    private String checkprojectmeterbetweenflowmeterpowersupply;
+
+    private String checkprojectmeterbetweenflowmetershow;
+
+    private String checkprojectmeterbetweenflowmeterappearance;
+
+    private String checkprojectmeterbetweenflowmeterresponsibleperson;
+
+    private String checkprojectmeterbetweenflowmeternote;
+
+    private String residualchlorineinstrumentpipeline;
+
+    private String residualchlorineinstrumentpowersupply;
+
+    private String residualchlorineinstrumentshow;
+
+    private String residualchlorineinstrumentappearance;
+
+    private String residualchlorineinstrumentpipelinmakewater;
+
+    private String residualchlorineinstrumentequipment;
+
+    private String residualchlorineinstrumentgroundsanitation;
+
+    private String residualchlorineinstrumentresponsibleperson;
+
+    private String residualchlorineinstrumentnote;
+
+    private String boosterpumproomwaterpump;
+
+    private String boosterpumproombearing;
+
+    private String boosterpumproomthevalue;
+
+    private String boosterpumproompumpbody;
+
+    private String boosterpumproomnameplate;
+
+    private String boosterpumproompacking;
+
+    private String boosterpumproomshow;
+
+    private String boosterpumproomfan;
+
+    private String boosterpumproomdrainage;
+
+    private String boosterpumproomsanitation;
+
+    private String boosterpumproomresponsibleperson;
+
+    private String boosterpumproomnote;
+
+    private String clearwaterreserviorsstairs;
+
+    private String clearwaterreserviorsvent;
+
+    private String clearwaterreserviorspoolroof;
+
+    private String clearwaterreserviorssanitation;
+
+    private String clearwaterreserviorspumpbody;
+
+    private String clearwaterreserviorsresponsibleperson;
+
+    private String clearwaterreserviorsnote;
+
+    private String betweenchlorineequipment;
+
+    private String betweenchlorinepipe;
+
+    private String betweenchlorinedosingpump;
+
+    private String betweenchlorinetraffic;
+
+    private String betweenchlorinefan;
+
+    private String betweenchlorinesanitation;
+
+    private String betweenchlorineresponsibleperson;
+
+    private String betweenchlorinenote;
+
+    private String groundenvironmentwelllids;
+
+    private String groundenvironmentdrainagen;
+
+    private String groundenvironmentwatersupply;
+
+    private String groundenvironmentcable;
+
+    private String groundenvironmentroad;
+
+    private String groundenvironmentresponsibleperson;
+
+    private String groundenvironmentnote;
+
+    private String groundsecurityillegal;
+
+    private String groundsecurityfire;
+
+    private String groundsecurityrats;
+
+    private String groundsecuritysuspiciouspersonnel;
+
+    private String groundsecurityresponsibleperson;
+
+    private String groundsecuritynote;
+
+    private String securitytoolemergency;
+
+    private String securitytoolfloodcontroland;
+
+    private String securitytoolprotective;
+
+    private String securitytoolmainteance;
+
+    private String securitytoolresponsibleperson;
+
+    private String securitytoolnote;
+
+    private Integer userid;
+
+    private Date creattime;
+
+    private String reamke1;
+
+    private String reamke2;
+
+    private String reamke3;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getCheckprojectcontrolrommwatersupplysystem() {
+        return checkprojectcontrolrommwatersupplysystem;
+    }
+
+    public void setCheckprojectcontrolrommwatersupplysystem(String checkprojectcontrolrommwatersupplysystem) {
+        this.checkprojectcontrolrommwatersupplysystem = checkprojectcontrolrommwatersupplysystem == null ? null : checkprojectcontrolrommwatersupplysystem.trim();
+    }
+
+    public String getCheckprojectcontrolrommsecuritysystem() {
+        return checkprojectcontrolrommsecuritysystem;
+    }
+
+    public void setCheckprojectcontrolrommsecuritysystem(String checkprojectcontrolrommsecuritysystem) {
+        this.checkprojectcontrolrommsecuritysystem = checkprojectcontrolrommsecuritysystem == null ? null : checkprojectcontrolrommsecuritysystem.trim();
+    }
+
+    public String getCheckprojectcontrolrommrunningrecord() {
+        return checkprojectcontrolrommrunningrecord;
+    }
+
+    public void setCheckprojectcontrolrommrunningrecord(String checkprojectcontrolrommrunningrecord) {
+        this.checkprojectcontrolrommrunningrecord = checkprojectcontrolrommrunningrecord == null ? null : checkprojectcontrolrommrunningrecord.trim();
+    }
+
+    public String getCheckprojectcontrolrommdocumentholder() {
+        return checkprojectcontrolrommdocumentholder;
+    }
+
+    public void setCheckprojectcontrolrommdocumentholder(String checkprojectcontrolrommdocumentholder) {
+        this.checkprojectcontrolrommdocumentholder = checkprojectcontrolrommdocumentholder == null ? null : checkprojectcontrolrommdocumentholder.trim();
+    }
+
+    public String getCheckprojectcontrolrommground() {
+        return checkprojectcontrolrommground;
+    }
+
+    public void setCheckprojectcontrolrommground(String checkprojectcontrolrommground) {
+        this.checkprojectcontrolrommground = checkprojectcontrolrommground == null ? null : checkprojectcontrolrommground.trim();
+    }
+
+    public String getCheckprojectcontrolrommresponsibleperson() {
+        return checkprojectcontrolrommresponsibleperson;
+    }
+
+    public void setCheckprojectcontrolrommresponsibleperson(String checkprojectcontrolrommresponsibleperson) {
+        this.checkprojectcontrolrommresponsibleperson = checkprojectcontrolrommresponsibleperson == null ? null : checkprojectcontrolrommresponsibleperson.trim();
+    }
+
+    public String getCheckprojectcontrolrommnote() {
+        return checkprojectcontrolrommnote;
+    }
+
+    public void setCheckprojectcontrolrommnote(String checkprojectcontrolrommnote) {
+        this.checkprojectcontrolrommnote = checkprojectcontrolrommnote == null ? null : checkprojectcontrolrommnote.trim();
+    }
+
+    public String getCheckprojectfrequencyconversionshow() {
+        return checkprojectfrequencyconversionshow;
+    }
+
+    public void setCheckprojectfrequencyconversionshow(String checkprojectfrequencyconversionshow) {
+        this.checkprojectfrequencyconversionshow = checkprojectfrequencyconversionshow == null ? null : checkprojectfrequencyconversionshow.trim();
+    }
+
+    public String getCheckprojectfrequencyconversionclose() {
+        return checkprojectfrequencyconversionclose;
+    }
+
+    public void setCheckprojectfrequencyconversionclose(String checkprojectfrequencyconversionclose) {
+        this.checkprojectfrequencyconversionclose = checkprojectfrequencyconversionclose == null ? null : checkprojectfrequencyconversionclose.trim();
+    }
+
+    public String getCheckprojectfrequencyconversionsanitation() {
+        return checkprojectfrequencyconversionsanitation;
+    }
+
+    public void setCheckprojectfrequencyconversionsanitation(String checkprojectfrequencyconversionsanitation) {
+        this.checkprojectfrequencyconversionsanitation = checkprojectfrequencyconversionsanitation == null ? null : checkprojectfrequencyconversionsanitation.trim();
+    }
+
+    public String getCheckprojectfrequencyconversionresponsibleperson() {
+        return checkprojectfrequencyconversionresponsibleperson;
+    }
+
+    public void setCheckprojectfrequencyconversionresponsibleperson(String checkprojectfrequencyconversionresponsibleperson) {
+        this.checkprojectfrequencyconversionresponsibleperson = checkprojectfrequencyconversionresponsibleperson == null ? null : checkprojectfrequencyconversionresponsibleperson.trim();
+    }
+
+    public String getCheckprojectfrequencyconversionnote() {
+        return checkprojectfrequencyconversionnote;
+    }
+
+    public void setCheckprojectfrequencyconversionnote(String checkprojectfrequencyconversionnote) {
+        this.checkprojectfrequencyconversionnote = checkprojectfrequencyconversionnote == null ? null : checkprojectfrequencyconversionnote.trim();
+    }
+
+    public String getCheckprojectmeterbetweenturbidityinstrumentpowersupply() {
+        return checkprojectmeterbetweenturbidityinstrumentpowersupply;
+    }
+
+    public void setCheckprojectmeterbetweenturbidityinstrumentpowersupply(String checkprojectmeterbetweenturbidityinstrumentpowersupply) {
+        this.checkprojectmeterbetweenturbidityinstrumentpowersupply = checkprojectmeterbetweenturbidityinstrumentpowersupply == null ? null : checkprojectmeterbetweenturbidityinstrumentpowersupply.trim();
+    }
+
+    public String getCheckprojectmeterbetweenturbidityinstrumentshow() {
+        return checkprojectmeterbetweenturbidityinstrumentshow;
+    }
+
+    public void setCheckprojectmeterbetweenturbidityinstrumentshow(String checkprojectmeterbetweenturbidityinstrumentshow) {
+        this.checkprojectmeterbetweenturbidityinstrumentshow = checkprojectmeterbetweenturbidityinstrumentshow == null ? null : checkprojectmeterbetweenturbidityinstrumentshow.trim();
+    }
+
+    public String getCheckprojectmeterbetweenturbidityinstrumentappearance() {
+        return checkprojectmeterbetweenturbidityinstrumentappearance;
+    }
+
+    public void setCheckprojectmeterbetweenturbidityinstrumentappearance(String checkprojectmeterbetweenturbidityinstrumentappearance) {
+        this.checkprojectmeterbetweenturbidityinstrumentappearance = checkprojectmeterbetweenturbidityinstrumentappearance == null ? null : checkprojectmeterbetweenturbidityinstrumentappearance.trim();
+    }
+
+    public String getCheckprojectmeterbetweenturbidityinstrumentrange() {
+        return checkprojectmeterbetweenturbidityinstrumentrange;
+    }
+
+    public void setCheckprojectmeterbetweenturbidityinstrumentrange(String checkprojectmeterbetweenturbidityinstrumentrange) {
+        this.checkprojectmeterbetweenturbidityinstrumentrange = checkprojectmeterbetweenturbidityinstrumentrange == null ? null : checkprojectmeterbetweenturbidityinstrumentrange.trim();
+    }
+
+    public String getCheckprojectmeterbetweenturbidityinstrumentdetection() {
+        return checkprojectmeterbetweenturbidityinstrumentdetection;
+    }
+
+    public void setCheckprojectmeterbetweenturbidityinstrumentdetection(String checkprojectmeterbetweenturbidityinstrumentdetection) {
+        this.checkprojectmeterbetweenturbidityinstrumentdetection = checkprojectmeterbetweenturbidityinstrumentdetection == null ? null : checkprojectmeterbetweenturbidityinstrumentdetection.trim();
+    }
+
+    public String getCheckprojectmeterbetweenturbidityinstrumentresponsibleperson() {
+        return checkprojectmeterbetweenturbidityinstrumentresponsibleperson;
+    }
+
+    public void setCheckprojectmeterbetweenturbidityinstrumentresponsibleperson(String checkprojectmeterbetweenturbidityinstrumentresponsibleperson) {
+        this.checkprojectmeterbetweenturbidityinstrumentresponsibleperson = checkprojectmeterbetweenturbidityinstrumentresponsibleperson == null ? null : checkprojectmeterbetweenturbidityinstrumentresponsibleperson.trim();
+    }
+
+    public String getCheckprojectmeterbetweenturbidityinstrumentnote() {
+        return checkprojectmeterbetweenturbidityinstrumentnote;
+    }
+
+    public void setCheckprojectmeterbetweenturbidityinstrumentnote(String checkprojectmeterbetweenturbidityinstrumentnote) {
+        this.checkprojectmeterbetweenturbidityinstrumentnote = checkprojectmeterbetweenturbidityinstrumentnote == null ? null : checkprojectmeterbetweenturbidityinstrumentnote.trim();
+    }
+
+    public String getCheckprojectmeterbetweenflowmeterpowersupply() {
+        return checkprojectmeterbetweenflowmeterpowersupply;
+    }
+
+    public void setCheckprojectmeterbetweenflowmeterpowersupply(String checkprojectmeterbetweenflowmeterpowersupply) {
+        this.checkprojectmeterbetweenflowmeterpowersupply = checkprojectmeterbetweenflowmeterpowersupply == null ? null : checkprojectmeterbetweenflowmeterpowersupply.trim();
+    }
+
+    public String getCheckprojectmeterbetweenflowmetershow() {
+        return checkprojectmeterbetweenflowmetershow;
+    }
+
+    public void setCheckprojectmeterbetweenflowmetershow(String checkprojectmeterbetweenflowmetershow) {
+        this.checkprojectmeterbetweenflowmetershow = checkprojectmeterbetweenflowmetershow == null ? null : checkprojectmeterbetweenflowmetershow.trim();
+    }
+
+    public String getCheckprojectmeterbetweenflowmeterappearance() {
+        return checkprojectmeterbetweenflowmeterappearance;
+    }
+
+    public void setCheckprojectmeterbetweenflowmeterappearance(String checkprojectmeterbetweenflowmeterappearance) {
+        this.checkprojectmeterbetweenflowmeterappearance = checkprojectmeterbetweenflowmeterappearance == null ? null : checkprojectmeterbetweenflowmeterappearance.trim();
+    }
+
+    public String getCheckprojectmeterbetweenflowmeterresponsibleperson() {
+        return checkprojectmeterbetweenflowmeterresponsibleperson;
+    }
+
+    public void setCheckprojectmeterbetweenflowmeterresponsibleperson(String checkprojectmeterbetweenflowmeterresponsibleperson) {
+        this.checkprojectmeterbetweenflowmeterresponsibleperson = checkprojectmeterbetweenflowmeterresponsibleperson == null ? null : checkprojectmeterbetweenflowmeterresponsibleperson.trim();
+    }
+
+    public String getCheckprojectmeterbetweenflowmeternote() {
+        return checkprojectmeterbetweenflowmeternote;
+    }
+
+    public void setCheckprojectmeterbetweenflowmeternote(String checkprojectmeterbetweenflowmeternote) {
+        this.checkprojectmeterbetweenflowmeternote = checkprojectmeterbetweenflowmeternote == null ? null : checkprojectmeterbetweenflowmeternote.trim();
+    }
+
+    public String getResidualchlorineinstrumentpipeline() {
+        return residualchlorineinstrumentpipeline;
+    }
+
+    public void setResidualchlorineinstrumentpipeline(String residualchlorineinstrumentpipeline) {
+        this.residualchlorineinstrumentpipeline = residualchlorineinstrumentpipeline == null ? null : residualchlorineinstrumentpipeline.trim();
+    }
+
+    public String getResidualchlorineinstrumentpowersupply() {
+        return residualchlorineinstrumentpowersupply;
+    }
+
+    public void setResidualchlorineinstrumentpowersupply(String residualchlorineinstrumentpowersupply) {
+        this.residualchlorineinstrumentpowersupply = residualchlorineinstrumentpowersupply == null ? null : residualchlorineinstrumentpowersupply.trim();
+    }
+
+    public String getResidualchlorineinstrumentshow() {
+        return residualchlorineinstrumentshow;
+    }
+
+    public void setResidualchlorineinstrumentshow(String residualchlorineinstrumentshow) {
+        this.residualchlorineinstrumentshow = residualchlorineinstrumentshow == null ? null : residualchlorineinstrumentshow.trim();
+    }
+
+    public String getResidualchlorineinstrumentappearance() {
+        return residualchlorineinstrumentappearance;
+    }
+
+    public void setResidualchlorineinstrumentappearance(String residualchlorineinstrumentappearance) {
+        this.residualchlorineinstrumentappearance = residualchlorineinstrumentappearance == null ? null : residualchlorineinstrumentappearance.trim();
+    }
+
+    public String getResidualchlorineinstrumentpipelinmakewater() {
+        return residualchlorineinstrumentpipelinmakewater;
+    }
+
+    public void setResidualchlorineinstrumentpipelinmakewater(String residualchlorineinstrumentpipelinmakewater) {
+        this.residualchlorineinstrumentpipelinmakewater = residualchlorineinstrumentpipelinmakewater == null ? null : residualchlorineinstrumentpipelinmakewater.trim();
+    }
+
+    public String getResidualchlorineinstrumentequipment() {
+        return residualchlorineinstrumentequipment;
+    }
+
+    public void setResidualchlorineinstrumentequipment(String residualchlorineinstrumentequipment) {
+        this.residualchlorineinstrumentequipment = residualchlorineinstrumentequipment == null ? null : residualchlorineinstrumentequipment.trim();
+    }
+
+    public String getResidualchlorineinstrumentgroundsanitation() {
+        return residualchlorineinstrumentgroundsanitation;
+    }
+
+    public void setResidualchlorineinstrumentgroundsanitation(String residualchlorineinstrumentgroundsanitation) {
+        this.residualchlorineinstrumentgroundsanitation = residualchlorineinstrumentgroundsanitation == null ? null : residualchlorineinstrumentgroundsanitation.trim();
+    }
+
+    public String getResidualchlorineinstrumentresponsibleperson() {
+        return residualchlorineinstrumentresponsibleperson;
+    }
+
+    public void setResidualchlorineinstrumentresponsibleperson(String residualchlorineinstrumentresponsibleperson) {
+        this.residualchlorineinstrumentresponsibleperson = residualchlorineinstrumentresponsibleperson == null ? null : residualchlorineinstrumentresponsibleperson.trim();
+    }
+
+    public String getResidualchlorineinstrumentnote() {
+        return residualchlorineinstrumentnote;
+    }
+
+    public void setResidualchlorineinstrumentnote(String residualchlorineinstrumentnote) {
+        this.residualchlorineinstrumentnote = residualchlorineinstrumentnote == null ? null : residualchlorineinstrumentnote.trim();
+    }
+
+    public String getBoosterpumproomwaterpump() {
+        return boosterpumproomwaterpump;
+    }
+
+    public void setBoosterpumproomwaterpump(String boosterpumproomwaterpump) {
+        this.boosterpumproomwaterpump = boosterpumproomwaterpump == null ? null : boosterpumproomwaterpump.trim();
+    }
+
+    public String getBoosterpumproombearing() {
+        return boosterpumproombearing;
+    }
+
+    public void setBoosterpumproombearing(String boosterpumproombearing) {
+        this.boosterpumproombearing = boosterpumproombearing == null ? null : boosterpumproombearing.trim();
+    }
+
+    public String getBoosterpumproomthevalue() {
+        return boosterpumproomthevalue;
+    }
+
+    public void setBoosterpumproomthevalue(String boosterpumproomthevalue) {
+        this.boosterpumproomthevalue = boosterpumproomthevalue == null ? null : boosterpumproomthevalue.trim();
+    }
+
+    public String getBoosterpumproompumpbody() {
+        return boosterpumproompumpbody;
+    }
+
+    public void setBoosterpumproompumpbody(String boosterpumproompumpbody) {
+        this.boosterpumproompumpbody = boosterpumproompumpbody == null ? null : boosterpumproompumpbody.trim();
+    }
+
+    public String getBoosterpumproomnameplate() {
+        return boosterpumproomnameplate;
+    }
+
+    public void setBoosterpumproomnameplate(String boosterpumproomnameplate) {
+        this.boosterpumproomnameplate = boosterpumproomnameplate == null ? null : boosterpumproomnameplate.trim();
+    }
+
+    public String getBoosterpumproompacking() {
+        return boosterpumproompacking;
+    }
+
+    public void setBoosterpumproompacking(String boosterpumproompacking) {
+        this.boosterpumproompacking = boosterpumproompacking == null ? null : boosterpumproompacking.trim();
+    }
+
+    public String getBoosterpumproomshow() {
+        return boosterpumproomshow;
+    }
+
+    public void setBoosterpumproomshow(String boosterpumproomshow) {
+        this.boosterpumproomshow = boosterpumproomshow == null ? null : boosterpumproomshow.trim();
+    }
+
+    public String getBoosterpumproomfan() {
+        return boosterpumproomfan;
+    }
+
+    public void setBoosterpumproomfan(String boosterpumproomfan) {
+        this.boosterpumproomfan = boosterpumproomfan == null ? null : boosterpumproomfan.trim();
+    }
+
+    public String getBoosterpumproomdrainage() {
+        return boosterpumproomdrainage;
+    }
+
+    public void setBoosterpumproomdrainage(String boosterpumproomdrainage) {
+        this.boosterpumproomdrainage = boosterpumproomdrainage == null ? null : boosterpumproomdrainage.trim();
+    }
+
+    public String getBoosterpumproomsanitation() {
+        return boosterpumproomsanitation;
+    }
+
+    public void setBoosterpumproomsanitation(String boosterpumproomsanitation) {
+        this.boosterpumproomsanitation = boosterpumproomsanitation == null ? null : boosterpumproomsanitation.trim();
+    }
+
+    public String getBoosterpumproomresponsibleperson() {
+        return boosterpumproomresponsibleperson;
+    }
+
+    public void setBoosterpumproomresponsibleperson(String boosterpumproomresponsibleperson) {
+        this.boosterpumproomresponsibleperson = boosterpumproomresponsibleperson == null ? null : boosterpumproomresponsibleperson.trim();
+    }
+
+    public String getBoosterpumproomnote() {
+        return boosterpumproomnote;
+    }
+
+    public void setBoosterpumproomnote(String boosterpumproomnote) {
+        this.boosterpumproomnote = boosterpumproomnote == null ? null : boosterpumproomnote.trim();
+    }
+
+    public String getClearwaterreserviorsstairs() {
+        return clearwaterreserviorsstairs;
+    }
+
+    public void setClearwaterreserviorsstairs(String clearwaterreserviorsstairs) {
+        this.clearwaterreserviorsstairs = clearwaterreserviorsstairs == null ? null : clearwaterreserviorsstairs.trim();
+    }
+
+    public String getClearwaterreserviorsvent() {
+        return clearwaterreserviorsvent;
+    }
+
+    public void setClearwaterreserviorsvent(String clearwaterreserviorsvent) {
+        this.clearwaterreserviorsvent = clearwaterreserviorsvent == null ? null : clearwaterreserviorsvent.trim();
+    }
+
+    public String getClearwaterreserviorspoolroof() {
+        return clearwaterreserviorspoolroof;
+    }
+
+    public void setClearwaterreserviorspoolroof(String clearwaterreserviorspoolroof) {
+        this.clearwaterreserviorspoolroof = clearwaterreserviorspoolroof == null ? null : clearwaterreserviorspoolroof.trim();
+    }
+
+    public String getClearwaterreserviorssanitation() {
+        return clearwaterreserviorssanitation;
+    }
+
+    public void setClearwaterreserviorssanitation(String clearwaterreserviorssanitation) {
+        this.clearwaterreserviorssanitation = clearwaterreserviorssanitation == null ? null : clearwaterreserviorssanitation.trim();
+    }
+
+    public String getClearwaterreserviorspumpbody() {
+        return clearwaterreserviorspumpbody;
+    }
+
+    public void setClearwaterreserviorspumpbody(String clearwaterreserviorspumpbody) {
+        this.clearwaterreserviorspumpbody = clearwaterreserviorspumpbody == null ? null : clearwaterreserviorspumpbody.trim();
+    }
+
+    public String getClearwaterreserviorsresponsibleperson() {
+        return clearwaterreserviorsresponsibleperson;
+    }
+
+    public void setClearwaterreserviorsresponsibleperson(String clearwaterreserviorsresponsibleperson) {
+        this.clearwaterreserviorsresponsibleperson = clearwaterreserviorsresponsibleperson == null ? null : clearwaterreserviorsresponsibleperson.trim();
+    }
+
+    public String getClearwaterreserviorsnote() {
+        return clearwaterreserviorsnote;
+    }
+
+    public void setClearwaterreserviorsnote(String clearwaterreserviorsnote) {
+        this.clearwaterreserviorsnote = clearwaterreserviorsnote == null ? null : clearwaterreserviorsnote.trim();
+    }
+
+    public String getBetweenchlorineequipment() {
+        return betweenchlorineequipment;
+    }
+
+    public void setBetweenchlorineequipment(String betweenchlorineequipment) {
+        this.betweenchlorineequipment = betweenchlorineequipment == null ? null : betweenchlorineequipment.trim();
+    }
+
+    public String getBetweenchlorinepipe() {
+        return betweenchlorinepipe;
+    }
+
+    public void setBetweenchlorinepipe(String betweenchlorinepipe) {
+        this.betweenchlorinepipe = betweenchlorinepipe == null ? null : betweenchlorinepipe.trim();
+    }
+
+    public String getBetweenchlorinedosingpump() {
+        return betweenchlorinedosingpump;
+    }
+
+    public void setBetweenchlorinedosingpump(String betweenchlorinedosingpump) {
+        this.betweenchlorinedosingpump = betweenchlorinedosingpump == null ? null : betweenchlorinedosingpump.trim();
+    }
+
+    public String getBetweenchlorinetraffic() {
+        return betweenchlorinetraffic;
+    }
+
+    public void setBetweenchlorinetraffic(String betweenchlorinetraffic) {
+        this.betweenchlorinetraffic = betweenchlorinetraffic == null ? null : betweenchlorinetraffic.trim();
+    }
+
+    public String getBetweenchlorinefan() {
+        return betweenchlorinefan;
+    }
+
+    public void setBetweenchlorinefan(String betweenchlorinefan) {
+        this.betweenchlorinefan = betweenchlorinefan == null ? null : betweenchlorinefan.trim();
+    }
+
+    public String getBetweenchlorinesanitation() {
+        return betweenchlorinesanitation;
+    }
+
+    public void setBetweenchlorinesanitation(String betweenchlorinesanitation) {
+        this.betweenchlorinesanitation = betweenchlorinesanitation == null ? null : betweenchlorinesanitation.trim();
+    }
+
+    public String getBetweenchlorineresponsibleperson() {
+        return betweenchlorineresponsibleperson;
+    }
+
+    public void setBetweenchlorineresponsibleperson(String betweenchlorineresponsibleperson) {
+        this.betweenchlorineresponsibleperson = betweenchlorineresponsibleperson == null ? null : betweenchlorineresponsibleperson.trim();
+    }
+
+    public String getBetweenchlorinenote() {
+        return betweenchlorinenote;
+    }
+
+    public void setBetweenchlorinenote(String betweenchlorinenote) {
+        this.betweenchlorinenote = betweenchlorinenote == null ? null : betweenchlorinenote.trim();
+    }
+
+    public String getGroundenvironmentwelllids() {
+        return groundenvironmentwelllids;
+    }
+
+    public void setGroundenvironmentwelllids(String groundenvironmentwelllids) {
+        this.groundenvironmentwelllids = groundenvironmentwelllids == null ? null : groundenvironmentwelllids.trim();
+    }
+
+    public String getGroundenvironmentdrainagen() {
+        return groundenvironmentdrainagen;
+    }
+
+    public void setGroundenvironmentdrainagen(String groundenvironmentdrainagen) {
+        this.groundenvironmentdrainagen = groundenvironmentdrainagen == null ? null : groundenvironmentdrainagen.trim();
+    }
+
+    public String getGroundenvironmentwatersupply() {
+        return groundenvironmentwatersupply;
+    }
+
+    public void setGroundenvironmentwatersupply(String groundenvironmentwatersupply) {
+        this.groundenvironmentwatersupply = groundenvironmentwatersupply == null ? null : groundenvironmentwatersupply.trim();
+    }
+
+    public String getGroundenvironmentcable() {
+        return groundenvironmentcable;
+    }
+
+    public void setGroundenvironmentcable(String groundenvironmentcable) {
+        this.groundenvironmentcable = groundenvironmentcable == null ? null : groundenvironmentcable.trim();
+    }
+
+    public String getGroundenvironmentroad() {
+        return groundenvironmentroad;
+    }
+
+    public void setGroundenvironmentroad(String groundenvironmentroad) {
+        this.groundenvironmentroad = groundenvironmentroad == null ? null : groundenvironmentroad.trim();
+    }
+
+    public String getGroundenvironmentresponsibleperson() {
+        return groundenvironmentresponsibleperson;
+    }
+
+    public void setGroundenvironmentresponsibleperson(String groundenvironmentresponsibleperson) {
+        this.groundenvironmentresponsibleperson = groundenvironmentresponsibleperson == null ? null : groundenvironmentresponsibleperson.trim();
+    }
+
+    public String getGroundenvironmentnote() {
+        return groundenvironmentnote;
+    }
+
+    public void setGroundenvironmentnote(String groundenvironmentnote) {
+        this.groundenvironmentnote = groundenvironmentnote == null ? null : groundenvironmentnote.trim();
+    }
+
+    public String getGroundsecurityillegal() {
+        return groundsecurityillegal;
+    }
+
+    public void setGroundsecurityillegal(String groundsecurityillegal) {
+        this.groundsecurityillegal = groundsecurityillegal == null ? null : groundsecurityillegal.trim();
+    }
+
+    public String getGroundsecurityfire() {
+        return groundsecurityfire;
+    }
+
+    public void setGroundsecurityfire(String groundsecurityfire) {
+        this.groundsecurityfire = groundsecurityfire == null ? null : groundsecurityfire.trim();
+    }
+
+    public String getGroundsecurityrats() {
+        return groundsecurityrats;
+    }
+
+    public void setGroundsecurityrats(String groundsecurityrats) {
+        this.groundsecurityrats = groundsecurityrats == null ? null : groundsecurityrats.trim();
+    }
+
+    public String getGroundsecuritysuspiciouspersonnel() {
+        return groundsecuritysuspiciouspersonnel;
+    }
+
+    public void setGroundsecuritysuspiciouspersonnel(String groundsecuritysuspiciouspersonnel) {
+        this.groundsecuritysuspiciouspersonnel = groundsecuritysuspiciouspersonnel == null ? null : groundsecuritysuspiciouspersonnel.trim();
+    }
+
+    public String getGroundsecurityresponsibleperson() {
+        return groundsecurityresponsibleperson;
+    }
+
+    public void setGroundsecurityresponsibleperson(String groundsecurityresponsibleperson) {
+        this.groundsecurityresponsibleperson = groundsecurityresponsibleperson == null ? null : groundsecurityresponsibleperson.trim();
+    }
+
+    public String getGroundsecuritynote() {
+        return groundsecuritynote;
+    }
+
+    public void setGroundsecuritynote(String groundsecuritynote) {
+        this.groundsecuritynote = groundsecuritynote == null ? null : groundsecuritynote.trim();
+    }
+
+    public String getSecuritytoolemergency() {
+        return securitytoolemergency;
+    }
+
+    public void setSecuritytoolemergency(String securitytoolemergency) {
+        this.securitytoolemergency = securitytoolemergency == null ? null : securitytoolemergency.trim();
+    }
+
+    public String getSecuritytoolfloodcontroland() {
+        return securitytoolfloodcontroland;
+    }
+
+    public void setSecuritytoolfloodcontroland(String securitytoolfloodcontroland) {
+        this.securitytoolfloodcontroland = securitytoolfloodcontroland == null ? null : securitytoolfloodcontroland.trim();
+    }
+
+    public String getSecuritytoolprotective() {
+        return securitytoolprotective;
+    }
+
+    public void setSecuritytoolprotective(String securitytoolprotective) {
+        this.securitytoolprotective = securitytoolprotective == null ? null : securitytoolprotective.trim();
+    }
+
+    public String getSecuritytoolmainteance() {
+        return securitytoolmainteance;
+    }
+
+    public void setSecuritytoolmainteance(String securitytoolmainteance) {
+        this.securitytoolmainteance = securitytoolmainteance == null ? null : securitytoolmainteance.trim();
+    }
+
+    public String getSecuritytoolresponsibleperson() {
+        return securitytoolresponsibleperson;
+    }
+
+    public void setSecuritytoolresponsibleperson(String securitytoolresponsibleperson) {
+        this.securitytoolresponsibleperson = securitytoolresponsibleperson == null ? null : securitytoolresponsibleperson.trim();
+    }
+
+    public String getSecuritytoolnote() {
+        return securitytoolnote;
+    }
+
+    public void setSecuritytoolnote(String securitytoolnote) {
+        this.securitytoolnote = securitytoolnote == null ? null : securitytoolnote.trim();
+    }
+
+    public Integer getUserid() {
+        return userid;
+    }
+
+    public void setUserid(Integer userid) {
+        this.userid = userid;
+    }
+
+    public Date getCreattime() {
+        return creattime;
+    }
+
+    public void setCreattime(Date creattime) {
+        this.creattime = creattime;
+    }
+
+    public String getReamke1() {
+        return reamke1;
+    }
+
+    public void setReamke1(String reamke1) {
+        this.reamke1 = reamke1 == null ? null : reamke1.trim();
+    }
+
+    public String getReamke2() {
+        return reamke2;
+    }
+
+    public void setReamke2(String reamke2) {
+        this.reamke2 = reamke2 == null ? null : reamke2.trim();
+    }
+
+    public String getReamke3() {
+        return reamke3;
+    }
+
+    public void setReamke3(String reamke3) {
+        this.reamke3 = reamke3 == null ? null : reamke3.trim();
+    }
+}

@@ -34,7 +34,7 @@ public class MyInvocationSecurityMetadataSourceService implements FilterInvocati
         map = new HashMap<>();
         map = new HashMap<>();
         Collection<ConfigAttribute> array;
         Collection<ConfigAttribute> array;
         ConfigAttribute cfg;
         ConfigAttribute cfg;
-        List<PERMISSION> permissions = permissionMapper.findAll();
+        List<PERMISSION> permissions = permissionMapper.findAll("");
         for(PERMISSION permission : permissions) {
         for(PERMISSION permission : permissions) {
             array = new ArrayList<>();
             array = new ArrayList<>();
 
 
@@ -74,7 +74,7 @@ public class MyInvocationSecurityMetadataSourceService implements FilterInvocati
     public Collection<ConfigAttribute> loadResourceDefine(){
     public Collection<ConfigAttribute> loadResourceDefine(){
         Collection<ConfigAttribute> array;
         Collection<ConfigAttribute> array;
         ConfigAttribute cfg;
         ConfigAttribute cfg;
-        List<PERMISSION> permissions = permissionMapper.findAll();
+        List<PERMISSION> permissions = permissionMapper.findAll("");
         for(PERMISSION permission : permissions) {
         for(PERMISSION permission : permissions) {
             array = new ArrayList<>();
             array = new ArrayList<>();
 
 

@@ -78,7 +78,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 //跨域配置
                 //跨域配置
                 .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
                 .requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
                 //管理页面只允许管理员角色访问
                 //管理页面只允许管理员角色访问
-                .antMatchers("/admin/**","/role/**","/user/**").authenticated()
+                .antMatchers("/admin/**","/ROLE/**","/user/**").authenticated()
                 //任何请求,登录后可以访问
                 //任何请求,登录后可以访问
                 //其余的不需要验证
                 //其余的不需要验证
                 .anyRequest().permitAll()
                 .anyRequest().permitAll()

 package com.tianbo.warehouse.security.handel;
 package com.tianbo.warehouse.security.handel;
 
 
+import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tianbo.warehouse.bean.AuthSuccessResponse;
 import com.tianbo.warehouse.bean.AuthSuccessResponse;
 import com.tianbo.warehouse.model.USERS;
 import com.tianbo.warehouse.model.USERS;
+import com.tianbo.warehouse.security.config.SecurityProperties;
 import com.tianbo.warehouse.security.filter.JwtTokenUtil;
 import com.tianbo.warehouse.security.filter.JwtTokenUtil;
 import com.tianbo.warehouse.security.model.LoginType;
 import com.tianbo.warehouse.security.model.LoginType;
 import com.tianbo.warehouse.service.PermissionService;
 import com.tianbo.warehouse.service.PermissionService;
+import com.tianbo.warehouse.util.RedisUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.tianbo.warehouse.security.config.SecurityProperties;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
@@ -45,6 +47,8 @@ public class MyAuthenticationSuccessHandler extends SavedRequestAwareAuthenticat
     @Autowired
     @Autowired
     private SecurityProperties securityProperties;
     private SecurityProperties securityProperties;
 
 
+    @Autowired
+    RedisUtils redisUtils;
     @Override
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws ServletException, IOException {
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws ServletException, IOException {
         logger.info("登录成功");
         logger.info("登录成功");
@@ -60,12 +64,16 @@ public class MyAuthenticationSuccessHandler extends SavedRequestAwareAuthenticat
             USERS loginedUser = new USERS();
             USERS loginedUser = new USERS();
             loginedUser.setUsername(user.getUsername());
             loginedUser.setUsername(user.getUsername());
             loginedUser.setUserface(user.getUserface());
             loginedUser.setUserface(user.getUserface());
+            loginedUser.setUserId(user.getUserId());
+            loginedUser.setRealname(user.getRealname());
 
 
 
 
             //设置用户的TOKEN的有效时间，时间配置在配置文件中设置
             //设置用户的TOKEN的有效时间，时间配置在配置文件中设置
             String jwtToken = JwtTokenUtil.generateToken(loginedUser.getUsername(), jwtMaxAlive);
             String jwtToken = JwtTokenUtil.generateToken(loginedUser.getUsername(), jwtMaxAlive);
             loginedUser.setToken(jwtToken);
             loginedUser.setToken(jwtToken);
-
+            //这里将登录成功的[user]对象数据写入redis缓存，KEY为token value为user的JSON对象
+            String json = JSON.toJSONString(user);
+            redisUtils.set(jwtToken, json,3600*24*7);
             Map<String,Object> menuMap =  permissionService.getUserMenus(user.getUserId());
             Map<String,Object> menuMap =  permissionService.getUserMenus(user.getUserId());
             //返回用户信息和用户可访问的目录列表
             //返回用户信息和用户可访问的目录列表
             response.getWriter().write(objectMapper.writeValueAsString(new AuthSuccessResponse(loginedUser,menuMap)));
             response.getWriter().write(objectMapper.writeValueAsString(new AuthSuccessResponse(loginedUser,menuMap)));

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Company;
+
+public interface CompanyService {
+
+    PageInfo<Company> findAll(int pageNum, int pageSize, String company);
+
+    int insertSelective(Company company);
+
+    int updateByPrimaryKeySelective(Company company);
+
+    int deleteByPrimaryKey(String companyId);
+
+}

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Department;
+
+public interface DepartmentService {
+
+    PageInfo<Department> findAll(int pageNum, int pageSize, String departmentName);
+
+    int insertSelective(Department department);
+
+    int updateByPrimaryKeySelective(Department department);
+
+    int deleteByPrimaryKey(String departmentId);
+
+}

+package com.tianbo.warehouse.service;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Group_company;
+
+public interface GroupCompanyService {
+
+    PageInfo<Group_company> findAll(int pageNum, int pageSize, String groupName);
+
+    int insertSelective(Group_company group_company);
+
+    int updateByPrimaryKeySelective(Group_company group_company);
+
+    int deleteByPrimaryKey(String departmentId);
+
+}

@@ -8,5 +8,5 @@ public interface LogService {
 
 
     int insertSelective(LOGWithBLOBs record);
     int insertSelective(LOGWithBLOBs record);
 
 
-    PageInfo<LOGWithBLOBs> selectAll(int pageNum, int pageSize);
+    PageInfo<LOGWithBLOBs> selectAll(int pageNum, int pageSize, String username, String modelnamecn);
 }
 }

@@ -8,7 +8,7 @@ import java.util.Map;
 
 
 public interface PermissionService {
 public interface PermissionService {
 
 
-    PageInfo<PERMISSION> findAll(int pageNum, int pageSize);
+    PageInfo<PERMISSION> findAll(int pageNum, int pageSize, String name);
 
 
     int insertSelective(PERMISSION record);
     int insertSelective(PERMISSION record);
 
 
@@ -18,4 +18,9 @@ public interface PermissionService {
      * @return
      * @return
      */
      */
     Map<String,Object> getUserMenus(Integer userId);
     Map<String,Object> getUserMenus(Integer userId);
+
+
+    int updateByPrimaryKeySelective(PERMISSION permission);
+
+    int deleteByPrimaryKey(String companyId);
 }
 }

@@ -5,9 +5,13 @@ import com.tianbo.warehouse.model.ROLE;
 import com.tianbo.warehouse.model.RolePermission;
 import com.tianbo.warehouse.model.RolePermission;
 
 
 public interface RoleService {
 public interface RoleService {
-    PageInfo<ROLE> findAll(int pageNum, int pageSize);
+    PageInfo<ROLE> findAll(int pageNum, int pageSize, String roleName);
 
 
     int insertSelective(ROLE record);
     int insertSelective(ROLE record);
 
 
     int setRolePermissoin(RolePermission record);
     int setRolePermissoin(RolePermission record);
+
+    int updateByPrimaryKeySelective(ROLE role);
+
+    int deleteByPrimaryKey(Integer departmentId);
 }
 }

@@ -9,7 +9,7 @@ import java.util.List;
 public interface UserService {
 public interface UserService {
     USERS loadByUsername(String username);
     USERS loadByUsername(String username);
 
 
-    PageInfo<USERS> selectAllUser(int pageNum, int pageSize,USERS users);
+    PageInfo<USERS> selectAllUser(int pageNum, int pageSize,String username, String realName);
 
 
     int updateByPrimaryKeySelective(USERS record);
     int updateByPrimaryKeySelective(USERS record);
 
 

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.CompanyMapper;
+import com.tianbo.warehouse.dao.Group_companyMapper;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.service.CompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class CompanyServiceImp implements CompanyService {
+
+    @Autowired
+    CompanyMapper companyMapper;
+
+    @Autowired
+    Group_companyMapper group_companyMapper;
+
+    @Override
+    public PageInfo<Company> findAll(int pageNum, int pageSize, String companyName) {
+        Page<Company> page =  PageHelper.startPage(pageNum,pageSize);
+        List<Company> list = companyMapper.findAll(companyName);
+
+        for (Company company: list){
+            Group_company group_company = group_companyMapper.selectByPrimaryKey(company.getGroupId());
+            if (group_company == null){
+                group_company.setGroupName("无");
+            }else {
+                company.setGroupName(group_company.getGroupName());
+            }
+        }
+        PageInfo<Company> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(Company company) {
+        company.setCompanyId(UUID.randomUUID().toString());
+        company.setCreatTime(new Date());
+        return companyMapper.insertSelective(company);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Company company) {
+        company.setCreatTime(new Date());
+        return companyMapper.updateByPrimaryKeySelective(company);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String companyId) {
+        if (companyId.contains(",")){
+            try {
+                String[] split = companyId.split(",");
+                for (int i=0; i<split.length; i++){
+                    companyMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+
+            return companyMapper.deleteByPrimaryKey(companyId);
+        }
+    }
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.CompanyMapper;
+import com.tianbo.warehouse.dao.DepartmentMapper;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Department;
+import com.tianbo.warehouse.service.DepartmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class DepartmentServiceImp implements DepartmentService {
+
+    @Autowired
+    DepartmentMapper departmentMapper;
+
+    @Autowired
+    CompanyMapper companyMapper;
+
+    @Override
+    public PageInfo<Department> findAll(int pageNum, int pageSize, String departmentName) {
+        Page<Department> page =  PageHelper.startPage(pageNum,pageSize);
+        List<Department> list = departmentMapper.findAll(departmentName);
+
+        for (Department department: list){
+            Company company = companyMapper.selectByPrimaryKey(department.getCompanyId());
+            if (company == null){
+                department.setCompanyName("无");
+            }else {
+                department.setCompanyName(company.getCompanyName());
+            }
+        }
+        PageInfo<Department> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(Department department) {
+        department.setDepartmentId(UUID.randomUUID().toString());
+        department.setCreatTime(new Date());
+        return departmentMapper.insertSelective(department);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Department department) {
+        department.setCreatTime(new Date());
+        return departmentMapper.updateByPrimaryKeySelective(department);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String departmentId) {
+        if (departmentId.contains(",")){
+            try {
+                System.out.println();
+                String[] split = departmentId.split(",");
+                for (int i=0; i<split.length; i++){
+                    departmentMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return departmentMapper.deleteByPrimaryKey(departmentId);
+        }
+    }
+}

+package com.tianbo.warehouse.service.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.DepartmentMapper;
+import com.tianbo.warehouse.dao.Group_companyMapper;
+import com.tianbo.warehouse.model.Department;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.service.DepartmentService;
+import com.tianbo.warehouse.service.GroupCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class GroupCompanyServiceImp implements GroupCompanyService {
+
+    @Autowired
+    Group_companyMapper group_companyMapper;
+
+    @Override
+    public PageInfo<Group_company> findAll(int pageNum, int pageSize, String groupName) {
+        Page<Group_company> page =  PageHelper.startPage(pageNum,pageSize);
+        List<Group_company> list = group_companyMapper.findAll(groupName);
+        PageInfo<Group_company> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(Group_company group_company) {
+        group_company.setGroupId(UUID.randomUUID().toString());
+        group_company.setCreatTime(new Date());
+        return group_companyMapper.insertSelective(group_company);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Group_company group_company) {
+        group_company.setCreatTime(new Date());
+        return group_companyMapper.updateByPrimaryKeySelective(group_company);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String groupId) {
+        if (groupId.contains(",")){
+            try {
+                System.out.println("");
+                String[] split = groupId.split(",");
+                for (int i=0; i<split.length; i++){
+                    group_companyMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return group_companyMapper.deleteByPrimaryKey(groupId);
+        }
+    }
+}

@@ -24,9 +24,9 @@ public class LogServiceImp  implements LogService{
    }
    }
 
 
    @Override
    @Override
-    public PageInfo<LOGWithBLOBs> selectAll(int pageNum,int pageSize){
+    public PageInfo<LOGWithBLOBs> selectAll(int pageNum,int pageSize, String username, String modelnamecn){
        Page<LOGWithBLOBs> page =  PageHelper.startPage(pageNum,pageSize);
        Page<LOGWithBLOBs> page =  PageHelper.startPage(pageNum,pageSize);
-       List<LOGWithBLOBs> list = logMapper.selectAll();
+       List<LOGWithBLOBs> list = logMapper.selectAll(username, modelnamecn);
        PageInfo<LOGWithBLOBs> result = new PageInfo<LOGWithBLOBs>(list);
        PageInfo<LOGWithBLOBs> result = new PageInfo<LOGWithBLOBs>(list);
        return result;
        return result;
     }
     }

@@ -19,9 +19,9 @@ public class PermissionServiceImp implements PermissionService{
     PERMISSIONMapper permissionMapper;
     PERMISSIONMapper permissionMapper;
 
 
     @Override
     @Override
-    public PageInfo<PERMISSION> findAll(int pageNum, int pageSize){
+    public PageInfo<PERMISSION> findAll(int pageNum, int pageSize, String name){
         Page<PERMISSION> page =  PageHelper.startPage(pageNum,pageSize);
         Page<PERMISSION> page =  PageHelper.startPage(pageNum,pageSize);
-        List<PERMISSION> list = permissionMapper.findAll();
+        List<PERMISSION> list = permissionMapper.findAll(name);
         PageInfo<PERMISSION> result = new PageInfo<>(list);
         PageInfo<PERMISSION> result = new PageInfo<>(list);
         return result;
         return result;
     }
     }
@@ -94,4 +94,31 @@ public class PermissionServiceImp implements PermissionService{
         }
         }
         return childList;
         return childList;
     }
     }
+
+
+    @Override
+    public int updateByPrimaryKeySelective(PERMISSION permission) {
+        return permissionMapper.updateByPrimaryKeySelective(permission);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String permissionId) {
+        if (permissionId.contains(",")){
+            try {
+                String[] split = permissionId.split(",");
+                for (int i=0; i<split.length; i++){
+                    permissionMapper.deleteByPrimaryKey(Integer.valueOf(split[i]));
+                }
+                System.out.println();
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+
+            return permissionMapper.deleteByPrimaryKey(Integer.valueOf(permissionId));
+        }
+    }
+
 }
 }

@@ -3,15 +3,20 @@ package com.tianbo.warehouse.service.imp;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.DepartmentMapper;
 import com.tianbo.warehouse.dao.ROLEMapper;
 import com.tianbo.warehouse.dao.ROLEMapper;
 import com.tianbo.warehouse.dao.RolePermissionMapper;
 import com.tianbo.warehouse.dao.RolePermissionMapper;
+import com.tianbo.warehouse.model.Department;
 import com.tianbo.warehouse.model.ROLE;
 import com.tianbo.warehouse.model.ROLE;
 import com.tianbo.warehouse.model.RolePermission;
 import com.tianbo.warehouse.model.RolePermission;
+import com.tianbo.warehouse.service.DepartmentService;
 import com.tianbo.warehouse.service.RoleService;
 import com.tianbo.warehouse.service.RoleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 @Service(value = "roleService")
 @Service(value = "roleService")
@@ -23,11 +28,24 @@ public class RoleServiceImp implements RoleService{
     @Autowired
     @Autowired
     private RolePermissionMapper rolePermissionMapper;
     private RolePermissionMapper rolePermissionMapper;
 
 
+    @Autowired
+    DepartmentMapper departmentMapper;
+
     @Override
     @Override
-    public PageInfo<ROLE> findAll(int pageNum, int pageSize){
+    public PageInfo<ROLE> findAll(int pageNum, int pageSize, String roleName){
         Page<ROLE> page =  PageHelper.startPage(pageNum,pageSize);
         Page<ROLE> page =  PageHelper.startPage(pageNum,pageSize);
-        List<ROLE> list = roleMapper.findAll();
+        List<ROLE> list = roleMapper.findAll(roleName);
+
+        for (ROLE role: list){
+            Department department = departmentMapper.selectByPrimaryKey(role.getDepartmentId());
+            if (department == null){
+                role.setDepartmentName("无");
+            }else {
+                role.setDepartmentName(department.getDepartmentName());
+            }
+        }
         PageInfo<ROLE> result = new PageInfo<ROLE>(list);
         PageInfo<ROLE> result = new PageInfo<ROLE>(list);
+
         return result;
         return result;
     }
     }
 
 
@@ -53,4 +71,29 @@ public class RoleServiceImp implements RoleService{
             return 0;
             return 0;
         }
         }
     }
     }
+
+    @Override
+    public int updateByPrimaryKeySelective(ROLE company) {
+        return roleMapper.updateByPrimaryKeySelective(company);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(Integer roleId) {
+        String s = roleId.toString();
+        if (s.contains(",")){
+            try {
+                String[] split = s.split(",");
+                for (int i=0; i<split.length; i++){
+                    roleMapper.deleteByPrimaryKey(Integer.valueOf(split[i]));
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return roleMapper.deleteByPrimaryKey(Integer.valueOf(roleId));
+        }
+    }
+
 }
 }

@@ -56,8 +56,11 @@ public class UserServiceImpl implements UserService{
     }
     }
 
 
     @Override
     @Override
-    public PageInfo<USERS> selectAllUser(int pageNum, int pageSize,USERS users){
+    public PageInfo<USERS> selectAllUser(int pageNum, int pageSize,String username, String realName){
         Page<USERS> page =  PageHelper.startPage(pageNum,pageSize);
         Page<USERS> page =  PageHelper.startPage(pageNum,pageSize);
+        USERS users = new USERS();
+        users.setUsername(username);
+        users.setRealname(realName);
         List<USERS> list = usersMapper.selectAllUser(users);
         List<USERS> list = usersMapper.selectAllUser(users);
         for (USERS user: list) {
         for (USERS user: list) {
             List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());
             List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());

+package com.tianbo.warehouse.service.satff;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+
+public interface ComeCarService {
+
+    PageInfo<StaffApartmentComeCar> findAll(int pageNum, int pageSize, String company);
+
+    int insertSelective(StaffApartmentComeCar staffApartmentComeCar);
+
+    int updateByPrimaryKeySelective(StaffApartmentComeCar staffApartmentComeCar);
+
+    int deleteByPrimaryKey(String id);
+
+}

+package com.tianbo.warehouse.service.satff.Imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.CompanyMapper;
+import com.tianbo.warehouse.dao.Group_companyMapper;
+import com.tianbo.warehouse.dao.StaffApartmentComeCarMapper;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+import com.tianbo.warehouse.service.CompanyService;
+import com.tianbo.warehouse.service.satff.ComeCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class ComeCayServiceImp implements ComeCarService {
+
+    @Autowired
+    StaffApartmentComeCarMapper staffApartmentComeCarMapper;
+
+    @Override
+    public PageInfo<StaffApartmentComeCar> findAll(int pageNum, int pageSize, String companyName) {
+        Page<StaffApartmentComeCar> page =  PageHelper.startPage(pageNum,pageSize);
+        List<StaffApartmentComeCar> list = staffApartmentComeCarMapper.findAll(companyName);
+
+        PageInfo<StaffApartmentComeCar> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(StaffApartmentComeCar staffApartmentComeCar) {
+        staffApartmentComeCar.setId(UUID.randomUUID().toString());
+        staffApartmentComeCar.setCreatetime(new Date());
+        return staffApartmentComeCarMapper.insertSelective(staffApartmentComeCar);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(StaffApartmentComeCar staffApartmentComeCar) {
+        staffApartmentComeCar.setCreatetime(new Date());
+        return staffApartmentComeCarMapper.updateByPrimaryKeySelective(staffApartmentComeCar);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String companyId) {
+        if (companyId.contains(",")){
+            try {
+                String[] split = companyId.split(",");
+                for (int i=0; i<split.length; i++){
+                    staffApartmentComeCarMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+
+            return staffApartmentComeCarMapper.deleteByPrimaryKey(companyId);
+        }
+    }
+}

+package com.tianbo.warehouse.service.satff.Imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.StaffApartmentSpareKeyMapper;
+import com.tianbo.warehouse.dao.StaffSecurityInspectionMapper;
+import com.tianbo.warehouse.model.StaffApartmentSpareKey;
+import com.tianbo.warehouse.model.StaffSecurityInspection;
+import com.tianbo.warehouse.service.satff.KeyService;
+import com.tianbo.warehouse.service.satff.StaffSecurityInspectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class KeyServiceImp implements KeyService {
+
+    @Autowired
+    StaffApartmentSpareKeyMapper staffApartmentSpareKeyMapper;
+
+    @Override
+    public PageInfo<StaffApartmentSpareKey> findAll(int pageNum, int pageSize, String staffname) {
+        Page<StaffApartmentSpareKey> page =  PageHelper.startPage(pageNum,pageSize);
+        List<StaffApartmentSpareKey> list = staffApartmentSpareKeyMapper.findAll(staffname);
+        PageInfo<StaffApartmentSpareKey> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(StaffApartmentSpareKey staffApartmentSpareKey) {
+        staffApartmentSpareKey.setId(UUID.randomUUID().toString());
+        staffApartmentSpareKey.setCreatetime(new Date());
+        return staffApartmentSpareKeyMapper.insertSelective(staffApartmentSpareKey);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(StaffApartmentSpareKey staffApartmentSpareKey) {
+        staffApartmentSpareKey.setCreatetime(new Date());
+        return staffApartmentSpareKeyMapper.updateByPrimaryKeySelective(staffApartmentSpareKey);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String securityInspectionId) {
+        if (securityInspectionId.contains(",")){
+            try {
+                String a  = "";
+                String[] split = securityInspectionId.split(",");
+                for (int i=0; i<split.length; i++){
+                    staffApartmentSpareKeyMapper.deleteByPrimaryKey(split[i]);
+                }
+                System.out.println();
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return staffApartmentSpareKeyMapper.deleteByPrimaryKey(securityInspectionId);
+        }
+    }
+}

+package com.tianbo.warehouse.service.satff.Imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.StaffApartmentMaintainMapper;
+import com.tianbo.warehouse.dao.StaffApartmentSpareKeyMapper;
+import com.tianbo.warehouse.model.StaffApartmentMaintain;
+import com.tianbo.warehouse.model.StaffApartmentSpareKey;
+import com.tianbo.warehouse.service.satff.KeyService;
+import com.tianbo.warehouse.service.satff.MaintainService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class MaintainServiceImp implements MaintainService {
+
+    @Autowired
+    StaffApartmentMaintainMapper staffApartmentMaintainMapper;
+
+    @Override
+    public PageInfo<StaffApartmentMaintain> findAll(int pageNum, int pageSize, String staffname) {
+        Page<StaffApartmentMaintain> page =  PageHelper.startPage(pageNum,pageSize);
+        List<StaffApartmentMaintain> list = staffApartmentMaintainMapper.findAll(staffname);
+        PageInfo<StaffApartmentMaintain> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(StaffApartmentMaintain staffApartmentMaintain) {
+        staffApartmentMaintain.setId(UUID.randomUUID().toString());
+        staffApartmentMaintain.setCreatetime(new Date());
+        return staffApartmentMaintainMapper.insertSelective(staffApartmentMaintain);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(StaffApartmentMaintain staffApartmentMaintain) {
+        staffApartmentMaintain.setCreatetime(new Date());
+        return staffApartmentMaintainMapper.updateByPrimaryKeySelective(staffApartmentMaintain);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String securityInspectionId) {
+        if (securityInspectionId.contains(",")){
+            try {
+                String a  = "";
+                String[] split = securityInspectionId.split(",");
+                for (int i=0; i<split.length; i++){
+                    staffApartmentMaintainMapper.deleteByPrimaryKey(split[i]);
+                }
+                System.out.println();
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return staffApartmentMaintainMapper.deleteByPrimaryKey(securityInspectionId);
+        }
+    }
+}

+package com.tianbo.warehouse.service.satff.Imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.StaffApartmentOndutyMapper;
+import com.tianbo.warehouse.model.StaffApartmentOnduty;
+import com.tianbo.warehouse.service.satff.OnDutyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class OnDutyServiceImp implements OnDutyService {
+
+    @Autowired
+    StaffApartmentOndutyMapper staffApartmentOndutyMapper;
+
+    @Override
+    public PageInfo<StaffApartmentOnduty> findAll(int pageNum, int pageSize, String name) {
+        Page<StaffApartmentOnduty> page =  PageHelper.startPage(pageNum,pageSize);
+        List<StaffApartmentOnduty> list = staffApartmentOndutyMapper.findAll(name);
+
+
+        PageInfo<StaffApartmentOnduty> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(StaffApartmentOnduty staffApartmentOnduty) {
+        staffApartmentOnduty.setId(UUID.randomUUID().toString());
+        staffApartmentOnduty.setCreatime(new Date());
+        return staffApartmentOndutyMapper.insertSelective(staffApartmentOnduty);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(StaffApartmentOnduty staffApartmentOnduty) {
+        staffApartmentOnduty.setCreatime(new Date());
+        return staffApartmentOndutyMapper.updateByPrimaryKeySelective(staffApartmentOnduty);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String companyId) {
+        if (companyId.contains(",")){
+            try {
+                String[] split = companyId.split(",");
+                for (int i=0; i<split.length; i++){
+                    staffApartmentOndutyMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+
+            return staffApartmentOndutyMapper.deleteByPrimaryKey(companyId);
+        }
+    }
+
+}

+package com.tianbo.warehouse.service.satff.Imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.CompanyMapper;
+import com.tianbo.warehouse.dao.Group_companyMapper;
+import com.tianbo.warehouse.dao.StaffSecurityInspectionMapper;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.Group_company;
+import com.tianbo.warehouse.model.StaffSecurityInspection;
+import com.tianbo.warehouse.service.CompanyService;
+import com.tianbo.warehouse.service.satff.StaffSecurityInspectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class StaffSecurityInspectionServiceImp implements StaffSecurityInspectionService {
+
+    @Autowired
+    StaffSecurityInspectionMapper staffSecurityInspectionMapper;
+
+    @Override
+    public PageInfo<StaffSecurityInspection> findAll(int pageNum, int pageSize, String securityInspectionName) {
+        Page<StaffSecurityInspection> page =  PageHelper.startPage(pageNum,pageSize);
+        List<StaffSecurityInspection> list = staffSecurityInspectionMapper.findAll(securityInspectionName);
+        PageInfo<StaffSecurityInspection> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(StaffSecurityInspection staffSecurityInspection) {
+        staffSecurityInspection.setSecurityInspectionId(UUID.randomUUID().toString());
+        staffSecurityInspection.setOptTime(new Date());
+        staffSecurityInspection.setRealname(staffSecurityInspection.getSecurityInspectionName());
+        return staffSecurityInspectionMapper.insertSelective(staffSecurityInspection);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(StaffSecurityInspection staffSecurityInspection) {
+        staffSecurityInspection.setOptTime(new Date());
+        return staffSecurityInspectionMapper.updateByPrimaryKeySelective(staffSecurityInspection);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String securityInspectionId) {
+        if (securityInspectionId.contains(",")){
+            try {
+                String a  = "";
+                String[] split = securityInspectionId.split(",");
+                for (int i=0; i<split.length; i++){
+                    staffSecurityInspectionMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+            return staffSecurityInspectionMapper.deleteByPrimaryKey(securityInspectionId);
+        }
+    }
+}

+package com.tianbo.warehouse.service.satff;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.StaffApartmentSpareKey;
+
+public interface KeyService {
+
+    PageInfo<StaffApartmentSpareKey> findAll(int pageNum, int pageSize, String staffname);
+
+    int insertSelective(StaffApartmentSpareKey staffApartmentSpareKey);
+
+    int updateByPrimaryKeySelective(StaffApartmentSpareKey staffApartmentSpareKey);
+
+    int deleteByPrimaryKey(String id);
+
+}

+package com.tianbo.warehouse.service.satff;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.StaffApartmentMaintain;
+import com.tianbo.warehouse.model.StaffApartmentSpareKey;
+
+public interface MaintainService {
+
+    PageInfo<StaffApartmentMaintain> findAll(int pageNum, int pageSize, String staffname);
+
+    int insertSelective(StaffApartmentMaintain staffApartmentMaintain);
+
+    int updateByPrimaryKeySelective(StaffApartmentMaintain staffApartmentMaintain);
+
+    int deleteByPrimaryKey(String id);
+
+
+}

+package com.tianbo.warehouse.service.satff;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.StaffApartmentOnduty;
+
+import java.util.List;
+
+public interface OnDutyService {
+
+    PageInfo<StaffApartmentOnduty> findAll(int pageNum, int pageSize, String name);
+
+    int insertSelective(StaffApartmentOnduty company);
+
+    int updateByPrimaryKeySelective(StaffApartmentOnduty company);
+
+    int deleteByPrimaryKey(String companyId);
+
+}

+package com.tianbo.warehouse.service.satff;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.Company;
+import com.tianbo.warehouse.model.StaffSecurityInspection;
+
+public interface StaffSecurityInspectionService {
+
+    PageInfo<StaffSecurityInspection> findAll(int pageNum, int pageSize, String securityInspectionName);
+
+    int insertSelective(StaffSecurityInspection staffSecurityInspection);
+
+    int updateByPrimaryKeySelective(StaffSecurityInspection company);
+
+    int deleteByPrimaryKey(String securityInspectionId);
+
+}

+package com.tianbo.warehouse.service.water;
+
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+import com.tianbo.warehouse.model.WaterStationsPatrol;
+
+public interface WaterStationsPatrolService {
+
+    PageInfo<WaterStationsPatrol> findAll(int pageNum, int pageSize);
+
+    int insertSelective(WaterStationsPatrol staffApartmentComeCar);
+
+    int updateByPrimaryKeySelective(WaterStationsPatrol staffApartmentComeCar);
+
+    int deleteByPrimaryKey(String id);
+
+}

+package com.tianbo.warehouse.service.water.imp;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.tianbo.warehouse.dao.StaffApartmentComeCarMapper;
+import com.tianbo.warehouse.dao.WaterStationsPatrolMapper;
+import com.tianbo.warehouse.model.StaffApartmentComeCar;
+import com.tianbo.warehouse.model.WaterStationsPatrol;
+import com.tianbo.warehouse.service.satff.ComeCarService;
+import com.tianbo.warehouse.service.water.WaterStationsPatrolService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class WaterStationsPatrolServiceImp implements WaterStationsPatrolService {
+
+    @Autowired
+    WaterStationsPatrolMapper waterStationsPatrolMapper;
+
+    @Override
+    public PageInfo<WaterStationsPatrol> findAll(int pageNum, int pageSize) {
+        Page<WaterStationsPatrol> page =  PageHelper.startPage(pageNum,pageSize);
+        List<WaterStationsPatrol> list = waterStationsPatrolMapper.findAll();
+
+        PageInfo<WaterStationsPatrol> result = new PageInfo<>(list);
+        return result;
+    }
+
+    @Override
+    public int insertSelective(WaterStationsPatrol staffApartmentComeCar) {
+        staffApartmentComeCar.setId(UUID.randomUUID().toString());
+        staffApartmentComeCar.setCreattime(new Date());
+        return waterStationsPatrolMapper.insertSelective(staffApartmentComeCar);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(WaterStationsPatrol staffApartmentComeCar) {
+        staffApartmentComeCar.setCreattime(new Date());
+        return waterStationsPatrolMapper.updateByPrimaryKeySelective(staffApartmentComeCar);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(String companyId) {
+        if (companyId.contains(",")){
+            try {
+                String[] split = companyId.split(",");
+                for (int i=0; i<split.length; i++){
+                    waterStationsPatrolMapper.deleteByPrimaryKey(split[i]);
+                }
+                return 1;
+            }catch (Exception e){
+                e.printStackTrace();
+                return 0;
+            }
+        }else {
+
+            return waterStationsPatrolMapper.deleteByPrimaryKey(companyId);
+        }
+    }
+}

+package com.tianbo.warehouse.util;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.BoundListOperations;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * redisTemplate封装
+ *
+ *  @author yinxp@dist.com.cn
+ */
+@Component
+public class RedisUtils {
+
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    public RedisUtils(StringRedisTemplate redisTemplate) {
+        this.redisTemplate = redisTemplate;
+    }
+
+    /**
+     * 指定缓存失效时间
+     * @param key 键
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean expire(String key,long time){
+        try {
+            if(time>0){
+                redisTemplate.expire(key, time, TimeUnit.SECONDS);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 根据key 获取过期时间
+     * @param key 键 不能为null
+     * @return 时间(秒) 返回0代表为永久有效
+     */
+    public long getExpire(String key){
+        return redisTemplate.getExpire(key,TimeUnit.SECONDS);
+    }
+
+    /**
+     * 判断key是否存在
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public boolean hasKey(String key){
+        try {
+            return redisTemplate.hasKey(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 删除缓存
+     * @param key 可以传一个值 或多个
+     */
+    @SuppressWarnings("unchecked")
+    public void del(String ... key){
+        if(key!=null&&key.length>0){
+            if(key.length==1){
+                redisTemplate.delete(key[0]);
+            }else{
+                redisTemplate.delete(CollectionUtils.arrayToList(key));
+            }
+        }
+    }
+
+    //============================String=============================
+    /**
+     * 普通缓存获取
+     * @param key 键
+     * @return 值
+     */
+    public String get(String key){
+        return key==null?null:redisTemplate.opsForValue().get(key);
+    }
+
+    /**
+     * 普通缓存放入
+     * @param key 键
+     * @param value 值
+     * @return true成功 false失败
+     */
+    public boolean set(String key,String value) {
+        try {
+            redisTemplate.opsForValue().set(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 普通缓存放入并设置时间
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期
+     * @return true成功 false 失败
+     */
+    public boolean set(String key,String value,long time){
+        try {
+            if(time>0){
+                redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
+            }else{
+                set(key, value);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 递增
+     * @param key 键
+     * @param delta 要增加几(大于0)
+     * @return
+     */
+    public long incr(String key, long delta){
+        if(delta<0){
+            throw new RuntimeException("递增因子必须大于0");
+        }
+        return redisTemplate.opsForValue().increment(key, delta);
+    }
+
+    /**
+     * 递减
+     * @param key 键
+     * @param delta 要减少几(小于0)
+     * @return
+     */
+    public long decr(String key, long delta){
+        if(delta<0){
+            throw new RuntimeException("递减因子必须大于0");
+        }
+        return redisTemplate.opsForValue().increment(key, -delta);
+    }
+
+    //================================Map=================================
+    /**
+     * HashGet
+     * @param key 键 不能为null
+     * @param item 项 不能为null
+     * @return 值
+     */
+    public Object hget(String key,String item){
+        return redisTemplate.opsForHash().get(key, item);
+    }
+
+    /**
+     * 获取hashKey对应的所有键值
+     * @param key 键
+     * @return 对应的多个键值
+     */
+    public Map<Object,Object> hmget(String key){
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * HashSet
+     * @param key 键
+     * @param map 对应多个键值
+     * @return true 成功 false 失败
+     */
+    public boolean hmset(String key, Map<String,String> map){
+        try {
+            redisTemplate.opsForHash().putAll(key, map);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * HashSet 并设置时间
+     * @param key 键
+     * @param map 对应多个键值
+     * @param time 时间(秒)
+     * @return true成功 false失败
+     */
+    public boolean hmset(String key, Map<String,String> map, long time){
+        try {
+            redisTemplate.opsForHash().putAll(key, map);
+            if(time>0){
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     * @param key 键
+     * @param item 项
+     * @param value 值
+     * @return true 成功 false失败
+     */
+    public boolean hset(String key,String item,String value) {
+        try {
+            redisTemplate.opsForHash().put(key, item, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     * @param key 键
+     * @param item 项
+     * @param value 值
+     * @param time 时间(秒)  注意:如果已存在的hash表有时间,这里将会替换原有的时间
+     * @return true 成功 false失败
+     */
+    public boolean hset(String key,String item,String value,long time) {
+        try {
+            redisTemplate.opsForHash().put(key, item, value);
+            if(time>0){
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 删除hash表中的值
+     * @param key 键 不能为null
+     * @param item 项 可以使多个 不能为null
+     */
+    public void hdel(String key, String... item){
+        redisTemplate.opsForHash().delete(key,item);
+    }
+
+    /**
+     * 判断hash表中是否有该项的值
+     * @param key 键 不能为null
+     * @param item 项 不能为null
+     * @return true 存在 false不存在
+     */
+    public boolean hHasKey(String key, String item){
+        return redisTemplate.opsForHash().hasKey(key, item);
+    }
+
+    /**
+     * hash递增 如果不存在,就会创建一个 并把新增后的值返回
+     * @param key 键
+     * @param item 项
+     * @param by 要增加几(大于0)
+     * @return
+     */
+    public double hincr(String key, String item,double by){
+        return redisTemplate.opsForHash().increment(key, item, by);
+    }
+
+    /**
+     * hash递减
+     * @param key 键
+     * @param item 项
+     * @param by 要减少记(小于0)
+     * @return
+     */
+    public double hdecr(String key, String item,double by){
+        return redisTemplate.opsForHash().increment(key, item,-by);
+    }
+
+    //============================set=============================
+    /**
+     * 根据key获取Set中的所有值
+     * @param key 键
+     * @return
+     */
+    public Set<String> sGet(String key){
+        try {
+            return redisTemplate.opsForSet().members(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 根据value从一个set中查询,是否存在
+     * @param key 键
+     * @param value 值
+     * @return true 存在 false不存在
+     */
+    public boolean sHasKey(String key,String value){
+        try {
+            return redisTemplate.opsForSet().isMember(key, value);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将数据放入set缓存
+     * @param key 键
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSet(String key, String...values) {
+        try {
+            return redisTemplate.opsForSet().add(key, values);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 将set数据放入缓存
+     * @param key 键
+     * @param time 时间(秒)
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public long sSetAndTime(String key,long time,String...values) {
+        try {
+            Long count = redisTemplate.opsForSet().add(key, values);
+            if(time>0) {
+                expire(key, time);
+            }
+            return count;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 获取set缓存的长度
+     * @param key 键
+     * @return
+     */
+    public long sGetSetSize(String key){
+        try {
+            return redisTemplate.opsForSet().size(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 移除值为value的
+     * @param key 键
+     * @param values 值 可以是多个
+     * @return 移除的个数
+     */
+    public long setRemove(String key, String ...values) {
+        try {
+            Long count = redisTemplate.opsForSet().remove(key, values);
+            return count;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+    //===============================list=================================
+
+    /**
+     * 获取list缓存的内容
+     * @param key 键
+     * @param start 开始
+     * @param end 结束  0 到 -1代表所有值
+     * @return
+     */
+    public List<String> lGet(String key, long start, long end){
+        try {
+            return redisTemplate.opsForList().range(key, start, end);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 获取list缓存的长度
+     * @param key 键
+     * @return
+     */
+    public long lGetListSize(String key){
+        try {
+            return redisTemplate.opsForList().size(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 通过索引 获取list中的值
+     * @param key 键
+     * @param index 索引  index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
+     * @return
+     */
+    public String lGetIndex(String key,long index){
+        try {
+            return redisTemplate.opsForList().index(key, index);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @return
+     */
+    public boolean lSet(String key, String value) {
+        try {
+            redisTemplate.opsForList().rightPush(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean lSet(String key, String value, long time) {
+        try {
+            redisTemplate.opsForList().rightPush(key, value);
+            if (time > 0) {
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @return
+     */
+    public boolean lSet(String key, List<String> value) {
+        try {
+            redisTemplate.opsForList().rightPushAll(key, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     * @param key 键
+     * @param value 值
+     * @param time 时间(秒)
+     * @return
+     */
+    public boolean lSet(String key, List<String> value, long time) {
+        try {
+            redisTemplate.opsForList().rightPushAll(key, value);
+            if (time > 0) {
+                expire(key, time);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 根据索引修改list中的某条数据
+     * @param key 键
+     * @param index 索引
+     * @param value 值
+     * @return
+     */
+    public boolean lUpdateIndex(String key, long index,String value) {
+        try {
+            redisTemplate.opsForList().set(key, index, value);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 移除N个值为value
+     * @param key 键
+     * @param count 移除多少个
+     * @param value 值
+     * @return 移除的个数
+     */
+    public long lRemove(String key,long count,String value) {
+        try {
+            Long remove = redisTemplate.opsForList().remove(key, count, value);
+            return remove;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 模糊查询获取key值
+     * @param pattern
+     * @return
+     */
+    public Set keys(String pattern){
+        return redisTemplate.keys(pattern);
+    }
+
+    /**
+     * 使用Redis的消息队列
+     * @param channel
+     * @param message 消息内容
+     */
+    public void convertAndSend(String channel, String message){
+        redisTemplate.convertAndSend(channel,message);
+    }
+
+
+    //=========BoundListOperations 用法 start============
+
+    /**
+     *将数据添加到Redis的list中（从右边添加）
+     * @param listKey
+     * @param expireEnum 有效期的枚举类
+     * @param values 待添加的数据
+     */
+//    public void addToListRight(String listKey, Status.ExpireEnum expireEnum, String... values) {
+//        //绑定操作
+//        BoundListOperations<String, String> boundValueOperations = redisTemplate.boundListOps(listKey);
+//        //插入数据
+//        boundValueOperations.rightPushAll(values);
+//        //设置过期时间
+//        boundValueOperations.expire(expireEnum.getTime(),expireEnum.getTimeUnit());
+//    }
+    /**
+     * 根据起始结束序号遍历Redis中的list
+     * @param listKey
+     * @param start  起始序号
+     * @param end  结束序号
+     * @return
+     */
+    public List<String> rangeList(String listKey, long start, long end) {
+        //绑定操作
+        BoundListOperations<String, String> boundValueOperations = redisTemplate.boundListOps(listKey);
+        //查询数据
+        return boundValueOperations.range(start, end);
+    }
+    /**
+     * 弹出右边的值 --- 并且移除这个值
+     * @param listKey
+     */
+    public String rifhtPop(String listKey){
+        //绑定操作
+        BoundListOperations<String, String> boundValueOperations = redisTemplate.boundListOps(listKey);
+        return boundValueOperations.rightPop();
+    }
+
+    //=========BoundListOperations 用法 End============
+
+}

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
 <generatorConfiguration>
     <!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包-->
     <!-- 数据库驱动:选择你的本地硬盘上面的数据库驱动包-->
-    <classPathEntry  location="/Users/mrz/Downloads/mybatis-generator-core-1.3.2/lib/mysql-connector-java-5.1.25-bin.jar"/>
+    <classPathEntry  location="/Users/shenhailong/.m2/repository/mysql/mysql-connector-java/5.1.30/mysql-connector-java-5.1.30.jar"/>
     <!--<classPathEntry  location="/Users/mrz/Documents/maven/ojdbc6.jar"/>-->
     <!--<classPathEntry  location="/Users/mrz/Documents/maven/ojdbc6.jar"/>-->
     <context id="DB2Tables"  targetRuntime="MyBatis3">
     <context id="DB2Tables"  targetRuntime="MyBatis3">
         <commentGenerator>
         <commentGenerator>
@@ -14,9 +14,9 @@
         </commentGenerator>
         </commentGenerator>
         <!--数据库链接URL，用户名、密码 -->
         <!--数据库链接URL，用户名、密码 -->
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                            connectionURL="jdbc:mysql://127.0.0.1:3307/statistics"
-                            userId="root"
-                            password="">
+                            connectionURL="jdbc:mysql://118.31.66.166:3306/HQPT_USER"
+                            userId="110"
+                            password="QAHqCJf2kFYCLirM">
         </jdbcConnection>
         </jdbcConnection>
         <!--<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"-->
         <!--<jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver"-->
                         <!--connectionURL="jdbc:oracle:thin:@10.50.3.68:1521:CGODW"-->
                         <!--connectionURL="jdbc:oracle:thin:@10.50.3.68:1521:CGODW"-->
@@ -45,6 +45,6 @@
             <property name="enableSubPackages" value="true"/>
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
         </javaClientGenerator>
         <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
         <!-- 要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
-        <table tableName="attachment" domainObjectName="Attachment" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
+        <table tableName="staff_aparment_come_car" domainObjectName="StaffApartmentComeCar" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
     </context>
     </context>
 </generatorConfiguration>
 </generatorConfiguration>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.CompanyMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.Company" >
+    <id column="company_id" property="companyId" jdbcType="VARCHAR" />
+    <result column="company_name" property="companyName" jdbcType="VARCHAR" />
+    <result column="group_id" property="groupId" jdbcType="VARCHAR" />
+    <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP" />
+    <result column="company_status" property="companyStatus" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    company_id, company_name, group_id, creat_time, company_status
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from company
+    where company_id = #{companyId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from company
+    <if test="companyName != '' and companyName != null">
+      where company_name = #{companyName,jdbcType=VARCHAR}
+    </if>
+    ORDER BY company_id
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from company
+    where company_id = #{companyId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.Company" >
+    insert into company (company_id, company_name, group_id, 
+      creat_time, company_status)
+    values (#{companyId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, 
+      #{creatTime,jdbcType=TIMESTAMP}, #{companyStatus,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.Company" >
+    insert into company
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="companyId != null" >
+        company_id,
+      </if>
+      <if test="companyName != null" >
+        company_name,
+      </if>
+      <if test="groupId != null" >
+        group_id,
+      </if>
+      <if test="creatTime != null" >
+        creat_time,
+      </if>
+      <if test="companyStatus != null" >
+        company_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null" >
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null" >
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="companyStatus != null" >
+        #{companyStatus,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.Company" >
+    update company
+    <set >
+      <if test="companyName != null" >
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null" >
+        group_id = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        creat_time = #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="companyStatus != null" >
+        company_status = #{companyStatus,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where company_id = #{companyId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.Company" >
+    update company
+    set company_name = #{companyName,jdbcType=VARCHAR},
+      group_id = #{groupId,jdbcType=VARCHAR},
+      creat_time = #{creatTime,jdbcType=TIMESTAMP},
+      company_status = #{companyStatus,jdbcType=VARCHAR}
+    where company_id = #{companyId,jdbcType=VARCHAR}
+  </update>
+
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.DepartmentMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.Department" >
+    <id column="department_id" property="departmentId" jdbcType="VARCHAR" />
+    <result column="department_name" property="departmentName" jdbcType="VARCHAR" />
+    <result column="creat_time" property="creatTime" jdbcType="DATE" />
+    <result column="company_id" property="companyId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    department_id, department_name, creat_time, company_id
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from department
+    where department_id = #{departmentId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from department
+    <if test="departmentName != '' and departmentName != null" >
+      where department_name = #{departmentName, jdbcType=VARCHAR}
+    </if>
+    ORDER BY department_id
+  </select>
+
+  <select id="count" parameterType="string" resultType="int">
+    select count(*) from department where department_id = #{value}
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from department
+    where department_id = #{departmentId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.Department" >
+    insert into department (department_id, department_name, creat_time, 
+      company_id)
+    values (#{departmentId,jdbcType=VARCHAR}, #{departmentName,jdbcType=VARCHAR}, #{creatTime,jdbcType=DATE}, 
+      #{companyId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.Department" >
+    insert into department
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="departmentId != null" >
+        department_id,
+      </if>
+      <if test="departmentName != null" >
+        department_name,
+      </if>
+      <if test="creatTime != null" >
+        creat_time,
+      </if>
+      <if test="companyId != null" >
+        company_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="departmentId != null" >
+        #{departmentId,jdbcType=VARCHAR},
+      </if>
+      <if test="departmentName != null" >
+        #{departmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        #{creatTime,jdbcType=DATE},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.Department" >
+    update department
+    <set >
+      <if test="departmentName != null" >
+        department_name = #{departmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        creat_time = #{creatTime,jdbcType=DATE},
+      </if>
+      <if test="companyId != null" >
+        company_id = #{companyId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where department_id = #{departmentId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.Department" >
+    update department
+    set department_name = #{departmentName,jdbcType=VARCHAR},
+      creat_time = #{creatTime,jdbcType=DATE},
+      company_id = #{companyId,jdbcType=VARCHAR}
+    where department_id = #{departmentId,jdbcType=VARCHAR}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.Group_companyMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.Group_company" >
+    <id column="group_id" property="groupId" jdbcType="VARCHAR" />
+    <result column="group_name" property="groupName" jdbcType="VARCHAR" />
+    <result column="creat_time" property="creatTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    group_id, group_name, creat_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from group_company
+    where group_id = #{groupId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from group_company
+    <if test="groupName != ''" >
+      where group_name = #{groupName, jdbcType=VARCHAR}
+    </if>
+    ORDER BY group_id
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from group_company
+    where group_id = #{groupId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.Group_company" >
+    insert into group_company (group_id, group_name, creat_time
+      )
+    values (#{groupId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR}, #{creatTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.Group_company" >
+    insert into group_company
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="groupId != null" >
+        group_id,
+      </if>
+      <if test="groupName != null" >
+        group_name,
+      </if>
+      <if test="creatTime != null" >
+        creat_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="groupId != null" >
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupName != null" >
+        #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.Group_company" >
+    update group_company
+    <set >
+      <if test="groupName != null" >
+        group_name = #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="creatTime != null" >
+        creat_time = #{creatTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where group_id = #{groupId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.Group_company" >
+    update group_company
+    set group_name = #{groupName,jdbcType=VARCHAR},
+      creat_time = #{creatTime,jdbcType=TIMESTAMP}
+    where group_id = #{groupId,jdbcType=VARCHAR}
+  </update>
+</mapper>

@@ -35,6 +35,13 @@
     ,
     ,
     <include refid="Blob_Column_List" />
     <include refid="Blob_Column_List" />
     from log
     from log
+    where 1=1
+    <if test="modelnamecn != ''">
+      and modelNameCN = #{modelnamecn, jdbcType=VARCHAR}
+    </if>
+    <if test="username != ''">
+      and userName = #{username, jdbcType=VARCHAR}
+    </if>
   </select>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from log
     delete from log

@@ -28,15 +28,19 @@
   <select id="findAll" resultMap="BaseResultMap" >
   <select id="findAll" resultMap="BaseResultMap" >
     select
     select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
-    from permission ORDER BY ismenu,parent_id,permission_order
+    from permission
+    <if test="name != '' and name !=null" >
+      where name = #{name, jdbcType=VARCHAR}
+    </if>
+    ORDER BY permission_order
   </select>
   </select>
   <select id="getRolePermisson" resultMap="BaseResultMap" parameterType="java.lang.Integer">
   <select id="getRolePermisson" resultMap="BaseResultMap" parameterType="java.lang.Integer">
     SELECT P.*
     SELECT P.*
     FROM role R
     FROM role R
     LEFT JOIN role_permission RP ON R.role_id = RP.role_id
     LEFT JOIN role_permission RP ON R.role_id = RP.role_id
     LEFT JOIN permission P ON RP.permission_id = P.permission_id
     LEFT JOIN permission P ON RP.permission_id = P.permission_id
-    WHERE r.role_id=#{roleId,jdbcType=INTEGER}
-    ORDER BY P.ismenu,P.name,p.permission_order DESC
+    WHERE R.role_id=#{roleId,jdbcType=INTEGER}
+    ORDER BY P.ismenu,P.name,P.permission_order DESC
   </select>
   </select>
   <select id="getAllMenus" resultMap="BaseResultMap" >
   <select id="getAllMenus" resultMap="BaseResultMap" >
     SELECT
     SELECT

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.tianbo.warehouse.dao.ROLEMapper">
-  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.ROLE">
-    <id column="role_id" jdbcType="INTEGER" property="roleId" />
-    <result column="role_name" jdbcType="VARCHAR" property="roleName" />
-    <result column="role_sign" jdbcType="VARCHAR" property="roleSign" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <collection property="permissions" ofType="PERMISSION" javaType="java.util.ArrayList" select="com.tianbo.warehouse.dao.PERMISSIONMapper.getRolePermisson" column="role_id"></collection>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.ROLEMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.ROLE" >
+    <id column="role_id" property="roleId" jdbcType="INTEGER" />
+    <result column="role_name" property="roleName" jdbcType="VARCHAR" />
+    <result column="role_sign" property="roleSign" jdbcType="VARCHAR" />
+    <result column="description" property="description" jdbcType="VARCHAR" />
+    <result column="department_id" property="departmentId" jdbcType="VARCHAR" />
+    <collection property="permissions" ofType="com.tianbo.warehouse.model.PERMISSION" javaType="java.util.ArrayList" select="com.tianbo.warehouse.dao.PERMISSIONMapper.getRolePermisson" column="role_id"></collection>
   </resultMap>
   </resultMap>
-  <sql id="Base_Column_List">
-    role_id, role_name, role_sign, description
+  <sql id="Base_Column_List" >
+    role_id, role_name, role_sign, description, department_id
   </sql>
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from role
     from role
     where role_id = #{roleId,jdbcType=INTEGER}
     where role_id = #{roleId,jdbcType=INTEGER}
   </select>
   </select>
-  <select id="findAll" resultMap="BaseResultMap" >
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String">
     SELECT
     SELECT
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     FROM role
     FROM role
+    <if test="roleName != ''  and roleName !=null" >
+      where role_name = #{roleName, jdbcType=VARCHAR}
+    </if>
   </select>
   </select>
   <select id="findRolesByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="findRolesByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     SELECT
     SELECT
@@ -31,68 +36,78 @@
     LEFT JOIN role R ON  R.role_id= UR.role_id
     LEFT JOIN role R ON  R.role_id= UR.role_id
     where U.user_id = #{userId,jdbcType=INTEGER}
     where U.user_id = #{userId,jdbcType=INTEGER}
   </select>
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from role
     delete from role
     where role_id = #{roleId,jdbcType=INTEGER}
     where role_id = #{roleId,jdbcType=INTEGER}
   </delete>
   </delete>
-  <insert id="insert" parameterType="com.tianbo.warehouse.model.ROLE">
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.ROLE" >
     insert into role (role_id, role_name, role_sign, 
     insert into role (role_id, role_name, role_sign, 
-      description)
+      description, department_id)
     values (#{roleId,jdbcType=INTEGER}, #{roleName,jdbcType=VARCHAR}, #{roleSign,jdbcType=VARCHAR}, 
     values (#{roleId,jdbcType=INTEGER}, #{roleName,jdbcType=VARCHAR}, #{roleSign,jdbcType=VARCHAR}, 
-      #{description,jdbcType=VARCHAR})
+      #{description,jdbcType=VARCHAR}, #{departmentId,jdbcType=VARCHAR})
   </insert>
   </insert>
-
-  <insert id="insertSelective" parameterType="Integer">
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.ROLE" >
     insert into role
     insert into role
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="roleId != null" >
         role_id,
         role_id,
       </if>
       </if>
-      <if test="roleName != null">
+      <if test="roleName != null" >
         role_name,
         role_name,
       </if>
       </if>
-      <if test="roleSign != null">
+      <if test="roleSign != null" >
         role_sign,
         role_sign,
       </if>
       </if>
-      <if test="description != null">
+      <if test="description != null" >
         description,
         description,
       </if>
       </if>
+      <if test="departmentId != null" >
+        department_id,
+      </if>
     </trim>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="roleId != null">
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="roleId != null" >
         #{roleId,jdbcType=INTEGER},
         #{roleId,jdbcType=INTEGER},
       </if>
       </if>
-      <if test="roleName != null">
+      <if test="roleName != null" >
         #{roleName,jdbcType=VARCHAR},
         #{roleName,jdbcType=VARCHAR},
       </if>
       </if>
-      <if test="roleSign != null">
+      <if test="roleSign != null" >
         #{roleSign,jdbcType=VARCHAR},
         #{roleSign,jdbcType=VARCHAR},
       </if>
       </if>
-      <if test="description != null">
+      <if test="description != null" >
         #{description,jdbcType=VARCHAR},
         #{description,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="departmentId != null" >
+        #{departmentId,jdbcType=VARCHAR},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.ROLE">
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.ROLE" >
     update role
     update role
-    <set>
-      <if test="roleName != null">
+    <set >
+      <if test="roleName != null" >
         role_name = #{roleName,jdbcType=VARCHAR},
         role_name = #{roleName,jdbcType=VARCHAR},
       </if>
       </if>
-      <if test="roleSign != null">
+      <if test="roleSign != null" >
         role_sign = #{roleSign,jdbcType=VARCHAR},
         role_sign = #{roleSign,jdbcType=VARCHAR},
       </if>
       </if>
-      <if test="description != null">
+      <if test="description != null" >
         description = #{description,jdbcType=VARCHAR},
         description = #{description,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="departmentId != null" >
+        department_id = #{departmentId,jdbcType=VARCHAR},
+      </if>
     </set>
     </set>
     where role_id = #{roleId,jdbcType=INTEGER}
     where role_id = #{roleId,jdbcType=INTEGER}
   </update>
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.ROLE">
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.ROLE" >
     update role
     update role
     set role_name = #{roleName,jdbcType=VARCHAR},
     set role_name = #{roleName,jdbcType=VARCHAR},
       role_sign = #{roleSign,jdbcType=VARCHAR},
       role_sign = #{roleSign,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR}
+      description = #{description,jdbcType=VARCHAR},
+      department_id = #{departmentId,jdbcType=VARCHAR}
     where role_id = #{roleId,jdbcType=INTEGER}
     where role_id = #{roleId,jdbcType=INTEGER}
   </update>
   </update>
 </mapper>
 </mapper>

@@ -29,11 +29,13 @@
     values (#{id,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}, #{permissionId,jdbcType=INTEGER}
     values (#{id,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}, #{permissionId,jdbcType=INTEGER}
       )
       )
   </insert>
   </insert>
-  <insert id="insertRolePerm" parameterType="RolePermission">
+  <insert id="insertRolePerm" parameterType="com.tianbo.warehouse.model.RolePermission">
     insert into role_permission(role_id, permission_id)
     insert into role_permission(role_id, permission_id)
     values
     values
     <foreach collection="permissionIds" item="rolePem" index="index"  separator=",">
     <foreach collection="permissionIds" item="rolePem" index="index"  separator=",">
+      <if test="rolePem !=null">
         (#{roleId,jdbcType=INTEGER},#{rolePem,jdbcType=INTEGER})
         (#{roleId,jdbcType=INTEGER},#{rolePem,jdbcType=INTEGER})
+      </if>
     </foreach>
     </foreach>
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.RolePermission" >
   <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.RolePermission" >

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.StaffApartmentComeCarMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="dateTime" property="datetime" jdbcType="TIMESTAMP" />
+    <result column="comeToVisitDate" property="cometovisitdate" jdbcType="TIMESTAMP" />
+    <result column="leaveDate" property="leavedate" jdbcType="TIMESTAMP" />
+    <result column="comeToVisitName" property="cometovisitname" jdbcType="VARCHAR" />
+    <result column="carNumber" property="carnumber" jdbcType="VARCHAR" />
+    <result column="phone" property="phone" jdbcType="VARCHAR" />
+    <result column="comeMatter" property="comematter" jdbcType="VARCHAR" />
+    <result column="warchkeeper" property="warchkeeper" jdbcType="VARCHAR" />
+    <result column="remark1" property="remark1" jdbcType="VARCHAR" />
+    <result column="remark2" property="remark2" jdbcType="VARCHAR" />
+    <result column="remark3" property="remark3" jdbcType="VARCHAR" />
+    <result column="userId" property="userid" jdbcType="INTEGER" />
+    <result column="createTime" property="createtime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, dateTime, comeToVisitDate, leaveDate, comeToVisitName, carNumber, phone, comeMatter, 
+    warchkeeper, remark1, remark2, remark3, userId, createTime
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from staff_aparment_come_car
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from staff_aparment_come_car
+    <if test="comeToVisitName != null and comeToVisitName!=''" >
+      where comeToVisitName = #{comeToVisitName, jdbcType=VARCHAR}
+    </if>
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from staff_aparment_come_car
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    insert into staff_aparment_come_car (id, dateTime, comeToVisitDate, 
+      leaveDate, comeToVisitName, carNumber, 
+      phone, comeMatter, warchkeeper, 
+      remark1, remark2, remark3, 
+      userId, createTime)
+    values (#{id,jdbcType=VARCHAR}, #{datetime,jdbcType=TIMESTAMP}, #{cometovisitdate,jdbcType=TIMESTAMP}, 
+      #{leavedate,jdbcType=TIMESTAMP}, #{cometovisitname,jdbcType=VARCHAR}, #{carnumber,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{comematter,jdbcType=VARCHAR}, #{warchkeeper,jdbcType=VARCHAR}, 
+      #{remark1,jdbcType=VARCHAR}, #{remark2,jdbcType=VARCHAR}, #{remark3,jdbcType=VARCHAR}, 
+      #{userid,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    insert into staff_aparment_come_car
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="datetime != null" >
+        dateTime,
+      </if>
+      <if test="cometovisitdate != null" >
+        comeToVisitDate,
+      </if>
+      <if test="leavedate != null" >
+        leaveDate,
+      </if>
+      <if test="cometovisitname != null" >
+        comeToVisitName,
+      </if>
+      <if test="carnumber != null" >
+        carNumber,
+      </if>
+      <if test="phone != null" >
+        phone,
+      </if>
+      <if test="comematter != null" >
+        comeMatter,
+      </if>
+      <if test="warchkeeper != null" >
+        warchkeeper,
+      </if>
+      <if test="remark1 != null" >
+        remark1,
+      </if>
+      <if test="remark2 != null" >
+        remark2,
+      </if>
+      <if test="remark3 != null" >
+        remark3,
+      </if>
+      <if test="userid != null" >
+        userId,
+      </if>
+      <if test="createtime != null" >
+        createTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="datetime != null" >
+        #{datetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cometovisitdate != null" >
+        #{cometovisitdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="leavedate != null" >
+        #{leavedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cometovisitname != null" >
+        #{cometovisitname,jdbcType=VARCHAR},
+      </if>
+      <if test="carnumber != null" >
+        #{carnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="comematter != null" >
+        #{comematter,jdbcType=VARCHAR},
+      </if>
+      <if test="warchkeeper != null" >
+        #{warchkeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="remark1 != null" >
+        #{remark1,jdbcType=VARCHAR},
+      </if>
+      <if test="remark2 != null" >
+        #{remark2,jdbcType=VARCHAR},
+      </if>
+      <if test="remark3 != null" >
+        #{remark3,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null" >
+        #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="createtime != null" >
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    update staff_aparment_come_car
+    <set >
+      <if test="datetime != null" >
+        dateTime = #{datetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cometovisitdate != null" >
+        comeToVisitDate = #{cometovisitdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="leavedate != null" >
+        leaveDate = #{leavedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cometovisitname != null" >
+        comeToVisitName = #{cometovisitname,jdbcType=VARCHAR},
+      </if>
+      <if test="carnumber != null" >
+        carNumber = #{carnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="comematter != null" >
+        comeMatter = #{comematter,jdbcType=VARCHAR},
+      </if>
+      <if test="warchkeeper != null" >
+        warchkeeper = #{warchkeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="remark1 != null" >
+        remark1 = #{remark1,jdbcType=VARCHAR},
+      </if>
+      <if test="remark2 != null" >
+        remark2 = #{remark2,jdbcType=VARCHAR},
+      </if>
+      <if test="remark3 != null" >
+        remark3 = #{remark3,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null" >
+        userId = #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="createtime != null" >
+        createTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffApartmentComeCar" >
+    update staff_aparment_come_car
+    set dateTime = #{datetime,jdbcType=TIMESTAMP},
+      comeToVisitDate = #{cometovisitdate,jdbcType=TIMESTAMP},
+      leaveDate = #{leavedate,jdbcType=TIMESTAMP},
+      comeToVisitName = #{cometovisitname,jdbcType=VARCHAR},
+      carNumber = #{carnumber,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      comeMatter = #{comematter,jdbcType=VARCHAR},
+      warchkeeper = #{warchkeeper,jdbcType=VARCHAR},
+      remark1 = #{remark1,jdbcType=VARCHAR},
+      remark2 = #{remark2,jdbcType=VARCHAR},
+      remark3 = #{remark3,jdbcType=VARCHAR},
+      userId = #{userid,jdbcType=INTEGER},
+      createTime = #{createtime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.StaffApartmentMaintainMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffApartmentMaintain" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="repairsDate" property="repairsdate" jdbcType="TIMESTAMP" />
+    <result column="repairsContent" property="repairscontent" jdbcType="VARCHAR" />
+    <result column="reflectWay" property="reflectway" jdbcType="VARCHAR" />
+    <result column="repairsDept" property="repairsdept" jdbcType="VARCHAR" />
+    <result column="answerThePhoneName" property="answerthephonename" jdbcType="VARCHAR" />
+    <result column="repairsName" property="repairsname" jdbcType="VARCHAR" />
+    <result column="repairsPhone" property="repairsphone" jdbcType="VARCHAR" />
+    <result column="maintainDate" property="maintaindate" jdbcType="TIMESTAMP" />
+    <result column="maintainCase" property="maintaincase" jdbcType="VARCHAR" />
+    <result column="cooperateMaintainName" property="cooperatemaintainname" jdbcType="VARCHAR" />
+    <result column="meno" property="meno" jdbcType="INTEGER" />
+    <result column="remark1" property="remark1" jdbcType="VARCHAR" />
+    <result column="remark2" property="remark2" jdbcType="VARCHAR" />
+    <result column="remark3" property="remark3" jdbcType="VARCHAR" />
+    <result column="createBy" property="createby" jdbcType="INTEGER" />
+    <result column="createTime" property="createtime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, repairsDate, repairsContent, reflectWay, repairsDept, answerThePhoneName, repairsName, 
+    repairsPhone, maintainDate, maintainCase, cooperateMaintainName, meno, remark1, remark2, 
+    remark3, createBy, createTime
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from staff_apertment_maintain
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from staff_apertment_maintain
+    <if test="repairsname != null and repairsname!=''" >
+      where repairsName = #{repairsname, jdbcType=VARCHAR}
+    </if>
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from staff_apertment_maintain
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.StaffApartmentMaintain" >
+    insert into staff_apertment_maintain (id, repairsDate, repairsContent, 
+      reflectWay, repairsDept, answerThePhoneName, 
+      repairsName, repairsPhone, maintainDate, 
+      maintainCase, cooperateMaintainName, meno, 
+      remark1, remark2, remark3, 
+      createBy, createTime)
+    values (#{id,jdbcType=VARCHAR}, #{repairsdate,jdbcType=TIMESTAMP}, #{repairscontent,jdbcType=VARCHAR}, 
+      #{reflectway,jdbcType=VARCHAR}, #{repairsdept,jdbcType=VARCHAR}, #{answerthephonename,jdbcType=VARCHAR}, 
+      #{repairsname,jdbcType=VARCHAR}, #{repairsphone,jdbcType=VARCHAR}, #{maintaindate,jdbcType=TIMESTAMP}, 
+      #{maintaincase,jdbcType=VARCHAR}, #{cooperatemaintainname,jdbcType=VARCHAR}, #{meno,jdbcType=INTEGER}, 
+      #{remark1,jdbcType=VARCHAR}, #{remark2,jdbcType=VARCHAR}, #{remark3,jdbcType=VARCHAR}, 
+      #{createby,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffApartmentMaintain" >
+    insert into staff_apertment_maintain
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="repairsdate != null" >
+        repairsDate,
+      </if>
+      <if test="repairscontent != null" >
+        repairsContent,
+      </if>
+      <if test="reflectway != null" >
+        reflectWay,
+      </if>
+      <if test="repairsdept != null" >
+        repairsDept,
+      </if>
+      <if test="answerthephonename != null" >
+        answerThePhoneName,
+      </if>
+      <if test="repairsname != null" >
+        repairsName,
+      </if>
+      <if test="repairsphone != null" >
+        repairsPhone,
+      </if>
+      <if test="maintaindate != null" >
+        maintainDate,
+      </if>
+      <if test="maintaincase != null" >
+        maintainCase,
+      </if>
+      <if test="cooperatemaintainname != null" >
+        cooperateMaintainName,
+      </if>
+      <if test="meno != null" >
+        meno,
+      </if>
+      <if test="remark1 != null" >
+        remark1,
+      </if>
+      <if test="remark2 != null" >
+        remark2,
+      </if>
+      <if test="remark3 != null" >
+        remark3,
+      </if>
+      <if test="createby != null" >
+        createBy,
+      </if>
+      <if test="createtime != null" >
+        createTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="repairsdate != null" >
+        #{repairsdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairscontent != null" >
+        #{repairscontent,jdbcType=VARCHAR},
+      </if>
+      <if test="reflectway != null" >
+        #{reflectway,jdbcType=VARCHAR},
+      </if>
+      <if test="repairsdept != null" >
+        #{repairsdept,jdbcType=VARCHAR},
+      </if>
+      <if test="answerthephonename != null" >
+        #{answerthephonename,jdbcType=VARCHAR},
+      </if>
+      <if test="repairsname != null" >
+        #{repairsname,jdbcType=VARCHAR},
+      </if>
+      <if test="repairsphone != null" >
+        #{repairsphone,jdbcType=VARCHAR},
+      </if>
+      <if test="maintaindate != null" >
+        #{maintaindate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="maintaincase != null" >
+        #{maintaincase,jdbcType=VARCHAR},
+      </if>
+      <if test="cooperatemaintainname != null" >
+        #{cooperatemaintainname,jdbcType=VARCHAR},
+      </if>
+      <if test="meno != null" >
+        #{meno,jdbcType=INTEGER},
+      </if>
+      <if test="remark1 != null" >
+        #{remark1,jdbcType=VARCHAR},
+      </if>
+      <if test="remark2 != null" >
+        #{remark2,jdbcType=VARCHAR},
+      </if>
+      <if test="remark3 != null" >
+        #{remark3,jdbcType=VARCHAR},
+      </if>
+      <if test="createby != null" >
+        #{createby,jdbcType=INTEGER},
+      </if>
+      <if test="createtime != null" >
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffApartmentMaintain" >
+    update staff_apertment_maintain
+    <set >
+      <if test="repairsdate != null" >
+        repairsDate = #{repairsdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="repairscontent != null" >
+        repairsContent = #{repairscontent,jdbcType=VARCHAR},
+      </if>
+      <if test="reflectway != null" >
+        reflectWay = #{reflectway,jdbcType=VARCHAR},
+      </if>
+      <if test="repairsdept != null" >
+        repairsDept = #{repairsdept,jdbcType=VARCHAR},
+      </if>
+      <if test="answerthephonename != null" >
+        answerThePhoneName = #{answerthephonename,jdbcType=VARCHAR},
+      </if>
+      <if test="repairsname != null" >
+        repairsName = #{repairsname,jdbcType=VARCHAR},
+      </if>
+      <if test="repairsphone != null" >
+        repairsPhone = #{repairsphone,jdbcType=VARCHAR},
+      </if>
+      <if test="maintaindate != null" >
+        maintainDate = #{maintaindate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="maintaincase != null" >
+        maintainCase = #{maintaincase,jdbcType=VARCHAR},
+      </if>
+      <if test="cooperatemaintainname != null" >
+        cooperateMaintainName = #{cooperatemaintainname,jdbcType=VARCHAR},
+      </if>
+      <if test="meno != null" >
+        meno = #{meno,jdbcType=INTEGER},
+      </if>
+      <if test="remark1 != null" >
+        remark1 = #{remark1,jdbcType=VARCHAR},
+      </if>
+      <if test="remark2 != null" >
+        remark2 = #{remark2,jdbcType=VARCHAR},
+      </if>
+      <if test="remark3 != null" >
+        remark3 = #{remark3,jdbcType=VARCHAR},
+      </if>
+      <if test="createby != null" >
+        createBy = #{createby,jdbcType=INTEGER},
+      </if>
+      <if test="createtime != null" >
+        createTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffApartmentMaintain" >
+    update staff_apertment_maintain
+    set repairsDate = #{repairsdate,jdbcType=TIMESTAMP},
+      repairsContent = #{repairscontent,jdbcType=VARCHAR},
+      reflectWay = #{reflectway,jdbcType=VARCHAR},
+      repairsDept = #{repairsdept,jdbcType=VARCHAR},
+      answerThePhoneName = #{answerthephonename,jdbcType=VARCHAR},
+      repairsName = #{repairsname,jdbcType=VARCHAR},
+      repairsPhone = #{repairsphone,jdbcType=VARCHAR},
+      maintainDate = #{maintaindate,jdbcType=TIMESTAMP},
+      maintainCase = #{maintaincase,jdbcType=VARCHAR},
+      cooperateMaintainName = #{cooperatemaintainname,jdbcType=VARCHAR},
+      meno = #{meno,jdbcType=INTEGER},
+      remark1 = #{remark1,jdbcType=VARCHAR},
+      remark2 = #{remark2,jdbcType=VARCHAR},
+      remark3 = #{remark3,jdbcType=VARCHAR},
+      createBy = #{createby,jdbcType=INTEGER},
+      createTime = #{createtime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.StaffApartmentOndutyMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="warchkeeper" property="warchkeeper" jdbcType="VARCHAR" />
+    <result column="handOverShiftTime" property="handovershifttime" jdbcType="TIMESTAMP" />
+    <result column="publicLighting" property="publiclighting" jdbcType="VARCHAR" />
+    <result column="carPark" property="carpark" jdbcType="VARCHAR" />
+    <result column="campusAfforestation" property="campusafforestation" jdbcType="VARCHAR" />
+    <result column="fireFightingEquipment" property="firefightingequipment" jdbcType="VARCHAR" />
+    <result column="equipmentFacilities" property="equipmentfacilities" jdbcType="VARCHAR" />
+    <result column="publicSanitation" property="publicsanitation" jdbcType="VARCHAR" />
+    <result column="property" property="property" jdbcType="VARCHAR" />
+    <result column="securityDanger" property="securitydanger" jdbcType="VARCHAR" />
+    <result column="rests" property="rests" jdbcType="VARCHAR" />
+    <result column="handoverMatters" property="handovermatters" jdbcType="VARCHAR" />
+    <result column="creaTime" property="creatime" jdbcType="TIMESTAMP" />
+    <result column="userId" property="userid" jdbcType="INTEGER" />
+    <result column="remberk1" property="remberk1" jdbcType="VARCHAR" />
+    <result column="remberk2" property="remberk2" jdbcType="VARCHAR" />
+    <result column="remberk3" property="remberk3" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, warchkeeper, handOverShiftTime, publicLighting, carPark, campusAfforestation, 
+    fireFightingEquipment, equipmentFacilities, publicSanitation, property, securityDanger, 
+    rests, handoverMatters, creaTime, userId, remberk1, remberk2, remberk3
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from staff_apartment_on_duty
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from staff_apartment_on_duty
+    <if test="warchkeeper != null and warchkeeper!=''" >
+      where warchkeeper = #{warchkeeper, jdbcType=VARCHAR}
+    </if>
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from staff_apartment_on_duty
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    insert into staff_apartment_on_duty (id, warchkeeper, handOverShiftTime, 
+      publicLighting, carPark, campusAfforestation, 
+      fireFightingEquipment, equipmentFacilities, 
+      publicSanitation, property, securityDanger, 
+      rests, handoverMatters, creaTime, 
+      userId, remberk1, remberk2, 
+      remberk3)
+    values (#{id,jdbcType=VARCHAR}, #{warchkeeper,jdbcType=VARCHAR}, #{handovershifttime,jdbcType=TIMESTAMP}, 
+      #{publiclighting,jdbcType=VARCHAR}, #{carpark,jdbcType=VARCHAR}, #{campusafforestation,jdbcType=VARCHAR}, 
+      #{firefightingequipment,jdbcType=VARCHAR}, #{equipmentfacilities,jdbcType=VARCHAR}, 
+      #{publicsanitation,jdbcType=VARCHAR}, #{property,jdbcType=VARCHAR}, #{securitydanger,jdbcType=VARCHAR}, 
+      #{rests,jdbcType=VARCHAR}, #{handovermatters,jdbcType=VARCHAR}, #{creatime,jdbcType=TIMESTAMP}, 
+      #{userid,jdbcType=INTEGER}, #{remberk1,jdbcType=VARCHAR}, #{remberk2,jdbcType=VARCHAR}, 
+      #{remberk3,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    insert into staff_apartment_on_duty
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="warchkeeper != null" >
+        warchkeeper,
+      </if>
+      <if test="handovershifttime != null" >
+        handOverShiftTime,
+      </if>
+      <if test="publiclighting != null" >
+        publicLighting,
+      </if>
+      <if test="carpark != null" >
+        carPark,
+      </if>
+      <if test="campusafforestation != null" >
+        campusAfforestation,
+      </if>
+      <if test="firefightingequipment != null" >
+        fireFightingEquipment,
+      </if>
+      <if test="equipmentfacilities != null" >
+        equipmentFacilities,
+      </if>
+      <if test="publicsanitation != null" >
+        publicSanitation,
+      </if>
+      <if test="property != null" >
+        property,
+      </if>
+      <if test="securitydanger != null" >
+        securityDanger,
+      </if>
+      <if test="rests != null" >
+        rests,
+      </if>
+      <if test="handovermatters != null" >
+        handoverMatters,
+      </if>
+      <if test="creatime != null" >
+        creaTime,
+      </if>
+      <if test="userid != null" >
+        userId,
+      </if>
+      <if test="remberk1 != null" >
+        remberk1,
+      </if>
+      <if test="remberk2 != null" >
+        remberk2,
+      </if>
+      <if test="remberk3 != null" >
+        remberk3,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="warchkeeper != null" >
+        #{warchkeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="handovershifttime != null" >
+        #{handovershifttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="publiclighting != null" >
+        #{publiclighting,jdbcType=VARCHAR},
+      </if>
+      <if test="carpark != null" >
+        #{carpark,jdbcType=VARCHAR},
+      </if>
+      <if test="campusafforestation != null" >
+        #{campusafforestation,jdbcType=VARCHAR},
+      </if>
+      <if test="firefightingequipment != null" >
+        #{firefightingequipment,jdbcType=VARCHAR},
+      </if>
+      <if test="equipmentfacilities != null" >
+        #{equipmentfacilities,jdbcType=VARCHAR},
+      </if>
+      <if test="publicsanitation != null" >
+        #{publicsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="property != null" >
+        #{property,jdbcType=VARCHAR},
+      </if>
+      <if test="securitydanger != null" >
+        #{securitydanger,jdbcType=VARCHAR},
+      </if>
+      <if test="rests != null" >
+        #{rests,jdbcType=VARCHAR},
+      </if>
+      <if test="handovermatters != null" >
+        #{handovermatters,jdbcType=VARCHAR},
+      </if>
+      <if test="creatime != null" >
+        #{creatime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userid != null" >
+        #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="remberk1 != null" >
+        #{remberk1,jdbcType=VARCHAR},
+      </if>
+      <if test="remberk2 != null" >
+        #{remberk2,jdbcType=VARCHAR},
+      </if>
+      <if test="remberk3 != null" >
+        #{remberk3,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    update staff_apartment_on_duty
+    <set >
+      <if test="warchkeeper != null" >
+        warchkeeper = #{warchkeeper,jdbcType=VARCHAR},
+      </if>
+      <if test="handovershifttime != null" >
+        handOverShiftTime = #{handovershifttime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="publiclighting != null" >
+        publicLighting = #{publiclighting,jdbcType=VARCHAR},
+      </if>
+      <if test="carpark != null" >
+        carPark = #{carpark,jdbcType=VARCHAR},
+      </if>
+      <if test="campusafforestation != null" >
+        campusAfforestation = #{campusafforestation,jdbcType=VARCHAR},
+      </if>
+      <if test="firefightingequipment != null" >
+        fireFightingEquipment = #{firefightingequipment,jdbcType=VARCHAR},
+      </if>
+      <if test="equipmentfacilities != null" >
+        equipmentFacilities = #{equipmentfacilities,jdbcType=VARCHAR},
+      </if>
+      <if test="publicsanitation != null" >
+        publicSanitation = #{publicsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="property != null" >
+        property = #{property,jdbcType=VARCHAR},
+      </if>
+      <if test="securitydanger != null" >
+        securityDanger = #{securitydanger,jdbcType=VARCHAR},
+      </if>
+      <if test="rests != null" >
+        rests = #{rests,jdbcType=VARCHAR},
+      </if>
+      <if test="handovermatters != null" >
+        handoverMatters = #{handovermatters,jdbcType=VARCHAR},
+      </if>
+      <if test="creatime != null" >
+        creaTime = #{creatime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="userid != null" >
+        userId = #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="remberk1 != null" >
+        remberk1 = #{remberk1,jdbcType=VARCHAR},
+      </if>
+      <if test="remberk2 != null" >
+        remberk2 = #{remberk2,jdbcType=VARCHAR},
+      </if>
+      <if test="remberk3 != null" >
+        remberk3 = #{remberk3,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffApartmentOnduty" >
+    update staff_apartment_on_duty
+    set warchkeeper = #{warchkeeper,jdbcType=VARCHAR},
+      handOverShiftTime = #{handovershifttime,jdbcType=TIMESTAMP},
+      publicLighting = #{publiclighting,jdbcType=VARCHAR},
+      carPark = #{carpark,jdbcType=VARCHAR},
+      campusAfforestation = #{campusafforestation,jdbcType=VARCHAR},
+      fireFightingEquipment = #{firefightingequipment,jdbcType=VARCHAR},
+      equipmentFacilities = #{equipmentfacilities,jdbcType=VARCHAR},
+      publicSanitation = #{publicsanitation,jdbcType=VARCHAR},
+      property = #{property,jdbcType=VARCHAR},
+      securityDanger = #{securitydanger,jdbcType=VARCHAR},
+      rests = #{rests,jdbcType=VARCHAR},
+      handoverMatters = #{handovermatters,jdbcType=VARCHAR},
+      creaTime = #{creatime,jdbcType=TIMESTAMP},
+      userId = #{userid,jdbcType=INTEGER},
+      remberk1 = #{remberk1,jdbcType=VARCHAR},
+      remberk2 = #{remberk2,jdbcType=VARCHAR},
+      remberk3 = #{remberk3,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.StaffApartmentSpareKeyMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="useDate" property="usedate" jdbcType="TIMESTAMP" />
+    <result column="roomNum" property="roomnum" jdbcType="VARCHAR" />
+    <result column="useTime" property="usetime" jdbcType="TIMESTAMP" />
+    <result column="staffName" property="staffname" jdbcType="VARCHAR" />
+    <result column="dept" property="dept" jdbcType="VARCHAR" />
+    <result column="phone" property="phone" jdbcType="VARCHAR" />
+    <result column="icType" property="ictype" jdbcType="VARCHAR" />
+    <result column="icCard" property="iccard" jdbcType="VARCHAR" />
+    <result column="roomDuty" property="roomduty" jdbcType="VARCHAR" />
+    <result column="remark1" property="remark1" jdbcType="VARCHAR" />
+    <result column="remark2" property="remark2" jdbcType="VARCHAR" />
+    <result column="remark3" property="remark3" jdbcType="VARCHAR" />
+    <result column="createBy" property="createby" jdbcType="INTEGER" />
+    <result column="createTime" property="createtime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, useDate, roomNum, useTime, staffName, dept, phone, icType, icCard, roomDuty, 
+    remark1, remark2, remark3, createBy, createTime
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from staff_apartment_spare_key
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from staff_apartment_spare_key
+    <if test="staffname != null and staffname!=''" >
+      where staffname = #{staffname, jdbcType=VARCHAR}
+    </if>
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from staff_apartment_spare_key
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
+    insert into staff_apartment_spare_key (id, useDate, roomNum, 
+      useTime, staffName, dept, 
+      phone, icType, icCard, 
+      roomDuty, remark1, remark2, 
+      remark3, createBy, createTime
+      )
+    values (#{id,jdbcType=VARCHAR}, #{usedate,jdbcType=TIMESTAMP}, #{roomnum,jdbcType=VARCHAR}, 
+      #{usetime,jdbcType=TIMESTAMP}, #{staffname,jdbcType=VARCHAR}, #{dept,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{ictype,jdbcType=VARCHAR}, #{iccard,jdbcType=VARCHAR}, 
+      #{roomduty,jdbcType=VARCHAR}, #{remark1,jdbcType=VARCHAR}, #{remark2,jdbcType=VARCHAR}, 
+      #{remark3,jdbcType=VARCHAR}, #{createby,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
+    insert into staff_apartment_spare_key
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="usedate != null" >
+        useDate,
+      </if>
+      <if test="roomnum != null" >
+        roomNum,
+      </if>
+      <if test="usetime != null" >
+        useTime,
+      </if>
+      <if test="staffname != null" >
+        staffName,
+      </if>
+      <if test="dept != null" >
+        dept,
+      </if>
+      <if test="phone != null" >
+        phone,
+      </if>
+      <if test="ictype != null" >
+        icType,
+      </if>
+      <if test="iccard != null" >
+        icCard,
+      </if>
+      <if test="roomduty != null" >
+        roomDuty,
+      </if>
+      <if test="remark1 != null" >
+        remark1,
+      </if>
+      <if test="remark2 != null" >
+        remark2,
+      </if>
+      <if test="remark3 != null" >
+        remark3,
+      </if>
+      <if test="createby != null" >
+        createBy,
+      </if>
+      <if test="createtime != null" >
+        createTime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="usedate != null" >
+        #{usedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="roomnum != null" >
+        #{roomnum,jdbcType=VARCHAR},
+      </if>
+      <if test="usetime != null" >
+        #{usetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="staffname != null" >
+        #{staffname,jdbcType=VARCHAR},
+      </if>
+      <if test="dept != null" >
+        #{dept,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="ictype != null" >
+        #{ictype,jdbcType=VARCHAR},
+      </if>
+      <if test="iccard != null" >
+        #{iccard,jdbcType=VARCHAR},
+      </if>
+      <if test="roomduty != null" >
+        #{roomduty,jdbcType=VARCHAR},
+      </if>
+      <if test="remark1 != null" >
+        #{remark1,jdbcType=VARCHAR},
+      </if>
+      <if test="remark2 != null" >
+        #{remark2,jdbcType=VARCHAR},
+      </if>
+      <if test="remark3 != null" >
+        #{remark3,jdbcType=VARCHAR},
+      </if>
+      <if test="createby != null" >
+        #{createby,jdbcType=INTEGER},
+      </if>
+      <if test="createtime != null" >
+        #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
+    update staff_apartment_spare_key
+    <set >
+      <if test="usedate != null" >
+        useDate = #{usedate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="roomnum != null" >
+        roomNum = #{roomnum,jdbcType=VARCHAR},
+      </if>
+      <if test="usetime != null" >
+        useTime = #{usetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="staffname != null" >
+        staffName = #{staffname,jdbcType=VARCHAR},
+      </if>
+      <if test="dept != null" >
+        dept = #{dept,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="ictype != null" >
+        icType = #{ictype,jdbcType=VARCHAR},
+      </if>
+      <if test="iccard != null" >
+        icCard = #{iccard,jdbcType=VARCHAR},
+      </if>
+      <if test="roomduty != null" >
+        roomDuty = #{roomduty,jdbcType=VARCHAR},
+      </if>
+      <if test="remark1 != null" >
+        remark1 = #{remark1,jdbcType=VARCHAR},
+      </if>
+      <if test="remark2 != null" >
+        remark2 = #{remark2,jdbcType=VARCHAR},
+      </if>
+      <if test="remark3 != null" >
+        remark3 = #{remark3,jdbcType=VARCHAR},
+      </if>
+      <if test="createby != null" >
+        createBy = #{createby,jdbcType=INTEGER},
+      </if>
+      <if test="createtime != null" >
+        createTime = #{createtime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffApartmentSpareKey" >
+    update staff_apartment_spare_key
+    set useDate = #{usedate,jdbcType=TIMESTAMP},
+      roomNum = #{roomnum,jdbcType=VARCHAR},
+      useTime = #{usetime,jdbcType=TIMESTAMP},
+      staffName = #{staffname,jdbcType=VARCHAR},
+      dept = #{dept,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      icType = #{ictype,jdbcType=VARCHAR},
+      icCard = #{iccard,jdbcType=VARCHAR},
+      roomDuty = #{roomduty,jdbcType=VARCHAR},
+      remark1 = #{remark1,jdbcType=VARCHAR},
+      remark2 = #{remark2,jdbcType=VARCHAR},
+      remark3 = #{remark3,jdbcType=VARCHAR},
+      createBy = #{createby,jdbcType=INTEGER},
+      createTime = #{createtime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.StaffSecurityInspectionMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    <id column="security_inspection_id" property="securityInspectionId" jdbcType="VARCHAR" />
+    <result column="security_inspection_name" property="securityInspectionName" jdbcType="VARCHAR" />
+    <result column="security_inspection_date" property="securityInspectionDate" jdbcType="TIMESTAMP" />
+    <result column="fire_name" property="fireName" jdbcType="VARCHAR" />
+    <result column="security_electro" property="securityElectro" jdbcType="VARCHAR" />
+    <result column="fireproofing" property="fireproofing" jdbcType="VARCHAR" />
+    <result column="doubtful_person" property="doubtfulPerson" jdbcType="VARCHAR" />
+    <result column="violations_car" property="violationsCar" jdbcType="VARCHAR" />
+    <result column="builders" property="builders" jdbcType="VARCHAR" />
+    <result column="other_situations" property="otherSituations" jdbcType="VARCHAR" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="realname" property="realname" jdbcType="VARCHAR" />
+    <result column="opt_time" property="optTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    security_inspection_id, security_inspection_name, security_inspection_date, fire_name, 
+    security_electro, fireproofing, doubtful_person, violations_car, builders, other_situations, 
+    user_id, realname, opt_time
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from staff_security_inspection
+    where security_inspection_id = #{securityInspectionId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List" />
+    from staff_security_inspection
+    <if test="securityInspectionName != null and securityInspectionName!=''" >
+      where security_inspection_name = #{securityInspectionName, jdbcType=VARCHAR}
+    </if>
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from staff_security_inspection
+    where security_inspection_id = #{securityInspectionId,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    insert into staff_security_inspection (security_inspection_id, security_inspection_name, 
+      security_inspection_date, fire_name, security_electro, 
+      fireproofing, doubtful_person, violations_car, 
+      builders, other_situations, user_id, 
+      realname, opt_time)
+    values (#{securityInspectionId,jdbcType=VARCHAR}, #{securityInspectionName,jdbcType=VARCHAR}, 
+      #{securityInspectionDate,jdbcType=TIMESTAMP}, #{fireName,jdbcType=VARCHAR}, #{securityElectro,jdbcType=VARCHAR}, 
+      #{fireproofing,jdbcType=VARCHAR}, #{doubtfulPerson,jdbcType=VARCHAR}, #{violationsCar,jdbcType=VARCHAR}, 
+      #{builders,jdbcType=VARCHAR}, #{otherSituations,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, 
+      #{realname,jdbcType=VARCHAR}, #{optTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    insert into staff_security_inspection
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="securityInspectionId != null" >
+        security_inspection_id,
+      </if>
+      <if test="securityInspectionName != null" >
+        security_inspection_name,
+      </if>
+      <if test="securityInspectionDate != null" >
+        security_inspection_date,
+      </if>
+      <if test="fireName != null" >
+        fire_name,
+      </if>
+      <if test="securityElectro != null" >
+        security_electro,
+      </if>
+      <if test="fireproofing != null" >
+        fireproofing,
+      </if>
+      <if test="doubtfulPerson != null" >
+        doubtful_person,
+      </if>
+      <if test="violationsCar != null" >
+        violations_car,
+      </if>
+      <if test="builders != null" >
+        builders,
+      </if>
+      <if test="otherSituations != null" >
+        other_situations,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="realname != null" >
+        realname,
+      </if>
+      <if test="optTime != null" >
+        opt_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="securityInspectionId != null" >
+        #{securityInspectionId,jdbcType=VARCHAR},
+      </if>
+      <if test="securityInspectionName != null" >
+        #{securityInspectionName,jdbcType=VARCHAR},
+      </if>
+      <if test="securityInspectionDate != null" >
+        #{securityInspectionDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fireName != null" >
+        #{fireName,jdbcType=VARCHAR},
+      </if>
+      <if test="securityElectro != null" >
+        #{securityElectro,jdbcType=VARCHAR},
+      </if>
+      <if test="fireproofing != null" >
+        #{fireproofing,jdbcType=VARCHAR},
+      </if>
+      <if test="doubtfulPerson != null" >
+        #{doubtfulPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="violationsCar != null" >
+        #{violationsCar,jdbcType=VARCHAR},
+      </if>
+      <if test="builders != null" >
+        #{builders,jdbcType=VARCHAR},
+      </if>
+      <if test="otherSituations != null" >
+        #{otherSituations,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="realname != null" >
+        #{realname,jdbcType=VARCHAR},
+      </if>
+      <if test="optTime != null" >
+        #{optTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    update staff_security_inspection
+    <set >
+      <if test="securityInspectionName != null" >
+        security_inspection_name = #{securityInspectionName,jdbcType=VARCHAR},
+      </if>
+      <if test="securityInspectionDate != null" >
+        security_inspection_date = #{securityInspectionDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="fireName != null" >
+        fire_name = #{fireName,jdbcType=VARCHAR},
+      </if>
+      <if test="securityElectro != null" >
+        security_electro = #{securityElectro,jdbcType=VARCHAR},
+      </if>
+      <if test="fireproofing != null" >
+        fireproofing = #{fireproofing,jdbcType=VARCHAR},
+      </if>
+      <if test="doubtfulPerson != null" >
+        doubtful_person = #{doubtfulPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="violationsCar != null" >
+        violations_car = #{violationsCar,jdbcType=VARCHAR},
+      </if>
+      <if test="builders != null" >
+        builders = #{builders,jdbcType=VARCHAR},
+      </if>
+      <if test="otherSituations != null" >
+        other_situations = #{otherSituations,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="realname != null" >
+        realname = #{realname,jdbcType=VARCHAR},
+      </if>
+      <if test="optTime != null" >
+        opt_time = #{optTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where security_inspection_id = #{securityInspectionId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.StaffSecurityInspection" >
+    update staff_security_inspection
+    set security_inspection_name = #{securityInspectionName,jdbcType=VARCHAR},
+      security_inspection_date = #{securityInspectionDate,jdbcType=TIMESTAMP},
+      fire_name = #{fireName,jdbcType=VARCHAR},
+      security_electro = #{securityElectro,jdbcType=VARCHAR},
+      fireproofing = #{fireproofing,jdbcType=VARCHAR},
+      doubtful_person = #{doubtfulPerson,jdbcType=VARCHAR},
+      violations_car = #{violationsCar,jdbcType=VARCHAR},
+      builders = #{builders,jdbcType=VARCHAR},
+      other_situations = #{otherSituations,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=INTEGER},
+      realname = #{realname,jdbcType=VARCHAR},
+      opt_time = #{optTime,jdbcType=TIMESTAMP}
+    where security_inspection_id = #{securityInspectionId,jdbcType=VARCHAR}
+  </update>
+</mapper>

@@ -49,12 +49,12 @@
     from users
     from users
     where username = #{username,jdbcType=VARCHAR}
     where username = #{username,jdbcType=VARCHAR}
   </select>
   </select>
-  <select id="selectAllUser" resultMap="SecurityResult" parameterType="com.tianbo.warehouse.model.USERS" >
+  <select id="selectAllUser" resultMap="BaseResultMap" parameterType="com.tianbo.warehouse.model.USERS" >
     select
     select
-    <include refid="user_List" />
-    from USERS
+    *
+    from users
     WHERE  1=1
     WHERE  1=1
-    <if test="username != null" >
+    <if test=" username != null" >
      and  username = #{username,jdbcType=VARCHAR}
      and  username = #{username,jdbcType=VARCHAR}
     </if>
     </if>
     <if test="realname != null" >
     <if test="realname != null" >

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.tianbo.warehouse.dao.WaterStationsPatrolMapper" >
+  <resultMap id="BaseResultMap" type="com.tianbo.warehouse.model.WaterStationsPatrol" >
+    <id column="id" property="id" jdbcType="VARCHAR" />
+    <result column="checkProjectControlRommWaterSupplySystem" property="checkprojectcontrolrommwatersupplysystem" jdbcType="VARCHAR" />
+    <result column="checkProjectControlRommSecuritySystem" property="checkprojectcontrolrommsecuritysystem" jdbcType="VARCHAR" />
+    <result column="checkProjectControlRommRunningRecord" property="checkprojectcontrolrommrunningrecord" jdbcType="VARCHAR" />
+    <result column="checkProjectControlRommDocumentHolder" property="checkprojectcontrolrommdocumentholder" jdbcType="VARCHAR" />
+    <result column="checkProjectControlRommGround" property="checkprojectcontrolrommground" jdbcType="VARCHAR" />
+    <result column="checkProjectControlRommResponsiblePerson" property="checkprojectcontrolrommresponsibleperson" jdbcType="VARCHAR" />
+    <result column="checkProjectControlRommnote" property="checkprojectcontrolrommnote" jdbcType="VARCHAR" />
+    <result column="checkProjectFrequencyConversionShow" property="checkprojectfrequencyconversionshow" jdbcType="VARCHAR" />
+    <result column="checkProjectFrequencyConversionClose" property="checkprojectfrequencyconversionclose" jdbcType="VARCHAR" />
+    <result column="checkProjectFrequencyConversionSanitation" property="checkprojectfrequencyconversionsanitation" jdbcType="VARCHAR" />
+    <result column="checkProjectFrequencyConversionResponsiblePerson" property="checkprojectfrequencyconversionresponsibleperson" jdbcType="VARCHAR" />
+    <result column="checkProjectFrequencyConversionNote" property="checkprojectfrequencyconversionnote" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenTurbidityInstrumentPowerSupply" property="checkprojectmeterbetweenturbidityinstrumentpowersupply" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenTurbidityInstrumentShow" property="checkprojectmeterbetweenturbidityinstrumentshow" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenTurbidityInstrumentAppearance" property="checkprojectmeterbetweenturbidityinstrumentappearance" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenTurbidityInstrumentRange" property="checkprojectmeterbetweenturbidityinstrumentrange" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenTurbidityInstrumentDetection" property="checkprojectmeterbetweenturbidityinstrumentdetection" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenTurbidityInstrumentResponsiblePerson" property="checkprojectmeterbetweenturbidityinstrumentresponsibleperson" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenTurbidityInstrumentNote" property="checkprojectmeterbetweenturbidityinstrumentnote" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenFlowMeterPowerSupply" property="checkprojectmeterbetweenflowmeterpowersupply" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenFlowMeterShow" property="checkprojectmeterbetweenflowmetershow" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenFlowMeterAppearance" property="checkprojectmeterbetweenflowmeterappearance" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenFlowMeterResponsiblePerson" property="checkprojectmeterbetweenflowmeterresponsibleperson" jdbcType="VARCHAR" />
+    <result column="checkProjectMeterBetweenFlowMeterNote" property="checkprojectmeterbetweenflowmeternote" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentPipeline" property="residualchlorineinstrumentpipeline" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentPowerSupply" property="residualchlorineinstrumentpowersupply" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentShow" property="residualchlorineinstrumentshow" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentAppearance" property="residualchlorineinstrumentappearance" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentPipelinMakeWater" property="residualchlorineinstrumentpipelinmakewater" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentEquipment" property="residualchlorineinstrumentequipment" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentGroundSanitation" property="residualchlorineinstrumentgroundsanitation" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentResponsiblePerson" property="residualchlorineinstrumentresponsibleperson" jdbcType="VARCHAR" />
+    <result column="residualChlorineInstrumentNote" property="residualchlorineinstrumentnote" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomWaterPump" property="boosterpumproomwaterpump" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomBearing" property="boosterpumproombearing" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomTheValue" property="boosterpumproomthevalue" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomPumpBody" property="boosterpumproompumpbody" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomNamePlate" property="boosterpumproomnameplate" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomPacking" property="boosterpumproompacking" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomShow" property="boosterpumproomshow" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomFan" property="boosterpumproomfan" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomDrainage" property="boosterpumproomdrainage" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomSanitation" property="boosterpumproomsanitation" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomResponsiblePerson" property="boosterpumproomresponsibleperson" jdbcType="VARCHAR" />
+    <result column="boosterPumpRoomNote" property="boosterpumproomnote" jdbcType="VARCHAR" />
+    <result column="clearWaterReserviorsStairs" property="clearwaterreserviorsstairs" jdbcType="VARCHAR" />
+    <result column="clearWaterReserviorsVent" property="clearwaterreserviorsvent" jdbcType="VARCHAR" />
+    <result column="clearWaterReserviorsPoolRoof" property="clearwaterreserviorspoolroof" jdbcType="VARCHAR" />
+    <result column="clearWaterReserviorsSanitation" property="clearwaterreserviorssanitation" jdbcType="VARCHAR" />
+    <result column="clearWaterReserviorsPumpBody" property="clearwaterreserviorspumpbody" jdbcType="VARCHAR" />
+    <result column="clearWaterReserviorsResponsiblePerson" property="clearwaterreserviorsresponsibleperson" jdbcType="VARCHAR" />
+    <result column="clearWaterReserviorsNote" property="clearwaterreserviorsnote" jdbcType="VARCHAR" />
+    <result column="betweenChlorineEquipment" property="betweenchlorineequipment" jdbcType="VARCHAR" />
+    <result column="betweenChlorinePipe" property="betweenchlorinepipe" jdbcType="VARCHAR" />
+    <result column="betweenChlorineDosingPump" property="betweenchlorinedosingpump" jdbcType="VARCHAR" />
+    <result column="betweenChlorineTraffic" property="betweenchlorinetraffic" jdbcType="VARCHAR" />
+    <result column="betweenChlorineFan" property="betweenchlorinefan" jdbcType="VARCHAR" />
+    <result column="betweenChlorineSanitation" property="betweenchlorinesanitation" jdbcType="VARCHAR" />
+    <result column="betweenChlorineResponsiblePerson" property="betweenchlorineresponsibleperson" jdbcType="VARCHAR" />
+    <result column="betweenChlorineNote" property="betweenchlorinenote" jdbcType="VARCHAR" />
+    <result column="groundEnvironmentWellLIDS" property="groundenvironmentwelllids" jdbcType="VARCHAR" />
+    <result column="groundEnvironmentDrainagen" property="groundenvironmentdrainagen" jdbcType="VARCHAR" />
+    <result column="groundEnvironmentWaterSupply" property="groundenvironmentwatersupply" jdbcType="VARCHAR" />
+    <result column="groundEnvironmentCable" property="groundenvironmentcable" jdbcType="VARCHAR" />
+    <result column="groundEnvironmentRoad" property="groundenvironmentroad" jdbcType="VARCHAR" />
+    <result column="groundEnvironmentResponsiblePerson" property="groundenvironmentresponsibleperson" jdbcType="VARCHAR" />
+    <result column="groundEnvironmentNote" property="groundenvironmentnote" jdbcType="VARCHAR" />
+    <result column="groundSecurityIllegal" property="groundsecurityillegal" jdbcType="VARCHAR" />
+    <result column="groundSecurityFire" property="groundsecurityfire" jdbcType="VARCHAR" />
+    <result column="groundSecurityRats" property="groundsecurityrats" jdbcType="VARCHAR" />
+    <result column="groundSecuritySuspiciousPersonnel" property="groundsecuritysuspiciouspersonnel" jdbcType="VARCHAR" />
+    <result column="groundSecurityResponsiblePerson" property="groundsecurityresponsibleperson" jdbcType="VARCHAR" />
+    <result column="groundSecurityNote" property="groundsecuritynote" jdbcType="VARCHAR" />
+    <result column="securityToolEmergency" property="securitytoolemergency" jdbcType="VARCHAR" />
+    <result column="securityToolFloodControlAnd" property="securitytoolfloodcontroland" jdbcType="VARCHAR" />
+    <result column="securityToolProtective" property="securitytoolprotective" jdbcType="VARCHAR" />
+    <result column="securityToolMainteance" property="securitytoolmainteance" jdbcType="VARCHAR" />
+    <result column="securityToolResponsiblePerson" property="securitytoolresponsibleperson" jdbcType="VARCHAR" />
+    <result column="securityToolNote" property="securitytoolnote" jdbcType="VARCHAR" />
+    <result column="userId" property="userid" jdbcType="INTEGER" />
+    <result column="creatTime" property="creattime" jdbcType="TIMESTAMP" />
+    <result column="reamke1" property="reamke1" jdbcType="VARCHAR" />
+    <result column="reamke2" property="reamke2" jdbcType="VARCHAR" />
+    <result column="reamke3" property="reamke3" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, checkProjectControlRommWaterSupplySystem, checkProjectControlRommSecuritySystem, 
+    checkProjectControlRommRunningRecord, checkProjectControlRommDocumentHolder, checkProjectControlRommGround, 
+    checkProjectControlRommResponsiblePerson, checkProjectControlRommnote, checkProjectFrequencyConversionShow, 
+    checkProjectFrequencyConversionClose, checkProjectFrequencyConversionSanitation, 
+    checkProjectFrequencyConversionResponsiblePerson, checkProjectFrequencyConversionNote, 
+    checkProjectMeterBetweenTurbidityInstrumentPowerSupply, checkProjectMeterBetweenTurbidityInstrumentShow, 
+    checkProjectMeterBetweenTurbidityInstrumentAppearance, checkProjectMeterBetweenTurbidityInstrumentRange, 
+    checkProjectMeterBetweenTurbidityInstrumentDetection, checkProjectMeterBetweenTurbidityInstrumentResponsiblePerson, 
+    checkProjectMeterBetweenTurbidityInstrumentNote, checkProjectMeterBetweenFlowMeterPowerSupply, 
+    checkProjectMeterBetweenFlowMeterShow, checkProjectMeterBetweenFlowMeterAppearance, 
+    checkProjectMeterBetweenFlowMeterResponsiblePerson, checkProjectMeterBetweenFlowMeterNote, 
+    residualChlorineInstrumentPipeline, residualChlorineInstrumentPowerSupply, residualChlorineInstrumentShow, 
+    residualChlorineInstrumentAppearance, residualChlorineInstrumentPipelinMakeWater, 
+    residualChlorineInstrumentEquipment, residualChlorineInstrumentGroundSanitation, 
+    residualChlorineInstrumentResponsiblePerson, residualChlorineInstrumentNote, boosterPumpRoomWaterPump, 
+    boosterPumpRoomBearing, boosterPumpRoomTheValue, boosterPumpRoomPumpBody, boosterPumpRoomNamePlate, 
+    boosterPumpRoomPacking, boosterPumpRoomShow, boosterPumpRoomFan, boosterPumpRoomDrainage, 
+    boosterPumpRoomSanitation, boosterPumpRoomResponsiblePerson, boosterPumpRoomNote, 
+    clearWaterReserviorsStairs, clearWaterReserviorsVent, clearWaterReserviorsPoolRoof, 
+    clearWaterReserviorsSanitation, clearWaterReserviorsPumpBody, clearWaterReserviorsResponsiblePerson, 
+    clearWaterReserviorsNote, betweenChlorineEquipment, betweenChlorinePipe, betweenChlorineDosingPump, 
+    betweenChlorineTraffic, betweenChlorineFan, betweenChlorineSanitation, betweenChlorineResponsiblePerson, 
+    betweenChlorineNote, groundEnvironmentWellLIDS, groundEnvironmentDrainagen, groundEnvironmentWaterSupply, 
+    groundEnvironmentCable, groundEnvironmentRoad, groundEnvironmentResponsiblePerson, 
+    groundEnvironmentNote, groundSecurityIllegal, groundSecurityFire, groundSecurityRats, 
+    groundSecuritySuspiciousPersonnel, groundSecurityResponsiblePerson, groundSecurityNote, 
+    securityToolEmergency, securityToolFloodControlAnd, securityToolProtective, securityToolMainteance, 
+    securityToolResponsiblePerson, securityToolNote, userId, creatTime, reamke1, reamke2, 
+    reamke3
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from water_stations_patrol
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+
+  <select id="findAll" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from water_stations_patrol
+  </select>
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from water_stations_patrol
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.tianbo.warehouse.model.WaterStationsPatrol" >
+    insert into water_stations_patrol (id, checkProjectControlRommWaterSupplySystem, 
+      checkProjectControlRommSecuritySystem, checkProjectControlRommRunningRecord, 
+      checkProjectControlRommDocumentHolder, checkProjectControlRommGround, 
+      checkProjectControlRommResponsiblePerson, checkProjectControlRommnote, 
+      checkProjectFrequencyConversionShow, checkProjectFrequencyConversionClose, 
+      checkProjectFrequencyConversionSanitation, checkProjectFrequencyConversionResponsiblePerson, 
+      checkProjectFrequencyConversionNote, checkProjectMeterBetweenTurbidityInstrumentPowerSupply, 
+      checkProjectMeterBetweenTurbidityInstrumentShow, checkProjectMeterBetweenTurbidityInstrumentAppearance, 
+      checkProjectMeterBetweenTurbidityInstrumentRange, checkProjectMeterBetweenTurbidityInstrumentDetection, 
+      checkProjectMeterBetweenTurbidityInstrumentResponsiblePerson, 
+      checkProjectMeterBetweenTurbidityInstrumentNote, checkProjectMeterBetweenFlowMeterPowerSupply, 
+      checkProjectMeterBetweenFlowMeterShow, checkProjectMeterBetweenFlowMeterAppearance, 
+      checkProjectMeterBetweenFlowMeterResponsiblePerson, checkProjectMeterBetweenFlowMeterNote, 
+      residualChlorineInstrumentPipeline, residualChlorineInstrumentPowerSupply, 
+      residualChlorineInstrumentShow, residualChlorineInstrumentAppearance, 
+      residualChlorineInstrumentPipelinMakeWater, residualChlorineInstrumentEquipment, 
+      residualChlorineInstrumentGroundSanitation, residualChlorineInstrumentResponsiblePerson, 
+      residualChlorineInstrumentNote, boosterPumpRoomWaterPump, 
+      boosterPumpRoomBearing, boosterPumpRoomTheValue, 
+      boosterPumpRoomPumpBody, boosterPumpRoomNamePlate, 
+      boosterPumpRoomPacking, boosterPumpRoomShow, 
+      boosterPumpRoomFan, boosterPumpRoomDrainage, 
+      boosterPumpRoomSanitation, boosterPumpRoomResponsiblePerson, 
+      boosterPumpRoomNote, clearWaterReserviorsStairs, 
+      clearWaterReserviorsVent, clearWaterReserviorsPoolRoof, 
+      clearWaterReserviorsSanitation, clearWaterReserviorsPumpBody, 
+      clearWaterReserviorsResponsiblePerson, clearWaterReserviorsNote, 
+      betweenChlorineEquipment, betweenChlorinePipe, 
+      betweenChlorineDosingPump, betweenChlorineTraffic, 
+      betweenChlorineFan, betweenChlorineSanitation, 
+      betweenChlorineResponsiblePerson, betweenChlorineNote, 
+      groundEnvironmentWellLIDS, groundEnvironmentDrainagen, 
+      groundEnvironmentWaterSupply, groundEnvironmentCable, 
+      groundEnvironmentRoad, groundEnvironmentResponsiblePerson, 
+      groundEnvironmentNote, groundSecurityIllegal, 
+      groundSecurityFire, groundSecurityRats, 
+      groundSecuritySuspiciousPersonnel, groundSecurityResponsiblePerson, 
+      groundSecurityNote, securityToolEmergency, 
+      securityToolFloodControlAnd, securityToolProtective, 
+      securityToolMainteance, securityToolResponsiblePerson, 
+      securityToolNote, userId, creatTime, 
+      reamke1, reamke2, reamke3
+      )
+    values (#{id,jdbcType=VARCHAR}, #{checkprojectcontrolrommwatersupplysystem,jdbcType=VARCHAR}, 
+      #{checkprojectcontrolrommsecuritysystem,jdbcType=VARCHAR}, #{checkprojectcontrolrommrunningrecord,jdbcType=VARCHAR}, 
+      #{checkprojectcontrolrommdocumentholder,jdbcType=VARCHAR}, #{checkprojectcontrolrommground,jdbcType=VARCHAR}, 
+      #{checkprojectcontrolrommresponsibleperson,jdbcType=VARCHAR}, #{checkprojectcontrolrommnote,jdbcType=VARCHAR}, 
+      #{checkprojectfrequencyconversionshow,jdbcType=VARCHAR}, #{checkprojectfrequencyconversionclose,jdbcType=VARCHAR}, 
+      #{checkprojectfrequencyconversionsanitation,jdbcType=VARCHAR}, #{checkprojectfrequencyconversionresponsibleperson,jdbcType=VARCHAR}, 
+      #{checkprojectfrequencyconversionnote,jdbcType=VARCHAR}, #{checkprojectmeterbetweenturbidityinstrumentpowersupply,jdbcType=VARCHAR}, 
+      #{checkprojectmeterbetweenturbidityinstrumentshow,jdbcType=VARCHAR}, #{checkprojectmeterbetweenturbidityinstrumentappearance,jdbcType=VARCHAR}, 
+      #{checkprojectmeterbetweenturbidityinstrumentrange,jdbcType=VARCHAR}, #{checkprojectmeterbetweenturbidityinstrumentdetection,jdbcType=VARCHAR}, 
+      #{checkprojectmeterbetweenturbidityinstrumentresponsibleperson,jdbcType=VARCHAR}, 
+      #{checkprojectmeterbetweenturbidityinstrumentnote,jdbcType=VARCHAR}, #{checkprojectmeterbetweenflowmeterpowersupply,jdbcType=VARCHAR}, 
+      #{checkprojectmeterbetweenflowmetershow,jdbcType=VARCHAR}, #{checkprojectmeterbetweenflowmeterappearance,jdbcType=VARCHAR}, 
+      #{checkprojectmeterbetweenflowmeterresponsibleperson,jdbcType=VARCHAR}, #{checkprojectmeterbetweenflowmeternote,jdbcType=VARCHAR}, 
+      #{residualchlorineinstrumentpipeline,jdbcType=VARCHAR}, #{residualchlorineinstrumentpowersupply,jdbcType=VARCHAR}, 
+      #{residualchlorineinstrumentshow,jdbcType=VARCHAR}, #{residualchlorineinstrumentappearance,jdbcType=VARCHAR}, 
+      #{residualchlorineinstrumentpipelinmakewater,jdbcType=VARCHAR}, #{residualchlorineinstrumentequipment,jdbcType=VARCHAR}, 
+      #{residualchlorineinstrumentgroundsanitation,jdbcType=VARCHAR}, #{residualchlorineinstrumentresponsibleperson,jdbcType=VARCHAR}, 
+      #{residualchlorineinstrumentnote,jdbcType=VARCHAR}, #{boosterpumproomwaterpump,jdbcType=VARCHAR}, 
+      #{boosterpumproombearing,jdbcType=VARCHAR}, #{boosterpumproomthevalue,jdbcType=VARCHAR}, 
+      #{boosterpumproompumpbody,jdbcType=VARCHAR}, #{boosterpumproomnameplate,jdbcType=VARCHAR}, 
+      #{boosterpumproompacking,jdbcType=VARCHAR}, #{boosterpumproomshow,jdbcType=VARCHAR}, 
+      #{boosterpumproomfan,jdbcType=VARCHAR}, #{boosterpumproomdrainage,jdbcType=VARCHAR}, 
+      #{boosterpumproomsanitation,jdbcType=VARCHAR}, #{boosterpumproomresponsibleperson,jdbcType=VARCHAR}, 
+      #{boosterpumproomnote,jdbcType=VARCHAR}, #{clearwaterreserviorsstairs,jdbcType=VARCHAR}, 
+      #{clearwaterreserviorsvent,jdbcType=VARCHAR}, #{clearwaterreserviorspoolroof,jdbcType=VARCHAR}, 
+      #{clearwaterreserviorssanitation,jdbcType=VARCHAR}, #{clearwaterreserviorspumpbody,jdbcType=VARCHAR}, 
+      #{clearwaterreserviorsresponsibleperson,jdbcType=VARCHAR}, #{clearwaterreserviorsnote,jdbcType=VARCHAR}, 
+      #{betweenchlorineequipment,jdbcType=VARCHAR}, #{betweenchlorinepipe,jdbcType=VARCHAR}, 
+      #{betweenchlorinedosingpump,jdbcType=VARCHAR}, #{betweenchlorinetraffic,jdbcType=VARCHAR}, 
+      #{betweenchlorinefan,jdbcType=VARCHAR}, #{betweenchlorinesanitation,jdbcType=VARCHAR}, 
+      #{betweenchlorineresponsibleperson,jdbcType=VARCHAR}, #{betweenchlorinenote,jdbcType=VARCHAR}, 
+      #{groundenvironmentwelllids,jdbcType=VARCHAR}, #{groundenvironmentdrainagen,jdbcType=VARCHAR}, 
+      #{groundenvironmentwatersupply,jdbcType=VARCHAR}, #{groundenvironmentcable,jdbcType=VARCHAR}, 
+      #{groundenvironmentroad,jdbcType=VARCHAR}, #{groundenvironmentresponsibleperson,jdbcType=VARCHAR}, 
+      #{groundenvironmentnote,jdbcType=VARCHAR}, #{groundsecurityillegal,jdbcType=VARCHAR}, 
+      #{groundsecurityfire,jdbcType=VARCHAR}, #{groundsecurityrats,jdbcType=VARCHAR}, 
+      #{groundsecuritysuspiciouspersonnel,jdbcType=VARCHAR}, #{groundsecurityresponsibleperson,jdbcType=VARCHAR}, 
+      #{groundsecuritynote,jdbcType=VARCHAR}, #{securitytoolemergency,jdbcType=VARCHAR}, 
+      #{securitytoolfloodcontroland,jdbcType=VARCHAR}, #{securitytoolprotective,jdbcType=VARCHAR}, 
+      #{securitytoolmainteance,jdbcType=VARCHAR}, #{securitytoolresponsibleperson,jdbcType=VARCHAR}, 
+      #{securitytoolnote,jdbcType=VARCHAR}, #{userid,jdbcType=INTEGER}, #{creattime,jdbcType=TIMESTAMP}, 
+      #{reamke1,jdbcType=VARCHAR}, #{reamke2,jdbcType=VARCHAR}, #{reamke3,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.tianbo.warehouse.model.WaterStationsPatrol" >
+    insert into water_stations_patrol
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="checkprojectcontrolrommwatersupplysystem != null" >
+        checkProjectControlRommWaterSupplySystem,
+      </if>
+      <if test="checkprojectcontrolrommsecuritysystem != null" >
+        checkProjectControlRommSecuritySystem,
+      </if>
+      <if test="checkprojectcontrolrommrunningrecord != null" >
+        checkProjectControlRommRunningRecord,
+      </if>
+      <if test="checkprojectcontrolrommdocumentholder != null" >
+        checkProjectControlRommDocumentHolder,
+      </if>
+      <if test="checkprojectcontrolrommground != null" >
+        checkProjectControlRommGround,
+      </if>
+      <if test="checkprojectcontrolrommresponsibleperson != null" >
+        checkProjectControlRommResponsiblePerson,
+      </if>
+      <if test="checkprojectcontrolrommnote != null" >
+        checkProjectControlRommnote,
+      </if>
+      <if test="checkprojectfrequencyconversionshow != null" >
+        checkProjectFrequencyConversionShow,
+      </if>
+      <if test="checkprojectfrequencyconversionclose != null" >
+        checkProjectFrequencyConversionClose,
+      </if>
+      <if test="checkprojectfrequencyconversionsanitation != null" >
+        checkProjectFrequencyConversionSanitation,
+      </if>
+      <if test="checkprojectfrequencyconversionresponsibleperson != null" >
+        checkProjectFrequencyConversionResponsiblePerson,
+      </if>
+      <if test="checkprojectfrequencyconversionnote != null" >
+        checkProjectFrequencyConversionNote,
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentpowersupply != null" >
+        checkProjectMeterBetweenTurbidityInstrumentPowerSupply,
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentshow != null" >
+        checkProjectMeterBetweenTurbidityInstrumentShow,
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentappearance != null" >
+        checkProjectMeterBetweenTurbidityInstrumentAppearance,
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentrange != null" >
+        checkProjectMeterBetweenTurbidityInstrumentRange,
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentdetection != null" >
+        checkProjectMeterBetweenTurbidityInstrumentDetection,
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentresponsibleperson != null" >
+        checkProjectMeterBetweenTurbidityInstrumentResponsiblePerson,
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentnote != null" >
+        checkProjectMeterBetweenTurbidityInstrumentNote,
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterpowersupply != null" >
+        checkProjectMeterBetweenFlowMeterPowerSupply,
+      </if>
+      <if test="checkprojectmeterbetweenflowmetershow != null" >
+        checkProjectMeterBetweenFlowMeterShow,
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterappearance != null" >
+        checkProjectMeterBetweenFlowMeterAppearance,
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterresponsibleperson != null" >
+        checkProjectMeterBetweenFlowMeterResponsiblePerson,
+      </if>
+      <if test="checkprojectmeterbetweenflowmeternote != null" >
+        checkProjectMeterBetweenFlowMeterNote,
+      </if>
+      <if test="residualchlorineinstrumentpipeline != null" >
+        residualChlorineInstrumentPipeline,
+      </if>
+      <if test="residualchlorineinstrumentpowersupply != null" >
+        residualChlorineInstrumentPowerSupply,
+      </if>
+      <if test="residualchlorineinstrumentshow != null" >
+        residualChlorineInstrumentShow,
+      </if>
+      <if test="residualchlorineinstrumentappearance != null" >
+        residualChlorineInstrumentAppearance,
+      </if>
+      <if test="residualchlorineinstrumentpipelinmakewater != null" >
+        residualChlorineInstrumentPipelinMakeWater,
+      </if>
+      <if test="residualchlorineinstrumentequipment != null" >
+        residualChlorineInstrumentEquipment,
+      </if>
+      <if test="residualchlorineinstrumentgroundsanitation != null" >
+        residualChlorineInstrumentGroundSanitation,
+      </if>
+      <if test="residualchlorineinstrumentresponsibleperson != null" >
+        residualChlorineInstrumentResponsiblePerson,
+      </if>
+      <if test="residualchlorineinstrumentnote != null" >
+        residualChlorineInstrumentNote,
+      </if>
+      <if test="boosterpumproomwaterpump != null" >
+        boosterPumpRoomWaterPump,
+      </if>
+      <if test="boosterpumproombearing != null" >
+        boosterPumpRoomBearing,
+      </if>
+      <if test="boosterpumproomthevalue != null" >
+        boosterPumpRoomTheValue,
+      </if>
+      <if test="boosterpumproompumpbody != null" >
+        boosterPumpRoomPumpBody,
+      </if>
+      <if test="boosterpumproomnameplate != null" >
+        boosterPumpRoomNamePlate,
+      </if>
+      <if test="boosterpumproompacking != null" >
+        boosterPumpRoomPacking,
+      </if>
+      <if test="boosterpumproomshow != null" >
+        boosterPumpRoomShow,
+      </if>
+      <if test="boosterpumproomfan != null" >
+        boosterPumpRoomFan,
+      </if>
+      <if test="boosterpumproomdrainage != null" >
+        boosterPumpRoomDrainage,
+      </if>
+      <if test="boosterpumproomsanitation != null" >
+        boosterPumpRoomSanitation,
+      </if>
+      <if test="boosterpumproomresponsibleperson != null" >
+        boosterPumpRoomResponsiblePerson,
+      </if>
+      <if test="boosterpumproomnote != null" >
+        boosterPumpRoomNote,
+      </if>
+      <if test="clearwaterreserviorsstairs != null" >
+        clearWaterReserviorsStairs,
+      </if>
+      <if test="clearwaterreserviorsvent != null" >
+        clearWaterReserviorsVent,
+      </if>
+      <if test="clearwaterreserviorspoolroof != null" >
+        clearWaterReserviorsPoolRoof,
+      </if>
+      <if test="clearwaterreserviorssanitation != null" >
+        clearWaterReserviorsSanitation,
+      </if>
+      <if test="clearwaterreserviorspumpbody != null" >
+        clearWaterReserviorsPumpBody,
+      </if>
+      <if test="clearwaterreserviorsresponsibleperson != null" >
+        clearWaterReserviorsResponsiblePerson,
+      </if>
+      <if test="clearwaterreserviorsnote != null" >
+        clearWaterReserviorsNote,
+      </if>
+      <if test="betweenchlorineequipment != null" >
+        betweenChlorineEquipment,
+      </if>
+      <if test="betweenchlorinepipe != null" >
+        betweenChlorinePipe,
+      </if>
+      <if test="betweenchlorinedosingpump != null" >
+        betweenChlorineDosingPump,
+      </if>
+      <if test="betweenchlorinetraffic != null" >
+        betweenChlorineTraffic,
+      </if>
+      <if test="betweenchlorinefan != null" >
+        betweenChlorineFan,
+      </if>
+      <if test="betweenchlorinesanitation != null" >
+        betweenChlorineSanitation,
+      </if>
+      <if test="betweenchlorineresponsibleperson != null" >
+        betweenChlorineResponsiblePerson,
+      </if>
+      <if test="betweenchlorinenote != null" >
+        betweenChlorineNote,
+      </if>
+      <if test="groundenvironmentwelllids != null" >
+        groundEnvironmentWellLIDS,
+      </if>
+      <if test="groundenvironmentdrainagen != null" >
+        groundEnvironmentDrainagen,
+      </if>
+      <if test="groundenvironmentwatersupply != null" >
+        groundEnvironmentWaterSupply,
+      </if>
+      <if test="groundenvironmentcable != null" >
+        groundEnvironmentCable,
+      </if>
+      <if test="groundenvironmentroad != null" >
+        groundEnvironmentRoad,
+      </if>
+      <if test="groundenvironmentresponsibleperson != null" >
+        groundEnvironmentResponsiblePerson,
+      </if>
+      <if test="groundenvironmentnote != null" >
+        groundEnvironmentNote,
+      </if>
+      <if test="groundsecurityillegal != null" >
+        groundSecurityIllegal,
+      </if>
+      <if test="groundsecurityfire != null" >
+        groundSecurityFire,
+      </if>
+      <if test="groundsecurityrats != null" >
+        groundSecurityRats,
+      </if>
+      <if test="groundsecuritysuspiciouspersonnel != null" >
+        groundSecuritySuspiciousPersonnel,
+      </if>
+      <if test="groundsecurityresponsibleperson != null" >
+        groundSecurityResponsiblePerson,
+      </if>
+      <if test="groundsecuritynote != null" >
+        groundSecurityNote,
+      </if>
+      <if test="securitytoolemergency != null" >
+        securityToolEmergency,
+      </if>
+      <if test="securitytoolfloodcontroland != null" >
+        securityToolFloodControlAnd,
+      </if>
+      <if test="securitytoolprotective != null" >
+        securityToolProtective,
+      </if>
+      <if test="securitytoolmainteance != null" >
+        securityToolMainteance,
+      </if>
+      <if test="securitytoolresponsibleperson != null" >
+        securityToolResponsiblePerson,
+      </if>
+      <if test="securitytoolnote != null" >
+        securityToolNote,
+      </if>
+      <if test="userid != null" >
+        userId,
+      </if>
+      <if test="creattime != null" >
+        creatTime,
+      </if>
+      <if test="reamke1 != null" >
+        reamke1,
+      </if>
+      <if test="reamke2 != null" >
+        reamke2,
+      </if>
+      <if test="reamke3 != null" >
+        reamke3,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommwatersupplysystem != null" >
+        #{checkprojectcontrolrommwatersupplysystem,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommsecuritysystem != null" >
+        #{checkprojectcontrolrommsecuritysystem,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommrunningrecord != null" >
+        #{checkprojectcontrolrommrunningrecord,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommdocumentholder != null" >
+        #{checkprojectcontrolrommdocumentholder,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommground != null" >
+        #{checkprojectcontrolrommground,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommresponsibleperson != null" >
+        #{checkprojectcontrolrommresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommnote != null" >
+        #{checkprojectcontrolrommnote,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionshow != null" >
+        #{checkprojectfrequencyconversionshow,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionclose != null" >
+        #{checkprojectfrequencyconversionclose,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionsanitation != null" >
+        #{checkprojectfrequencyconversionsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionresponsibleperson != null" >
+        #{checkprojectfrequencyconversionresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionnote != null" >
+        #{checkprojectfrequencyconversionnote,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentpowersupply != null" >
+        #{checkprojectmeterbetweenturbidityinstrumentpowersupply,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentshow != null" >
+        #{checkprojectmeterbetweenturbidityinstrumentshow,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentappearance != null" >
+        #{checkprojectmeterbetweenturbidityinstrumentappearance,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentrange != null" >
+        #{checkprojectmeterbetweenturbidityinstrumentrange,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentdetection != null" >
+        #{checkprojectmeterbetweenturbidityinstrumentdetection,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentresponsibleperson != null" >
+        #{checkprojectmeterbetweenturbidityinstrumentresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentnote != null" >
+        #{checkprojectmeterbetweenturbidityinstrumentnote,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterpowersupply != null" >
+        #{checkprojectmeterbetweenflowmeterpowersupply,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmetershow != null" >
+        #{checkprojectmeterbetweenflowmetershow,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterappearance != null" >
+        #{checkprojectmeterbetweenflowmeterappearance,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterresponsibleperson != null" >
+        #{checkprojectmeterbetweenflowmeterresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmeternote != null" >
+        #{checkprojectmeterbetweenflowmeternote,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentpipeline != null" >
+        #{residualchlorineinstrumentpipeline,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentpowersupply != null" >
+        #{residualchlorineinstrumentpowersupply,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentshow != null" >
+        #{residualchlorineinstrumentshow,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentappearance != null" >
+        #{residualchlorineinstrumentappearance,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentpipelinmakewater != null" >
+        #{residualchlorineinstrumentpipelinmakewater,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentequipment != null" >
+        #{residualchlorineinstrumentequipment,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentgroundsanitation != null" >
+        #{residualchlorineinstrumentgroundsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentresponsibleperson != null" >
+        #{residualchlorineinstrumentresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentnote != null" >
+        #{residualchlorineinstrumentnote,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomwaterpump != null" >
+        #{boosterpumproomwaterpump,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproombearing != null" >
+        #{boosterpumproombearing,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomthevalue != null" >
+        #{boosterpumproomthevalue,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproompumpbody != null" >
+        #{boosterpumproompumpbody,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomnameplate != null" >
+        #{boosterpumproomnameplate,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproompacking != null" >
+        #{boosterpumproompacking,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomshow != null" >
+        #{boosterpumproomshow,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomfan != null" >
+        #{boosterpumproomfan,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomdrainage != null" >
+        #{boosterpumproomdrainage,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomsanitation != null" >
+        #{boosterpumproomsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomresponsibleperson != null" >
+        #{boosterpumproomresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomnote != null" >
+        #{boosterpumproomnote,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorsstairs != null" >
+        #{clearwaterreserviorsstairs,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorsvent != null" >
+        #{clearwaterreserviorsvent,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorspoolroof != null" >
+        #{clearwaterreserviorspoolroof,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorssanitation != null" >
+        #{clearwaterreserviorssanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorspumpbody != null" >
+        #{clearwaterreserviorspumpbody,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorsresponsibleperson != null" >
+        #{clearwaterreserviorsresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorsnote != null" >
+        #{clearwaterreserviorsnote,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorineequipment != null" >
+        #{betweenchlorineequipment,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinepipe != null" >
+        #{betweenchlorinepipe,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinedosingpump != null" >
+        #{betweenchlorinedosingpump,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinetraffic != null" >
+        #{betweenchlorinetraffic,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinefan != null" >
+        #{betweenchlorinefan,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinesanitation != null" >
+        #{betweenchlorinesanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorineresponsibleperson != null" >
+        #{betweenchlorineresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinenote != null" >
+        #{betweenchlorinenote,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentwelllids != null" >
+        #{groundenvironmentwelllids,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentdrainagen != null" >
+        #{groundenvironmentdrainagen,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentwatersupply != null" >
+        #{groundenvironmentwatersupply,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentcable != null" >
+        #{groundenvironmentcable,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentroad != null" >
+        #{groundenvironmentroad,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentresponsibleperson != null" >
+        #{groundenvironmentresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentnote != null" >
+        #{groundenvironmentnote,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecurityillegal != null" >
+        #{groundsecurityillegal,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecurityfire != null" >
+        #{groundsecurityfire,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecurityrats != null" >
+        #{groundsecurityrats,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecuritysuspiciouspersonnel != null" >
+        #{groundsecuritysuspiciouspersonnel,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecurityresponsibleperson != null" >
+        #{groundsecurityresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecuritynote != null" >
+        #{groundsecuritynote,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolemergency != null" >
+        #{securitytoolemergency,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolfloodcontroland != null" >
+        #{securitytoolfloodcontroland,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolprotective != null" >
+        #{securitytoolprotective,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolmainteance != null" >
+        #{securitytoolmainteance,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolresponsibleperson != null" >
+        #{securitytoolresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolnote != null" >
+        #{securitytoolnote,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null" >
+        #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="creattime != null" >
+        #{creattime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="reamke1 != null" >
+        #{reamke1,jdbcType=VARCHAR},
+      </if>
+      <if test="reamke2 != null" >
+        #{reamke2,jdbcType=VARCHAR},
+      </if>
+      <if test="reamke3 != null" >
+        #{reamke3,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tianbo.warehouse.model.WaterStationsPatrol" >
+    update water_stations_patrol
+    <set >
+      <if test="checkprojectcontrolrommwatersupplysystem != null" >
+        checkProjectControlRommWaterSupplySystem = #{checkprojectcontrolrommwatersupplysystem,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommsecuritysystem != null" >
+        checkProjectControlRommSecuritySystem = #{checkprojectcontrolrommsecuritysystem,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommrunningrecord != null" >
+        checkProjectControlRommRunningRecord = #{checkprojectcontrolrommrunningrecord,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommdocumentholder != null" >
+        checkProjectControlRommDocumentHolder = #{checkprojectcontrolrommdocumentholder,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommground != null" >
+        checkProjectControlRommGround = #{checkprojectcontrolrommground,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommresponsibleperson != null" >
+        checkProjectControlRommResponsiblePerson = #{checkprojectcontrolrommresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectcontrolrommnote != null" >
+        checkProjectControlRommnote = #{checkprojectcontrolrommnote,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionshow != null" >
+        checkProjectFrequencyConversionShow = #{checkprojectfrequencyconversionshow,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionclose != null" >
+        checkProjectFrequencyConversionClose = #{checkprojectfrequencyconversionclose,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionsanitation != null" >
+        checkProjectFrequencyConversionSanitation = #{checkprojectfrequencyconversionsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionresponsibleperson != null" >
+        checkProjectFrequencyConversionResponsiblePerson = #{checkprojectfrequencyconversionresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectfrequencyconversionnote != null" >
+        checkProjectFrequencyConversionNote = #{checkprojectfrequencyconversionnote,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentpowersupply != null" >
+        checkProjectMeterBetweenTurbidityInstrumentPowerSupply = #{checkprojectmeterbetweenturbidityinstrumentpowersupply,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentshow != null" >
+        checkProjectMeterBetweenTurbidityInstrumentShow = #{checkprojectmeterbetweenturbidityinstrumentshow,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentappearance != null" >
+        checkProjectMeterBetweenTurbidityInstrumentAppearance = #{checkprojectmeterbetweenturbidityinstrumentappearance,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentrange != null" >
+        checkProjectMeterBetweenTurbidityInstrumentRange = #{checkprojectmeterbetweenturbidityinstrumentrange,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentdetection != null" >
+        checkProjectMeterBetweenTurbidityInstrumentDetection = #{checkprojectmeterbetweenturbidityinstrumentdetection,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentresponsibleperson != null" >
+        checkProjectMeterBetweenTurbidityInstrumentResponsiblePerson = #{checkprojectmeterbetweenturbidityinstrumentresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenturbidityinstrumentnote != null" >
+        checkProjectMeterBetweenTurbidityInstrumentNote = #{checkprojectmeterbetweenturbidityinstrumentnote,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterpowersupply != null" >
+        checkProjectMeterBetweenFlowMeterPowerSupply = #{checkprojectmeterbetweenflowmeterpowersupply,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmetershow != null" >
+        checkProjectMeterBetweenFlowMeterShow = #{checkprojectmeterbetweenflowmetershow,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterappearance != null" >
+        checkProjectMeterBetweenFlowMeterAppearance = #{checkprojectmeterbetweenflowmeterappearance,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmeterresponsibleperson != null" >
+        checkProjectMeterBetweenFlowMeterResponsiblePerson = #{checkprojectmeterbetweenflowmeterresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="checkprojectmeterbetweenflowmeternote != null" >
+        checkProjectMeterBetweenFlowMeterNote = #{checkprojectmeterbetweenflowmeternote,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentpipeline != null" >
+        residualChlorineInstrumentPipeline = #{residualchlorineinstrumentpipeline,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentpowersupply != null" >
+        residualChlorineInstrumentPowerSupply = #{residualchlorineinstrumentpowersupply,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentshow != null" >
+        residualChlorineInstrumentShow = #{residualchlorineinstrumentshow,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentappearance != null" >
+        residualChlorineInstrumentAppearance = #{residualchlorineinstrumentappearance,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentpipelinmakewater != null" >
+        residualChlorineInstrumentPipelinMakeWater = #{residualchlorineinstrumentpipelinmakewater,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentequipment != null" >
+        residualChlorineInstrumentEquipment = #{residualchlorineinstrumentequipment,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentgroundsanitation != null" >
+        residualChlorineInstrumentGroundSanitation = #{residualchlorineinstrumentgroundsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentresponsibleperson != null" >
+        residualChlorineInstrumentResponsiblePerson = #{residualchlorineinstrumentresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="residualchlorineinstrumentnote != null" >
+        residualChlorineInstrumentNote = #{residualchlorineinstrumentnote,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomwaterpump != null" >
+        boosterPumpRoomWaterPump = #{boosterpumproomwaterpump,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproombearing != null" >
+        boosterPumpRoomBearing = #{boosterpumproombearing,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomthevalue != null" >
+        boosterPumpRoomTheValue = #{boosterpumproomthevalue,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproompumpbody != null" >
+        boosterPumpRoomPumpBody = #{boosterpumproompumpbody,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomnameplate != null" >
+        boosterPumpRoomNamePlate = #{boosterpumproomnameplate,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproompacking != null" >
+        boosterPumpRoomPacking = #{boosterpumproompacking,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomshow != null" >
+        boosterPumpRoomShow = #{boosterpumproomshow,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomfan != null" >
+        boosterPumpRoomFan = #{boosterpumproomfan,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomdrainage != null" >
+        boosterPumpRoomDrainage = #{boosterpumproomdrainage,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomsanitation != null" >
+        boosterPumpRoomSanitation = #{boosterpumproomsanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomresponsibleperson != null" >
+        boosterPumpRoomResponsiblePerson = #{boosterpumproomresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="boosterpumproomnote != null" >
+        boosterPumpRoomNote = #{boosterpumproomnote,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorsstairs != null" >
+        clearWaterReserviorsStairs = #{clearwaterreserviorsstairs,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorsvent != null" >
+        clearWaterReserviorsVent = #{clearwaterreserviorsvent,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorspoolroof != null" >
+        clearWaterReserviorsPoolRoof = #{clearwaterreserviorspoolroof,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorssanitation != null" >
+        clearWaterReserviorsSanitation = #{clearwaterreserviorssanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorspumpbody != null" >
+        clearWaterReserviorsPumpBody = #{clearwaterreserviorspumpbody,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorsresponsibleperson != null" >
+        clearWaterReserviorsResponsiblePerson = #{clearwaterreserviorsresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="clearwaterreserviorsnote != null" >
+        clearWaterReserviorsNote = #{clearwaterreserviorsnote,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorineequipment != null" >
+        betweenChlorineEquipment = #{betweenchlorineequipment,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinepipe != null" >
+        betweenChlorinePipe = #{betweenchlorinepipe,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinedosingpump != null" >
+        betweenChlorineDosingPump = #{betweenchlorinedosingpump,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinetraffic != null" >
+        betweenChlorineTraffic = #{betweenchlorinetraffic,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinefan != null" >
+        betweenChlorineFan = #{betweenchlorinefan,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinesanitation != null" >
+        betweenChlorineSanitation = #{betweenchlorinesanitation,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorineresponsibleperson != null" >
+        betweenChlorineResponsiblePerson = #{betweenchlorineresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="betweenchlorinenote != null" >
+        betweenChlorineNote = #{betweenchlorinenote,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentwelllids != null" >
+        groundEnvironmentWellLIDS = #{groundenvironmentwelllids,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentdrainagen != null" >
+        groundEnvironmentDrainagen = #{groundenvironmentdrainagen,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentwatersupply != null" >
+        groundEnvironmentWaterSupply = #{groundenvironmentwatersupply,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentcable != null" >
+        groundEnvironmentCable = #{groundenvironmentcable,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentroad != null" >
+        groundEnvironmentRoad = #{groundenvironmentroad,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentresponsibleperson != null" >
+        groundEnvironmentResponsiblePerson = #{groundenvironmentresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="groundenvironmentnote != null" >
+        groundEnvironmentNote = #{groundenvironmentnote,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecurityillegal != null" >
+        groundSecurityIllegal = #{groundsecurityillegal,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecurityfire != null" >
+        groundSecurityFire = #{groundsecurityfire,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecurityrats != null" >
+        groundSecurityRats = #{groundsecurityrats,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecuritysuspiciouspersonnel != null" >
+        groundSecuritySuspiciousPersonnel = #{groundsecuritysuspiciouspersonnel,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecurityresponsibleperson != null" >
+        groundSecurityResponsiblePerson = #{groundsecurityresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="groundsecuritynote != null" >
+        groundSecurityNote = #{groundsecuritynote,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolemergency != null" >
+        securityToolEmergency = #{securitytoolemergency,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolfloodcontroland != null" >
+        securityToolFloodControlAnd = #{securitytoolfloodcontroland,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolprotective != null" >
+        securityToolProtective = #{securitytoolprotective,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolmainteance != null" >
+        securityToolMainteance = #{securitytoolmainteance,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolresponsibleperson != null" >
+        securityToolResponsiblePerson = #{securitytoolresponsibleperson,jdbcType=VARCHAR},
+      </if>
+      <if test="securitytoolnote != null" >
+        securityToolNote = #{securitytoolnote,jdbcType=VARCHAR},
+      </if>
+      <if test="userid != null" >
+        userId = #{userid,jdbcType=INTEGER},
+      </if>
+      <if test="creattime != null" >
+        creatTime = #{creattime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="reamke1 != null" >
+        reamke1 = #{reamke1,jdbcType=VARCHAR},
+      </if>
+      <if test="reamke2 != null" >
+        reamke2 = #{reamke2,jdbcType=VARCHAR},
+      </if>
+      <if test="reamke3 != null" >
+        reamke3 = #{reamke3,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tianbo.warehouse.model.WaterStationsPatrol" >
+    update water_stations_patrol
+    set checkProjectControlRommWaterSupplySystem = #{checkprojectcontrolrommwatersupplysystem,jdbcType=VARCHAR},
+      checkProjectControlRommSecuritySystem = #{checkprojectcontrolrommsecuritysystem,jdbcType=VARCHAR},
+      checkProjectControlRommRunningRecord = #{checkprojectcontrolrommrunningrecord,jdbcType=VARCHAR},
+      checkProjectControlRommDocumentHolder = #{checkprojectcontrolrommdocumentholder,jdbcType=VARCHAR},
+      checkProjectControlRommGround = #{checkprojectcontrolrommground,jdbcType=VARCHAR},
+      checkProjectControlRommResponsiblePerson = #{checkprojectcontrolrommresponsibleperson,jdbcType=VARCHAR},
+      checkProjectControlRommnote = #{checkprojectcontrolrommnote,jdbcType=VARCHAR},
+      checkProjectFrequencyConversionShow = #{checkprojectfrequencyconversionshow,jdbcType=VARCHAR},
+      checkProjectFrequencyConversionClose = #{checkprojectfrequencyconversionclose,jdbcType=VARCHAR},
+      checkProjectFrequencyConversionSanitation = #{checkprojectfrequencyconversionsanitation,jdbcType=VARCHAR},
+      checkProjectFrequencyConversionResponsiblePerson = #{checkprojectfrequencyconversionresponsibleperson,jdbcType=VARCHAR},
+      checkProjectFrequencyConversionNote = #{checkprojectfrequencyconversionnote,jdbcType=VARCHAR},
+      checkProjectMeterBetweenTurbidityInstrumentPowerSupply = #{checkprojectmeterbetweenturbidityinstrumentpowersupply,jdbcType=VARCHAR},
+      checkProjectMeterBetweenTurbidityInstrumentShow = #{checkprojectmeterbetweenturbidityinstrumentshow,jdbcType=VARCHAR},
+      checkProjectMeterBetweenTurbidityInstrumentAppearance = #{checkprojectmeterbetweenturbidityinstrumentappearance,jdbcType=VARCHAR},
+      checkProjectMeterBetweenTurbidityInstrumentRange = #{checkprojectmeterbetweenturbidityinstrumentrange,jdbcType=VARCHAR},
+      checkProjectMeterBetweenTurbidityInstrumentDetection = #{checkprojectmeterbetweenturbidityinstrumentdetection,jdbcType=VARCHAR},
+      checkProjectMeterBetweenTurbidityInstrumentResponsiblePerson = #{checkprojectmeterbetweenturbidityinstrumentresponsibleperson,jdbcType=VARCHAR},
+      checkProjectMeterBetweenTurbidityInstrumentNote = #{checkprojectmeterbetweenturbidityinstrumentnote,jdbcType=VARCHAR},
+      checkProjectMeterBetweenFlowMeterPowerSupply = #{checkprojectmeterbetweenflowmeterpowersupply,jdbcType=VARCHAR},
+      checkProjectMeterBetweenFlowMeterShow = #{checkprojectmeterbetweenflowmetershow,jdbcType=VARCHAR},
+      checkProjectMeterBetweenFlowMeterAppearance = #{checkprojectmeterbetweenflowmeterappearance,jdbcType=VARCHAR},
+      checkProjectMeterBetweenFlowMeterResponsiblePerson = #{checkprojectmeterbetweenflowmeterresponsibleperson,jdbcType=VARCHAR},
+      checkProjectMeterBetweenFlowMeterNote = #{checkprojectmeterbetweenflowmeternote,jdbcType=VARCHAR},
+      residualChlorineInstrumentPipeline = #{residualchlorineinstrumentpipeline,jdbcType=VARCHAR},
+      residualChlorineInstrumentPowerSupply = #{residualchlorineinstrumentpowersupply,jdbcType=VARCHAR},
+      residualChlorineInstrumentShow = #{residualchlorineinstrumentshow,jdbcType=VARCHAR},
+      residualChlorineInstrumentAppearance = #{residualchlorineinstrumentappearance,jdbcType=VARCHAR},
+      residualChlorineInstrumentPipelinMakeWater = #{residualchlorineinstrumentpipelinmakewater,jdbcType=VARCHAR},
+      residualChlorineInstrumentEquipment = #{residualchlorineinstrumentequipment,jdbcType=VARCHAR},
+      residualChlorineInstrumentGroundSanitation = #{residualchlorineinstrumentgroundsanitation,jdbcType=VARCHAR},
+      residualChlorineInstrumentResponsiblePerson = #{residualchlorineinstrumentresponsibleperson,jdbcType=VARCHAR},
+      residualChlorineInstrumentNote = #{residualchlorineinstrumentnote,jdbcType=VARCHAR},
+      boosterPumpRoomWaterPump = #{boosterpumproomwaterpump,jdbcType=VARCHAR},
+      boosterPumpRoomBearing = #{boosterpumproombearing,jdbcType=VARCHAR},
+      boosterPumpRoomTheValue = #{boosterpumproomthevalue,jdbcType=VARCHAR},
+      boosterPumpRoomPumpBody = #{boosterpumproompumpbody,jdbcType=VARCHAR},
+      boosterPumpRoomNamePlate = #{boosterpumproomnameplate,jdbcType=VARCHAR},
+      boosterPumpRoomPacking = #{boosterpumproompacking,jdbcType=VARCHAR},
+      boosterPumpRoomShow = #{boosterpumproomshow,jdbcType=VARCHAR},
+      boosterPumpRoomFan = #{boosterpumproomfan,jdbcType=VARCHAR},
+      boosterPumpRoomDrainage = #{boosterpumproomdrainage,jdbcType=VARCHAR},
+      boosterPumpRoomSanitation = #{boosterpumproomsanitation,jdbcType=VARCHAR},
+      boosterPumpRoomResponsiblePerson = #{boosterpumproomresponsibleperson,jdbcType=VARCHAR},
+      boosterPumpRoomNote = #{boosterpumproomnote,jdbcType=VARCHAR},
+      clearWaterReserviorsStairs = #{clearwaterreserviorsstairs,jdbcType=VARCHAR},
+      clearWaterReserviorsVent = #{clearwaterreserviorsvent,jdbcType=VARCHAR},
+      clearWaterReserviorsPoolRoof = #{clearwaterreserviorspoolroof,jdbcType=VARCHAR},
+      clearWaterReserviorsSanitation = #{clearwaterreserviorssanitation,jdbcType=VARCHAR},
+      clearWaterReserviorsPumpBody = #{clearwaterreserviorspumpbody,jdbcType=VARCHAR},
+      clearWaterReserviorsResponsiblePerson = #{clearwaterreserviorsresponsibleperson,jdbcType=VARCHAR},
+      clearWaterReserviorsNote = #{clearwaterreserviorsnote,jdbcType=VARCHAR},
+      betweenChlorineEquipment = #{betweenchlorineequipment,jdbcType=VARCHAR},
+      betweenChlorinePipe = #{betweenchlorinepipe,jdbcType=VARCHAR},
+      betweenChlorineDosingPump = #{betweenchlorinedosingpump,jdbcType=VARCHAR},
+      betweenChlorineTraffic = #{betweenchlorinetraffic,jdbcType=VARCHAR},
+      betweenChlorineFan = #{betweenchlorinefan,jdbcType=VARCHAR},
+      betweenChlorineSanitation = #{betweenchlorinesanitation,jdbcType=VARCHAR},
+      betweenChlorineResponsiblePerson = #{betweenchlorineresponsibleperson,jdbcType=VARCHAR},
+      betweenChlorineNote = #{betweenchlorinenote,jdbcType=VARCHAR},
+      groundEnvironmentWellLIDS = #{groundenvironmentwelllids,jdbcType=VARCHAR},
+      groundEnvironmentDrainagen = #{groundenvironmentdrainagen,jdbcType=VARCHAR},
+      groundEnvironmentWaterSupply = #{groundenvironmentwatersupply,jdbcType=VARCHAR},
+      groundEnvironmentCable = #{groundenvironmentcable,jdbcType=VARCHAR},
+      groundEnvironmentRoad = #{groundenvironmentroad,jdbcType=VARCHAR},
+      groundEnvironmentResponsiblePerson = #{groundenvironmentresponsibleperson,jdbcType=VARCHAR},
+      groundEnvironmentNote = #{groundenvironmentnote,jdbcType=VARCHAR},
+      groundSecurityIllegal = #{groundsecurityillegal,jdbcType=VARCHAR},
+      groundSecurityFire = #{groundsecurityfire,jdbcType=VARCHAR},
+      groundSecurityRats = #{groundsecurityrats,jdbcType=VARCHAR},
+      groundSecuritySuspiciousPersonnel = #{groundsecuritysuspiciouspersonnel,jdbcType=VARCHAR},
+      groundSecurityResponsiblePerson = #{groundsecurityresponsibleperson,jdbcType=VARCHAR},
+      groundSecurityNote = #{groundsecuritynote,jdbcType=VARCHAR},
+      securityToolEmergency = #{securitytoolemergency,jdbcType=VARCHAR},
+      securityToolFloodControlAnd = #{securitytoolfloodcontroland,jdbcType=VARCHAR},
+      securityToolProtective = #{securitytoolprotective,jdbcType=VARCHAR},
+      securityToolMainteance = #{securitytoolmainteance,jdbcType=VARCHAR},
+      securityToolResponsiblePerson = #{securitytoolresponsibleperson,jdbcType=VARCHAR},
+      securityToolNote = #{securitytoolnote,jdbcType=VARCHAR},
+      userId = #{userid,jdbcType=INTEGER},
+      creatTime = #{creattime,jdbcType=TIMESTAMP},
+      reamke1 = #{reamke1,jdbcType=VARCHAR},
+      reamke2 = #{reamke2,jdbcType=VARCHAR},
+      reamke3 = #{reamke3,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

-package com.tianbo.warehouse;
-
-import com.tianbo.warehouse.imf.handle.IMFSaveHandle;
-
-public class handleTest {
-    private static String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><Msg>    <META>        <SNDR>NDLR</SNDR>        <RCVR></RCVR>        <SEQN>172-33519102</SEQN>        <DDTM>20181229124530224</DDTM>        <TYPE>HYXX</TYPE>        <STYP>NDLR</STYP>    </META>    <DECLAREPREPAREMASTERXMLBODY>        <Head>            <MessageID>CN_MT2201_1P0_460470678920X_20181229124530224</MessageID>            <FunctionCode>9</FunctionCode>            <MessageType>MT2201MASTER</MessageType>            <SenderID>460470678920X_DXPENT0000460002_20181229124530224</SenderID>            <ReceiverID>4604_20181229124530224</ReceiverID>            <SendTime>20181229124530224</SendTime>            <Version>1.0</Version>        </Head>        <Declaration>            <Carrier>                <ID>CV</ID>            </Carrier>            <ORG>                <ID>CGO</ID>            </ORG>            <DES>                <ID>CDG</ID>            </DES>            <BorderTransportMeans>                <JourneyID>9732/2019-01-01</JourneyID>            </BorderTransportMeans>            <Consignment>                <TransportContractDocument>                    <ID>172-33519102</ID>                </TransportContractDocument>                <LoadingLocation>                    <ID>CGO/4604</ID>                    <LoadingDate>2018-12-29 12:45</LoadingDate>                </LoadingLocation>                <UnloadingLocation>                    <ID>CGO/4604</ID>                </UnloadingLocation>                <TransportSplitIndicator>0</TransportSplitIndicator>                <ConsignmentPackaging>                    <QuantityQuantity>337</QuantityQuantity>                </ConsignmentPackaging>                <TotalGrossMassMeasure>3192</TotalGrossMassMeasure>                <PreQuantityQuantity>337</PreQuantityQuantity>                <PreTotalGrossMassMeasure>3192</PreTotalGrossMassMeasure>                <CustomsStatus>001</CustomsStatus>                <FreightPayment>                    <MethodCode>PP</MethodCode>                </FreightPayment>                <ProductName>IMITATION JEWELRY</ProductName>                <PrepareTime>2018-12-29 12:45</PrepareTime>                <CustomsCode>4604</CustomsCode>                <AgentName>ZRP</AgentName>                <AgentCompany>郑州睿鹏物流有限公司</AgentCompany>                <NameOfgoods>IMITATION JEWELRY</NameOfgoods>                <DeliveryStation>001</DeliveryStation>                <UNnumber></UNnumber>                <Category></Category>                <Consignee>                    <Name>QUALITAIR  SEA INTERNATIONAL</Name>                    <Address>                        <Line>4  RUE DU MEUNIER BP  19622 95724   ROISSY  CDG</Line>                        <CityName>CDG</CityName>                        <CountryCode>FR</CountryCode>                        <ZipCode></ZipCode>                        <PROVINCECODE></PROVINCECODE>                        <PROVINCENAME></PROVINCENAME>                        <Deltaname></Deltaname>                        <TelePhone>33 1 34 38 58 13</TelePhone>                        <Fax></Fax>                        <CNECUSID>EUROPEAN VAT NUMBER+FR93392293635</CNECUSID>                        <CNEAEO></CNEAEO>                        <Unlodingcode>CDG</Unlodingcode>                    </Address>                </Consignee>                <Consignor>                    <name>ON TIME EXPRESS LIMITED</name>                    <Address>                        <Line>ROOM 1102 FINANCIAL STREET HAI LUN CENTER NO 440 HAI LUN ROAD</Line>                        <CountryCode>CN</CountryCode>                        <ZipCode></ZipCode>                        <Deltaname></Deltaname>                        <TelePhone>862163642582</TelePhone>                        <Fax></Fax>                        <SHPAEO></SHPAEO>                        <SHPCUSID>USCI+91310000717852489D</SHPCUSID>                    </Address>                </Consignor>            </Consignment>        </Declaration>    </DECLAREPREPAREMASTERXMLBODY></Msg>";
-
-
-
-        public static void main(String[] args) {
-
-            IMFSaveHandle handle = new IMFSaveHandle();
-            handle.init();
-            handle.handle(xml);
-
-        }
-
-
-}