新建表

base_person_info, 人员信息表（邓凯，注意主键用bigint,自增）
base_device_info，终端设备信息表（颜黎明）
base_person_device_relation, 人员与终端绑定（颜黎明）
wechat_reply_message，微信回复消息设置 （郑强）
base_company_position (每家企业对应5个位置字段的中文名称) (邓凯)
修改表
base_company_info增加logo字段。
sys_user增加company_id，name_,phone_字段。

src/main/java/com/jpsoft/smart/modules/base/controller/CompanyPositionController.java

@@ -0,0 +1,224 @@
+package com.jpsoft.smart.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.base.entity.CompanyPosition;
+import com.jpsoft.smart.modules.base.service.CompanyPositionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/companyPosition")
+@Api(description = "companyPosition")
+public class CompanyPositionController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private CompanyPositionService companyPositionService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<CompanyPosition> create(){
+        MessageResult<CompanyPosition> msgResult = new MessageResult<>();
+
+        CompanyPosition companyPosition = new CompanyPosition();
+
+        msgResult.setData(companyPosition);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<CompanyPosition> add(@RequestBody CompanyPosition companyPosition,@RequestAttribute String subject){
+        MessageResult<CompanyPosition> msgResult = new MessageResult<>();
+
+        try {
+            companyPosition.setId(UUID.randomUUID().toString());
+            companyPosition.setCreateBy(subject);
+            companyPosition.setCreateTime(new Date());
+            
+            int affectCount = companyPositionService.insert(companyPosition);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(companyPosition);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<CompanyPosition> edit(@PathVariable("id") String id){
+        MessageResult<CompanyPosition> msgResult = new MessageResult<>();
+
+        try {
+            CompanyPosition companyPosition = companyPositionService.get(id);
+
+            if (companyPosition != null) {
+                msgResult.setResult(true);
+                msgResult.setData(companyPosition);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<CompanyPosition> update(@RequestBody CompanyPosition companyPosition,@RequestAttribute String subject){
+        MessageResult<CompanyPosition> msgResult = new MessageResult<>();
+
+        try {
+            companyPosition.setUpdateBy(subject);
+            companyPosition.setUpdateTime(new Date());
+            
+            int affectCount = companyPositionService.update(companyPosition);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(companyPosition);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            CompanyPosition companyPosition = companyPositionService.get(id);
+            companyPosition.setDelFlag(true);
+            companyPosition.setUpdateBy(subject);
+            companyPosition.setUpdateTime(new Date());
+
+            int affectCount = companyPositionService.update(companyPosition);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                CompanyPosition companyPosition = companyPositionService.get(id);
+                companyPosition.setDelFlag(true);
+                companyPosition.setUpdateBy(subject);
+                companyPosition.setUpdateTime(new Date());
+
+                affectCount += companyPositionService.update(companyPosition);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<CompanyPosition> page = companyPositionService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

src/main/java/com/jpsoft/smart/modules/base/controller/DeviceInfoController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.smart.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
+import com.jpsoft.smart.modules.base.service.DeviceInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/deviceInfo")
+@Api(description = "deviceInfo")
+public class DeviceInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private DeviceInfoService deviceInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<DeviceInfo> create(){
+        MessageResult<DeviceInfo> msgResult = new MessageResult<>();
+
+        DeviceInfo deviceInfo = new DeviceInfo();
+
+        msgResult.setData(deviceInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<DeviceInfo> add(@RequestBody DeviceInfo deviceInfo,@RequestAttribute String subject){
+        MessageResult<DeviceInfo> msgResult = new MessageResult<>();
+
+        try {
+            deviceInfo.setId(UUID.randomUUID().toString());
+            deviceInfo.setDelFlag(false);
+            deviceInfo.setCreateBy(subject);
+            deviceInfo.setCreateTime(new Date());
+            
+            int affectCount = deviceInfoService.insert(deviceInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<DeviceInfo> edit(@PathVariable("id") String id){
+        MessageResult<DeviceInfo> msgResult = new MessageResult<>();
+
+        try {
+            DeviceInfo deviceInfo = deviceInfoService.get(id);
+
+            if (deviceInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<DeviceInfo> update(@RequestBody DeviceInfo deviceInfo,@RequestAttribute String subject){
+        MessageResult<DeviceInfo> msgResult = new MessageResult<>();
+
+        try {
+            deviceInfo.setUpdateBy(subject);
+            deviceInfo.setUpdateTime(new Date());
+            
+            int affectCount = deviceInfoService.update(deviceInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(deviceInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            DeviceInfo deviceInfo = deviceInfoService.get(id);
+            deviceInfo.setDelFlag(true);
+            deviceInfo.setUpdateBy(subject);
+            deviceInfo.setUpdateTime(new Date());
+
+            int affectCount = deviceInfoService.update(deviceInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                DeviceInfo deviceInfo = deviceInfoService.get(id);
+                deviceInfo.setDelFlag(true);
+                deviceInfo.setUpdateBy(subject);
+                deviceInfo.setUpdateTime(new Date());
+
+                affectCount += deviceInfoService.update(deviceInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<DeviceInfo> page = deviceInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceRelationController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.smart.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.base.entity.PersonDeviceRelation;
+import com.jpsoft.smart.modules.base.service.PersonDeviceRelationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/personDeviceRelation")
+@Api(description = "personDeviceRelation")
+public class PersonDeviceRelationController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PersonDeviceRelationService personDeviceRelationService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<PersonDeviceRelation> create(){
+        MessageResult<PersonDeviceRelation> msgResult = new MessageResult<>();
+
+        PersonDeviceRelation personDeviceRelation = new PersonDeviceRelation();
+
+        msgResult.setData(personDeviceRelation);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<PersonDeviceRelation> add(@RequestBody PersonDeviceRelation personDeviceRelation,@RequestAttribute String subject){
+        MessageResult<PersonDeviceRelation> msgResult = new MessageResult<>();
+
+        try {
+            personDeviceRelation.setId(UUID.randomUUID().toString());
+            personDeviceRelation.setDelFlag(false);
+            personDeviceRelation.setCreateBy(subject);
+            personDeviceRelation.setCreateTime(new Date());
+            
+            int affectCount = personDeviceRelationService.insert(personDeviceRelation);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(personDeviceRelation);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<PersonDeviceRelation> edit(@PathVariable("id") String id){
+        MessageResult<PersonDeviceRelation> msgResult = new MessageResult<>();
+
+        try {
+            PersonDeviceRelation personDeviceRelation = personDeviceRelationService.get(id);
+
+            if (personDeviceRelation != null) {
+                msgResult.setResult(true);
+                msgResult.setData(personDeviceRelation);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<PersonDeviceRelation> update(@RequestBody PersonDeviceRelation personDeviceRelation,@RequestAttribute String subject){
+        MessageResult<PersonDeviceRelation> msgResult = new MessageResult<>();
+
+        try {
+            personDeviceRelation.setUpdateBy(subject);
+            personDeviceRelation.setUpdateTime(new Date());
+            
+            int affectCount = personDeviceRelationService.update(personDeviceRelation);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(personDeviceRelation);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            PersonDeviceRelation personDeviceRelation = personDeviceRelationService.get(id);
+            personDeviceRelation.setDelFlag(true);
+            personDeviceRelation.setUpdateBy(subject);
+            personDeviceRelation.setUpdateTime(new Date());
+
+            int affectCount = personDeviceRelationService.update(personDeviceRelation);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                PersonDeviceRelation personDeviceRelation = personDeviceRelationService.get(id);
+                personDeviceRelation.setDelFlag(true);
+                personDeviceRelation.setUpdateBy(subject);
+                personDeviceRelation.setUpdateTime(new Date());
+
+                affectCount += personDeviceRelationService.update(personDeviceRelation);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<PersonDeviceRelation> page = personDeviceRelationService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

src/main/java/com/jpsoft/smart/modules/base/controller/PersonInfoController.java

@@ -0,0 +1,225 @@
+package com.jpsoft.smart.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.utils.PojoUtils;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.jpsoft.smart.modules.common.dto.MessageResult;
+import com.jpsoft.smart.modules.base.entity.PersonInfo;
+import com.jpsoft.smart.modules.base.service.PersonInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/personInfo")
+@Api(description = "personInfo")
+public class PersonInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PersonInfoService personInfoService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<PersonInfo> create(){
+        MessageResult<PersonInfo> msgResult = new MessageResult<>();
+
+        PersonInfo personInfo = new PersonInfo();
+
+        msgResult.setData(personInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<PersonInfo> add(@RequestBody PersonInfo personInfo,@RequestAttribute String subject){
+        MessageResult<PersonInfo> msgResult = new MessageResult<>();
+
+        try {
+//            personInfo.setId(UUID.randomUUID().toString());
+            personInfo.setDelFlag(false);
+            personInfo.setCreateBy(subject);
+            personInfo.setCreateTime(new Date());
+            
+            int affectCount = personInfoService.insert(personInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(personInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<PersonInfo> edit(@PathVariable("id") String id){
+        MessageResult<PersonInfo> msgResult = new MessageResult<>();
+
+        try {
+            PersonInfo personInfo = personInfoService.get(id);
+
+            if (personInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(personInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<PersonInfo> update(@RequestBody PersonInfo personInfo,@RequestAttribute String subject){
+        MessageResult<PersonInfo> msgResult = new MessageResult<>();
+
+        try {
+            personInfo.setUpdateBy(subject);
+            personInfo.setUpdateTime(new Date());
+            
+            int affectCount = personInfoService.update(personInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(personInfo);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            PersonInfo personInfo = personInfoService.get(id);
+            personInfo.setDelFlag(true);
+            personInfo.setUpdateBy(subject);
+            personInfo.setUpdateTime(new Date());
+
+            int affectCount = personInfoService.update(personInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                PersonInfo personInfo = personInfoService.get(id);
+                personInfo.setDelFlag(true);
+                personInfo.setUpdateBy(subject);
+                personInfo.setUpdateTime(new Date());
+
+                affectCount += personInfoService.update(personInfo);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+        Page<PersonInfo> page = personInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

src/main/java/com/jpsoft/smart/modules/base/dao/CompanyPositionDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.CompanyPosition;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface CompanyPositionDAO {
+	int insert(CompanyPosition entity);
+	int update(CompanyPosition entity);
+	int exist(String id);
+	CompanyPosition get(String id);
+	int delete(String id);
+	List<CompanyPosition> list();
+	List<CompanyPosition> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/dao/DeviceInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface DeviceInfoDAO {
+	int insert(DeviceInfo entity);
+	int update(DeviceInfo entity);
+	int exist(String id);
+	DeviceInfo get(String id);
+	int delete(String id);
+	List<DeviceInfo> list();
+	List<DeviceInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/dao/PersonDeviceRelationDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.PersonDeviceRelation;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface PersonDeviceRelationDAO {
+	int insert(PersonDeviceRelation entity);
+	int update(PersonDeviceRelation entity);
+	int exist(String id);
+	PersonDeviceRelation get(String id);
+	int delete(String id);
+	List<PersonDeviceRelation> list();
+	List<PersonDeviceRelation> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/dao/PersonInfoDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.base.entity.PersonInfo;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface PersonInfoDAO {
+	int insert(PersonInfo entity);
+	int update(PersonInfo entity);
+	int exist(String id);
+	PersonInfo get(String id);
+	int delete(String id);
+	List<PersonInfo> list();
+	List<PersonInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/entity/CompanyInfo.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,10 +13,13 @@ import io.swagger.annotations.ApiModel;
 /**
   描述:base_company_info的实体类
  */
+@Data
 @ApiModel(value = "base_company_info的实体类")
 public class CompanyInfo {
     @ApiModelProperty(value = "公司编号")
 	private String id;
+	@ApiModelProperty(value = "公司logo")
+	private String logo;
     @ApiModelProperty(value = "序号")
 	private Integer sortNo;
     @ApiModelProperty(value = "公司名称")
@@ -24,134 +28,18 @@ public class CompanyInfo {
 	private String remark;
     @ApiModelProperty(value = "创建人")
 	private String createBy;
+
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "创建时间")
 	private Date createTime;
     @ApiModelProperty(value = "更新人")
 	private String updateBy;
+
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "更新时间")
 	private Date updateTime;
     @ApiModelProperty(value = "是否删除")
 	private Boolean delFlag;
-
-	/**
-	 *获取公司编号
-	 */
-    	public String getId(){
-		return id;
-	}
-	
-	/**
-	 *设置公司编号
-	 */
-	public void setId(String id){
-		this.id = id;
-	}
-	/**
-	 *获取序号
-	 */
-    	public Integer getSortNo(){
-		return sortNo;
-	}
-	
-	/**
-	 *设置序号
-	 */
-	public void setSortNo(Integer sortNo){
-		this.sortNo = sortNo;
-	}
-	/**
-	 *获取公司名称
-	 */
-    	public String getName(){
-		return name;
-	}
-	
-	/**
-	 *设置公司名称
-	 */
-	public void setName(String name){
-		this.name = name;
-	}
-	/**
-	 *获取备注
-	 */
-    	public String getRemark(){
-		return remark;
-	}
-	
-	/**
-	 *设置备注
-	 */
-	public void setRemark(String remark){
-		this.remark = remark;
-	}
-	/**
-	 *获取创建人
-	 */
-    	public String getCreateBy(){
-		return createBy;
-	}
-	
-	/**
-	 *设置创建人
-	 */
-	public void setCreateBy(String createBy){
-		this.createBy = createBy;
-	}
-	/**
-	 *获取创建时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-		public Date getCreateTime(){
-		return createTime;
-	}
-	
-	/**
-	 *设置创建时间
-	 */
-	public void setCreateTime(Date createTime){
-		this.createTime = createTime;
-	}
-	/**
-	 *获取更新人
-	 */
-    	public String getUpdateBy(){
-		return updateBy;
-	}
-	
-	/**
-	 *设置更新人
-	 */
-	public void setUpdateBy(String updateBy){
-		this.updateBy = updateBy;
-	}
-	/**
-	 *获取更新时间
-	 */
-    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-		public Date getUpdateTime(){
-		return updateTime;
-	}
-	
-	/**
-	 *设置更新时间
-	 */
-	public void setUpdateTime(Date updateTime){
-		this.updateTime = updateTime;
-	}
-	/**
-	 *获取是否删除
-	 */
-    	public Boolean getDelFlag(){
-		return delFlag;
-	}
-	
-	/**
-	 *设置是否删除
-	 */
-	public void setDelFlag(Boolean delFlag){
-		this.delFlag = delFlag;
-	}
 }

src/main/java/com/jpsoft/smart/modules/base/entity/CompanyPosition.java

@@ -0,0 +1,83 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_company_position的实体类
+ */
+@Data
+@ApiModel(value = "base_company_position的实体类")
+public class CompanyPosition {
+	/**
+	 *
+	 */
+        @ApiModelProperty(value = "")
+	private String id;
+	/**
+	 *企业编号
+	 */
+        @ApiModelProperty(value = "企业编号")
+	private String companyId;
+	/**
+	 *位置1名称
+	 */
+        @ApiModelProperty(value = "位置1名称")
+	private String position1Name;
+	/**
+	 *位置2名称
+	 */
+        @ApiModelProperty(value = "位置2名称")
+	private String position2Name;
+	/**
+	 *位置3名称
+	 */
+        @ApiModelProperty(value = "位置3名称")
+	private String position3Name;
+	/**
+	 *位置4名称
+	 */
+        @ApiModelProperty(value = "位置4名称")
+	private String position4Name;
+	/**
+	 *位置5名称
+	 */
+        @ApiModelProperty(value = "位置5名称")
+	private String position5Name;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+}

src/main/java/com/jpsoft/smart/modules/base/entity/DeviceInfo.java

@@ -0,0 +1,104 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_device_info的实体类
+ */
+@Data
+@ApiModel(value = "base_device_info的实体类")
+public class DeviceInfo {
+	/**
+	 *ID
+	 */
+        @ApiModelProperty(value = "ID")
+	private String id;
+	/**
+	 *表头
+	 */
+        @ApiModelProperty(value = "表头")
+	private String 
+header;
+	/**
+	 *设备编号
+	 */
+        @ApiModelProperty(value = "设备编号")
+	private String deviceNo;
+	/**
+	 *设备别名
+	 */
+        @ApiModelProperty(value = "设备别名")
+	private String aliasName;
+	/**
+	 *单元楼栋
+	 */
+        @ApiModelProperty(value = "单元楼栋")
+	private String address;
+	/**
+	 *运行状态（是否在线）
+	 */
+        @ApiModelProperty(value = "运行状态（是否在线）")
+	private Boolean isOnline;
+	/**
+	 *开锁密码
+	 */
+        @ApiModelProperty(value = "开锁密码")
+	private String unlockPassword;
+	/**
+	 *二维码地址
+	 */
+        @ApiModelProperty(value = "二维码地址")
+	private String codeAddress;
+	/**
+	 *ip地址
+	 */
+        @ApiModelProperty(value = "ip地址")
+	private String ipAddress;
+	/**
+	 *端口
+	 */
+        @ApiModelProperty(value = "端口")
+	private String port;
+	/**
+	 *类型
+	 */
+        @ApiModelProperty(value = "类型")
+	private String type;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

src/main/java/com/jpsoft/smart/modules/base/entity/PersonDeviceRelation.java

@@ -0,0 +1,63 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_person_device_relation的实体类
+ */
+@Data
+@ApiModel(value = "base_person_device_relation的实体类")
+public class PersonDeviceRelation {
+	/**
+	 *ID
+	 */
+        @ApiModelProperty(value = "ID")
+	private String id;
+	/**
+	 *设备ID
+	 */
+        @ApiModelProperty(value = "设备ID")
+	private String deviceId;
+	/**
+	 *人员ID
+	 */
+        @ApiModelProperty(value = "人员ID")
+	private String personId;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

src/main/java/com/jpsoft/smart/modules/base/entity/PersonInfo.java

@@ -0,0 +1,123 @@
+package com.jpsoft.smart.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_person_info的实体类
+ */
+@Data
+@ApiModel(value = "base_person_info的实体类")
+public class PersonInfo {
+	/**
+	 *编号
+	 */
+        @ApiModelProperty(value = "编号")
+	private Long id;
+	/**
+	 *企业编号
+	 */
+        @ApiModelProperty(value = "企业编号")
+	private String companyId;
+	/**
+	 *姓名
+	 */
+        @ApiModelProperty(value = "姓名")
+	private String name;
+	/**
+	 *手机号
+	 */
+        @ApiModelProperty(value = "手机号")
+	private String phone;
+	/**
+	 *微信openId
+	 */
+        @ApiModelProperty(value = "微信openId")
+	private Boolean openId;
+	/**
+	 *人脸
+	 */
+        @ApiModelProperty(value = "人脸")
+	private Boolean faceEnabled;
+	/**
+	 *刷卡
+	 */
+        @ApiModelProperty(value = "刷卡")
+	private Boolean cardEnabled;
+	/**
+	 *手机
+	 */
+        @ApiModelProperty(value = "手机")
+	private Boolean appEnabled;
+	/**
+	 *密码
+	 */
+        @ApiModelProperty(value = "密码")
+	private Boolean passwordEnabled;
+	/**
+	 *访客
+	 */
+        @ApiModelProperty(value = "访客")
+	private Boolean guestEnabled;
+	/**
+	 *位置1
+	 */
+        @ApiModelProperty(value = "位置1")
+	private String position1;
+	/**
+	 *位置2
+	 */
+        @ApiModelProperty(value = "位置2")
+	private String position2;
+	/**
+	 *位置3
+	 */
+        @ApiModelProperty(value = "位置3")
+	private String position3;
+	/**
+	 *位置4
+	 */
+        @ApiModelProperty(value = "位置4")
+	private String position4;
+	/**
+	 *位置5
+	 */
+        @ApiModelProperty(value = "位置5")
+	private String position5;
+	/**
+	 *是否删除
+	 */
+        @ApiModelProperty(value = "是否删除")
+	private Boolean delFlag;
+	/**
+	 *创建人
+	 */
+        @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新人
+	 */
+        @ApiModelProperty(value = "更新人")
+	private String updateBy;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

src/main/java/com/jpsoft/smart/modules/base/service/CompanyPositionService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.smart.modules.base.entity.CompanyPosition;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface CompanyPositionService {
+	CompanyPosition get(String id);
+	boolean exist(String id);
+	int insert(CompanyPosition model);
+	int update(CompanyPosition model);
+	int delete(String id);
+	List<CompanyPosition> list();
+	Page<CompanyPosition> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize,boolean count, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/service/DeviceInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface DeviceInfoService {
+	DeviceInfo get(String id);
+	boolean exist(String id);
+	int insert(DeviceInfo model);
+	int update(DeviceInfo model);
+	int delete(String id);
+	List<DeviceInfo> list();
+	Page<DeviceInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize,boolean count, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/service/PersonDeviceRelationService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.smart.modules.base.entity.PersonDeviceRelation;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface PersonDeviceRelationService {
+	PersonDeviceRelation get(String id);
+	boolean exist(String id);
+	int insert(PersonDeviceRelation model);
+	int update(PersonDeviceRelation model);
+	int delete(String id);
+	List<PersonDeviceRelation> list();
+	Page<PersonDeviceRelation> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize,boolean count, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/service/PersonInfoService.java

@@ -0,0 +1,17 @@
+package com.jpsoft.smart.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.smart.modules.base.entity.PersonInfo;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+public interface PersonInfoService {
+	PersonInfo get(String id);
+	boolean exist(String id);
+	int insert(PersonInfo model);
+	int update(PersonInfo model);
+	int delete(String id);
+	List<PersonInfo> list();
+	Page<PersonInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize,boolean count, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/base/service/impl/CompanyPositionServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.smart.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.smart.modules.base.dao.CompanyPositionDAO;
+import com.jpsoft.smart.modules.base.entity.CompanyPosition;
+import com.jpsoft.smart.modules.base.service.CompanyPositionService;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="companyPositionService")
+public class CompanyPositionServiceImpl implements CompanyPositionService {
+	@Resource(name="companyPositionDAO")
+	private CompanyPositionDAO companyPositionDAO;
+
+	@Override
+	public CompanyPosition get(String id) {
+		// TODO Auto-generated method stub
+		return companyPositionDAO.get(id);
+	}
+
+	@Override
+	public int insert(CompanyPosition model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return companyPositionDAO.insert(model);
+	}
+
+	@Override
+	public int update(CompanyPosition model) {
+		// TODO Auto-generated method stub
+		return companyPositionDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return companyPositionDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = companyPositionDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<CompanyPosition> list() {
+		// TODO Auto-generated method stub
+		return companyPositionDAO.list();
+	}
+		
+	@Override
+	public Page<CompanyPosition> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<CompanyPosition> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            companyPositionDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

src/main/java/com/jpsoft/smart/modules/base/service/impl/DeviceInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.smart.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.smart.modules.base.dao.DeviceInfoDAO;
+import com.jpsoft.smart.modules.base.entity.DeviceInfo;
+import com.jpsoft.smart.modules.base.service.DeviceInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="deviceInfoService")
+public class DeviceInfoServiceImpl implements DeviceInfoService {
+	@Resource(name="deviceInfoDAO")
+	private DeviceInfoDAO deviceInfoDAO;
+
+	@Override
+	public DeviceInfo get(String id) {
+		// TODO Auto-generated method stub
+		return deviceInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(DeviceInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return deviceInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(DeviceInfo model) {
+		// TODO Auto-generated method stub
+		return deviceInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return deviceInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = deviceInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<DeviceInfo> list() {
+		// TODO Auto-generated method stub
+		return deviceInfoDAO.list();
+	}
+		
+	@Override
+	public Page<DeviceInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<DeviceInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            deviceInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

src/main/java/com/jpsoft/smart/modules/base/service/impl/PersonDeviceRelationServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.smart.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.smart.modules.base.dao.PersonDeviceRelationDAO;
+import com.jpsoft.smart.modules.base.entity.PersonDeviceRelation;
+import com.jpsoft.smart.modules.base.service.PersonDeviceRelationService;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="personDeviceRelationService")
+public class PersonDeviceRelationServiceImpl implements PersonDeviceRelationService {
+	@Resource(name="personDeviceRelationDAO")
+	private PersonDeviceRelationDAO personDeviceRelationDAO;
+
+	@Override
+	public PersonDeviceRelation get(String id) {
+		// TODO Auto-generated method stub
+		return personDeviceRelationDAO.get(id);
+	}
+
+	@Override
+	public int insert(PersonDeviceRelation model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return personDeviceRelationDAO.insert(model);
+	}
+
+	@Override
+	public int update(PersonDeviceRelation model) {
+		// TODO Auto-generated method stub
+		return personDeviceRelationDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return personDeviceRelationDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = personDeviceRelationDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<PersonDeviceRelation> list() {
+		// TODO Auto-generated method stub
+		return personDeviceRelationDAO.list();
+	}
+		
+	@Override
+	public Page<PersonDeviceRelation> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<PersonDeviceRelation> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            personDeviceRelationDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

src/main/java/com/jpsoft/smart/modules/base/service/impl/PersonInfoServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.smart.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.smart.modules.base.dao.PersonInfoDAO;
+import com.jpsoft.smart.modules.base.entity.PersonInfo;
+import com.jpsoft.smart.modules.base.service.PersonInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="personInfoService")
+public class PersonInfoServiceImpl implements PersonInfoService {
+	@Resource(name="personInfoDAO")
+	private PersonInfoDAO personInfoDAO;
+
+	@Override
+	public PersonInfo get(String id) {
+		// TODO Auto-generated method stub
+		return personInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(PersonInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return personInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(PersonInfo model) {
+		// TODO Auto-generated method stub
+		return personInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return personInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = personInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<PersonInfo> list() {
+		// TODO Auto-generated method stub
+		return personInfoDAO.list();
+	}
+		
+	@Override
+	public Page<PersonInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<PersonInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            personInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

src/main/java/com/jpsoft/smart/modules/sys/entity/User.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  */
 public class User {
 	private String id;
+	private String companyId;
 	private String userName;
 	private String password;
 	private String realName;
@@ -150,4 +151,12 @@ public class User {
 	public void setRoles(List<String> roles) {
 		this.roles = roles;
 	}
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
 }

src/main/java/com/jpsoft/smart/modules/wechat/dao/ReplyMessageDAO.java

@@ -0,0 +1,18 @@
+package com.jpsoft.smart.modules.wechat.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.smart.modules.wechat.entity.ReplyMessage;
+import java.util.Map;
+import com.jpsoft.smart.modules.common.dto.Sort;
+
+@Repository
+public interface ReplyMessageDAO {
+	int insert(ReplyMessage entity);
+	int update(ReplyMessage entity);
+	int exist(String id);
+	ReplyMessage get(String id);
+	int delete(String id);
+	List<ReplyMessage> list();
+	List<ReplyMessage> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

src/main/java/com/jpsoft/smart/modules/wechat/entity/ReplyMessage.java

@@ -0,0 +1,53 @@
+package com.jpsoft.smart.modules.wechat.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:wechat_reply_message的实体类
+ */
+@Data
+@ApiModel(value = "wechat_reply_message的实体类")
+public class ReplyMessage {
+	/**
+	 *编号
+	 */
+        @ApiModelProperty(value = "编号")
+	private String id;
+	/**
+	 *事件
+	 */
+        @ApiModelProperty(value = "事件")
+	private String event;
+	/**
+	 *回复消息
+	 */
+        @ApiModelProperty(value = "回复消息")
+	private String message;
+	/**
+	 *回调地址
+	 */
+        @ApiModelProperty(value = "回调地址")
+	private String callbackUrl;
+	/**
+	 *创建时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**
+	 *更新时间
+	 */
+    	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	    @ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+}

src/main/java/com/jpsoft/smart/modules/wechat/service/impl/ReplyMessageServiceImpl.java

@@ -0,0 +1,70 @@
+package com.jpsoft.smart.modules.wechat.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.smart.modules.wechat.dao.ReplyMessageDAO;
+import com.jpsoft.smart.modules.wechat.entity.ReplyMessage;
+import com.jpsoft.smart.modules.wechat.service.ReplyMessageService;
+import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="replyMessageService")
+public class ReplyMessageServiceImpl implements ReplyMessageService {
+	@Resource(name="replyMessageDAO")
+	private ReplyMessageDAO replyMessageDAO;
+
+	@Override
+	public ReplyMessage get(String id) {
+		// TODO Auto-generated method stub
+		return replyMessageDAO.get(id);
+	}
+
+	@Override
+	public int insert(ReplyMessage model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return replyMessageDAO.insert(model);
+	}
+
+	@Override
+	public int update(ReplyMessage model) {
+		// TODO Auto-generated method stub
+		return replyMessageDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return replyMessageDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = replyMessageDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<ReplyMessage> list() {
+		// TODO Auto-generated method stub
+		return replyMessageDAO.list();
+	}
+		
+	@Override
+	public Page<ReplyMessage> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<ReplyMessage> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            replyMessageDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

src/main/resources/mapper/base/CompanyInfo.xml

@@ -1,96 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.smart.modules.base.dao.CompanyInfoDAO">
-	<resultMap id="CompanyInfoMap" type="com.jpsoft.smart.modules.base.entity.CompanyInfo">
-		<id property="id" column="id_" />
-			<result property="sortNo" column="sort_no" />
-			<result property="name" column="name_" />
-			<result property="remark" column="remark_" />
-			<result property="createBy" column="create_by" />
-			<result property="createTime" column="create_time" />
-			<result property="updateBy" column="update_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="delFlag" column="del_flag" />
-			</resultMap>
-	<insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.CompanyInfo">
-	<!--
-	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-		select sys_guid() from dual
-	</selectKey>
-	-->
-	<![CDATA[
+    <resultMap id="CompanyInfoMap" type="com.jpsoft.smart.modules.base.entity.CompanyInfo">
+        <id property="id" column="id_"/>
+        <result property="sortNo" column="sort_no"/>
+        <result property="name" column="name_"/>
+        <result property="logo" column="logo_"/>
+        <result property="remark" column="remark_"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+    <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.CompanyInfo">
+        <!--
+        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            select sys_guid() from dual
+        </selectKey>
+        -->
+        <![CDATA[
 		insert into base_company_info
-	    (id_,sort_no,name_,remark_,create_by,create_time,update_by,update_time,del_flag)
+	    (id_,sort_no,name_,logo_,remark_,create_by,create_time,update_by,update_time,del_flag)
 		values
 		(
-#{id,jdbcType=VARCHAR}
-,#{sortNo,jdbcType= NUMERIC }
-,#{name,jdbcType=VARCHAR}
-,#{remark,jdbcType=VARCHAR}
-,#{createBy,jdbcType=VARCHAR}
-,#{createTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
-,#{delFlag,jdbcType= NUMERIC }
+			#{id,jdbcType=VARCHAR}
+			,#{sortNo,jdbcType= NUMERIC }
+			,#{name,jdbcType=VARCHAR}
+			,#{logo,jdbcType=VARCHAR}
+			,#{remark,jdbcType=VARCHAR}
+			,#{createBy,jdbcType=VARCHAR}
+			,#{createTime,jdbcType= TIMESTAMP }
+			,#{updateBy,jdbcType=VARCHAR}
+			,#{updateTime,jdbcType= TIMESTAMP }
+			,#{delFlag,jdbcType= NUMERIC }
 		)
 	]]>
-	</insert>
-	<delete id="delete" parameterType="string">
-		delete from base_company_info where id_=#{id,jdbcType=VARCHAR}
-	</delete>
-	<update id="update" parameterType="com.jpsoft.smart.modules.base.entity.CompanyInfo">
-		update base_company_info
-		<set>
-				<if test="sortNo!=null">
-		sort_no=#{sortNo,jdbcType= NUMERIC },
-		</if>
-				<if test="name!=null">
-		name_=#{name,jdbcType=VARCHAR},
-		</if>
-				<if test="remark!=null">
-		remark_=#{remark,jdbcType=VARCHAR},
-		</if>
-				<if test="createBy!=null">
-		create_by=#{createBy,jdbcType=VARCHAR},
-		</if>
-				<if test="createTime!=null">
-		create_time=#{createTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="updateBy!=null">
-		update_by=#{updateBy,jdbcType=VARCHAR},
-		</if>
-				<if test="updateTime!=null">
-		update_time=#{updateTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="delFlag!=null">
-		del_flag=#{delFlag,jdbcType= NUMERIC },
-		</if>
-		</set>
-	where id_=#{id}
-	</update>
-	<select id="get" parameterType="string" resultMap="CompanyInfoMap">
-		select 
-id_,sort_no,name_,remark_,create_by,create_time,update_by,update_time,del_flag		from base_company_info where id_=#{0}
-	</select>
-	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_company_info where id_=#{0}
-	</select>
-	<select id="list" resultMap="CompanyInfoMap">
-		select * from base_company_info where del_flag=0 order by sort_no asc
-	</select>
-	<select id="search" parameterType="hashmap" resultMap="CompanyInfoMap">
-		<![CDATA[
+    </insert>
+    <delete id="delete" parameterType="string">
+        delete from base_company_info where id_=#{id,jdbcType=VARCHAR}
+    </delete>
+    <update id="update" parameterType="com.jpsoft.smart.modules.base.entity.CompanyInfo">
+        update base_company_info
+        <set>
+            <if test="sortNo!=null">
+                sort_no=#{sortNo,jdbcType= NUMERIC },
+            </if>
+            <if test="name!=null">
+                name_=#{name,jdbcType=VARCHAR},
+            </if>
+            <if test="logo!=null">
+                logo_=#{logo,jdbcType=VARCHAR},
+            </if>
+            <if test="remark!=null">
+                remark_=#{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="createBy!=null">
+                create_by=#{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime!=null">
+                create_time=#{createTime,jdbcType= TIMESTAMP },
+            </if>
+            <if test="updateBy!=null">
+                update_by=#{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime!=null">
+                update_time=#{updateTime,jdbcType= TIMESTAMP },
+            </if>
+            <if test="delFlag!=null">
+                del_flag=#{delFlag,jdbcType= NUMERIC },
+            </if>
+        </set>
+        where id_=#{id}
+    </update>
+    <select id="get" parameterType="string" resultMap="CompanyInfoMap">
+        select * from base_company_info where id_=#{0}
+    </select>
+    <select id="exist" parameterType="string" resultType="int">
+        select count(*) from base_company_info where id_=#{0}
+    </select>
+    <select id="list" resultMap="CompanyInfoMap">
+        select * from base_company_info where del_flag=0 order by sort_no asc
+    </select>
+    <select id="search" parameterType="hashmap" resultMap="CompanyInfoMap">
+        <![CDATA[
 			select * from base_company_info
 		]]>
-		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
-	 	</foreach>
-	</select>
+        <where>
+            <if test="searchParams.id != null">
+                and ID_ like #{searchParams.id}
+            </if>
+        </where>
+        <foreach item="sort" collection="sortList" open="order by" separator=",">
+            ${sort.name} ${sort.order}
+        </foreach>
+    </select>
 </mapper>

src/main/resources/mapper/base/CompanyPosition.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.base.dao.CompanyPositionDAO">
+	<resultMap id="CompanyPositionMap" type="com.jpsoft.smart.modules.base.entity.CompanyPosition">
+		<id property="id" column="id_" />
+			<result property="companyId" column="company_id" />
+			<result property="position1Name" column="position1_name" />
+			<result property="position2Name" column="position2_name" />
+			<result property="position3Name" column="position3_name" />
+			<result property="position4Name" column="position4_name" />
+			<result property="position5Name" column="position5_name" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.CompanyPosition">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_company_position
+	    (id_,company_id,position1_name,position2_name,position3_name,position4_name,position5_name,create_by,create_time,update_by,update_time,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{position1Name,jdbcType=VARCHAR}
+,#{position2Name,jdbcType=VARCHAR}
+,#{position3Name,jdbcType=VARCHAR}
+,#{position4Name,jdbcType=VARCHAR}
+,#{position5Name,jdbcType=VARCHAR}
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_company_position where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.smart.modules.base.entity.CompanyPosition">
+		update base_company_position
+		<set>
+				<if test="companyId!=null">
+		company_id=#{companyId,jdbcType=VARCHAR},
+		</if>
+				<if test="position1Name!=null">
+		position1_name=#{position1Name,jdbcType=VARCHAR},
+		</if>
+				<if test="position2Name!=null">
+		position2_name=#{position2Name,jdbcType=VARCHAR},
+		</if>
+				<if test="position3Name!=null">
+		position3_name=#{position3Name,jdbcType=VARCHAR},
+		</if>
+				<if test="position4Name!=null">
+		position4_name=#{position4Name,jdbcType=VARCHAR},
+		</if>
+				<if test="position5Name!=null">
+		position5_name=#{position5Name,jdbcType=VARCHAR},
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="CompanyPositionMap">
+		select 
+id_,company_id,position1_name,position2_name,position3_name,position4_name,position5_name,create_by,create_time,update_by,update_time,del_flag		from base_company_position where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_company_position where id_=#{0}
+	</select>
+	<select id="list" resultMap="CompanyPositionMap">
+		select * from base_company_position
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="CompanyPositionMap">
+		<![CDATA[
+			select * from base_company_position
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

src/main/resources/mapper/base/DeviceInfo.xml

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.base.dao.DeviceInfoDAO">
+	<resultMap id="DeviceInfoMap" type="com.jpsoft.smart.modules.base.entity.DeviceInfo">
+		<id property="id" column="id_" />
+			<result property="
+header" column="
+header_" />
+			<result property="deviceNo" column="device_no" />
+			<result property="aliasName" column="alias_name" />
+			<result property="address" column="address_" />
+			<result property="isOnline" column="is_online" />
+			<result property="unlockPassword" column="unlock_password" />
+			<result property="codeAddress" column="code_address" />
+			<result property="ipAddress" column="ip_address" />
+			<result property="port" column="port_" />
+			<result property="type" column="type_" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.DeviceInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_device_info
+	    (id_,
+header_,device_no,alias_name,address_,is_online,unlock_password,code_address,ip_address,port_,type_,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{
+header,jdbcType=VARCHAR}
+,#{deviceNo,jdbcType=VARCHAR}
+,#{aliasName,jdbcType=VARCHAR}
+,#{address,jdbcType=VARCHAR}
+,#{isOnline,jdbcType= NUMERIC }
+,#{unlockPassword,jdbcType=VARCHAR}
+,#{codeAddress,jdbcType=VARCHAR}
+,#{ipAddress,jdbcType=VARCHAR}
+,#{port,jdbcType=VARCHAR}
+,#{type,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_device_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.smart.modules.base.entity.DeviceInfo">
+		update base_device_info
+		<set>
+				<if test="
+header!=null">
+		
+header_=#{
+header,jdbcType=VARCHAR},
+		</if>
+				<if test="deviceNo!=null">
+		device_no=#{deviceNo,jdbcType=VARCHAR},
+		</if>
+				<if test="aliasName!=null">
+		alias_name=#{aliasName,jdbcType=VARCHAR},
+		</if>
+				<if test="address!=null">
+		address_=#{address,jdbcType=VARCHAR},
+		</if>
+				<if test="isOnline!=null">
+		is_online=#{isOnline,jdbcType= NUMERIC },
+		</if>
+				<if test="unlockPassword!=null">
+		unlock_password=#{unlockPassword,jdbcType=VARCHAR},
+		</if>
+				<if test="codeAddress!=null">
+		code_address=#{codeAddress,jdbcType=VARCHAR},
+		</if>
+				<if test="ipAddress!=null">
+		ip_address=#{ipAddress,jdbcType=VARCHAR},
+		</if>
+				<if test="port!=null">
+		port_=#{port,jdbcType=VARCHAR},
+		</if>
+				<if test="type!=null">
+		type_=#{type,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="DeviceInfoMap">
+		select 
+id_,
+header_,device_no,alias_name,address_,is_online,unlock_password,code_address,ip_address,port_,type_,del_flag,create_by,create_time,update_by,update_time		from base_device_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_device_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="DeviceInfoMap">
+		select * from base_device_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="DeviceInfoMap">
+		<![CDATA[
+			select * from base_device_info
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

src/main/resources/mapper/base/PersonDeviceRelation.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.base.dao.PersonDeviceRelationDAO">
+	<resultMap id="PersonDeviceRelationMap" type="com.jpsoft.smart.modules.base.entity.PersonDeviceRelation">
+		<id property="id" column="id_" />
+			<result property="deviceId" column="device_id" />
+			<result property="personId" column="person_id" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="createTime" column="create_time" />
+			<result property="updateBy" column="update_by" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.PersonDeviceRelation">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_person_device_relation
+	    (id_,device_id,person_id,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{deviceId,jdbcType=VARCHAR}
+,#{personId,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateBy,jdbcType=VARCHAR}
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_person_device_relation where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.smart.modules.base.entity.PersonDeviceRelation">
+		update base_person_device_relation
+		<set>
+				<if test="deviceId!=null">
+		device_id=#{deviceId,jdbcType=VARCHAR},
+		</if>
+				<if test="personId!=null">
+		person_id=#{personId,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="PersonDeviceRelationMap">
+		select 
+id_,device_id,person_id,del_flag,create_by,create_time,update_by,update_time		from base_person_device_relation where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_person_device_relation where id_=#{0}
+	</select>
+	<select id="list" resultMap="PersonDeviceRelationMap">
+		select * from base_person_device_relation
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="PersonDeviceRelationMap">
+		<![CDATA[
+			select * from base_person_device_relation
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

src/main/resources/mapper/base/PersonInfo.xml

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.base.dao.PersonInfoDAO">
+    <resultMap id="PersonInfoMap" type="com.jpsoft.smart.modules.base.entity.PersonInfo">
+        <id property="id" column="id_"/>
+        <result property="companyId" column="company_id"/>
+        <result property="name" column="name_"/>
+        <result property="phone" column="phone_"/>
+        <result property="openId" column="open_id"/>
+        <result property="faceEnabled" column="face_enabled"/>
+        <result property="cardEnabled" column="card_enabled"/>
+        <result property="appEnabled" column="app_enabled"/>
+        <result property="passwordEnabled" column="password_enabled"/>
+        <result property="guestEnabled" column="guest_enabled"/>
+        <result property="position1" column="position1_"/>
+        <result property="position2" column="position2_"/>
+        <result property="position3" column="position3_"/>
+        <result property="position4" column="position4_"/>
+        <result property="position5" column="position5_"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+    <insert id="insert" parameterType="com.jpsoft.smart.modules.base.entity.PersonInfo">
+        <!--
+        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            select sys_guid() from dual
+        </selectKey>
+        -->
+        <![CDATA[
+		insert into base_person_info
+	    (company_id,name_,phone_,open_id,face_enabled,card_enabled,
+	    app_enabled,password_enabled,guest_enabled,position1_,position2_,
+	    position3_,position4_,position5_,del_flag,create_by,create_time,update_by,update_time)
+		values
+		(
+            #{companyId,jdbcType=VARCHAR}
+            ,#{name,jdbcType=VARCHAR}
+            ,#{phone,jdbcType=VARCHAR}
+            ,#{openId,jdbcType= NUMERIC }
+            ,#{faceEnabled,jdbcType= NUMERIC }
+            ,#{cardEnabled,jdbcType= NUMERIC }
+            ,#{appEnabled,jdbcType= NUMERIC }
+            ,#{passwordEnabled,jdbcType= NUMERIC }
+            ,#{guestEnabled,jdbcType= NUMERIC }
+            ,#{position1,jdbcType=VARCHAR}
+            ,#{position2,jdbcType=VARCHAR}
+            ,#{position3,jdbcType=VARCHAR}
+            ,#{position4,jdbcType=VARCHAR}
+            ,#{position5,jdbcType=VARCHAR}
+            ,#{delFlag,jdbcType= NUMERIC }
+            ,#{createBy,jdbcType=VARCHAR}
+            ,#{createTime,jdbcType= TIMESTAMP }
+            ,#{updateBy,jdbcType=VARCHAR}
+            ,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+    </insert>
+    <delete id="delete" parameterType="string">
+        delete from base_person_info where id_=#{id,jdbcType=VARCHAR}
+    </delete>
+    <update id="update" parameterType="com.jpsoft.smart.modules.base.entity.PersonInfo">
+        update base_person_info
+        <set>
+            <if test="companyId!=null">
+                company_id=#{companyId,jdbcType=VARCHAR},
+            </if>
+            <if test="name!=null">
+                name_=#{name,jdbcType=VARCHAR},
+            </if>
+            <if test="phone!=null">
+                phone_=#{phone,jdbcType=VARCHAR},
+            </if>
+            <if test="openId!=null">
+                open_id=#{openId,jdbcType= NUMERIC },
+            </if>
+            <if test="faceEnabled!=null">
+                face_enabled=#{faceEnabled,jdbcType= NUMERIC },
+            </if>
+            <if test="cardEnabled!=null">
+                card_enabled=#{cardEnabled,jdbcType= NUMERIC },
+            </if>
+            <if test="appEnabled!=null">
+                app_enabled=#{appEnabled,jdbcType= NUMERIC },
+            </if>
+            <if test="passwordEnabled!=null">
+                password_enabled=#{passwordEnabled,jdbcType= NUMERIC },
+            </if>
+            <if test="guestEnabled!=null">
+                guest_enabled=#{guestEnabled,jdbcType= NUMERIC },
+            </if>
+            <if test="position1!=null">
+                position1_=#{position1,jdbcType=VARCHAR},
+            </if>
+            <if test="position2!=null">
+                position2_=#{position2,jdbcType=VARCHAR},
+            </if>
+            <if test="position3!=null">
+                position3_=#{position3,jdbcType=VARCHAR},
+            </if>
+            <if test="position4!=null">
+                position4_=#{position4,jdbcType=VARCHAR},
+            </if>
+            <if test="position5!=null">
+                position5_=#{position5,jdbcType=VARCHAR},
+            </if>
+            <if test="delFlag!=null">
+                del_flag=#{delFlag,jdbcType= NUMERIC },
+            </if>
+            <if test="createBy!=null">
+                create_by=#{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime!=null">
+                create_time=#{createTime,jdbcType= TIMESTAMP },
+            </if>
+            <if test="updateBy!=null">
+                update_by=#{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime!=null">
+                update_time=#{updateTime,jdbcType= TIMESTAMP },
+            </if>
+        </set>
+        where id_=#{id}
+    </update>
+    <select id="get" parameterType="string" resultMap="PersonInfoMap">
+        select
+        id_,company_id,name_,phone_,open_id,face_enabled,card_enabled,app_enabled,password_enabled,guest_enabled,position1_,position2_,position3_,position4_,position5_,del_flag,create_by,create_time,update_by,update_time
+        from base_person_info where id_=#{0}
+    </select>
+    <select id="exist" parameterType="string" resultType="int">
+        select count(*) from base_person_info where id_=#{0}
+    </select>
+    <select id="list" resultMap="PersonInfoMap">
+        select * from base_person_info
+    </select>
+    <select id="search" parameterType="hashmap" resultMap="PersonInfoMap">
+        <![CDATA[
+			select * from base_person_info
+		]]>
+        <where>
+            <if test="searchParams.id != null">
+                and ID_ like #{searchParams.id}
+            </if>
+        </where>
+        <foreach item="sort" collection="sortList" open="order by" separator=",">
+            ${sort.name} ${sort.order}
+        </foreach>
+    </select>
+</mapper>

src/main/resources/mapper/sys/User.xml

@@ -3,9 +3,10 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.smart.modules.sys.dao.UserDAO">
-    <resultMap id="UserMap" type="User">
+    <resultMap id="UserMap" type="com.jpsoft.smart.modules.sys.entity.User">
         <id property="id" column="id_"/>
         <result property="userName" column="user_name"/>
+        <result property="companyId" column="company_id" />
         <result property="password" column="password_"/>
         <result property="realName" column="real_name"/>
         <result property="createTime" column="create_time"/>
@@ -14,7 +15,7 @@
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
     </resultMap>
-    <insert id="insert" parameterType="User">
+    <insert id="insert" parameterType="com.jpsoft.smart.modules.sys.entity.User">
         <!--
         <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
             select sys_guid() from dual
@@ -22,10 +23,12 @@
         -->
         <![CDATA[
 		insert into sys_user
-	    (id_,user_name,password_,real_name,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,company_id,user_name,password_,real_name,create_time,update_time,
+	    del_flag,create_by,update_by)
 		values
 		(
             #{id,jdbcType=VARCHAR}
+            ,#{companyId,jdbcType=VARCHAR}
             ,#{userName,jdbcType=VARCHAR}
             ,#{password,jdbcType=VARCHAR}
             ,#{realName,jdbcType=VARCHAR}
@@ -40,12 +43,15 @@
     <delete id="delete" parameterType="string">
         delete from sys_user where id_=#{id,jdbcType=VARCHAR}
     </delete>
-    <update id="update" parameterType="User">
+    <update id="update" parameterType="com.jpsoft.smart.modules.sys.entity.User">
         update sys_user
         <set>
             <if test="userName!=null">
                 user_name=#{userName,jdbcType=VARCHAR},
             </if>
+            <if test="companyId!=null">
+                company_id=#{companyId,jdbcType=VARCHAR},
+            </if>
             <if test="password!=null">
                 password_=#{password,jdbcType=VARCHAR},
             </if>
@@ -71,9 +77,7 @@
         where id_=#{id}
     </update>
     <select id="get" parameterType="string" resultMap="UserMap">
-        select
-        id_,user_name,password_,real_name,create_time,update_time,del_flag,create_by,update_by from sys_user where
-        id_=#{0}
+        select * from sys_user where id_=#{0}
     </select>
     <select id="exist" parameterType="string" resultType="int">
         select count(*) from sys_user where id_=#{0}

src/main/resources/mapper/wechat/ReplyMessage.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.smart.modules.wechat.dao.ReplyMessageDAO">
+	<resultMap id="ReplyMessageMap" type="com.jpsoft.smart.modules.wechat.entity.ReplyMessage">
+		<id property="id" column="id_" />
+			<result property="event" column="event_" />
+			<result property="message" column="message_" />
+			<result property="callbackUrl" column="callback_url" />
+			<result property="createTime" column="create_time" />
+			<result property="updateTime" column="update_time" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.smart.modules.wechat.entity.ReplyMessage">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into wechat_reply_message
+	    (id_,event_,message_,callback_url,create_time,update_time)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{event,jdbcType=VARCHAR}
+,#{message,jdbcType=VARCHAR}
+,#{callbackUrl,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from wechat_reply_message where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.smart.modules.wechat.entity.ReplyMessage">
+		update wechat_reply_message
+		<set>
+				<if test="event!=null">
+		event_=#{event,jdbcType=VARCHAR},
+		</if>
+				<if test="message!=null">
+		message_=#{message,jdbcType=VARCHAR},
+		</if>
+				<if test="callbackUrl!=null">
+		callback_url=#{callbackUrl,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="ReplyMessageMap">
+		select 
+id_,event_,message_,callback_url,create_time,update_time		from wechat_reply_message where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from wechat_reply_message where id_=#{0}
+	</select>
+	<select id="list" resultMap="ReplyMessageMap">
+		select * from wechat_reply_message
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="ReplyMessageMap">
+		<![CDATA[
+			select * from wechat_reply_message
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

src/main/resources/mapper/wechat/accessControl.xml

@@ -3,7 +3,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!-- namespace必须指向DAO接口 -->
 <mapper namespace="com.jpsoft.smart.modules.wechat.dao.AccessContorlDAO">
-    <resultMap id="AccessControlMap" type="AccessControl">
+    <resultMap id="AccessControlMap" type="com.jpsoft.smart.modules.wechat.entity.AccessControl">
         <id property="id" column="id"/>
         <result property="ownerId" column="owner_id"/>
         <result property="openId" column="open_id"/>
@@ -21,8 +21,7 @@
         open_id=#{0}
     </select>
 
-
-    <insert id="save" parameterType="AccessControl">
+    <insert id="save" parameterType="com.jpsoft.smart.modules.wechat.entity.AccessControl">
         insert into access_control
         (id,owner_id,open_id,bind_time,bind_face,create_time)
         values
@@ -33,11 +32,9 @@
         ,#{bindFace,jdbcType= NUMERIC }
         ,#{createTime,jdbcType= TIMESTAMP }
         )
-
     </insert>
 
-
-    <update id="update" parameterType="AccessControl">
+    <update id="update" parameterType="com.jpsoft.smart.modules.wechat.entity.AccessControl">
         update access_control
         <set>
             <if test="createBy!=null">