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);
 }
 }