更新

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/controller/OrganizationController.java

@@ -1,28 +0,0 @@
-package cn.com.ty.lift.system.organization.controller;
-
-import cn.com.ty.lift.system.organization.entity.Project;
-import cn.com.ty.lift.system.organization.service.impl.ProjectServiceImpl;
-import cn.com.xwy.boot.web.dto.RestResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/organization")
-@AllArgsConstructor
-public class OrganizationController {
-    private final ProjectServiceImpl projectService;
-
-
-    @PostMapping("/list")
-    public RestResponse list(@RequestBody Project project) {
-        Map<String ,Object> map = new HashMap<String ,Object>();
-//        map.put()
-        return RestResponse.ok("");
-    }
-}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/controller/ProjectController.java

@@ -1,19 +0,0 @@
-package cn.com.ty.lift.system.organization.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 项目 前端控制器
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-10
- */
-@RestController
-@RequestMapping("/organization/project")
-public class ProjectController {
-
-}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/entity/Project.java

@@ -1,197 +0,0 @@
-package cn.com.ty.lift.system.organization.entity;
-
-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.time.LocalDate;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 项目
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class Project implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 项目ID
-     */
-    @TableId("id")
-    private Long id;
-
-    /**
-     * 维保公司ID
-     */
-    @TableField("mt_company_id")
-    private Long mtCompanyId;
-
-    /**
-     * 甲方公司ID
-     */
-    @TableField("pp_company_id")
-    private Long ppCompanyId;
-
-    /**
-     * 甲方联系人ID
-     */
-    @TableField("pp_contact_id")
-    private Long ppContactId;
-
-    /**
-     * 项目编号
-     */
-    @TableField("project_code")
-    private String projectCode;
-
-    /**
-     * 项目名称
-     */
-    @TableField("project_name")
-    private String projectName;
-
-    /**
-     * 省编码
-     */
-    @TableField("province_code")
-    private String provinceCode;
-
-    /**
-     * 省
-     */
-    @TableField("province")
-    private String province;
-
-    /**
-     * 市编码
-     */
-    @TableField("city_code")
-    private String cityCode;
-
-    /**
-     * 市
-     */
-    @TableField("city")
-    private String city;
-
-    /**
-     * 区编码
-     */
-    @TableField("district_code")
-    private String districtCode;
-
-    /**
-     * 区
-     */
-    @TableField("district")
-    private String district;
-
-    /**
-     * 项目地址
-     */
-    @TableField("address")
-    private String address;
-
-    /**
-     * 台量
-     */
-    @TableField("num")
-    private Integer num;
-
-    /**
-     * 实际台量
-     */
-    @TableField("actual_num")
-    private Integer actualNum;
-
-    /**
-     * 用途 1.住宅2.办公楼3.医院4.商场5.工厂6.酒店7.交通枢纽8.学校9.剧场10.其他
-     */
-    @TableField("project_usage")
-    private Integer projectUsage;
-
-    /**
-     * 开始时间
-     */
-    @TableField("start_date")
-    private LocalDate startDate;
-
-    /**
-     * 结束时间
-     */
-    @TableField("end_date")
-    private LocalDate endDate;
-
-    /**
-     * 状态  0:删除 1:尚未开始(项目开始日期晚于系统日期);2:服务中(系统日期在项目开始和结束日期之间，包括相等) 3:停止服务4.逾期
-     */
-    @TableField("project_status")
-    private Integer projectStatus;
-
-    /**
-     * 备注
-     */
-    @TableField("remarks")
-    private String remarks;
-
-    /**
-     * 是否锁定 0否 1是
-     */
-    @TableField("is_locked")
-    private Integer isLocked;
-
-    /**
-     * 创建人ID
-     */
-    @TableField("creator_id")
-    private Long creatorId;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    /**
-     * 评价方式 0是默认 24  1天后自动评价 48  48小时候默认好评
-     */
-    @TableField("evaluate")
-    private Integer evaluate;
-
-    /**
-     * 停止服务描述
-     */
-    @TableField("end_remarks")
-    private String endRemarks;
-
-    /**
-     * 维保班长编辑电梯负责人权限  0否1是
-     */
-    @TableField("if_monitor")
-    private Integer ifMonitor;
-
-    /**
-     * 维保工查看所有电梯权限 0否 1是
-     */
-    @TableField("all_project")
-    private Integer allProject;
-
-    /**
-     * 区域ID
-     */
-    @TableField("region_id")
-    private Long regionId;
-
-
-}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/mapper/ProjectMapper.java

@@ -1,16 +0,0 @@
-package cn.com.ty.lift.system.organization.mapper;
-
-import cn.com.ty.lift.system.organization.entity.Project;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 项目 Mapper 接口
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-10
- */
-public interface ProjectMapper extends BaseMapper<Project> {
-
-}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/service/ProjectService.java

@@ -1,16 +0,0 @@
-package cn.com.ty.lift.system.organization.service;
-
-import cn.com.ty.lift.system.organization.entity.Project;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 项目 服务类
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-10
- */
-public interface ProjectService extends IService<Project> {
-
-}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/service/impl/ProjectServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ty.lift.system.organization.service.impl;
-
-import cn.com.ty.lift.system.organization.entity.Project;
-import cn.com.ty.lift.system.organization.mapper.ProjectMapper;
-import cn.com.ty.lift.system.organization.service.ProjectService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 项目 服务实现类
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-10
- */
-@Service
-public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
-
-}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/controller/MtCompanyUserRegionController.java

@@ -1,39 +1,39 @@
-package cn.com.ty.lift.system.region.controller;
-
-
-import cn.com.ty.lift.system.region.service.impl.MtCompanyUserRegionServiceImpl;
-import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 团队区域表1 前端控制器
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-@RestController
-@RequestMapping("/system/mt-company-user-region")
-@AllArgsConstructor
-public class MtCompanyUserRegionController {
-    private final MtCompanyUserRegionServiceImpl mtCompanyUserRegionService;
-    private final AreaCodeService areaCodeService;
-
-//    @PostMapping("/list")
-//    public RestResponse list(@RequestBody MtCompanyUserRegion mtCompanyUserRegion) {
-//        List<MtCompanyUserRegion> userRegions = mtCompanyUserRegionService.list(new QueryWrapper<MtCompanyUserRegion>()
-//                .eq("mtCompanyId", mtCompanyUserRegion.getMtCompanyId()));
-//        AreaCode provinceCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
-//                .eq("province_code", mtCompanyUserRegion.getProvinceCode()));
-//        provinceCode.getName();
-//         areaCodeService.list(new QueryWrapper<AreaCode>()
-//                .eq("city_code", mtCompanyUserRegion.getCityCode()));
-//        cityCode.getName();
-//        AreaCode cityCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
-//                .eq("city_code", mtCompanyUserRegion.getCityCode()));
+//package cn.com.ty.lift.system.region.controller;
 //
-//    }
-}
+//
+//import cn.com.ty.lift.system.region.service.impl.MtCompanyUserRegionServiceImpl;
+//import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
+//import lombok.AllArgsConstructor;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+///**
+// * <p>
+// * 团队区域表1 前端控制器
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//@RestController
+//@RequestMapping("/system/mt-company-user-region")
+////@AllArgsConstructor
+//public class MtCompanyUserRegionController {
+////    private final MtCompanyUserRegionServiceImpl mtCompanyUserRegionService;
+////    private final AreaCodeService areaCodeService;
+//
+////    @PostMapping("/list")
+////    public RestResponse list(@RequestBody MtCompanyUserRegion mtCompanyUserRegion) {
+////        List<MtCompanyUserRegion> userRegions = mtCompanyUserRegionService.list(new QueryWrapper<MtCompanyUserRegion>()
+////                .eq("mtCompanyId", mtCompanyUserRegion.getMtCompanyId()));
+////        AreaCode provinceCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
+////                .eq("province_code", mtCompanyUserRegion.getProvinceCode()));
+////        provinceCode.getName();
+////         areaCodeService.list(new QueryWrapper<AreaCode>()
+////                .eq("city_code", mtCompanyUserRegion.getCityCode()));
+////        cityCode.getName();
+////        AreaCode cityCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
+////                .eq("city_code", mtCompanyUserRegion.getCityCode()));
+////
+////    }
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/controller/RegionController.java

@@ -1,95 +1,95 @@
-package cn.com.ty.lift.system.region.controller;
-
-import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.ty.lift.common.model.AreaCode;
-import cn.com.ty.lift.system.region.dao.entity.Region;
-import cn.com.ty.lift.system.region.dao.entity.model.RegionReq;
-import cn.com.ty.lift.system.region.service.impl.RegionServiceImpl;
-import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
-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 lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * <p>
- * 区域表 前端控制器
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-@AllArgsConstructor
-@RestController
-@RequestMapping("/region")
-public class RegionController {
-    private final RegionServiceImpl regionService;
-    private final AreaCodeService areaCodeService;
-
-    @PostMapping("/list")
-    public RestResponse list(@RequestBody RegionReq regionReq) {
-        IPage<Region> page = regionService.page(new Page<>(regionReq.getPageNum(), regionReq.getPageSize()));
-        if (page.getRecords().isEmpty()) {
-            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-        }
-        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, "查询成功");
-    }
-
-    @PostMapping("/add")
-    public RestResponse add(@RequestBody Region region) {
-        if (regionService.save(region)) {
-            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增成功");
-        }
-        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "新增失败");
-    }
-
-    @PostMapping("/delete")
-    public RestResponse delete(@RequestBody Region region) {
-        if (regionService.removeById(region.getId())) {
-            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "删除成功");
-        }
-        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "删除失败");
-    }
-
-    @PostMapping("/update")
-    public RestResponse update(@RequestBody Region region) {
-        if (regionService.updateById(region)) {
-            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "修改成功");
-        }
-        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "修改失败");
-    }
-
-    @PostMapping
-    public RestResponse get(@RequestBody Region region) {
-        Region byId = regionService.getById(region.getId());
-        if (null == byId) {
-            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "未找到");
-        }
-        return RestResponse.ok(byId, ApiConstants.RESULT_SUCCESS, "查询成功");
-    }
-
-    @PostMapping("/project/regions")
-    public RestResponse regions(@RequestBody Region region) {
-        List<Region> regions = regionService.list(new QueryWrapper<Region>()
-                .eq("mt_company_id", region.getMtCompanyId()));
-        if (regions.isEmpty()) {
-            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-        }
-        return RestResponse.ok(regions, ApiConstants.RESULT_SUCCESS, "查询成功");
-    }
-
-    @PostMapping("/project/areas")
-    public RestResponse areas(@RequestBody AreaCode areaCode) {
-        List<AreaCode> areaCodes = areaCodeService.list(new QueryWrapper<AreaCode>()
-                .eq("parent", areaCode.getParent())
-                .eq("level", 3));
-        if (areaCodes.isEmpty()) {
-            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-        }
-        return RestResponse.ok(areaCodes, ApiConstants.RESULT_SUCCESS, "查询成功");
-    }
-}
+//package cn.com.ty.lift.system.region.controller;
+//
+//import cn.com.ty.lift.common.constants.ApiConstants;
+//import cn.com.ty.lift.common.model.AreaCode;
+//import cn.com.ty.lift.system.region.dao.entity.Region;
+//import cn.com.ty.lift.system.region.dao.entity.model.RegionReq;
+//import cn.com.ty.lift.system.region.service.impl.RegionServiceImpl;
+//import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
+//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 lombok.AllArgsConstructor;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * <p>
+// * 区域表 前端控制器
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//@AllArgsConstructor
+//@RestController
+//@RequestMapping("/region")
+//public class RegionController {
+//    private final RegionServiceImpl regionService;
+//    private final AreaCodeService areaCodeService;
+//
+//    @PostMapping("/list")
+//    public RestResponse list(@RequestBody RegionReq regionReq) {
+//        IPage<Region> page = regionService.page(new Page<>(regionReq.getPageNum(), regionReq.getPageSize()));
+//        if (page.getRecords().isEmpty()) {
+//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+//        }
+//        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, "查询成功");
+//    }
+//
+//    @PostMapping("/add")
+//    public RestResponse add(@RequestBody Region region) {
+//        if (regionService.save(region)) {
+//            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增成功");
+//        }
+//        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "新增失败");
+//    }
+//
+//    @PostMapping("/delete")
+//    public RestResponse delete(@RequestBody Region region) {
+//        if (regionService.removeById(region.getId())) {
+//            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "删除成功");
+//        }
+//        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "删除失败");
+//    }
+//
+//    @PostMapping("/update")
+//    public RestResponse update(@RequestBody Region region) {
+//        if (regionService.updateById(region)) {
+//            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "修改成功");
+//        }
+//        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "修改失败");
+//    }
+//
+//    @PostMapping
+//    public RestResponse get(@RequestBody Region region) {
+//        Region byId = regionService.getById(region.getId());
+//        if (null == byId) {
+//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "未找到");
+//        }
+//        return RestResponse.ok(byId, ApiConstants.RESULT_SUCCESS, "查询成功");
+//    }
+//
+//    @PostMapping("/project/regions")
+//    public RestResponse regions(@RequestBody Region region) {
+//        List<Region> regions = regionService.list(new QueryWrapper<Region>()
+//                .eq("mt_company_id", region.getMtCompanyId()));
+//        if (regions.isEmpty()) {
+//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+//        }
+//        return RestResponse.ok(regions, ApiConstants.RESULT_SUCCESS, "查询成功");
+//    }
+//
+//    @PostMapping("/project/areas")
+//    public RestResponse areas(@RequestBody AreaCode areaCode) {
+//        List<AreaCode> areaCodes = areaCodeService.list(new QueryWrapper<AreaCode>()
+//                .eq("parent", areaCode.getParent())
+//                .eq("level", 3));
+//        if (areaCodes.isEmpty()) {
+//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+//        }
+//        return RestResponse.ok(areaCodes, ApiConstants.RESULT_SUCCESS, "查询成功");
+//    }
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/entity/MtCompanyUserRegion.java

@@ -1,53 +1,53 @@
-package cn.com.ty.lift.system.region.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;
-
-/**
- * <p>
- * 团队区域表1
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class MtCompanyUserRegion implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 团队ID
-     */
-    @TableField("mt_company_id")
-    private Long mtCompanyId;
-
-    /**
-     * 用户ID
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 省编号
-     */
-    @TableField("province_code")
-    private String provinceCode;
-
-    /**
-     * 市编号
-     */
-    @TableField("city_code")
-    private String cityCode;
-
-    @TableId(value = "id", type = IdType.ID_WORKER)
-    private Integer id;
-}
+//package cn.com.ty.lift.system.region.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;
+//
+///**
+// * <p>
+// * 团队区域表1
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = false)
+//@Accessors(chain = true)
+//public class MtCompanyUserRegion implements Serializable {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//    /**
+//     * 团队ID
+//     */
+//    @TableField("mt_company_id")
+//    private Long mtCompanyId;
+//
+//    /**
+//     * 用户ID
+//     */
+//    @TableField("user_id")
+//    private Long userId;
+//
+//    /**
+//     * 省编号
+//     */
+//    @TableField("province_code")
+//    private String provinceCode;
+//
+//    /**
+//     * 市编号
+//     */
+//    @TableField("city_code")
+//    private String cityCode;
+//
+//    @TableId(value = "id", type = IdType.ID_WORKER)
+//    private Integer id;
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/entity/Region.java

@@ -1,79 +1,79 @@
-package cn.com.ty.lift.system.region.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;
-
-/**
- * <p>
- * 区域表
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class Region implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.ID_WORKER)
-    private Long id;
-
-    /**
-     * 团队id
-     */
-    @TableField("mt_company_id")
-    private Long mtCompanyId;
-
-    /**
-     * 区域代号
-     */
-    @TableField("area_code")
-    private String areaCode;
-
-    /**
-     * 省级行政代码
-     */
-    @TableField("province_code")
-    private String provinceCode;
-
-    /**
-     * 城市区域代码
-     */
-    @TableField("city_code")
-    private String cityCode;
-
-    /**
-     * 区域名称
-     */
-    @TableField("area_name")
-    private String areaName;
-
-    /**
-     * 用户id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 文员id
-     */
-    @TableField("clerk")
-    private Long clerk;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-
-}
+//package cn.com.ty.lift.system.region.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;
+//
+///**
+// * <p>
+// * 区域表
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = false)
+//@Accessors(chain = true)
+//public class Region implements Serializable {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//    @TableId(value = "id", type = IdType.ID_WORKER)
+//    private Long id;
+//
+//    /**
+//     * 团队id
+//     */
+//    @TableField("mt_company_id")
+//    private Long mtCompanyId;
+//
+//    /**
+//     * 区域代号
+//     */
+//    @TableField("area_code")
+//    private String areaCode;
+//
+//    /**
+//     * 省级行政代码
+//     */
+//    @TableField("province_code")
+//    private String provinceCode;
+//
+//    /**
+//     * 城市区域代码
+//     */
+//    @TableField("city_code")
+//    private String cityCode;
+//
+//    /**
+//     * 区域名称
+//     */
+//    @TableField("area_name")
+//    private String areaName;
+//
+//    /**
+//     * 用户id
+//     */
+//    @TableField("user_id")
+//    private Long userId;
+//
+//    /**
+//     * 文员id
+//     */
+//    @TableField("clerk")
+//    private Long clerk;
+//
+//    /**
+//     * 备注
+//     */
+//    @TableField("remark")
+//    private String remark;
+//
+//
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/entity/model/RegionReq.java

@@ -1,82 +1,82 @@
-package cn.com.ty.lift.system.region.dao.entity.model;
-
-import cn.com.ty.lift.system.region.dao.entity.Region;
-import cn.com.xwy.boot.controller.BaseRequestModel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 区域表
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class RegionReq extends BaseRequestModel implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.ID_WORKER)
-    private Long id;
-
-    /**
-     * 团队id
-     */
-    @TableField("mt_company_id")
-    private Long mtCompanyId;
-
-    /**
-     * 区域代号
-     */
-    @TableField("area_code")
-    private String areaCode;
-
-    /**
-     * 省级行政代码
-     */
-    @TableField("province_code")
-    private String provinceCode;
-
-    /**
-     * 城市区域代码
-     */
-    @TableField("city_code")
-    private String cityCode;
-
-    /**
-     * 区域名称
-     */
-    @TableField("area_name")
-    private String areaName;
-
-    /**
-     * 用户id
-     */
-    @TableField("user_id")
-    private Long userId;
-
-    /**
-     * 文员id
-     */
-    @TableField("clerk")
-    private Long clerk;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-}
-
+//package cn.com.ty.lift.system.region.dao.entity.model;
+//
+//import cn.com.ty.lift.system.region.dao.entity.Region;
+//import cn.com.xwy.boot.controller.BaseRequestModel;
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableField;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//import lombok.experimental.Accessors;
+//
+//import java.io.Serializable;
+//
+///**
+// * <p>
+// * 区域表
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = false)
+//@Accessors(chain = true)
+//public class RegionReq extends BaseRequestModel implements Serializable {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//    @TableId(value = "id", type = IdType.ID_WORKER)
+//    private Long id;
+//
+//    /**
+//     * 团队id
+//     */
+//    @TableField("mt_company_id")
+//    private Long mtCompanyId;
+//
+//    /**
+//     * 区域代号
+//     */
+//    @TableField("area_code")
+//    private String areaCode;
+//
+//    /**
+//     * 省级行政代码
+//     */
+//    @TableField("province_code")
+//    private String provinceCode;
+//
+//    /**
+//     * 城市区域代码
+//     */
+//    @TableField("city_code")
+//    private String cityCode;
+//
+//    /**
+//     * 区域名称
+//     */
+//    @TableField("area_name")
+//    private String areaName;
+//
+//    /**
+//     * 用户id
+//     */
+//    @TableField("user_id")
+//    private Long userId;
+//
+//    /**
+//     * 文员id
+//     */
+//    @TableField("clerk")
+//    private Long clerk;
+//
+//    /**
+//     * 备注
+//     */
+//    @TableField("remark")
+//    private String remark;
+//
+//}
+//

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/mapper/CommonMapper.java

@@ -0,0 +1,16 @@
+//package cn.com.ty.lift.system.region.dao.mapper;
+//
+//import org.apache.ibatis.annotations.Mapper;
+//import org.apache.ibatis.annotations.Select;
+//
+//import java.util.List;
+//import java.util.Map;
+//
+//@Mapper
+//public interface CommonMapper {
+//    @Select("select ${fields} from ${tables} ${conditions}")
+//    List<Map<String, Object>> list(String fields, String tables, String conditions);
+//
+//    @Select("select ${fields} from ${tables} where ${conditions}")
+//    Map<String, Object> one(String fields, String tables, String conditions);
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/mapper/MtCompanyUserRegionMapper.java

@@ -1,16 +1,16 @@
-package cn.com.ty.lift.system.region.dao.mapper;
-
-import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 团队区域表1 Mapper 接口
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-public interface MtCompanyUserRegionMapper extends BaseMapper<MtCompanyUserRegion> {
-
-}
+//package cn.com.ty.lift.system.region.dao.mapper;
+//
+//import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//
+///**
+// * <p>
+// * 团队区域表1 Mapper 接口
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//public interface MtCompanyUserRegionMapper extends BaseMapper<MtCompanyUserRegion> {
+//
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/mapper/RegionMapper.java

@@ -1,15 +1,15 @@
-package cn.com.ty.lift.system.region.dao.mapper;
-
-import cn.com.ty.lift.system.region.dao.entity.Region;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-/**
- * <p>
- * 区域表 Mapper 接口
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-public interface RegionMapper extends BaseMapper<Region> {
-
-}
+//package cn.com.ty.lift.system.region.dao.mapper;
+//
+//import cn.com.ty.lift.system.region.dao.entity.Region;
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+///**
+// * <p>
+// * 区域表 Mapper 接口
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//public interface RegionMapper extends BaseMapper<Region> {
+//
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/service/MtCompanyUserRegionService.java

@@ -1,16 +1,16 @@
-package cn.com.ty.lift.system.region.service;
-
-import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 团队区域表1 服务类
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-public interface MtCompanyUserRegionService extends IService<MtCompanyUserRegion> {
-
-}
+//package cn.com.ty.lift.system.region.service;
+//
+//import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+///**
+// * <p>
+// * 团队区域表1 服务类
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//public interface MtCompanyUserRegionService extends IService<MtCompanyUserRegion> {
+//
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/service/RegionService.java

@@ -1,16 +1,16 @@
-package cn.com.ty.lift.system.region.service;
-
-import cn.com.ty.lift.system.region.dao.entity.Region;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 区域表 服务类
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-public interface RegionService extends IService<Region> {
-
-}
+//package cn.com.ty.lift.system.region.service;
+//
+//import cn.com.ty.lift.system.region.dao.entity.Region;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//
+///**
+// * <p>
+// * 区域表 服务类
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//public interface RegionService extends IService<Region> {
+//
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/service/impl/MtCompanyUserRegionServiceImpl.java

@@ -1,20 +1,20 @@
-package cn.com.ty.lift.system.region.service.impl;
-
-import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
-import cn.com.ty.lift.system.region.dao.mapper.MtCompanyUserRegionMapper;
-import cn.com.ty.lift.system.region.service.MtCompanyUserRegionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 团队区域表1 服务实现类
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-@Service
-public class MtCompanyUserRegionServiceImpl extends ServiceImpl<MtCompanyUserRegionMapper, MtCompanyUserRegion> implements MtCompanyUserRegionService {
-
-}
+//package cn.com.ty.lift.system.region.service.impl;
+//
+//import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
+//import cn.com.ty.lift.system.region.dao.mapper.MtCompanyUserRegionMapper;
+//import cn.com.ty.lift.system.region.service.MtCompanyUserRegionService;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * <p>
+// * 团队区域表1 服务实现类
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//@Service
+//public class MtCompanyUserRegionServiceImpl extends ServiceImpl<MtCompanyUserRegionMapper, MtCompanyUserRegion> implements MtCompanyUserRegionService {
+//
+//}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/service/impl/RegionServiceImpl.java

@@ -1,20 +1,20 @@
-package cn.com.ty.lift.system.region.service.impl;
-
-import cn.com.ty.lift.system.region.dao.entity.Region;
-import cn.com.ty.lift.system.region.dao.mapper.RegionMapper;
-import cn.com.ty.lift.system.region.service.RegionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 区域表 服务实现类
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-@Service
-public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
-
-}
+//package cn.com.ty.lift.system.region.service.impl;
+//
+//import cn.com.ty.lift.system.region.dao.entity.Region;
+//import cn.com.ty.lift.system.region.dao.mapper.RegionMapper;
+//import cn.com.ty.lift.system.region.service.RegionService;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import org.springframework.stereotype.Service;
+//
+///**
+// * <p>
+// * 区域表 服务实现类
+// * </p>
+// *
+// * @author wang-hai-cheng
+// * @since 2019-12-09
+// */
+//@Service
+//public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
+//
+//}