Merge branch 'develop' into wanghaicheng

lift-common/src/main/java/cn.com.ty.lift.common/constants/ApiConstants.java

@@ -55,4 +55,24 @@ public class ApiConstants {
      */
     public static final String AREA_PARENT_ATTR = "parent";
 
+    /**
+     * 用户常量
+     */
+    public interface UserConstants {
+        /**
+         * 超级管理员/平台管理员
+         */
+        int TYPE_SUPER_ADMIN = 0;
+
+        /**
+         *企业管理员
+         */
+        int TYPE_ENTERPRISE_ADMIN = 1;
+
+        /**
+         * 普通用户
+         */
+        int TYPE_USER = 2;
+    }
+
 }

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

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.enterprise.settings.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 维保公司 前端控制器
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@RestController
+@RequestMapping("/mt-company")
+public class MaintenanceCompanyController {
+
+}

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

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.enterprise.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

@@ -0,0 +1,186 @@
+package cn.com.ty.lift.enterprise.settings.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 维保公司
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MaintenanceCompany implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 公司ID
+     */
+    @TableId(value = "id", type = IdType.ID_WORKER)
+    private Long id;
+
+    /**
+     * 公司名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 公司地址
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 注册资金
+     */
+    @TableField("registered_capital")
+    private BigDecimal registeredCapital;
+
+    /**
+     * 企业法人
+     */
+    @TableField("corporator")
+    private String corporator;
+
+    /**
+     * 联系电话
+     */
+    @TableField("telephone")
+    private String telephone;
+
+    /**
+     * 主要业务
+     */
+    @TableField("mainbusiness")
+    private String mainbusiness;
+
+    /**
+     * 营业执照编号
+     */
+    @TableField("business_license_code")
+    private String businessLicenseCode;
+
+    /**
+     * 营业执照附件
+     */
+    @TableField("business_license_annex")
+    private String businessLicenseAnnex;
+
+    /**
+     * 备注
+     */
+    @TableField("remarks")
+    private String remarks;
+
+    /**
+     * 是否认证  '0 未认证 1 已认证 2 审核中 3 认证失败'
+     */
+    @TableField("is_certificated")
+    private Integer isCertificated;
+
+    /**
+     * 状态  '1：生效 2：系统创建'
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 创建人ID
+     */
+    @TableField("creator_id")
+    private Long creatorId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_date")
+    private LocalDateTime createDate;
+
+    @TableField("limited_num")
+    private Integer limitedNum;
+
+    /**
+     * 服务总积分
+     */
+    @TableField("service_total")
+    private Integer serviceTotal;
+
+    /**
+     * 满意度总积分
+     */
+    @TableField("satisfaction_total")
+    private Integer satisfactionTotal;
+
+    @TableField("service_count")
+    private Integer serviceCount;
+
+    /**
+     * 用户等级
+     */
+    @TableField("level")
+    private Integer level;
+
+    /**
+     * 团队图片
+     */
+    @TableField("logo_img")
+    private String logoImg;
+
+    /**
+     * 维保积分
+     */
+    @TableField("maintenance_total")
+    private Integer maintenanceTotal;
+
+    /**
+     * 急修积分
+     */
+    @TableField("emergency_total")
+    private Integer emergencyTotal;
+
+    /**
+     * 创建电梯积分
+     */
+    @TableField("lift_total")
+    private Integer liftTotal;
+
+    /**
+     * 是否开启打卡
+     */
+    @TableField("is_clock")
+    private Integer isClock;
+
+    /**
+     * 上班时间
+     */
+    @TableField("top_time")
+    private LocalDateTime topTime;
+
+    /**
+     * 下班时间
+     */
+    @TableField("down_time")
+    private LocalDateTime downTime;
+
+    /**
+     * 是否开启上下班打卡
+     */
+    @TableField("is_updown")
+    private Integer isUpdown;
+
+
+}

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

@@ -0,0 +1,9 @@
+package cn.com.ty.lift.enterprise.settings.dao.entity.model;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-09
+ * @description
+ */
+public class MTCompany {
+}

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

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.enterprise.settings.dao.mapper;
+
+import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 维保公司 Mapper 接口
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-09
+ */
+public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany> {
+
+}

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

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.enterprise.settings.service;
+
+import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 维保公司 服务类
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-09
+ */
+public interface MaintenanceCompanyService extends IService<MaintenanceCompany> {
+
+}

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

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

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

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.enterprise.settings.service.impl;
+
+import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
+import cn.com.ty.lift.enterprise.settings.dao.mapper.MaintenanceCompanyMapper;
+import cn.com.ty.lift.enterprise.settings.service.MaintenanceCompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 维保公司 服务实现类
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-09
+ */
+@Service
+public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompanyMapper, MaintenanceCompany> implements MaintenanceCompanyService {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/RoleController.java

@@ -44,7 +44,7 @@ public class RoleController {
      * @param roleRequest 角色请求对象
      * @return
      */
-    @PostMapping("/addRole")
+    @PostMapping("/add")
     public RestResponse addRole(HttpServletRequest request, @RequestBody RoleRequest roleRequest){
         //设置创建者信息
         UserAccount userAccount = (UserAccount) request.getSession().getAttribute(ApiConstants.CURRENT_USER);
@@ -59,7 +59,7 @@ public class RoleController {
      * @param roleRequest 角色请求对象
      * @return
      */
-    @PostMapping("/updateRole")
+    @PostMapping("/update")
     public RestResponse updateRole(HttpServletRequest request, @RequestBody RoleRequest roleRequest){
         //设置更新者信息
         UserAccount userAccount = (UserAccount) request.getSession().getAttribute(ApiConstants.CURRENT_USER);
@@ -74,7 +74,7 @@ public class RoleController {
      * @param roleRequest 角色请求类
      * @return
      */
-    @PostMapping("/deleteRole")
+    @PostMapping("/delete")
     public RestResponse deleteRole(HttpServletRequest request, @RequestBody RoleRequest roleRequest){
         //设置删除者信息
         UserAccount userAccount = (UserAccount) request.getSession().getAttribute(ApiConstants.CURRENT_USER);

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/UserController.java

@@ -42,7 +42,7 @@ public class UserController {
      * @param userRequest 用户请求参数
      * @return
      */
-    @PostMapping("/addUser")
+    @PostMapping("/add")
     public RestResponse addUser(@RequestBody UserRequest userRequest){
         return userService.addUser(userRequest);
     }
@@ -53,7 +53,7 @@ public class UserController {
      * @param userRequest 用户请求参数
      * @return
      */
-    @PostMapping("/updateUser")
+    @PostMapping("/update")
     public RestResponse updateUser(@RequestBody UserRequest userRequest){
         return userService.updateUser(userRequest);
     }
@@ -64,7 +64,7 @@ public class UserController {
      * @param userRequest 用户请求参数
      * @return
      */
-    @PostMapping("/deleteUser")
+    @PostMapping("/delete")
     public RestResponse deleteUser(@RequestBody UserRequest userRequest){
         return userService.deleteUser(userRequest);
     }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IMenuService.java

@@ -52,4 +52,13 @@ public interface IMenuService extends IService<Menu> {
      * @return
      */
     RestResponse companyMenu(MenuRequest menuRequest);
+
+    /**
+     * @description 获取菜单树
+     * @date 2019-12-09
+     * @param menuList 菜单列表
+     * @return
+     */
+    List<Menu> getMenuTree(List<Menu> menuList);
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MenuService.java

@@ -50,13 +50,14 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
 
     @Override
     public RestResponse all() {
-        return RestResponse.ok(this.list(), ApiConstants.RESULT_SUCCESS, "获取所有菜单信息");
+        List<Menu> allMenus = this.list();
+        return RestResponse.ok(getMenuTree(allMenus), ApiConstants.RESULT_SUCCESS, "获取所有菜单信息");
     }
 
     @Override
     public RestResponse list(MenuRequest menuRequest) {
         List<Menu> menuList = this.list(new QueryWrapper<Menu>().eq("company_id", menuRequest.getCompanyId()));
-        return RestResponse.ok(menuList, ApiConstants.RESULT_SUCCESS, "获取企业所有菜单信息");
+        return RestResponse.ok(getMenuTree(menuList), ApiConstants.RESULT_SUCCESS, "获取企业所有菜单信息");
     }
 
     @Override
@@ -80,6 +81,11 @@ public class MenuService extends ServiceImpl<MenuMapper, Menu> implements IMenuS
         return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "分配菜单成功");
     }
 
+    @Override
+    public List<Menu> getMenuTree(List<Menu> menuList) {
+        return TreeUtil.listToTree(menuList, ApiConstants.MENU_PARENT_ATTR, ApiConstants.ROOT_MENU_PARENT_ID, "id");
+    }
+
     /**
      * @param menuTree 菜单树，
      * @param sb       路径StringBuilder对象

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -41,6 +41,8 @@ public class UserService implements IUserService {
         //设置账号(小梯号)
         userAccount.setAccount(userRequest.getAccount());
         userAccount.setCreateDate(new Date());
+        //设置用户类型
+        userAccount.setType(ApiConstants.UserConstants.TYPE_USER);
         UserInfo userInfo = new UserInfo();
         userInfo.setName(userRequest.getName());