更新

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/controller/PropertyCompanyController.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.custom.controller;
 
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyCompany;
+import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyAndPropertyContactReq;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyReq;
 import cn.com.ty.lift.enterprise.custom.service.impl.PropertyCompanyServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -57,11 +58,8 @@ public class PropertyCompanyController {
      * @param [客户]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse add(@RequestBody PropertyCompany propertyCompany) {
-        if (propertyCompanyService.save(propertyCompany)) {
-            return RestResponse.ok(null, "1", "新增成功");
-        }
-        return RestResponse.ok(null, "0", "新增失败");
+    public RestResponse add(@RequestBody PropertyCompanyAndPropertyContactReq req) {
+        return propertyCompanyService.saveAll(req);
     }
 
     @PostMapping("/update")
@@ -101,7 +99,7 @@ public class PropertyCompanyController {
     }
 
     @GetMapping("/export")
-    public void export(HttpServletRequest request, HttpServletResponse response) {
-        propertyCompanyService.export();
+    public RestResponse export(HttpServletRequest request, HttpServletResponse response) {
+        return propertyCompanyService.export();
     }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/entity/PropertyContact.java

@@ -74,4 +74,4 @@ public class PropertyContact implements Serializable {
      */
     @TableField("create_date")
     private LocalDateTime createDate;
-}
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/entity/model/PropertyCompanyAndPropertyContactReq.java

@@ -0,0 +1,15 @@
+package cn.com.ty.lift.enterprise.custom.dao.entity.model;
+
+import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyCompany;
+import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyContact;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PropertyCompanyAndPropertyContactReq {
+
+    private PropertyCompany propertyCompany;
+
+    private List<PropertyContact> propertyContacts;
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/dao/entity/model/PropertyCompanyReq.java

@@ -123,5 +123,4 @@ public class PropertyCompanyReq extends BaseRequestModel implements Serializable
     @TableField("create_date")
     private LocalDateTime createDate;
 
-
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/service/impl/PropertyCompanyServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ty.lift.enterprise.custom.service.impl;
 
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyCompany;
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyContact;
+import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyAndPropertyContactReq;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyReq;
 import cn.com.ty.lift.enterprise.custom.dao.mapper.PropertyCompanyMapper;
 import cn.com.ty.lift.enterprise.custom.service.PropertyCompanyService;
@@ -10,6 +12,7 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
@@ -19,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -86,25 +90,19 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
         return RestResponse.ok(records, "1", "查询成功");
     }
 
-    public void export() {
-        ExcelWriter writer = ExcelUtil.getWriter("客户列表.xls");
-        //设置列别名
-        paramMap.forEach(writer::addHeaderAlias);
-        writer.write(this.list(), true);
-        writer.autoSizeColumnAll();
-        writer.close();
+    public RestResponse saveAll(PropertyCompanyAndPropertyContactReq req) {
+        long id = IdWorker.getId();
+        req.getPropertyCompany().setId(id);
+        req.getPropertyContacts().forEach(contact -> {
+            contact.setPpCompanyId(id);
+        });
+        if (this.save(req.getPropertyCompany()) && propertyContactService.saveBatch(req.getPropertyContacts())) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "新增失败");
     }
 
-    private Map<String, String> paramMap = new HashMap<String, String>() {{
-        put("id", "客户id");
-        put("mtCompanyId", "维保公司id");
-        put("code", "编号");
-        put("name", "名称");
-        put("address", "地址");
-        put("mailingAddress", "通讯地址");
-        put("actualNum", "系统台量");
-        put("address", "项目地址");
-        put("startDate", "开始时间");
-        put("endDate", "结束时间");
-    }};
+    public RestResponse export() {
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "待实现");
+    }
 }

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

@@ -1,6 +1,8 @@
 package cn.com.ty.lift.enterprise.organization.service;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.common.utils.ProjectUtils;
+import cn.com.ty.lift.common.utils.TreeUtil;
 import cn.com.ty.lift.enterprise.common.mapper.CommonMapper;
 import cn.com.ty.lift.enterprise.organization.dao.entity.Project;
 import cn.com.ty.lift.enterprise.organization.dao.entity.model.OrganizationReq;
@@ -62,6 +64,7 @@ public class OrganizationService {
                 }
             }
         }
+
         treeData.put("province", provinces);
         treeData.put("city", cities);
         treeData.put("district", districts);

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

@@ -1,47 +0,0 @@
-//package cn.com.ty.lift.system.region.controller;
-//
-//
-//import cn.com.ty.lift.common.model.AreaCode;
-//import cn.com.ty.lift.system.region.dao.entity.MtCompanyUserRegion;
-//import cn.com.ty.lift.system.region.service.impl.MtCompanyUserRegionServiceImpl;
-//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 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.List;
-//
-///**
-// * <p>
-// * 团队区域表1 前端控制器
-// * </p>
-// *
-// * @author wang-hai-cheng
-// * @since 2019-12-09
-// */
-//@RestController
-//@RequestMapping("/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-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/controller/RegionController.java

@@ -12,6 +12,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -76,14 +77,10 @@ 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()) {
+        List<Map<String, Object>> areaCodes = mapper.list("id,name", "area_code", " where parent=" + areaCode.getParent() + " level=3");
+        if (areaCodes.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-//        }
-//        return RestResponse.ok(areaCodes, ApiConstants.RESULT_SUCCESS, "查询成功");
+        }
+        return RestResponse.ok(areaCodes, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
 }

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

@@ -1,53 +0,0 @@
-package cn.com.ty.lift.enterprise.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-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/dao/mapper/MtCompanyUserRegionMapper.java

@@ -1,16 +0,0 @@
-package cn.com.ty.lift.enterprise.region.dao.mapper;
-
-import cn.com.ty.lift.enterprise.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-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/MtCompanyUserRegionService.java

@@ -1,16 +0,0 @@
-package cn.com.ty.lift.enterprise.region.service;
-
-import cn.com.ty.lift.enterprise.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-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/region/service/impl/MtCompanyUserRegionServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ty.lift.enterprise.region.service.impl;
-
-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;
-
-/**
- * <p>
- * 团队区域表1 服务实现类
- * </p>
- *
- * @author wang-hai-cheng
- * @since 2019-12-09
- */
-@Service
-public class MtCompanyUserRegionServiceImpl extends ServiceImpl<MtCompanyUserRegionMapper, MtCompanyUserRegion> implements MtCompanyUserRegionService {
-
-}

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

@@ -40,14 +40,19 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         int count = 0;
         Integer num = 0;
         //遍历区域列表
+        if (regions.isEmpty()) {
+            return  RestResponse.ok(null,ApiConstants.RESULT_NO_DATA,"无数据");
+        }
         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"));
+                    region.remove("province_code");
                 }
                 if (region.get("city_code").equals(area.get("code"))) {
                     region.put("cityName", area.get("name"));
+                    region.remove("city_code");
                 }
             }
 
@@ -67,6 +72,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
         //封装分页
         //待完成
+
         System.out.println(regions);
         if (regions.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");

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

@@ -0,0 +1,62 @@
+package cn.com.ty.lift.system.settings.controller;
+
+
+import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.system.settings.dao.entity.GlobalSet;
+import cn.com.ty.lift.system.settings.service.impl.GlobalSetServiceImpl;
+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.time.Clock;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.List;
+
+/**
+ * <p>
+ * 全局设置 前端控制器
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-13
+ */
+@RestController
+@RequestMapping("/global-set")
+@AllArgsConstructor
+public class GlobalSetController {
+    private final GlobalSetServiceImpl globalSetService;
+
+    /**
+     * @param mtCompanyId
+     * @return 操作结果
+     * @description 获取维保公司的全局设置列表
+     * @date 2019/12/13 16:23
+     */
+    @PostMapping("/{mtCompanyId}")
+    public RestResponse id(@PathVariable Long mtCompanyId) {
+        List<GlobalSet> globalSets = globalSetService.list(new QueryWrapper<GlobalSet>().eq("company_id", mtCompanyId));
+        if (globalSets.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        return RestResponse.ok(globalSets, ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
+
+    /**
+     * @param globalSets
+     * @return 操作结果
+     * @description 根据id更新维保公司的全局设置
+     * @date 2019/12/13 16:24
+     */
+    @PostMapping("/update")
+    public RestResponse update(@RequestBody List<GlobalSet> globalSets) {
+        globalSets.forEach(globalSet -> {
+            globalSet.setUpdateTime(LocalDateTime.now(Clock.system(ZoneId.of("Asia/Shanghai"))));
+        });
+        if (globalSetService.updateBatchById(globalSets)) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "更新成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+    }
+}

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

@@ -0,0 +1,71 @@
+package cn.com.ty.lift.system.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.time.LocalDateTime;
+
+/**
+ * <p>
+ * 全局设置
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class GlobalSet implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设置名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 设置值
+     */
+    @TableField("value")
+    private String value;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 公司id
+     */
+    @TableField("company_id")
+    private Long companyId;
+
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/mapper/GlobalSetMapper.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.system.settings.dao.mapper;
+
+import cn.com.ty.lift.system.settings.dao.entity.GlobalSet;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 全局设置 Mapper 接口
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-13
+ */
+public interface GlobalSetMapper extends BaseMapper<GlobalSet> {
+
+}

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

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.system.settings.service;
+
+import cn.com.ty.lift.system.settings.dao.entity.GlobalSet;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 全局设置 服务类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-13
+ */
+public interface GlobalSetService extends IService<GlobalSet> {
+
+}

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

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.system.settings.service.impl;
+
+import cn.com.ty.lift.system.settings.dao.entity.GlobalSet;
+import cn.com.ty.lift.system.settings.dao.mapper.GlobalSetMapper;
+import cn.com.ty.lift.system.settings.service.GlobalSetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 全局设置 服务实现类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-13
+ */
+@Service
+public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet> implements GlobalSetService {
+
+}