Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

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

@@ -32,21 +32,21 @@ public class MaintenanceOptionController {
     private final MaintenanceOptionServiceImpl optionService;
 
     /**
-     * 分页获取维保项列表
-     *
      * @param req 页码 页大小
      * @return cn.com.xwy.boot.web.dto.RestResponse
-     * @since 2019/12/19 9:21
+     * @description 分页获取维保项列表
+     * @date 2019/12/19 9:21
      */
     @PostMapping("/list")
     public RestResponse list(@RequestBody OptionReq req) {
         IPage<MaintenanceOption> page = optionService.page(
                 new Page<>(req.getPageNum(), req.getPageSize()), new QueryWrapper<MaintenanceOption>()
-                        //0是系统默认维保项
-                        .in("mt_company_id", 0L, req.getMtCompanyId())
+                        //10086是平台的团队id
+                        .in("mt_company_id", 10086L, req.getMtCompanyId())
+                        //留1是为了兼容以前数据,2.0使用的status版本1 ,    3.0使用的status版本2
+                        .eq("status", 2)
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftType() != null, "lift_type", req.getLiftType())
-                        .eq("status",2)
                         .orderByDesc("mt_company_id")
         );
         if (page.getRecords().isEmpty()) {
@@ -58,37 +58,42 @@ public class MaintenanceOptionController {
     /**
      * app端维保项列表
      *
-     * @param request
+     * @param req
      * @return RestResponse
      */
     @PostMapping("/options")
-    public RestResponse options(@RequestBody OptionReq request) {
-        Integer liftType = request.getLiftType();
+    public RestResponse options(@RequestBody OptionReq req) {
+        Integer liftType = req.getLiftType();
         String sort = null;
         if (liftType.equals(3)) {
             sort = "-1,1";
         }
         List<MaintenanceOption> options = optionService.list(
                 new QueryWrapper<MaintenanceOption>()
-                        //0是系统默认维保项
-                        .in("mt_company_id", 0L, request.getMtCompanyId())
-                        .in(request.getType() != null, "type", type(request))
-                        .eq(request.getLiftType() != null, "lift_type", request.getLiftType())
-                        .eq("status",2)
+                        //10086是平台的团队id
+                        .in("mt_company_id", 10086L, req.getMtCompanyId())
+                        //留1是为了兼容以前数据,2.0使用的status版本1 ,    3.0使用的status版本2
+                        .eq("status", 2)
+                        .in(req.getType() != null, "type", type(req))
+                        .eq(req.getLiftType() != null, "lift_type", req.getLiftType())
                         .in(sort != null, "sort", sort)
         );
+        if (options.isEmpty()) {
+            return RestResponse.success();
+        }
         return RestResponse.success(options);
     }
 
     /**
-     * 新增维保项
-     *
      * @param option 维保项信息
      * @return RestResponse
-     * @since 2019/12/19 9:20
+     * @description 新增维保项
+     * @date 2019/12/19 9:20
      */
     @PostMapping("/add")
     public RestResponse add(@RequestBody MaintenanceOption option) {
+        //留1是为了兼容以前数据,2.0使用的status版本1 ,    3.0使用的status版本2
+        option.setStatus(2);
         if (optionService.save(option)) {
             return RestResponse.success(option.getId(), "成功");
         }
@@ -96,16 +101,15 @@ public class MaintenanceOptionController {
     }
 
     /**
-     * 判断是否默认维保项，不是默认维保项才可以更新
-     *
      * @param option 维保项信息
      * @return RestResponse
-     * @since 2019/12/19 10:03
+     * @description 判断是否默认维保项，不是默认维保项才可以更新
+     * @date 2019/12/19 10:03
      */
     @PostMapping("/modify")
     public RestResponse modify(@RequestBody MaintenanceOption option) {
-        //0是系统默认维保项
-        if (option.getMtCompanyId().equals(0L)) {
+        //10086是平台的团队id
+        if (option.getMtCompanyId().equals(10086L)) {
             return RestResponse.fail("默认维保项无法编辑");
         }
         if (optionService.updateById(option)) {
@@ -115,15 +119,21 @@ public class MaintenanceOptionController {
     }
 
     /**
-     * 判断是否是默认维保项，不是默认的维保项才可以删除
-     *
      * @param option 维保项id
      * @return RestResponse
-     * @since 2019/12/19 9:20
+     * @description 判断是否是默认维保项，不是默认的维保项才可以删除
+     * @date 2019/12/19 9:20
      */
     @PostMapping("/delete")
     public RestResponse delete(@RequestBody MaintenanceOption option) {
-        return optionService.delete(option);
+        //10086是平台的团队id
+        if (option.getMtCompanyId().equals(10086L)) {
+            return RestResponse.fail("默认维保项无法删除");
+        }
+        if (optionService.removeById(option.getId())) {
+            return RestResponse.success(null, "成功");
+        }
+        return RestResponse.fail();
     }
 
     /**

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

@@ -94,6 +94,9 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
             }
             region.put("projectNum", projectNum);
             region.put("num", num);
+
+            projectNum = 0;
+            num = 0;
         }
         return RestResponse.success(regions, "成功");
     }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/dao/entity/QuanNews.java

@@ -58,8 +58,8 @@ public class QuanNews implements Serializable {
     /**
      * 视频地址
      */
-    @TableField("video_path")
-    private String videoPath;
+    @TableField("video_url")
+    private String videoUrl;
 
     /**
      * 发布时间

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

@@ -46,7 +46,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
     public RestResponse news(QuanNewsReq request) {
         Page<QuanNews> page = new Page<>(request.getPageNum(), request.getPageSize());
         IPage<Map<String, Object>> news = this.pageMaps(page, new QueryWrapper<QuanNews>()
-                .select("id", "title", "content", "top_serial topSerial", "video_path videoPath", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
+                .select("id", "title", "content", "top_serial topSerial", "video_url videoUrl", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
                 .like(null != request.getDistrict(), "district", request.getDistrict())
                 .like(null != request.getTitle(), "title", request.getTitle())
                 .eq("top_serial", "0")
@@ -60,7 +60,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         result.put("news", news);
         if (request.getHaveTops() == 1) {
             List<Map<String, Object>> topNews = this.listMaps(new QueryWrapper<QuanNews>()
-                    .select("id", "title", "content", "top_serial topSerial", "video_path videoPath", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
+                    .select("id", "title", "content", "top_serial topSerial", "video_url videoUrl", "release_id releaseId", "release_user releaseUser", "release_date releaseDate")
                     .ne("top_serial", "0")
                     .orderByAsc("top_serial"));
             //把点赞的用户数量和浏览量整入新闻字段中
@@ -155,7 +155,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
             Object id = record.get("id");
             //如果没有浏览量
             if (lookTimes.isEmpty()) {
-                record.put("lookNum", "0");
+                record.put("lookNum", 0);
             } else {
                 //遍历lookTimes，查看对应id的新闻浏览量
                 for (Map.Entry<Object, Object> entry : lookTimes.entrySet()) {
@@ -165,12 +165,12 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
                         record.put("lookNum", value);
                         break;
                     }
-                    record.put("lookNum", "0");
+                    record.put("lookNum", 0);
                 }
             }
             //如果没有用户喜爱
             if (likeUsers.isEmpty()) {
-                record.put("likeNum", "0");
+                record.put("likeNum", 0);
             } else {
                 //遍历likeUsers，查看对应id的新闻的点赞量
                 for (Map.Entry<Object, Object> entry : likeUsers.entrySet()) {
@@ -180,7 +180,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
                         record.put("likeNum", v.size());
                         break;
                     }
-                    record.put("likeNum", "0");
+                    record.put("likeNum", 0);
                 }
             }
         }