Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

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

@@ -79,7 +79,7 @@ public class PropertyCompanyController {
 
     @PostMapping("/delete")
     /**
-     * @description RestResponse
+     * @description 删除客户
      * @date 2019/11/27 11:46
      * @param [id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
@@ -92,16 +92,17 @@ public class PropertyCompanyController {
     public RestResponse customs(@RequestBody PropertyCompany propertyCompany) {
         List<PropertyCompany> propertyCompanies = propertyCompanyService.list(new QueryWrapper<PropertyCompany>()
                 .select("id", "name")
-                .eq("mt_company_id", propertyCompany.getMtCompanyId()));
+                .eq("mt_company_id", propertyCompany.getMtCompanyId()).ne("status", 0));
         if (propertyCompanies.isEmpty()) {
             return RestResponse.ok(null, "9", "无数据");
         }
         return RestResponse.ok(propertyCompanies, "1", "查询成功");
     }
+
     /**
-         * @description 项目模块，新增客户
-         * @date 2019/12/16 17:08
-         */
+     * @description 项目模块，新增客户
+     * @date 2019/12/16 17:08
+     */
     @PostMapping("/project/custom/add")
     public RestResponse customAdd(@RequestBody PropertyCompany propertyCompany) {
         propertyCompany.setStatus(2);

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

@@ -41,7 +41,9 @@ public class PropertyContactController {
         Page<PropertyContact> page = new Page<>(propertyContact.getPageNum(), propertyContact.getPageSize());
         IPage<PropertyContact> records = propertyContactService.page(page, new QueryWrapper<PropertyContact>()
                 .select("id", "pp_company_id", "name", "job", "telephone", "status")
-                .eq("pp_company_id", propertyContact.getPpCompanyId()));
+                .ne("status", 0)
+                .eq("pp_company_id", propertyContact.getPpCompanyId())
+        );
         if (records.getRecords().isEmpty()) {
             return RestResponse.ok(null, "9", "无数据");
         }
@@ -94,6 +96,7 @@ public class PropertyContactController {
     public RestResponse customs(@RequestBody PropertyContact propertyContact) {
         List<PropertyContact> propertyCompanies = propertyContactService.list(new QueryWrapper<PropertyContact>()
                 .select("id", "name", "telephone")
+                .ne("status", 0)
                 .eq("pp_company_id", propertyContact.getPpCompanyId()));
         if (propertyCompanies.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
@@ -109,7 +112,7 @@ public class PropertyContactController {
     public RestResponse customAdd(@RequestBody PropertyContact propertyContact) {
         propertyContact.setStatus(2);
         if (propertyContactService.save(propertyContact)) {
-            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "新增成功");
+            return RestResponse.ok(propertyContact.getId(), ApiConstants.RESULT_SUCCESS, "新增成功");
         }
         return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "新增失败");
     }

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

@@ -39,38 +39,18 @@ import java.util.Map;
 @AllArgsConstructor
 public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMapper, PropertyCompany> implements PropertyCompanyService {
     private final PropertyContactServiceImpl propertyContactService;
-    private final RestTemplate restTemplate;
 
     public RestResponse delete(Long id) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("projectStatus", 2);
-        map.put("ppCompanyId", id);
-        map.put("pageNum", 1);
-        map.put("pageSize", 1);
-        ResponseEntity<HashMap> objectResponseEntity = restTemplate.postForEntity("http://132.232.206.88:20227/project/companyProjectList", map, HashMap.class);
-        String statusCode = (String) objectResponseEntity.getBody().get("statusCode");
-        if (statusCode.equals("1")) {
-            //就不删除
+        PropertyCompany byId = this.getById(id);
+        if (byId.getStatus() == 2) {
             return RestResponse.ok(null, "0", "有正在服务的关联项目，无法删除");
-        }
-        //如果有这项，逻辑删除
-        PropertyCompany one = this.getById(id);
-        if (null == one) {
+        } else {
+            byId.setStatus(0);
+            if (this.updateById(byId)) {
+                return RestResponse.ok(null, "1", "删除成功");
+            }
             return RestResponse.ok(null, "0", "删除失败");
         }
-
-        one.setStatus(0);
-        this.updateById(one);
-        this.deleteForContact(id);
-        return RestResponse.ok(null, "1", "删除成功");
-    }
-
-    public boolean deleteForContact(Long id) {
-        PropertyContact propertyContact = new PropertyContact();
-        propertyContact.setStatus(0);
-        return propertyContactService.update(propertyContact,
-                new QueryWrapper<PropertyContact>()
-                        .eq("pp_company_id", id));
     }
 
     public RestResponse propertyCompanies(PropertyCompanyReq propertyCompany) {
@@ -80,6 +60,7 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
                 .page(page, new QueryWrapper<PropertyCompany>()
                         .select("id", "mt_company_id", "name", "mailing_address", "telephone", "status")
                         .eq("mt_company_id", propertyCompany.getMtCompanyId())
+                        .ne("status", 0)
                         .like(propertyCompany.getName() != null, "name", propertyCompany.getName())
                         .like(propertyCompany.getAddress() != null, "address", propertyCompany.getAddress())
                         .like(propertyCompany.getTelephone() != null, "telephone", propertyCompany.getTelephone())

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

@@ -1,5 +1,6 @@
 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.PropertyContact;
 import cn.com.ty.lift.enterprise.custom.dao.mapper.PropertyContactMapper;
 import cn.com.ty.lift.enterprise.custom.service.PropertyContactService;
@@ -26,32 +27,18 @@ import java.util.HashMap;
 @Transactional
 @AllArgsConstructor
 public class PropertyContactServiceImpl extends ServiceImpl<PropertyContactMapper, PropertyContact> implements PropertyContactService {
-    private final RestTemplate restTemplate;
 
     public RestResponse delete(Long id) {
         PropertyContact byId = this.getById(id);
-        if (null == byId) {
-            return RestResponse.ok(null, "9", "无数据");
-        }
-        //获取联系人在项目表中是否有还在维保中的项目信息
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("projectStatus", 2);
-        map.put("ppContactId", id);
-        map.put("ppCompanyId", byId.getPpCompanyId());
-        map.put("pageNum", 1);
-        map.put("pageSize", 1);
-        ResponseEntity<HashMap> objectResponseEntity = restTemplate.postForEntity("http://132.232.206.88:20227/project/companyProjectList", map, HashMap.class);
-        String statusCode = (String) objectResponseEntity.getBody().get("statusCode");
-        //还有维保的项目就不能删除联系人
-        if (statusCode.equals("1")) {
-            //就不删除
+        if (byId.getStatus() == 2) {
             return RestResponse.ok(null, "0", "有正在服务的关联项目，无法删除");
-        }
-        byId.setStatus(0);
-        if (this.update(byId, new QueryWrapper<PropertyContact>().eq("id", byId.getId()))) {
-            return RestResponse.ok(null, "1", "删除成功");
         } else {
-            return RestResponse.ok(null, "0", "删除失败");
+            byId.setStatus(0);
+            if (this.updateById(byId)) {
+                return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "删除成功");
+            } else {
+                return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "删除失败");
+            }
         }
     }
 }

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.enterprise.organization.controller;
 
+import cn.com.ty.lift.enterprise.organization.dao.entity.Project;
 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;
@@ -16,7 +17,12 @@ public class OrganizationController {
     private final OrganizationService organizationService;
 
     @PostMapping("/list")
-    public RestResponse test(@RequestBody OrganizationReq req){
+    public RestResponse list(@RequestBody OrganizationReq req) {
         return organizationService.organization(req);
     }
+
+    @PostMapping("/user")
+    public RestResponse user(@RequestBody Project project) {
+        return organizationService.users(project);
+    }
 }

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

@@ -6,8 +6,6 @@ import lombok.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/dao/mapper/ProjectMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author wang-hai-cheng
  * @since 2019-12-13
  */
-public interface ProjectMapper extends BaseMapper<Project> {
+public interface OrganizationMapper extends BaseMapper<Project> {
 
     @Select("select distinct province from project where mt_company_id = ${mtCompanyId}")
     List<HashMap<String, String>> provinces(@Param("mtCompanyId") Long mtCompanyId);
@@ -29,4 +29,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     @Select("select id,project_name projectName,num from project where mt_company_id = ${mtCompanyId} and district=#{district}")
     List<HashMap<String, String>> projects(@Param("mtCompanyId") Long mtCompanyId, @Param("district") String district);
+
+    @Select("select u.avatar_url avatar,u.name name, p.user_role role,u.mobile mobile,p.is_monitor monitor from project_user p left join user_info u on p.user_id = u.user_id where p.project_id = #{projectId} and (p.user_role in (13, 14, 15, 16) or p.is_monitor = 1)")
+    List<HashMap<String, Object>> users(@Param("projectId") Long projectId);
 }

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

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.organization.service;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.enterprise.organization.dao.entity.Project;
 import cn.com.ty.lift.enterprise.organization.dao.entity.model.OrganizationReq;
 import cn.com.ty.lift.enterprise.organization.service.impl.ProjectServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -21,6 +22,7 @@ public class OrganizationService {
      */
     public RestResponse organization(OrganizationReq req) {
         List<HashMap<String, String>> areas;
+        List<HashMap<String, String>> areaChild;
         HashMap<String, Object> result;
         if (req.getDistrict() != null) {
             List<HashMap<String, String>> projects = projectService.getBaseMapper().projects(req.getMtCompanyId(), req.getDistrict());
@@ -38,6 +40,9 @@ public class OrganizationService {
             areas = projectService.getBaseMapper().cities(req.getMtCompanyId(), req.getProvince());
         } else {
             areas = projectService.getBaseMapper().provinces(req.getMtCompanyId());
+            if (areas.isEmpty()) {
+                return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+            }
         }
         if (areas.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
@@ -48,4 +53,37 @@ public class OrganizationService {
         result.put("areas", areas);
         return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
+
+    public RestResponse users(Project project) {
+        List<HashMap<String, Object>> projectUsers = projectService.getBaseMapper().users(project.getId());
+        ArrayList<HashMap<String, Object>> deleteList = new ArrayList<>();
+        if (projectUsers.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        for (HashMap<String, Object> projectUser : projectUsers) {
+            Object monitor = projectUser.get("monitor");
+            Object role = projectUser.get("role");
+            if (monitor != null && monitor.equals("1")) {
+                projectUser.replace("monitor", "维保班长");
+            }
+            if (role != null) {
+                switch (role.toString()) {
+                    case "13":
+                        projectUser.replace("role", "维保工");
+                        break;
+                    case "14":
+                        projectUser.replace("role", "省级经理");
+                        break;
+                    case "15":
+                        projectUser.replace("role", "市级经理");
+                        break;
+                    case "16":
+                        projectUser.replace("role", "文员");
+                        break;
+                }
+            }
+        }
+        projectUsers.removeAll(deleteList);
+        return RestResponse.ok(projectUsers, ApiConstants.RESULT_SUCCESS, "查询成功");
+    }
 }

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

@@ -1,7 +1,7 @@
 package cn.com.ty.lift.enterprise.organization.service.impl;
 
 import cn.com.ty.lift.enterprise.organization.dao.entity.Project;
-import cn.com.ty.lift.enterprise.organization.dao.mapper.ProjectMapper;
+import cn.com.ty.lift.enterprise.organization.dao.mapper.OrganizationMapper;
 import cn.com.ty.lift.enterprise.organization.service.ProjectService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2019-12-13
  */
 @Service
-public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
+public class ProjectServiceImpl extends ServiceImpl<OrganizationMapper, Project> implements ProjectService {
 
 }

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.enterprise.region.dao.mapper;
 
 import cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 /**
  * <p>
  * 区域表 Mapper 接口
@@ -11,5 +12,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2019-12-09
  */
 public interface RegionMapper extends BaseMapper<Region> {
-
-}
+}

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

@@ -7,10 +7,13 @@ 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.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -27,29 +30,37 @@ import java.util.Map;
 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();
+    //分页区域列表
+    public RestResponse regions(RegionReq req) {
+        long pageNum = (req.getPageNum() - 1) * req.getPageSize();
+        long pageSize = req.getPageSize();
+        Page<Map<String, Object>> page = new Page<>(req.getPageNum(), req.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;
+                "r.id, r.area_code areaCode, r.province_code provinceCode, r.city_code cityCode, r.area_name areaName, r.remark, u.name",
+                "region r left join user_info u on r.user_id = u.user_id",
+                "where r.mt_company_id =" + req.getMtCompanyId() + " limit " + pageNum + "," + pageSize);
+        //如果没有区域
+        if (regions.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
+        }
+        List<Map<String, Object>> projects = mapper
+                .list("region_id,num", "project", "");
+        List<Map<String, Object>> area_code = mapper
+                .list("code,name", "area_code", "");
+        int projectNum = 0;
         Integer num = 0;
         //遍历区域列表
         if (regions.isEmpty()) {
-            return RestResponse.ok(null,ApiConstants.RESULT_NO_DATA,"无数据");
+            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"))) {
+                if (region.get("provinceCode").equals(area.get("code"))) {
                     region.put("provinceName", area.get("name"));
                 }
-                if (region.get("city_code").equals(area.get("code"))) {
+                if (region.get("cityCode").equals(area.get("code"))) {
                     region.put("cityName", area.get("name"));
                 }
             }
@@ -58,29 +69,29 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             Object id = region.get("id");
             for (Map<String, Object> project : projects) {
                 if (project.get("region_id").equals(id)) {
-                    count += 1;
+                    projectNum += 1;
                     num += (Integer) project.get("num");
                 }
             }
-            region.put("project_num", count);
+            region.put("project_num", projectNum);
             region.put("num", num);
-            count = 0;
+            projectNum = 0;
             num = 0;
         }
-
+        //设置分页对象的属性
+        int count = this.getBaseMapper().selectCount(new QueryWrapper<Region>()
+                .eq("mt_company_id", req.getMtCompanyId()));
+        page.setRecords(regions);
+        page.setTotal(count);
+        page.setPages(count / pageSize);
         //封装分页
         //待完成
-
-        System.out.println(regions);
-        if (regions.isEmpty()) {
-            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
-        }
-        return RestResponse.ok(regions, ApiConstants.RESULT_SUCCESS, "查询成功");
+        return RestResponse.ok(page, 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 (regionId.get("count").equals(0L)) {
             if (this.removeById(region.getId())) {
                 return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "删除成功");
             }

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

@@ -21,19 +21,23 @@ import java.util.List;
 @AllArgsConstructor
 public class FaqController {
     private final FaqServiceImpl faqService;
+
     /**
-         * @description 获取分类及问题列表
-         * @date 2019/12/13 10:11
-         * @param
-         * @return
-         */
+     * @param
+     * @return
+     * @description 获取分类及问题列表
+     * @date 2019/12/13 10:11
+     */
     @PostMapping("/child")
-    public RestResponse aa(){
-        List<Faq> faqs = faqService.list(new QueryWrapper<Faq>().eq("type", 1).or().eq("type", 2));
+    public RestResponse child() {
+        List<Faq> faqs = faqService.list(new QueryWrapper<Faq>()
+                .eq("type", 1)
+                .or()
+                .eq("type", 2));
         if (faqs.isEmpty()) {
-            return RestResponse.ok(null,ApiConstants.RESULT_NO_DATA,"无数据");
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "无数据");
         }
-        return RestResponse.ok(faqs,ApiConstants.RESULT_SUCCESS,"查询成功");
+        return RestResponse.ok(faqs, ApiConstants.RESULT_SUCCESS, "查询成功");
     }
 
     @PostMapping("/list")
@@ -67,9 +71,9 @@ public class FaqController {
      */
     public RestResponse updateOne(@RequestBody Faq faq) {
         if (faqService.updateById(faq)) {
-            return RestResponse.ok(null, "1", "更新成功");
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "更新成功");
         }
-        return RestResponse.ok(null, "0", "更新失败");
+        return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "更新失败");
     }
 
     @PostMapping("/delete")

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

@@ -59,10 +59,8 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
     public RestResponse delete(Long id) {
         List<Long> ids = new ArrayList<>();
         List<Faq> faqs = this.list(new QueryWrapper<Faq>().select("id", "parent_id"));
-
         this.ids(id, faqs, ids);
         ids.add(id);
-
         if (this.removeByIds(ids)) {
             return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "删除成功");
         }
@@ -89,19 +87,24 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
     public RestResponse serial(Long id, Integer type) {
         Faq byId = this.getById(id);
         if (byId == null) {
-            return RestResponse.ok(null, "0", "此id不存在");
+            return RestResponse.ok(null, ApiConstants.RESULT_ERROR, "此id不存在");
         }
+
         List<Faq> faqs;
         if (type == 1) {
-            faqs = this.list(new QueryWrapper<Faq>().eq("type", byId.getType()).eq("parent_id", byId.getParentId()).orderByDesc("serial"));
+            faqs = this.list(new QueryWrapper<Faq>().eq("type", byId.getType())
+                    .eq("parent_id", byId.getParentId())
+                    .orderByDesc("serial"));
         } else {
-            faqs = this.list(new QueryWrapper<Faq>().eq("type", byId.getType()).eq("parent_id", byId.getParentId()).orderByAsc(("serial")));
+            faqs = this.list(new QueryWrapper<Faq>().eq("type", byId.getType())
+                    .eq("parent_id", byId.getParentId())
+                    .orderByAsc(("serial")));
         }
 
         if (faqs.isEmpty()) {
             byId.setSerial(1);
             this.updateById(byId);
-            return RestResponse.ok(null, "1", "移动成功");
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "移动成功");
         }
 
         Faq faq;
@@ -121,14 +124,14 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
         }
 
         if (i == faqs.size()) {
-            return RestResponse.ok(null, "1", "移动成功");
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "移动成功");
         }
 
         faq = faqs.get(i);
 
 
         if (byId.getId().equals(faq.getId())) {
-            return RestResponse.ok(null, "1", "移动成功");
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "移动成功");
         }
 
         Integer serial = faq.getSerial();
@@ -138,6 +141,6 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
         this.updateById(faq);
         this.updateById(byId);
 
-        return RestResponse.ok(null, "1", "移动成功");
+        return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "移动成功");
     }
 }

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

@@ -43,6 +43,12 @@ public class GlobalSet implements Serializable {
     @TableField("value")
     private String value;
 
+    /**
+     * 设置编码号
+     */
+    @TableField("code")
+    private String code;
+
     /**
      * 描述
      */