diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml index 7a666471..8d91fd39 100644 --- a/dq-financial-crms/pom.xml +++ b/dq-financial-crms/pom.xml @@ -30,6 +30,11 @@ dq-framework-model 1.0-SNAPSHOT + + com.daqing.framework + dq-framework-utils + 0.0.1-SNAPSHOT + org.springframework.boot spring-boot-starter-web diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CompanyCustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CompanyCustomerController.java new file mode 100644 index 00000000..8e4cee6b --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CompanyCustomerController.java @@ -0,0 +1,83 @@ +package com.daqing.financial.crms.controller; + +import java.util.Arrays; +import java.util.Map; + +import com.daqing.framework.model.response.ResponseResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.daqing.financial.crms.service.CompanyCustomerService; +import com.daqing.framework.utils.PageUtils; + +/** + * 企业类型客户信息表 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@RestController +@RequestMapping("crms/companycustomer") +public class CompanyCustomerController { + @Autowired + private CompanyCustomerService companyCustomerService; + + /** + * 列表 + */ + @GetMapping("/list") + //@RequiresPermissions("crms:companycustomer:list") + public ResponseResult list(@RequestParam Map params){ + PageUtils page = companyCustomerService.queryPage(params); + + return ResponseResult.SUCCESS(); + } + + + /** + * 信息 + */ + @GetMapping("/info/{id}") + //@RequiresPermissions("crms:companycustomer:info") + public ResponseResult info(@PathVariable("id") Long id){ + CompanyCustomerEntity companyCustomer = companyCustomerService.getById(id); + + return ResponseResult.SUCCESS(); + } + + /** + * 保存 + */ + @PostMapping("/save") + //@RequiresPermissions("crms:companycustomer:save") + public ResponseResult save(@RequestBody CompanyCustomerEntity companyCustomer){ + companyCustomerService.save(companyCustomer); + + return ResponseResult.SUCCESS(); + } + + /** + * 修改 + */ + @PutMapping("/update") + //@RequiresPermissions("crms:companycustomer:update") + public ResponseResult update(@RequestBody CompanyCustomerEntity companyCustomer){ + companyCustomerService.updateById(companyCustomer); + + return ResponseResult.SUCCESS(); + } + + /** + * 删除 + */ + @DeleteMapping("/delete") + //@RequiresPermissions("crms:companycustomer:delete") + public ResponseResult delete(@RequestBody Long[] ids){ + companyCustomerService.removeByIds(Arrays.asList(ids)); + + return ResponseResult.SUCCESS(); + } + +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java new file mode 100644 index 00000000..a239d800 --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -0,0 +1,84 @@ +package com.daqing.financial.crms.controller; + +import com.daqing.financial.crms.service.CustomerService; +import com.daqing.framework.domain.crms.CustomerEntity; +import com.daqing.framework.model.response.ResponseResult; +import com.daqing.framework.utils.PageUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Map; + + +/** + * 记录客户基本信息 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@RestController +@RequestMapping("crms/customer") +public class CustomerController { + @Autowired + private CustomerService customerService; + + /** + * 列表 + */ + @GetMapping("/list") + //@RequiresPermissions("crms:customer:list") + public ResponseResult list(@RequestParam Map params) { + PageUtils page = customerService.queryPage(params); + + return ResponseResult.SUCCESS(); + } + + + /** + * 信息 + */ + @GetMapping("/info/{id}") + //@RequiresPermissions("crms:customer:info") + public ResponseResult info(@PathVariable("id") Long id) { + CustomerEntity customer = customerService.getById(id); + + return ResponseResult.SUCCESS(); + } + + /** + * 保存 + */ + @PostMapping("/save") + //@RequiresPermissions("crms:customer:save") + public ResponseResult save(@RequestBody CustomerEntity customer) { + customerService.save(customer); + + return ResponseResult.SUCCESS(); + } + + /** + * 修改 + */ + @PutMapping("/update") + //@RequiresPermissions("crms:customer:update") + public ResponseResult update(@RequestBody CustomerEntity customer) { + customerService.updateById(customer); + + return ResponseResult.SUCCESS(); + } + + /** + * 删除 + */ + @DeleteMapping("/delete") + //@RequiresPermissions("crms:customer:delete") + public ResponseResult delete(@RequestBody Long[] ids) { + customerService.removeByIds(Arrays.asList(ids)); + + return ResponseResult.SUCCESS(); + + } + +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/PersonalCustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/PersonalCustomerController.java new file mode 100644 index 00000000..845d0ceb --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/PersonalCustomerController.java @@ -0,0 +1,82 @@ +package com.daqing.financial.crms.controller; + +import com.daqing.financial.crms.service.PersonalCustomerService; +import com.daqing.framework.domain.crms.PersonalCustomerEntity; +import com.daqing.framework.model.response.ResponseResult; +import com.daqing.framework.utils.PageUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Map; + +/** + * 个人类型客户信息表 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@RestController +@RequestMapping("crms/personalcustomer") +public class PersonalCustomerController { + @Autowired + private PersonalCustomerService personalCustomerService; + + /** + * 列表 + */ + @GetMapping("/list") + //@RequiresPermissions("crms:personalcustomer:list") + public ResponseResult list(@RequestParam Map params) { + PageUtils page = personalCustomerService.queryPage(params); + + return ResponseResult.SUCCESS(); + } + + + /** + * 信息 + */ + @GetMapping("/info/{id}") + //@RequiresPermissions("crms:personalcustomer:info") + public ResponseResult info(@PathVariable("id") Long id) { + PersonalCustomerEntity personalCustomer = personalCustomerService.getById(id); + + return ResponseResult.SUCCESS(); + } + + /** + * 保存 + */ + @PostMapping("/save") + //@RequiresPermissions("crms:personalcustomer:save") + public ResponseResult save(@RequestBody PersonalCustomerEntity personalCustomer) { + personalCustomerService.save(personalCustomer); + + return ResponseResult.SUCCESS(); + } + + /** + * 修改 + */ + @PutMapping("/update") + //@RequiresPermissions("crms:personalcustomer:update") + public ResponseResult update(@RequestBody PersonalCustomerEntity personalCustomer) { + personalCustomerService.updateById(personalCustomer); + + return ResponseResult.SUCCESS(); + } + + /** + * 删除 + */ + @DeleteMapping("/delete") + //@RequiresPermissions("crms:personalcustomer:delete") + public ResponseResult delete(@RequestBody Long[] ids) { + personalCustomerService.removeByIds(Arrays.asList(ids)); + + return ResponseResult.SUCCESS(); + } + +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/contoller/TestFeignController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/TestFeignController.java similarity index 96% rename from dq-financial-crms/src/main/java/com/daqing/financial/crms/contoller/TestFeignController.java rename to dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/TestFeignController.java index d632823e..081df766 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/contoller/TestFeignController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/TestFeignController.java @@ -1,4 +1,4 @@ -package com.daqing.financial.crms.contoller; +package com.daqing.financial.crms.controller; import com.daqing.financial.crms.feign.HrmsFeignService; import com.daqing.framework.model.response.ResponseResult; diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java new file mode 100644 index 00000000..5019530e --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java @@ -0,0 +1,17 @@ +package com.daqing.financial.crms.dao; + +import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 企业类型客户信息表 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@Mapper +public interface CompanyCustomerDao extends BaseMapper { + +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java new file mode 100644 index 00000000..5bfa77d7 --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java @@ -0,0 +1,17 @@ +package com.daqing.financial.crms.dao; + +import com.daqing.framework.domain.crms.CustomerEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 记录客户基本信息 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@Mapper +public interface CustomerDao extends BaseMapper { + +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/PersonalCustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/PersonalCustomerDao.java new file mode 100644 index 00000000..224346c5 --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/PersonalCustomerDao.java @@ -0,0 +1,17 @@ +package com.daqing.financial.crms.dao; + +import com.daqing.framework.domain.crms.PersonalCustomerEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 个人类型客户信息表 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@Mapper +public interface PersonalCustomerDao extends BaseMapper { + +} diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CompanyCustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CompanyCustomerService.java new file mode 100644 index 00000000..673ee2e1 --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CompanyCustomerService.java @@ -0,0 +1,20 @@ +package com.daqing.financial.crms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.daqing.framework.utils.PageUtils; + +import java.util.Map; + +/** + * 企业类型客户信息表 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +public interface CompanyCustomerService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java new file mode 100644 index 00000000..2ffec802 --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java @@ -0,0 +1,20 @@ +package com.daqing.financial.crms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.domain.crms.CustomerEntity; + +import java.util.Map; + +/** + * 记录客户基本信息 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +public interface CustomerService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/PersonalCustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/PersonalCustomerService.java new file mode 100644 index 00000000..4e42a9db --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/PersonalCustomerService.java @@ -0,0 +1,20 @@ +package com.daqing.financial.crms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.domain.crms.PersonalCustomerEntity; + +import java.util.Map; + +/** + * 个人类型客户信息表 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +public interface PersonalCustomerService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CompanyCustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CompanyCustomerServiceImpl.java new file mode 100644 index 00000000..cb173c4c --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CompanyCustomerServiceImpl.java @@ -0,0 +1,29 @@ +package com.daqing.financial.crms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.financial.crms.dao.CompanyCustomerDao; +import com.daqing.financial.crms.service.CompanyCustomerService; +import com.daqing.framework.domain.crms.CompanyCustomerEntity; +import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.utils.Query; +import org.springframework.stereotype.Service; + +import java.util.Map; + + +@Service("companyCustomerService") +public class CompanyCustomerServiceImpl extends ServiceImpl implements CompanyCustomerService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java new file mode 100644 index 00000000..c8b8934b --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -0,0 +1,29 @@ +package com.daqing.financial.crms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.financial.crms.dao.CustomerDao; +import com.daqing.financial.crms.service.CustomerService; +import com.daqing.framework.domain.crms.CustomerEntity; +import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.utils.Query; +import org.springframework.stereotype.Service; + +import java.util.Map; + + +@Service("customerService") +public class CustomerServiceImpl extends ServiceImpl implements CustomerService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/PersonalCustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/PersonalCustomerServiceImpl.java new file mode 100644 index 00000000..6abee02a --- /dev/null +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/PersonalCustomerServiceImpl.java @@ -0,0 +1,29 @@ +package com.daqing.financial.crms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.financial.crms.dao.PersonalCustomerDao; +import com.daqing.financial.crms.service.PersonalCustomerService; +import com.daqing.framework.domain.crms.PersonalCustomerEntity; +import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.utils.Query; +import org.springframework.stereotype.Service; + +import java.util.Map; + + +@Service("personalCustomerService") +public class PersonalCustomerServiceImpl extends ServiceImpl implements PersonalCustomerService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml new file mode 100644 index 00000000..967931cb --- /dev/null +++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml new file mode 100644 index 00000000..75cafeba --- /dev/null +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml new file mode 100644 index 00000000..1b94dbb9 --- /dev/null +++ b/dq-financial-crms/src/main/resources/mapper/crms/PersonalCustomerDao.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java new file mode 100644 index 00000000..28fca9cd --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CompanyCustomerEntity.java @@ -0,0 +1,68 @@ +package com.daqing.framework.domain.crms; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 企业类型客户信息表 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@Data +@TableName("crms_company_customer") +public class CompanyCustomerEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 注册资金 + */ + private String registeredCapital; + /** + * 所属行业 + */ + private String industry; + /** + * 成立年限 + */ + private Integer years; + /** + * 所在区域 + */ + private String region; + /** + * 股东名称 + */ + private String shareholder; + /** + * 关联企业 + */ + private String affiliatedCompany; + /** + * 员工个数 + */ + private String empNum; + /** + * 联系人 + */ + private String linkman; + /** + * 业务来源 + */ + private String businessSource; + /** + * 客户基本信息表id + */ + private Long customerId; + +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java new file mode 100644 index 00000000..783efa3b --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java @@ -0,0 +1,68 @@ +package com.daqing.framework.domain.crms; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 记录客户基本信息 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@Data +@TableName("crms_customer") +public class CustomerEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 客户编号 + */ + private String code; + /** + * 客户类型 + */ + private Integer type; + /** + * 客户的经理人id + */ + private Long manager; + /** + * 客户名称 + */ + private String name; + /** + * 联系地址 + */ + private String addr; + /** + * 联系电话 + */ + private String phone; + /** + * 密码 + */ + private String password; + /** + * 微信唯一标识 + */ + private String wechatId; + /** + * 创建时间 + */ + private Date createTime; + /** + * 修改时间 + */ + private Date motifyTime; + +} diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java new file mode 100644 index 00000000..665b9e23 --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/crms/PersonalCustomerEntity.java @@ -0,0 +1,92 @@ +package com.daqing.framework.domain.crms; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 个人类型客户信息表 + * + * @author gongsj + * @email gongsj@gmail.com + * @date 2020-09-08 09:57:32 + */ +@Data +@TableName("crms_personal_customer") +public class PersonalCustomerEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId + private Long id; + /** + * 客户基本信息表id + */ + private Long customerId; + /** + * 身份证号 + */ + private String idCard; + /** + * 年龄 + */ + private Integer age; + /** + * 性别：1、男，0、女 + */ + private Integer gender; + /** + * 婚姻状况：1、已婚，0、未婚 + */ + private Integer maritalStatus; + /** + * + */ + private String education; + /** + * + */ + private String employer; + /** + * + */ + private String position; + /** + * + */ + private Integer workingYears; + /** + * + */ + private String socialSecurityNum; + /** + * + */ + private String livingSituation; + /** + * + */ + private String residenceAddr; + /** + * + */ + private String businessSource; + /** + * + */ + private String emergencyLinkman; + /** + * + */ + private String emergencyLinkmanRelationship; + /** + * + */ + private String emergencyLinkmanPhone; + +}