更新

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

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.system.region.dao.mapper;
+package cn.com.ty.lift.enterprise.common.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;

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

@@ -0,0 +1,21 @@
+package cn.com.ty.lift.enterprise.organization.controller;
+
+import cn.com.ty.lift.enterprise.organization.dao.entity.model.OrganizationReq;
+import cn.com.ty.lift.enterprise.organization.service.OrganizationService;
+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;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/organization")
+public class OrganizationController {
+    private final OrganizationService organizationService;
+    @PostMapping("/list")
+    public RestResponse list(@RequestBody OrganizationReq organizationReq){
+        return organizationService.datas(organizationReq);
+    }
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/dao/entity/model/OrganizationReq.java

@@ -0,0 +1,13 @@
+package cn.com.ty.lift.enterprise.organization.dao.entity.model;
+
+import lombok.Data;
+
+@Data
+public class OrganizationReq {
+    //维保公司id
+    private Long mtCompanyId;
+    //1省 2市 3区 4项目和电梯数量列表 5项目成员
+    private Integer listType;
+    //项目id
+    private Long projectId;
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/service/OrganizationService.java

@@ -0,0 +1,54 @@
+package cn.com.ty.lift.enterprise.organization.service;
+
+import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.enterprise.common.mapper.CommonMapper;
+import cn.com.ty.lift.enterprise.organization.dao.entity.model.OrganizationReq;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class OrganizationService {
+    private final CommonMapper mapper;
+
+    //获取维保公司下的1省，2市，3区，4项目和电梯数量 5项目成员列表
+    public RestResponse datas(OrganizationReq organizationReq) {
+        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
+        switch (organizationReq.getListType()) {
+            case 1:
+                list = mapper.list("DISTINCT province",
+                        "project",
+                        "where mt_company_id= " + organizationReq.getMtCompanyId());
+                break;
+            case 2:
+                list = mapper.list("DISTINCT city",
+                        "project",
+                        "where mt_company_id= " + organizationReq.getMtCompanyId());
+                break;
+            case 3:
+                list = mapper.list("DISTINCT district",
+                        "project",
+                        "where mt_company_id= " + organizationReq.getMtCompanyId());
+                break;
+            case 4:
+                list = mapper.list("DISTINCT id,project_name,num",
+                        "project",
+                        "where mt_company_id= " + organizationReq.getMtCompanyId());
+                break;
+            case 5:
+                list = mapper.list(" pu.project_id,u.avatar_url,u.name,u.mobile,pu.is_monitor ",
+                        " project_user pu left join user_info u on u.user_id = pu.user_id ",
+                        "where mt_company_id = " + organizationReq.getMtCompanyId() + " and project_id = " + organizationReq.getProjectId());
+                break;
+        }
+        if (list.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        return RestResponse.ok(list, ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
+}

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

@@ -1,22 +1,17 @@
-package cn.com.ty.lift.system.region.controller;
+package cn.com.ty.lift.enterprise.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.dao.mapper.CommonMapper;
-import cn.com.ty.lift.system.region.service.impl.RegionServiceImpl;
-import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
+import cn.com.ty.lift.enterprise.common.mapper.CommonMapper;
+import cn.com.ty.lift.enterprise.region.dao.entity.Region;
+import cn.com.ty.lift.enterprise.region.dao.entity.model.RegionReq;
+import cn.com.ty.lift.enterprise.region.service.impl.RegionServiceImpl;
 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.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -31,46 +26,11 @@ import java.util.Map;
 @RequestMapping("/region")
 public class RegionController {
     private final RegionServiceImpl regionService;
-    private final AreaCodeService areaCodeService;
     private final CommonMapper mapper;
 
-
     @PostMapping("/list")
     public RestResponse list(@RequestBody RegionReq regionReq) {
-        long current = regionReq.getPageNum() * regionReq.getPageSize() - 1;
-        List<Map<String, Object>> list = mapper.list(
-                "r.id, r.area_code, r.province_code, a.name cityName, r.area_name, r.remark, u.name",
-                "region r left join user_info u on r.user_id = u.user_id left join area_code a on r.city_code = a.code left join area_code on r.province_code = a.name",
-                "where r.mt_company_id =" + regionReq.getMtCompanyId());
-        List<Map<String, Object>> projects = mapper.list("region_id,num", "project", "");
-        int count = 0;
-        Integer num = 0;
-        for (int i = 0; i < list.size(); i++) {
-            Object id = list.get(i).get("id");
-            for (int j = 0; j < projects.size(); j++) {
-//                System.out.println("================"+projects.get(i).get("region_id"));
-//                System.out.println("================"+list.get(j).get("id"));
-                if (projects.get(j).get("region_id").equals(id)) {
-                    count += 1;
-                }
-//                num += projects.get(j).get("num");
-                //
-                //
-                //
-                //
-                //
-            }
-            list.get(i).put("project_num", count);
-            count = 0;
-            num = 0;
-        }
-
-        System.out.println(list);
-        //        if (page.getRecords().isEmpty()) {
-//            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-//        }
-//        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, "查询成功");
-        return RestResponse.ok(null, "", "");
+        return regionService.regions(regionReq);
     }
 
     @PostMapping("/add")
@@ -83,10 +43,8 @@ public class RegionController {
 
     @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, "删除失败");
+        return regionService.delete(region);
+
     }
 
     @PostMapping("/update")
@@ -118,9 +76,11 @@ public class RegionController {
 
     @PostMapping("/project/areas")
     public RestResponse areas(@RequestBody AreaCode areaCode) {
+    mapper.list("id,","area_code"," where parent="+areaCode.getParent()+)
         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, "无数据");
         }

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

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.system.region.dao.entity;
+package cn.com.ty.lift.enterprise.region.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/region/dao/entity/Region.java

@@ -1,4 +1,4 @@
-package cn.com.ty.lift.system.region.dao.entity;
+package cn.com.ty.lift.enterprise.region.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/region/dao/entity/model/RegionReq.java

@@ -1,11 +1,9 @@
-package cn.com.ty.lift.system.region.dao.entity.model;
+package cn.com.ty.lift.enterprise.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;

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

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

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

@@ -1,6 +1,6 @@
-package cn.com.ty.lift.system.region.dao.mapper;
+package cn.com.ty.lift.enterprise.region.dao.mapper;
 
-import cn.com.ty.lift.system.region.dao.entity.Region;
+import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * <p>

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

@@ -1,6 +1,6 @@
-package cn.com.ty.lift.system.region.service;
+package cn.com.ty.lift.enterprise.region.service;
 
-import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
+import cn.com.ty.lift.enterprise.region.dao.entity.MtCompanyUserRegion;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

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

@@ -1,6 +1,6 @@
-package cn.com.ty.lift.system.region.service;
+package cn.com.ty.lift.enterprise.region.service;
 
-import cn.com.ty.lift.system.region.dao.entity.Region;
+import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

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

@@ -1,8 +1,8 @@
-package cn.com.ty.lift.system.region.service.impl;
+package cn.com.ty.lift.enterprise.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 cn.com.ty.lift.enterprise.region.dao.entity.MtCompanyUserRegion;
+import cn.com.ty.lift.enterprise.region.dao.mapper.MtCompanyUserRegionMapper;
+import cn.com.ty.lift.enterprise.region.service.MtCompanyUserRegionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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

@@ -0,0 +1,86 @@
+package cn.com.ty.lift.enterprise.region.service.impl;
+
+import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.enterprise.region.dao.entity.Region;
+import cn.com.ty.lift.enterprise.region.dao.entity.model.RegionReq;
+import cn.com.ty.lift.enterprise.common.mapper.CommonMapper;
+import cn.com.ty.lift.enterprise.region.dao.mapper.RegionMapper;
+import cn.com.ty.lift.enterprise.region.service.RegionService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 区域表 服务实现类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Service
+@AllArgsConstructor
+public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements RegionService {
+    private final CommonMapper mapper;
+
+    public RestResponse regions(RegionReq regionReq) {
+        long pageNum = regionReq.getPageNum() * regionReq.getPageSize() - 2;
+        long pageSize = regionReq.getPageSize();
+        //获取维保团队的区域列表
+        List<Map<String, Object>> regions = mapper.list(
+                "r.id, r.area_code, r.province_code, r.city_code, r.area_name, r.remark, u.name",
+                "region r left join user_info u on r.user_id = u.user_id left join area_code a on r.city_code = a.code left join area_code on r.province_code = a.name",
+                "where r.mt_company_id =" + regionReq.getMtCompanyId() + " limit " + pageNum + "," + pageSize);
+        List<Map<String, Object>> projects = mapper.list("region_id,num", "project", "");
+        List<Map<String, Object>> area_code = mapper.list("code,name", "area_code", "");
+        int count = 0;
+        Integer num = 0;
+        //遍历区域列表
+        for (Map<String, Object> region : regions) {
+            //遍历省市列表，将省市的id转化为name
+            for (Map<String, Object> area : area_code) {
+                if (region.get("province_code").equals(area.get("code"))) {
+                    region.put("provinceName", area.get("name"));
+                }
+                if (region.get("city_code").equals(area.get("code"))) {
+                    region.put("cityName", area.get("name"));
+                }
+            }
+
+            //遍历项目列表，获取区域下的项目个数和区域下的总电梯数
+            Object id = region.get("id");
+            for (Map<String, Object> project : projects) {
+                if (project.get("region_id").equals(id)) {
+                    count += 1;
+                    num += (Integer) project.get("num");
+                }
+            }
+            region.put("project_num", count);
+            region.put("num", num);
+            count = 0;
+            num = 0;
+        }
+
+        //封装分页
+        //待完成
+        System.out.println(regions);
+        if (regions.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        return RestResponse.ok(regions, ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
+
+    public RestResponse delete(Region region) {
+        Map<String, Object> regionId = mapper.one("count(id) count", "project", "where region_id=" + region.getId());
+        if ( regionId.get("count").equals(0L)) {
+            if (this.removeById(region.getId())) {
+                return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "删除成功");
+            }
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "区域内有项目，无法删除");
+    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/controller/FaqController.java

@@ -1,12 +1,18 @@
 package cn.com.ty.lift.system.faq.controller;
 
 
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.system.faq.entity.Faq;
+import cn.com.ty.lift.system.faq.entity.model.FaqReq;
 import cn.com.ty.lift.system.faq.service.impl.FaqServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * @author wang-hai-cheng
  * @date 2019/12/4
@@ -18,9 +24,20 @@ import org.springframework.web.bind.annotation.*;
 public class FaqController {
     private final FaqServiceImpl faqService;
 
+    @PostMapping("/child")
+    /**
+     * @description 查询父id下的子分类和问题
+     * @date 2019/12/12 17:22
+     * @param [faq]
+     * @return cn.com.xwy.boot.web.dto.RestResponse
+     */
+    public RestResponse kind(@RequestBody Faq faq) {
+        return RestResponse.ok(faqService.kindAndQuestion(faq), ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
+
     @PostMapping("/list")
     /**
-     * @description 查询一级分类
+     * @description 查询分类或问题或答案
      * @date 2019/11/27 10:19
      * @param []
      * @return cn.com.xwy.boot.web.dto.RestResponse
@@ -73,7 +90,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse up(@RequestBody Faq faq) {
-        return faqService.serial(faq.getId(),1);
+        return faqService.serial(faq.getId(), 1);
     }
 
     @PostMapping("/down")
@@ -84,6 +101,6 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse down(@RequestBody Faq faq) {
-        return faqService.serial(faq.getId(),0);
+        return faqService.serial(faq.getId(), 0);
     }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/entity/model/FaqReq.java

@@ -0,0 +1,8 @@
+package cn.com.ty.lift.system.faq.entity.model;
+
+import lombok.Data;
+
+@Data
+public class FaqReq {
+    private Integer type;
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/service/impl/FaqServiceImpl.java

@@ -9,6 +9,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -55,14 +58,29 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
     }
 
     public RestResponse delete(Long id) {
+        List<Long> ids = new ArrayList<>();
+        List<Faq> faqs = this.list();
+        faqs.forEach(faq -> {
+            if (id.equals(faq.getParentId())) {
+                ids.add(faq.getParentId());
+                ids.addAll(this.d(faq.getParentId()), faqs);
+            }
+        });
+
         if (deleteAll(id)) {
             return RestResponse.ok(null, "1", "删除成功");
         }
         return RestResponse.ok(null, "0", "删除失败");
     }
 
+    private ArrayList<Integer> d(Long id, List<Faq> faqs) {
+
+    }
+
     //递归删除id及它下面所有分类，问答
     private boolean deleteAll(Long id) {
+
+
         //获取父id下的所有子分类或问答
         List<Faq> faqs = this.list(new QueryWrapper<Faq>().eq("parent_id", id));
         //删除父id下的所有子分类或问答
@@ -141,4 +159,13 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
 
         return RestResponse.ok(null, "1", "移动成功");
     }
+
+    public HashMap<String, List<Faq>> kindAndQuestion(Faq faq) {
+        List<Faq> kind = this.list(new QueryWrapper<Faq>().eq("type", 1).eq("parent_id", faq.getId()));
+        List<Faq> question = this.list(new QueryWrapper<Faq>().eq("type", 2).eq("parent_id", faq.getId()));
+        HashMap<String, List<Faq>> kindAndquestions = new HashMap<>();
+        kindAndquestions.put("kind", kind);
+        kindAndquestions.put("question", question);
+        return kindAndquestions;
+    }
 }

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

@@ -1,20 +0,0 @@
-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 {
-
-}