vue sample update

Author: robinhood-jim

mybatisproj/src/main/java/com/robin/basis/controller/biz/CustomerController.java

@@ -0,0 +1,34 @@
+package com.robin.basis.controller.biz;
+
+import com.robin.basis.dto.CustomerDTO;
+import com.robin.basis.dto.query.CustomerQueryDTO;
+import com.robin.basis.mapper.biz.CustomerMapper;
+import com.robin.basis.service.biz.ICustomerService;
+import com.robin.basis.utils.WebUtils;
+import com.robin.biz.model.Customer;
+import com.robin.core.web.controller.AbstractMyBatisController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/customer")
+public class CustomerController extends AbstractMyBatisController<ICustomerService, CustomerMapper, Customer,Long> {
+    @GetMapping
+    public Map<String,Object> list(CustomerQueryDTO dto){
+        return WebUtils.toPageVO(queryPage(dto, CustomerDTO.class),null);
+    }
+    @PostMapping
+    public Map<String,Object> save(@RequestBody Map<String,Object> reqMap){
+        return doSave(reqMap,null);
+    }
+    @PutMapping
+    public Map<String,Object> update(@RequestBody Map<String,Object> reqMap){
+        return doUpdate(reqMap,Long.valueOf(reqMap.get("id").toString()));
+    }
+    @DeleteMapping
+    public Map<String,Object> delete(@RequestBody List<Long> ids ){
+        return doDeleteLogic(ids);
+    }
+}

mybatisproj/src/main/java/com/robin/basis/controller/system/TenantInfoController.java

@@ -14,6 +14,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.security.PermitAll;
 import java.util.List;
 import java.util.Map;
 
@@ -78,5 +79,11 @@ public Map<String,Object> activeTenant(Map<String,Object> reqMap){
         }
 
     }
+    @GetMapping("/attendTenant")
+    @PermitAll
+    public Map<String,Object> attendTenant(Map<String,Object> reqMap){
+
+        return null;
+    }
 
 }

mybatisproj/src/main/java/com/robin/basis/dto/CustomerDTO.java

@@ -0,0 +1,17 @@
+package com.robin.basis.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CustomerDTO implements Serializable {
+    private Long id;
+    private String name;
+    private String district;
+    private String phone;
+    private String creditNo;
+    private String gender;
+    private String birthDay;
+    private String type;
+}

mybatisproj/src/main/java/com/robin/basis/dto/query/CustomerQueryDTO.java

@@ -0,0 +1,13 @@
+package com.robin.basis.dto.query;
+
+import com.robin.core.base.dto.PageDTO;
+import lombok.Data;
+
+@Data
+public class CustomerQueryDTO extends PageDTO {
+    private String phone;
+    private String name;
+    private String creditNo;
+    private String districtId;
+    private String address;
+}

mybatisproj/src/main/java/com/robin/basis/mapper/TenantUserInviteMapper.java

@@ -0,0 +1,9 @@
+package com.robin.basis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.robin.basis.model.user.TenantUserInvite;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TenantUserInviteMapper extends BaseMapper<TenantUserInvite> {
+}

mybatisproj/src/main/java/com/robin/basis/mapper/TenantUserMapper.java

@@ -18,6 +18,6 @@ public interface TenantUserMapper extends BaseMapper<TenantUser> {
     List<EmployeeUserTenantDTO> getTenantEmpUser(@Param(Constants.WRAPPER) QueryWrapper<EmployeeUserTenantDTO> wrapper);
 
     @Select("<script>"+
-            "select * from (select a.id,name,u.id as userId from t_sys_employee a,t_sys_user_info u where a.id=u.employee_id) t ${ew.customSqlSegment}"+"</script>")
+            "select * from (select a.id,name,u.id as userId from t_sys_employee a,t_sys_user_info u where a.id=u.employee_id and a.status='1' and b.status='1') t ${ew.customSqlSegment}"+"</script>")
     List<EmployeeUserTenantDTO> getEmployeeUser(@Param(Constants.WRAPPER) QueryWrapper<EmployeeUserTenantDTO> wrapper);
 }

mybatisproj/src/main/java/com/robin/basis/mapper/biz/CustomerMapper.java

@@ -0,0 +1,9 @@
+package com.robin.basis.mapper.biz;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.robin.biz.model.Customer;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CustomerMapper  extends BaseMapper<Customer> {
+}

mybatisproj/src/main/java/com/robin/basis/mapper/biz/MemberConsumptionMapper.java

@@ -0,0 +1,9 @@
+package com.robin.basis.mapper.biz;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.robin.biz.model.MemberConsumption;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MemberConsumptionMapper extends BaseMapper<MemberConsumption> {
+}

mybatisproj/src/main/java/com/robin/basis/mapper/biz/MerchantMapper.java

@@ -0,0 +1,9 @@
+package com.robin.basis.mapper.biz;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.robin.biz.model.Merchant;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MerchantMapper extends BaseMapper<Merchant> {
+}

mybatisproj/src/main/java/com/robin/basis/mapper/biz/MerchantMemberMapper.java

@@ -0,0 +1,9 @@
+package com.robin.basis.mapper.biz;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.robin.biz.model.MerchantMember;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MerchantMemberMapper extends BaseMapper<MerchantMember> {
+}

mybatisproj/src/main/java/com/robin/basis/model/user/TenantUserInvite.java

@@ -0,0 +1,34 @@
+package com.robin.basis.model.user;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.robin.core.base.model.BaseObject;
+import lombok.Data;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+@TableName("t_tenant_user_invite")
+@Data
+public class TenantUserInvite extends BaseObject {
+    private Long id;
+    private Long tenantId;
+    private Long empId;
+    private String phone;
+    private String inviteCode;
+    private String acceptable;
+    private Timestamp acceptTime;
+    private String acceptIp;
+    @TableField(value = "creator", fill = FieldFill.INSERT)
+    private Long creatorId;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(value = "create_tm", fill = FieldFill.INSERT)
+    private LocalDateTime createTm;
+
+}

mybatisproj/src/main/java/com/robin/basis/service/biz/ICustomerService.java

@@ -0,0 +1,7 @@
+package com.robin.basis.service.biz;
+
+import com.robin.biz.model.Customer;
+import com.robin.core.base.service.IMybatisBaseService;
+
+public interface ICustomerService extends IMybatisBaseService<Customer,Long> {
+}

mybatisproj/src/main/java/com/robin/basis/service/biz/IMemberConsumptionService.java

@@ -0,0 +1,7 @@
+package com.robin.basis.service.biz;
+
+import com.robin.biz.model.MemberConsumption;
+import com.robin.core.base.service.IMybatisBaseService;
+
+public interface IMemberConsumptionService extends IMybatisBaseService<MemberConsumption,Long> {
+}

mybatisproj/src/main/java/com/robin/basis/service/biz/IMerchantMemberService.java

@@ -0,0 +1,7 @@
+package com.robin.basis.service.biz;
+
+import com.robin.biz.model.MerchantMember;
+import com.robin.core.base.service.IMybatisBaseService;
+
+public interface IMerchantMemberService extends IMybatisBaseService<MerchantMember,Long> {
+}

mybatisproj/src/main/java/com/robin/basis/service/biz/IMerchantService.java

@@ -0,0 +1,7 @@
+package com.robin.basis.service.biz;
+
+import com.robin.biz.model.Merchant;
+import com.robin.core.base.service.IMybatisBaseService;
+
+public interface IMerchantService extends IMybatisBaseService<Merchant,Long> {
+}

mybatisproj/src/main/java/com/robin/basis/service/biz/impl/CustomerServiceImpl.java

@@ -0,0 +1,11 @@
+package com.robin.basis.service.biz.impl;
+
+import com.robin.basis.mapper.biz.CustomerMapper;
+import com.robin.basis.service.biz.ICustomerService;
+import com.robin.biz.model.Customer;
+import com.robin.core.base.service.AbstractMybatisService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CustomerServiceImpl extends AbstractMybatisService<CustomerMapper, Customer,Long> implements ICustomerService {
+}

mybatisproj/src/main/java/com/robin/basis/service/biz/impl/MemberConsumptionServiceImpl.java

@@ -0,0 +1,11 @@
+package com.robin.basis.service.biz.impl;
+
+import com.robin.basis.mapper.biz.MemberConsumptionMapper;
+import com.robin.basis.service.biz.IMemberConsumptionService;
+import com.robin.biz.model.MemberConsumption;
+import com.robin.core.base.service.AbstractMybatisService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MemberConsumptionServiceImpl  extends AbstractMybatisService<MemberConsumptionMapper, MemberConsumption,Long> implements IMemberConsumptionService {
+}

mybatisproj/src/main/java/com/robin/basis/service/biz/impl/MerchantMemberServiceImpl.java

@@ -0,0 +1,11 @@
+package com.robin.basis.service.biz.impl;
+
+import com.robin.basis.mapper.biz.MerchantMemberMapper;
+import com.robin.basis.service.biz.IMerchantMemberService;
+import com.robin.biz.model.MerchantMember;
+import com.robin.core.base.service.AbstractMybatisService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MerchantMemberServiceImpl extends AbstractMybatisService<MerchantMemberMapper, MerchantMember,Long> implements IMerchantMemberService {
+}

mybatisproj/src/main/java/com/robin/basis/service/biz/impl/MerchantServiceImpl.java

@@ -0,0 +1,11 @@
+package com.robin.basis.service.biz.impl;
+
+import com.robin.basis.mapper.biz.MerchantMapper;
+import com.robin.basis.service.biz.IMerchantService;
+import com.robin.biz.model.Merchant;
+import com.robin.core.base.service.AbstractMybatisService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class MerchantServiceImpl extends AbstractMybatisService<MerchantMapper, Merchant,Long> implements IMerchantService {
+}

mybatisproj/src/main/java/com/robin/basis/service/system/ISysOrgService.java

@@ -20,7 +20,7 @@ public interface ISysOrgService extends IMybatisBaseService<SysOrg,Long> {
     boolean removeOrg(Long orgId,List<Long> uids);
     List<SysOrgVO> queryOrg(SysOrgQueryDTO dto);
     IPage<EmployeeDTO> queryOrgUser(SysOrgQueryDTO dto);
-    TenantInfo getTopOrgTenant(Long orgId);
+    Pair<TenantInfo, SysOrg> getTopOrgTenant(Long orgId);
     IPage<EmployeeDTO> selectEmployeeInOrg(Page<SysUserQueryDTO> page, QueryWrapper wrapper, List<Long> orgIds);
     IPage<EmployeeDTO> selectEmployeeNotInOrg(Page<SysUserQueryDTO> page,  QueryWrapper wrapper,List<Long> orgIds);
     Pair<Integer,Integer> deleteOrg(List<Long> orgIds);

mybatisproj/src/main/java/com/robin/basis/service/system/ITenantInfoService.java

@@ -13,5 +13,6 @@ public interface ITenantInfoService extends IMybatisBaseService<TenantInfo,Long>
     boolean activeTenant(Long tenantId,Long managerId);
     boolean closeTenant(Long tenantId);
     boolean insertTenant(TenantInfoDTO dto, MultipartFile logo);
+    boolean inviteEmployees(Long tenantId,List<Long> empIds);
     //TenantInfo getManagedTenant(Long useId);
 }

mybatisproj/src/main/java/com/robin/basis/service/system/ITenantUserInviteService.java

@@ -0,0 +1,7 @@
+package com.robin.basis.service.system;
+
+import com.robin.basis.model.user.TenantUserInvite;
+import com.robin.core.base.service.IMybatisBaseService;
+
+public interface ITenantUserInviteService extends IMybatisBaseService<TenantUserInvite,Long> {
+}