Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/controller/MaintenanceCompanyController.java

@@ -1,38 +0,0 @@
-package cn.com.ty.lift.enterprise.settings.controller;
-
-
-import cn.com.ty.lift.enterprise.settings.dao.entity.model.MtCompanyRequest;
-import cn.com.ty.lift.enterprise.settings.service.IMaintenanceCompanyService;
-import cn.com.xwy.boot.web.dto.RestResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 维保公司 前端控制器
- * </p>
- *
- * @author huangy
- * @since 2019-12-09
- */
-@RestController
-@RequestMapping("/mt-company")
-public class MaintenanceCompanyController {
-
-    @Autowired
-    private IMaintenanceCompanyService maintenanceCompanyService;
-
-    /**
-     * @description 获取公司列表
-     * @date 2019-12-11 11:01
-     * @param mtCompanyRequest 请求类
-     * @return
-     */
-    @RequestMapping("/list")
-    @ResponseBody
-    public RestResponse list(MtCompanyRequest mtCompanyRequest){
-        return maintenanceCompanyService.list(mtCompanyRequest);
-    }
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/controller/SettingsController.java

@@ -0,0 +1,14 @@
+package cn.com.ty.lift.enterprise.settings.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-11
+ * @description
+ */
+@RestController
+@RequestMapping("/settings")
+public class SettingsController {
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/dao/entity/model/MtCompanyRequest.java

@@ -1,15 +0,0 @@
-package cn.com.ty.lift.enterprise.settings.dao.entity.model;
-
-import lombok.Data;
-
-/**
- * @author huangyuan
- * @date 2019-12-09
- * @description 维保公司请求类
- */
-@Data
-public class MtCompanyRequest {
-    private String name;//公司名称
-    private int pageSize;//每页的条数
-    private int pageNum;//第几页
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/dao/entity/model/MtCompanyResponse.java

@@ -1,9 +0,0 @@
-package cn.com.ty.lift.enterprise.settings.dao.entity.model;
-
-/**
- * @author huangyuan
- * @date 2019-12-11
- * @description 维保公司相应类
- */
-public class MtCompanyResponse {
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/service/IMaintenanceCompanyService.java

@@ -1,25 +0,0 @@
-package cn.com.ty.lift.enterprise.settings.service;
-
-import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
-import cn.com.ty.lift.enterprise.settings.dao.entity.model.MtCompanyRequest;
-import cn.com.xwy.boot.web.dto.RestResponse;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 维保公司 服务类
- * </p>
- *
- * @author huangy
- * @since 2019-12-09
- */
-public interface IMaintenanceCompanyService extends IService<MaintenanceCompany> {
-
-    /**
-     * @description 分页获取团队信息
-     * @date 2019-12-11 10:26
-     * @param
-     * @return
-     */
-    RestResponse list(MtCompanyRequest mtCompanyRequest);
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/service/ISettingsService.java

@@ -0,0 +1,9 @@
+package cn.com.ty.lift.enterprise.settings.service;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-11
+ * @description
+ */
+public interface ISettingsService {
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -1,38 +0,0 @@
-package cn.com.ty.lift.enterprise.settings.service.impl;
-
-import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
-import cn.com.ty.lift.enterprise.settings.dao.entity.model.MtCompanyRequest;
-import cn.com.ty.lift.enterprise.settings.dao.mapper.MaintenanceCompanyMapper;
-import cn.com.ty.lift.enterprise.settings.service.IMaintenanceCompanyService;
-import cn.com.xwy.boot.web.dto.RestResponse;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 维保公司 服务实现类
- * </p>
- *
- * @author huangy
- * @since 2019-12-09
- */
-@Service
-public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompanyMapper, MaintenanceCompany> implements IMaintenanceCompanyService {
-
-    @Override
-    public RestResponse list(MtCompanyRequest mtCompanyRequest) {
-        IPage<MaintenanceCompany> maintenanceCompanyPage = new Page<>(
-                mtCompanyRequest.getPageNum(), mtCompanyRequest.getPageSize());
-        maintenanceCompanyPage = this.page(
-                maintenanceCompanyPage, new QueryWrapper<MaintenanceCompany>()
-                //通过公司名称模糊查找公司信息
-                .like(StringUtils.isNotBlank(mtCompanyRequest.getName()), "name", mtCompanyRequest.getName())
-        );
-        return RestResponse.ok(maintenanceCompanyPage, ApiConstants.RESULT_SUCCESS, "获取公司列表成功");
-    }
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/service/impl/SettingsService.java

@@ -0,0 +1,11 @@
+package cn.com.ty.lift.enterprise.settings.service.impl;
+
+import cn.com.ty.lift.enterprise.settings.service.ISettingsService;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-11
+ * @description
+ */
+public class SettingsService implements ISettingsService {
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/MaintenanceCompanyController.java

@@ -0,0 +1,48 @@
+package cn.com.ty.lift.system.settings.controller;
+
+
+import cn.com.ty.lift.enterprise.settings.dao.entity.model.MaintenanceCompanyRequest;
+import cn.com.ty.lift.enterprise.settings.service.IMaintenanceCompanyService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 维保公司 前端控制器
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-09
+ */
+@RestController
+@RequestMapping("/mtcompany")
+public class MaintenanceCompanyController {
+
+    @Autowired
+    private IMaintenanceCompanyService maintenanceCompanyService;
+
+    /**
+     * @description 获取公司列表
+     * @date 2019-12-11 11:01
+     * @param maintenanceCompanyRequest 请求类
+     * @return
+     */
+    @RequestMapping("/list")
+    public RestResponse list(MaintenanceCompanyRequest maintenanceCompanyRequest){
+        return maintenanceCompanyService.list(maintenanceCompanyRequest);
+    }
+
+    /**
+     * @description 申请团队
+     * @date 2019-12-11 14:04
+     * @param maintenanceCompanyRequest 请求对象
+     * @return
+     */
+    @PostMapping("/applyTeam")
+    public RestResponse applyTeam(MaintenanceCompanyRequest maintenanceCompanyRequest){
+        return maintenanceCompanyService.applyTeam(maintenanceCompanyRequest);
+    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/SettingsController.java

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.system.settings.controller;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class SettingsController {
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/dao/entity/MaintenanceCompany.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.enterprise.settings.dao.entity;
+package cn.com.ty.lift.system.settings.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/MaintenanceCompanyRequest.java

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.system.settings.dao.entity.model;
+
+import lombok.Data;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-09
+ * @description 维保公司请求类
+ */
+@Data
+public class MaintenanceCompanyRequest {
+    private String companyId;//公司id
+    private String companyName;//公司名称
+    private String telephone;//联系电话
+    private String corporator;//联系人
+    private String remarks;//团队描述
+    private Long userId;//用户id
+    private int pageSize;//每页的条数
+    private int pageNum;//第几页
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/MaintenanceCompanyResponse.java

@@ -0,0 +1,9 @@
+package cn.com.ty.lift.system.settings.dao.entity.model;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-11
+ * @description 维保公司相应类
+ */
+public class MaintenanceCompanyResponse {
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/dao/mapper/MaintenanceCompanyMapper.java

@@ -1,6 +1,6 @@
-package cn.com.ty.lift.enterprise.settings.dao.mapper;
+package cn.com.ty.lift.system.settings.dao.mapper;
 
-import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
+import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/IMaintenanceCompanyService.java

@@ -0,0 +1,33 @@
+package cn.com.ty.lift.system.settings.service;
+
+import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
+import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 维保公司 服务类
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-09
+ */
+public interface IMaintenanceCompanyService extends IService<MaintenanceCompany> {
+
+    /**
+     * @description 分页获取团队信息
+     * @date 2019-12-11 10:26
+     * @param
+     * @return
+     */
+    RestResponse list(MaintenanceCompanyRequest maintenanceCompanyRequest);
+
+    /**
+     * @description 申请团队
+     * @date 2019-12-11 14:05
+     * @param maintenanceCompanyRequest 申请团队信息
+     * @return
+     */
+    RestResponse applyTeam(MaintenanceCompanyRequest maintenanceCompanyRequest);
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/SettingsService.java

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.system.settings.service;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class SettingsService {
-}

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -0,0 +1,60 @@
+package cn.com.ty.lift.system.settings.service.impl;
+
+import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
+import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
+import cn.com.ty.lift.system.settings.dao.mapper.MaintenanceCompanyMapper;
+import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ * 维保公司 服务实现类
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-09
+ */
+@Service
+public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompanyMapper, MaintenanceCompany> implements IMaintenanceCompanyService {
+
+    @Override
+    public RestResponse list(MaintenanceCompanyRequest MaintenanceCompanyRequest) {
+        IPage<MaintenanceCompany> maintenanceCompanyPage = new Page<>(
+                MaintenanceCompanyRequest.getPageNum(), MaintenanceCompanyRequest.getPageSize());
+        maintenanceCompanyPage = this.page(
+                maintenanceCompanyPage, new QueryWrapper<MaintenanceCompany>()
+                //通过公司名称模糊查找公司信息
+                .like(StringUtils.isNotBlank(MaintenanceCompanyRequest.getCompanyName()), "name", MaintenanceCompanyRequest.getCompanyName())
+        );
+        return RestResponse.ok(maintenanceCompanyPage, ApiConstants.RESULT_SUCCESS, "获取公司列表成功");
+    }
+
+    @Override
+    @Transactional
+    public RestResponse applyTeam(MaintenanceCompanyRequest MaintenanceCompanyRequest) {
+        MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
+        //设置申请团队信息
+        maintenanceCompany.setName(MaintenanceCompanyRequest.getCompanyName());
+        maintenanceCompany.setCorporator(MaintenanceCompanyRequest.getCorporator());
+        maintenanceCompany.setCreatorId(MaintenanceCompanyRequest.getUserId());
+        maintenanceCompany.setRemarks(MaintenanceCompanyRequest.getRemarks());
+        boolean saveFlag = this.save(maintenanceCompany);
+        if(saveFlag){
+            //创建团队成功
+            //创建默认角色企业管理员
+
+            //保存成功给团队分配默认菜单
+
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "申请团队成功");
+        }
+        return RestResponse.error(ApiConstants.RESULT_ERROR, "申请团队失败");
+    }
+}