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

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/controller/EvaluationController.java

@@ -4,6 +4,8 @@ package cn.com.ty.lift.business.evaluation.controller;
 import cn.com.ty.lift.business.evaluation.dao.entity.Evaluation;
 import cn.com.ty.lift.business.evaluation.service.EvaluationService;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,26 +22,39 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/evaluation")
+@AllArgsConstructor
 public class EvaluationController {
 
-    @Autowired
-    private EvaluationService evaluationService;
+    private final EvaluationService evaluationService;
 
     /**
-     * @param
-     * @return
+     * @param entity 维保，急修记录
+     * @return RestResponse
      * @description 保存评价信息
      * @date 2019-12-31 15:46
      */
     @PostMapping("/save")
     public RestResponse save(@RequestBody Evaluation entity) {
-        if(null == entity){
-            return RestResponse.failParam();
-        }
-        boolean result = evaluationService.save(entity);
-        if(result){
-            return RestResponse.success(result);
+        if (evaluationService.save(entity)) {
+            return RestResponse.success(null, "成功");
         }
         return RestResponse.fail();
     }
+
+    /**
+     * 查看评价信息
+     *
+     * @param entity 维保，急修记录id
+     * @return RestResponse
+     * @date 2020-01-11 09:51
+     */
+    @PostMapping
+    public RestResponse evaluation(@RequestBody Evaluation entity) {
+        Evaluation one = evaluationService.getOne(new QueryWrapper<Evaluation>()
+                .eq(entity.getRecordId() != null, "record_id", entity.getRecordId()));
+        if (null == one) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(one);
+    }
 }

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

@@ -24,38 +24,38 @@ import java.util.List;
 public class PropertyCompanyController {
     private final PropertyCompanyServiceImpl propertyCompanyService;
 
+    @PostMapping("/list")
+    /**
+     * @description 根据条件查询客户列表
+     * @date 2019/12/3 8:51
+     * @param [客户名称或客户地址或客户邮寄地址或客户联系方式,页码,页大小,维保公司id]
+     * @return RestResponse
+     */
+    public RestResponse propertyCompanies(@RequestBody PropertyCompanyReq propertyCompany) {
+        return propertyCompanyService.propertyCompanies(propertyCompany);
+    }
+
     @GetMapping("/{id}")
     /**
      * @description 根据id获取客户详细信息
      * @date 2019/11/27 11:36
      * @param [客户id]
-     * @return cn.com.xwy.boot.web.dto.RestResponse
+     * @return RestResponse
      */
     public RestResponse propertyCompany(@PathVariable Long id) {
         PropertyCompany byId = propertyCompanyService.getById(id);
         if (byId == null) {
-            return RestResponse.failParam();
+            return RestResponse.success();
         }
         return RestResponse.success(byId);
     }
 
-    @PostMapping("/list")
-    /**
-     * @description 根据条件查询客户列表
-     * @date 2019/12/3 8:51
-     * @param [客户名称或客户地址或客户邮寄地址或客户联系方式,页码,页大小,维保公司id]
-     * @return cn.com.xwy.boot.web.dto.RestResponse
-     */
-    public RestResponse propertyCompanies(@RequestBody PropertyCompanyReq propertyCompany) {
-        return propertyCompanyService.propertyCompanies(propertyCompany);
-    }
-
     @PostMapping("/add")
     /**
      * @description 新增客户
      * @date 2019/11/27 11:45
      * @param [客户]
-     * @return cn.com.xwy.boot.web.dto.RestResponse
+     * @return RestResponse
      */
     public RestResponse add(@RequestBody PropertyCompanyAndPropertyContactReq req) {
         return propertyCompanyService.saveAll(req);
@@ -66,7 +66,7 @@ public class PropertyCompanyController {
      * @description 更新客户信息
      * @date 2019/11/27 11:45
      * @param [客户]
-     * @return cn.com.xwy.boot.web.dto.RestResponse
+     * @return RestResponse
      */
     public RestResponse update(@RequestBody PropertyCompany propertyCompany) {
         if (propertyCompanyService.updateById(propertyCompany)) {

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -66,13 +66,16 @@ public class MaintenanceOptionController {
     }
 
     /**
-     * @param
+     * @param option 维保项信息
      * @return RestResponse
      * @description 新增维保项
      * @date 2019/12/19 9:20
      */
     @PostMapping("/add")
     public RestResponse add(@RequestBody MaintenanceOption option) {
+        if (option.getMtCompanyId().equals(0L)) {
+            option.setEdit(0);
+        }
         if (optionService.save(option)) {
             return RestResponse.success(option.getId(), "成功");
         }
@@ -80,15 +83,15 @@ public class MaintenanceOptionController {
     }
 
     /**
-     * @param
-     * @return
+     * @param option 维保项信息
+     * @return RestResponse
      * @description 判断是否默认维保项，不是默认维保项才可以更新
      * @date 2019/12/19 10:03
      */
     @PostMapping("/modify")
     public RestResponse modify(@RequestBody MaintenanceOption option) {
         MaintenanceOption byId = optionService.getById(option.getId());
-        if (byId.getMtCompanyId().equals(0L)) {
+        if (byId.getEdit() == 0) {
             return RestResponse.fail("默认维保项无法编辑");
         }
         if (optionService.updateById(option)) {
@@ -99,14 +102,14 @@ public class MaintenanceOptionController {
 
     /**
      * @param option 维保项id
-     * @return
+     * @return RestResponse
      * @description 判断是否是默认维保项，不是默认的维保项才可以删除
      * @date 2019/12/19 9:20
      */
     @PostMapping("/delete")
     public RestResponse delete(@RequestBody MaintenanceOption option) {
         MaintenanceOption byId = optionService.getById(option.getId());
-        if (byId.getMtCompanyId().equals(0L)) {
+        if (byId.getEdit() == 0) {
             return RestResponse.fail("默认维保项无法删除");
         }
         if (optionService.removeById(option.getId())) {

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/dao/entity/MaintenanceOption.java

@@ -55,13 +55,13 @@ public class MaintenanceOption implements Serializable {
     private Integer type;
 
     /**
-     * 电梯类型  '1.直梯，2.扶梯 3:液压梯'
+     * 电梯类型  '(1乘客梯/载货电梯 2液压梯 3扶梯/人行道 4杂物梯)'
      */
     @TableField("lift_type")
     private Integer liftType;
 
     /**
-     * 分类
+     * 分类(1机房 2轿顶 3轿厢 4层门 5底坑井道)
      */
     @TableField("sort")
     private Integer sort;

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

@@ -156,62 +156,4 @@ public class OrganizationService {
         }
         return RestResponse.success(ps,"成功");
     }
-
-
-//    public Map<String, List> organizationTree1(Long mtCompanyId) {
-//        Map<String, List> ps = new HashMap<>();
-//        Map<String, List> cs = new HashMap<>();
-//        Map<String, List> ds = new HashMap<>();
-//
-//        List<Project> projects = projectService.list(new QueryWrapper<Project>()
-//                .select("id", "project_name", "province", "city", "district", "num")
-//                .eq("mt_company_id", mtCompanyId)
-//        );
-//
-//        for (Project project : projects) {
-//            if (project.getProjectName() == null || project.getDistrict() == null || project.getCity() == null || project.getProvince() == null)
-//                continue;
-//
-//            String district = project.getDistrict();
-//            String city = project.getCity();
-//            String province = project.getProvince();
-//
-//            //获取区列表和区下的项目
-//            if (!ds.containsKey(district)) {
-//                ds.put(district, new ArrayList());
-//            }
-//            if (ds.get(district) instanceof ArrayList) {
-//                ds.get(district).add(project);
-//            }
-//
-//            //获取市列表
-//            if (!cs.containsKey(city)) {
-//                cs.put(city, new ArrayList());
-//            }
-//
-//            //获取省列表
-//            if (!ps.containsKey(province)) {
-//                ps.put(province, new ArrayList());
-//            }
-//        }
-//
-//        for (Map.Entry<String, List> entry : ds.entrySet()) {
-//            for (Project project : projects) {
-//                if (entry.getKey().equals(project.getDistrict())) {
-//                    cs.get(project.getCity()).add(entry);
-//                    break;
-//                }
-//            }
-//        }
-//
-//        for (Map.Entry<String, List> entry : cs.entrySet()) {
-//            for (Project project : projects) {
-//                if (entry.getKey().equals(project.getCity())) {
-//                    ps.get(project.getProvince()).add(entry);
-//                    break;
-//                }
-//            }
-//        }
-//        return ps;
-//    }
 }

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

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-
 /**
  * <p>
  * 区域表 前端控制器
@@ -31,6 +30,15 @@ public class RegionController {
         return regionService.regions(regionReq);
     }
 
+    @PostMapping
+    public RestResponse region(@RequestBody Region region) {
+        Region byId = regionService.getById(region.getId());
+        if (null == byId) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(byId, "成功");
+    }
+
     @PostMapping("/add")
     public RestResponse add(@RequestBody Region region) {
         if (regionService.save(region)) {
@@ -39,11 +47,6 @@ public class RegionController {
         return RestResponse.fail();
     }
 
-    @PostMapping("/delete")
-    public RestResponse delete(@RequestBody Region region) {
-        return regionService.delete(region);
-    }
-
     @PostMapping("/update")
     public RestResponse update(@RequestBody Region region) {
         if (regionService.updateById(region)) {
@@ -52,13 +55,9 @@ public class RegionController {
         return RestResponse.fail();
     }
 
-    @PostMapping
-    public RestResponse region(@RequestBody Region region) {
-        Region byId = regionService.getById(region.getId());
-        if (null == byId) {
-            return RestResponse.success();
-        }
-        return RestResponse.success(byId, "成功");
+    @PostMapping("/delete")
+    public RestResponse delete(@RequestBody Region region) {
+        return regionService.delete(region);
     }
 
     /**
@@ -79,8 +78,8 @@ public class RegionController {
     }
 
     /**
-     * @param
-     * @return
+     * @param region 区域id
+     * @return RestResponse
      * @description 项目模块，查询区列表
      * @date 2019/12/17 10:34
      */
@@ -100,8 +99,8 @@ public class RegionController {
     }
 
     /**
-     * @param
-     * @return
+     * @param region
+     * @return RestResponse
      * @description 区域属于的省市名，省市编码
      * @date 2019/12/19 15:15
      */

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

@@ -1,15 +1,13 @@
 package cn.com.ty.lift.enterprise.region.dao.entity.model;
 
-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 cn.com.ty.lift.enterprise.region.dao.entity.Region;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>
@@ -22,60 +20,9 @@ import java.util.List;
 @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")
+public class RegionReq extends Region implements Serializable{
+    private Long pageNum;
+    private Long pageSize;
     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 String clerk;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
 }
 

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

@@ -21,8 +21,8 @@ public interface RegionMapper extends BaseMapper<Region> {
     @Select("select city_code cityCode, province_code provinceCode from region where id = #{id}")
     List<Map<String, Object>> selectProjectRegions(@Param("id") Long id);
 
-    @Select("select r.id, r.area_code areaCode, r.province_code provinceCode, r.city_code cityCode, r.area_name areaName, r.remark, u.name from region r left join user_info u on r.user_id = u.user_id where r.mt_company_id = ${mtCompanyId} limit ${pageNum},${pageSize}")
-    List<Map<String, Object>> selectRegions(@Param("mtCompanyId") Long mtCompanyId, @Param("pageNum") Long pageNum, @Param("pageSize") Long pageSize);
+    @Select("select user_id userId,name from user_info")
+    List<Map<String,Object>> selectUserInfo();
 
     @Select("select region_id regionId,num from project")
     List<Map<String, Object>> selectProjects();

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

@@ -7,6 +7,7 @@ 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.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
@@ -31,30 +32,45 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
 
     //分页区域列表
     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(), pageSize);
         //获取维保团队的区域列表
-        List<Map<String, Object>> regions = this.getBaseMapper().selectRegions(req.getMtCompanyId(), pageNum, pageSize);
+        System.out.println(req);
+        System.out.println(this.page(new Page<>(req.getPageNum(), req.getPageSize())).getRecords());
+        IPage<Map<String, Object>> regions = this.pageMaps(new Page<>(req.getPageNum(), req.getPageSize()),
+                new QueryWrapper<Region>()
+                .eq("mt_company_id", req.getMtCompanyId()));
+
+        List<Map<String, Object>> records = regions.getRecords();
         //如果没有区域
-        if (regions.isEmpty()) {
+        if (records.isEmpty()) {
             return RestResponse.success();
         }
-        List<Map<String, Object>> projects = this.getBaseMapper().selectProjects();
-        List<Map<String, Object>> areaCodes = this.getBaseMapper().selectAreaCodes();
+        List<Map<String, Object>> projects = baseMapper.selectProjects();
+        List<Map<String, Object>> areaCodes = baseMapper.selectAreaCodes();
         int projectNum = 0;
-        Integer num = 0;
+        int num = 0;
         //遍历区域列表
-        if (regions.isEmpty()) {
+        if (records.isEmpty()) {
             return RestResponse.success();
         }
-        for (Map<String, Object> region : regions) {
-            //遍历省市列表，将省市的id转化为name
+        for (Map<String, Object> region : records) {
+            //遍历用户列表，将user_id替换为name
+            List<Map<String, Object>> userInfos = baseMapper.selectUserInfo();
+            if (userInfos.isEmpty()) {
+                region.put("name", "无");
+            } else {
+                userInfos.forEach(userInfo -> {
+                    if (null != userInfo.get("id") && userInfo.get("id").equals(region.get("userId"))) {
+                        region.put("name", userInfo.get("name"));
+                    }
+                });
+            }
+
+            //遍历省市列表，将省市的code转化为name
             for (Map<String, Object> area : areaCodes) {
-                if (region.get("provinceCode").equals(area.get("code"))) {
+                if (null != region.get("provinceCode") && region.get("provinceCode").equals(area.get("code"))) {
                     region.put("provinceName", area.get("name"));
                 }
-                if (region.get("cityCode").equals(area.get("code"))) {
+                if (null != region.get("cityCode") && region.get("cityCode").equals(area.get("code"))) {
                     region.put("cityName", area.get("name"));
                 }
             }
@@ -62,9 +78,14 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             //遍历项目列表，获取区域下的项目个数和区域下的总电梯数
             Object id = region.get("id");
             for (Map<String, Object> project : projects) {
-                if (project.get("regionId").equals(id)) {
+                if (null != project.get("regionId")) {
+                    if (project.get("regionId").equals(id)) {
+                        projectNum += 1;
+                        num += (Integer) project.get("num");
+                    }
+                } else {
                     projectNum += 1;
-                    num += (Integer) project.get("num");
+                    num = 0;
                 }
             }
             region.put("projectNum", projectNum);
@@ -72,19 +93,13 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             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);
-        return RestResponse.success(page, "成功");
+        return RestResponse.success(regions, "成功");
     }
 
     //删除区域，如果区域下没有关联项目
     public RestResponse delete(Region region) {
-        Map<String, Object> regionId = this.baseMapper.selectProjectCount(region.getId());
-        if (regionId.get("count").equals(0L)) {
+        Map<String, Object> projectCount = baseMapper.selectProjectCount(region.getId());
+        if (null != projectCount.get("count") && projectCount.get("count").equals(0L)) {
             if (this.removeById(region.getId())) {
                 return RestResponse.success(null, "成功");
             }
@@ -102,11 +117,11 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         for (Map<String, Object> region : regions) {
             for (AreaCode area : areas) {
                 //如果区域的城市code等于区中的code，put名字到区域中
-                if (region.get("cityCode").equals(area.getCode())) {
+                if (null != region.get("cityCode") && region.get("cityCode").equals(area.getCode())) {
                     region.put("city", area.getName());
                 }
                 //如果区域的省code等于区中的code，put名字到区域中
-                if (region.get("provinceCode").equals(area.getCode())) {
+                if (null != region.get("provinceCode") && region.get("provinceCode").equals(area.getCode())) {
                     region.put("province", area.getName());
                 }
             }
@@ -120,19 +135,19 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         if (region == null) {
             return RestResponse.success();
         }
-        HashMap<String, Object> data = new HashMap<>();
-        List<Map<String, Object>> regionUser = this.baseMapper.selectRegionMember(region.getUserId().toString());
-        if (region.getClerk() != null && !region.getClerk().equals("-1")) {
-            List<Map<String, Object>> regionClerk = this.baseMapper.selectRegionMember(region.getClerk());
-            data.put("regionClerk", regionClerk);
+        HashMap<String, Object> result = new HashMap<>();
+        List<Map<String, Object>> regionUser = baseMapper.selectRegionMember(region.getUserId().toString());
+        if (null != region.getClerk() && !region.getClerk().equals("-1")) {
+            List<Map<String, Object>> regionClerk = baseMapper.selectRegionMember(region.getClerk());
+            result.put("regionClerk", regionClerk);
         } else {
-            data.put("regionClerk", null);
+            result.put("regionClerk", null);
         }
-        if (regionUser.get(0) == null) {
-            data.put("regionUser", regionUser);
+        if (regionUser.isEmpty()) {
+            result.put("regionUser", null);
         } else {
-            data.put("regionUser", regionUser.get(0).get("name"));
+            result.put("regionUser", regionUser.get(0).get("name"));
         }
-        return RestResponse.success(data, "查询成功");
+        return RestResponse.success(result, "查询成功");
     }
 }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/controller/QuanNewsController.java

@@ -93,8 +93,4 @@ public class QuanNewsController {
         return quanNewsService.like(req);
     }
 
-    @PostMapping("/upFile")
-    public RestResponse upFile(@RequestParam MultipartFile file) {
-        return quanNewsService.upFile(file);
-    }
 }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/service/impl/QuanNewsServiceImpl.java

@@ -8,16 +8,16 @@ import cn.com.ty.lift.quan.news.service.QuanNewsService;
 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.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -138,10 +138,6 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
     void newsAddLookAndLike(List<Map<String, Object>> records, Map<Object, Object> lookTimes, Map<Object, Object> likeUsers) {
         for (Map<String, Object> record : records) {
             Object id = record.get("id");
-            if (null != record.get("video_name")) {
-                //fixme 新闻视频的路径
-                record.put("video_name", "https://temp15827479607.oss-cn-beijing.aliyuncs.com/" + record.get("video_name"));
-            }
             //如果没有浏览量
             if (lookTimes.isEmpty()) {
                 record.put("lookNum", "0");
@@ -254,29 +250,6 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         }
     }
 
-    //新增、更新新闻时上传文件
-    public RestResponse upFile(MultipartFile file) {
-        String originalFilename = file.getOriginalFilename();
-        if (originalFilename != null && originalFilename.contains(".")) {
-            String fileName = "quan/news/video/" + IdWorker.getIdStr()
-                    + "."
-                    + originalFilename.substring(file.getOriginalFilename().lastIndexOf(".") + 1);
-            //阿里云OSS操作结果
-            boolean result = false;
-            try {
-                result = new AliyunOSSUtil().putObject(file.getBytes(), fileName);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            //如果保存成功
-            if (result) {
-                return RestResponse.success(fileName);
-            }
-            return RestResponse.fail();
-        }
-        return RestResponse.failParam();
-    }
-
     public RestResponse like(QuanNewsReq req) {
         String uid = req.getUserId().toString();
         String id = req.getId().toString();
@@ -318,8 +291,6 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
             }
             byId.put("lookNum", lookNum);
             byId.put("isLike", isLike);
-            //fixme 新闻视频的路径
-            byId.put("videoName", "https://temp15827479607.oss-cn-beijing.aliyuncs.com/" + byId.get("videoName"));
             return RestResponse.success(byId, "成功");
         } else {
             return RestResponse.success();

lift-quan-service/src/main/resources/application.yml

@@ -14,8 +14,8 @@ spring:
     multipart:
       enabled: true
       file-size-threshold: 0
-      max-file-size: 500MB
-      max-request-size: 500MB
+      max-file-size: 100MB
+      max-request-size: 100MB
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0

lift-system-service/src/main/java/cn/com/ty/lift/system/banner/controller/BannerImageController.java

@@ -41,9 +41,4 @@ public class BannerImageController {
     public RestResponse delete(@RequestBody BannerImage bannerImage) {
         return bannerService.delete(bannerImage);
     }
-
-    @PostMapping("/upFile")
-    public RestResponse upFile(@RequestParam MultipartFile file) {
-        return bannerService.upFile(file);
-    }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/banner/service/impl/BannerImageServiceImpl.java

@@ -6,12 +6,9 @@ import cn.com.ty.lift.system.banner.dao.mapper.BannerImageMapper;
 import cn.com.ty.lift.system.banner.service.BannerImageService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -25,31 +22,11 @@ import java.util.List;
 @Service
 public class BannerImageServiceImpl extends ServiceImpl<BannerImageMapper, BannerImage> implements BannerImageService {
 
-    public RestResponse upFile(MultipartFile file) {
-        String originalFilename = file.getOriginalFilename();
-        if (null != originalFilename && originalFilename.contains(".")) {
-            String fileName = "banner/image/" + IdWorker.getIdStr()
-                    + "."
-                    + originalFilename.substring(file.getOriginalFilename().lastIndexOf(".") + 1);
-            //阿里云OSS操作结果
-            boolean result = false;
-            try {
-                result = new AliyunOSSUtil().putObject(file.getBytes(), fileName);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            if (result) {
-                return RestResponse.success(fileName);
-            }
-            return RestResponse.fail();
-        }
-        return RestResponse.failParam();
-    }
-
     public RestResponse modify(BannerImage bannerImage) {
         if (null != bannerImage.getId()) {
             BannerImage byId = this.getById(bannerImage.getId());
             if (null != byId && null != byId.getImage()) {
+                //fixme 删除图片
                 AliyunOSSUtil.me().deleteObject(byId.getImage());
             }
         }
@@ -77,9 +54,6 @@ public class BannerImageServiceImpl extends ServiceImpl<BannerImageMapper, Banne
         if (banners.isEmpty()) {
             return RestResponse.success();
         }
-        for (BannerImage bannerImage : banners) {
-            bannerImage.setImage("https://temp15827479607.oss-cn-beijing.aliyuncs.com/" + bannerImage.getImage());
-        }
         return RestResponse.success(banners);
     }
 }

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

@@ -43,7 +43,7 @@ public class FaqController {
      * @description 查询分类或问题或答案
      * @date 2019/11/27 10:19
      * @param []
-     * @return cn.com.xwy.boot.web.dto.RestResponse
+     * @return RestResponse
      */
     public RestResponse one(@RequestBody Faq faq) {
         return faqService.getFaqs(faq);
@@ -54,7 +54,7 @@ public class FaqController {
      * @description 新增分类或问题或答案
      * @date 2019/11/27 10:47
      * @param [faq]
-     * @return cn.com.xwy.boot.web.dto.RestResponse
+     * @return RestResponse
      */
     public RestResponse add(@RequestBody Faq faq) {
         return faqService.add(faq);
@@ -65,7 +65,7 @@ public class FaqController {
      * @description 更新分类名或问题标题或答案内容, 都是title参数, description是对此id信息的描述
      * @date 2019/11/27 10:51
      * @param [faq]
-     * @return cn.com.xwy.boot.web.dto.RestResponse
+     * @return RestResponse
      */
     public RestResponse updateOne(@RequestBody Faq faq) {
         if (faqService.updateById(faq)) {
@@ -79,7 +79,7 @@ public class FaqController {
      * @description 根据id删除此id下的分类和问答
      * @date 2019/11/27 10:51
      * @param [id]
-     * @return cn.com.xwy.boot.web.dto.RestResponse
+     * @return RestResponse
      */
     public RestResponse delete(@RequestBody Faq faq) {
         return faqService.delete(faq.getId());
@@ -106,5 +106,4 @@ public class FaqController {
     public RestResponse down(@RequestBody Faq faq) {
         return faqService.serial(faq.getId(), 0);
     }
-
 }

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

@@ -35,7 +35,7 @@ public class GlobalSetController {
      * @description 获取维保公司的全局设置列表
      * @date 2019/12/13 16:23
      */
-    @PostMapping("list")
+    @PostMapping("/list")
     public RestResponse sets(@RequestBody GlobalSet globalSet) {
         List<Map<String, Object>> globalSets = globalSetService
                 .listMaps(new QueryWrapper<GlobalSet>()

lift-system-service/src/main/resources/application.yml

@@ -15,17 +15,17 @@ spring:
   profiles:
     active: dev
   datasource:
-    url: jdbc:mysql://132.232.206.88/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.46/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
-    password: ms.c88pocY/
+    password: Tyty-2020
 
 
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: 132.232.206.88 #服务器地址
+    host: 192.168.1.46    #服务器地址
     port: 6379 #端口
-    password: mdx12358 #验证密码
+    password: newtyty    #验证密码
     jedis:
       pool:
         max-active: 8 #最大连接数