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

lift-common/src/main/java/cn.com.ty.lift.common/utils/AliyunOSSUtil.java

@@ -2,10 +2,7 @@ package cn.com.ty.lift.common.utils;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.oss.model.OSSObject;
-import com.aliyun.oss.model.OSSObjectSummary;
-import com.aliyun.oss.model.ObjectListing;
-import com.aliyun.oss.model.PutObjectRequest;
+import com.aliyun.oss.model.*;
 
 import java.io.*;
 
@@ -72,15 +69,16 @@ public class AliyunOSSUtil {
      * @description 上传文件，上传文件至OSS
      * @date 2019/11/29 10:31
      */
-    public void putObject(String bucketName,byte[] content,String objectName) {
+    public PutObjectResult putObject(String bucketName, byte[] content, String objectName) {
         // <yourObjectName>上传文件到OSS时需要指定包含文件后缀在内的完整路径，例如abc/efg/123.jpg。
 
         // 创建OSSClient实例。
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
         // 上传内容到指定的存储空间（bucketName）并保存为指定的文件名称（objectName）。
-        ossClient.putObject(bucketName, objectName, new ByteArrayInputStream(content));
+        PutObjectResult result = ossClient.putObject(bucketName, objectName, new ByteArrayInputStream(content));
         // 关闭OSSClient。
         ossClient.shutdown();
+        return result;
     }
 
     /**

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

@@ -5,8 +5,10 @@ import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
 import cn.com.ty.lift.quan.news.dao.mapper.QuanNewsMapper;
 import cn.com.ty.lift.quan.news.service.QuanNewsService;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import com.aliyun.oss.model.PutObjectResult;
 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 org.springframework.stereotype.Service;
@@ -130,13 +132,11 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         //上传视频到Oss,获取视频地址
         //获取发布人名称
         //多线程上传视频
-        new Thread(() -> {
-            try {
-                new AliyunOSSUtil().putObject("temp15827479607", videoFile.getBytes(), videoFile.getOriginalFilename());
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }).start();
+        //获取文件全名
+        if (!videoFile.isEmpty()) {
+            quanNews.setVideoPath(this.upFile(videoFile));
+        }
+
         List<QuanNews> tops;
         if (isTop != 0) {
             //获取置顶新闻列表
@@ -145,7 +145,6 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
             quanNews
                     .setReleaseId(quanNews.getReleaseId())
                     .setReleaseUser(quanNews.getReleaseUser())
-                    .setVideoPath(videoFile.getOriginalFilename())
                     .setTopSerial(1);
             //遍历排序加1
             if (!tops.isEmpty()) {
@@ -168,8 +167,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         //设置新添加新闻的数据
         quanNews
                 .setReleaseId(quanNews.getReleaseId())
-                .setReleaseUser(quanNews.getReleaseUser())
-                .setVideoPath(videoFile.getOriginalFilename());
+                .setReleaseUser(quanNews.getReleaseUser());
         if (this.save(quanNews)) {
             return RestResponse.ok(null, "1", "新增成功");
         } else {
@@ -187,16 +185,11 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         if (null == byId) {
             return RestResponse.ok(null, "0", "不存在此新闻");
         }
-
         byId.setTitle(quanNews.getTitle()).setContent(quanNews.getContent());
-        if (null != videoFile) {
-            //上传视频到Oss,获取视频地址
-            //上传视频到Oss,获取视频地址
-            //上传视频到Oss,获取视频地址
-            //上传视频到Oss,获取视频地址
-            //上传视频到Oss,获取视频地址
+
+        if (!videoFile.isEmpty()) {
             //上传视频到Oss,获取视频地址
-            byId.setVideoPath("videoPath");
+            byId.setVideoPath(this.upFile(videoFile));
         }
 
         if (this.updateById(byId)) {
@@ -225,4 +218,17 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
             return RestResponse.ok(null, "0", "删除失败");
         }
     }
+
+    private String upFile(MultipartFile videoFile) {
+        String substring = videoFile.getOriginalFilename().substring(videoFile.getOriginalFilename().lastIndexOf(".") + 1);
+        String fileName = IdWorker.getIdStr() + "." + substring;
+        new Thread(() -> {
+            try {
+                PutObjectResult result = new AliyunOSSUtil().putObject("temp15827479607", videoFile.getBytes(), fileName);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }).start();
+        return fileName;
+    }
 }

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

@@ -24,11 +24,9 @@ import java.util.List;
 public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqService {
 
     public RestResponse getFaqs(Faq faq) {
-        boolean typeFlag = faq.getId() != null;
-        boolean parentIdFlag = faq.getId() != null;
-
         List<Faq> faqs = this.list(new QueryWrapper<Faq>()
-                .eq(typeFlag, "type", faq.getType()).eq(parentIdFlag, "parent_id", faq.getParentId())
+                .eq(faq.getType() != null, "type", faq.getType())
+                .eq(faq.getParentId() != null, "parent_id", faq.getParentId())
                 .orderByAsc("serial"));
         if (faqs.isEmpty()) {
             return RestResponse.ok(null, "9", "无数据");
@@ -123,7 +121,7 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
             }
         }
 
-        if (i==faqs.size()) {
+        if (i == faqs.size()) {
             return RestResponse.ok(null, "1", "移动成功");
         }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/template/controller/ItemController.java

@@ -0,0 +1,59 @@
+package cn.com.ty.lift.system.template.controller;
+
+import cn.com.ty.lift.system.template.dao.entity.Item;
+import cn.com.ty.lift.system.template.service.impl.ItemServiceImpl;
+import cn.com.ty.lift.system.template.service.impl.TemplateServiceImpl;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 模板项 前端控制器
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-11-25
+ */
+@RestController
+@RequestMapping("/item")
+@AllArgsConstructor
+public class ItemController {
+    private final ItemServiceImpl itemService;
+    private final TemplateServiceImpl templateService;
+
+    @PostMapping("/add")
+    /**
+     * @description 新增模板项
+     * @date 2019/12/6 13:58
+     * @param [item]
+     * @return org.springframework.http.ResponseEntity
+     */
+    public RestResponse add(@RequestBody Item item) {
+        if (itemService.save(item)) {
+            return RestResponse.ok(null, "1", "新增成功");
+        }
+        return RestResponse.ok(null, "0", "新增失败");
+    }
+
+    @PostMapping("/update")
+    /**
+     * @description 更新模板项
+     * @date 2019/12/6 13:58
+     * @param [item]
+     * @return org.springframework.http.ResponseEntity
+     */
+    public RestResponse update(@RequestBody Item item) {
+        if (itemService.updateById(item)) {
+            return RestResponse. ok(null, "1", "更新成功");
+        }
+        return RestResponse.ok(null, "0", "更新失败");
+    }
+
+    @PostMapping("/delete")
+    public RestResponse delete(@RequestBody Item item) {
+        return templateService.deleteItem(item);
+    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/controller/TemplateController.java

@@ -1,7 +1,100 @@
 package cn.com.ty.lift.system.template.controller;
 
-import org.springframework.web.bind.annotation.RestController;
 
+import cn.com.ty.lift.system.template.dao.entity.Template;
+import cn.com.ty.lift.system.template.dao.entity.model.TemplateReq;
+import cn.com.ty.lift.system.template.service.impl.TemplateServiceImpl;
+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.*;
+
+/**
+ * @author wang-hai-cheng
+ * @date 2019/12/6
+ * @description 模板
+ */
 @RestController
+@RequestMapping("/template")
+@AllArgsConstructor
 public class TemplateController {
-}
+    private final TemplateServiceImpl templateService;
+
+    @RequestMapping("/list")
+    /**
+     * @description 分页获取全部模板
+     * @date 2019/12/6 11:20
+     * @param [TemplateReq]
+     * @return java.util.List<cn.com.ty.lift.system.template.dao.entity.Template>
+     */
+    public RestResponse list(@RequestBody TemplateReq templateReq) {
+        IPage<Template> templateIPage = templateService.page(
+                new Page<>(templateReq.getPageNum(), templateReq.getPageSize()),
+                new QueryWrapper<Template>()
+                        .eq(templateReq.getMtCompanyId() != null, "mt_company_id", templateReq.getMtCompanyId()));
+        if (templateIPage.getRecords().isEmpty()) {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+        return RestResponse.ok(templateIPage, "1", "查询成功");
+    }
+
+    @PostMapping("/add")
+    /**
+     * @description 新增模板
+     * @date 2019/12/6 11:26
+     * @param [Template]
+     * @return org.springframework.http.ResponseEntity
+     */
+    public RestResponse<Object> add(@RequestBody Template template) {
+        if (template.getMtCompanyId() == 0) {
+            template.setEdit(0);
+        }
+        if (templateService.save(template)) {
+            return RestResponse.ok(null, "1", "新增成功");
+        }
+        return RestResponse.ok(null, "0", "新增失败");
+    }
+
+    @PostMapping("/update")
+    /**
+     * @description 根据id修改模板信息
+     * @date 2019/12/6 11:26
+     * @param [Template]
+     * @return
+     */
+    public RestResponse update(@RequestBody Template template) {
+        if (templateService.updateById(template)) {
+            return RestResponse.ok(null, "1", "修改模板成功");
+        }
+        return RestResponse.ok(null, "0", "修改模板失败");
+    }
+
+    @PostMapping("/delete")
+    /**
+     * @description 根据id删除模板及未被其它模板依赖的模板项
+     * @date 2019/12/6 11:27
+     * @param [id]
+     * @return org.springframework.http.ResponseEntity
+     */
+    public RestResponse delete(@RequestBody Template template) {
+        Template byId = templateService.getById(template.getId());
+        if (byId.getEdit() == 1) {
+            return RestResponse.ok(null, "0", "此模板无法删除");
+        }
+        //删除模板及相关模板项
+        return templateService.removeItemOfTemplate(template.getId());
+    }
+
+    @PostMapping("/items")
+    /**
+     * @description  分页获取模板下模板项
+     * @date 2019/12/6 11:27
+     * @param [templateId]
+     * @return
+     */
+    public RestResponse items(@RequestBody TemplateReq templateReq) {
+        return templateService.getItems(templateReq);
+    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/dao/entity/Item.java

@@ -0,0 +1,87 @@
+package cn.com.ty.lift.system.template.dao.entity;
+
+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>
+ * 模板项
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Item implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板项id
+     */
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 模板id
+     */
+    @TableField("template_id")
+    private Long templateId;
+
+    /**
+     * 模板项名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 模板详情
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 保养时长 1半月 2季度 3半年 4全年
+     */
+    @TableField("maintain_duration")
+    private Integer maintainDuration;
+
+    /**
+     * 电梯类别 1直梯 2扶梯
+     */
+    @TableField("lift")
+    private Integer lift;
+
+    /**
+     * 电梯类型 1乘客梯/载货电梯 2液压梯 3扶梯/人行道 4杂物梯
+     */
+    @TableField("business_type")
+    private Integer businessType;
+
+    /**
+     * 1机房 2轿顶 3轿厢 4层门 5底坑井道
+     */
+    @TableField("sort")
+    private Integer sort;
+
+//    /**
+//     * 1已经保养 2需要更换 0无需保养
+//     */
+//    @TableField("maintain")
+//    private Integer maintain;
+
+//    /**
+//     * 引导标识
+//     */
+//    @TableField("signage")
+//    private String signage;
+
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/dao/entity/Template.java

@@ -0,0 +1,61 @@
+package cn.com.ty.lift.system.template.dao.entity;
+
+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>
+ * 模板
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Template implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板id
+     */
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 模板名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 是否可编辑 1可编辑 0不可编辑
+     */
+    @TableField("edit")
+    private Integer edit;
+
+    /**
+     * 模板所属的维保公司id,0为全维保公司都拥有的模板
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    @TableField(exist = false)
+    private Integer pageNum;
+
+    @TableField(exist = false)
+    private Integer pageSize;
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/dao/entity/model/TemplateReq.java

@@ -0,0 +1,58 @@
+package cn.com.ty.lift.system.template.dao.entity.model;
+
+import cn.com.xwy.boot.controller.BaseRequestModel;
+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>
+ * 模板
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TemplateReq extends BaseRequestModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板id
+     */
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 模板名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 是否可编辑 1可编辑 0不可编辑
+     */
+    @TableField("edit")
+    private Integer edit;
+
+    /**
+     * 模板所属的维保公司id,0为全维保公司都拥有的模板
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/dao/mapper/ItemMapper.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.system.template.dao.mapper;
+
+import cn.com.ty.lift.system.template.dao.entity.Item;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 模板项 Mapper 接口
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+public interface ItemMapper extends BaseMapper<Item> {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/dao/mapper/TemplateMapper.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.system.template.dao.mapper;
+
+import cn.com.ty.lift.system.template.dao.entity.Template;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 模板 Mapper 接口
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+public interface TemplateMapper extends BaseMapper<Template> {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/service/ItemService.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.system.template.service;
+
+import cn.com.ty.lift.system.template.dao.entity.Item;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 模板项 服务类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+public interface ItemService extends IService<Item> {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/service/TemplateService.java

@@ -1,7 +1,16 @@
 package cn.com.ty.lift.system.template.service;
 
-import org.springframework.stereotype.Service;
+import cn.com.ty.lift.system.template.dao.entity.Template;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 模板 服务类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+public interface TemplateService extends IService<Template> {
 
-@Service
-public class TemplateService {
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/template/service/impl/ItemServiceImpl.java

@@ -0,0 +1,21 @@
+package cn.com.ty.lift.system.template.service.impl;
+
+import cn.com.ty.lift.system.template.dao.entity.Item;
+import cn.com.ty.lift.system.template.dao.mapper.ItemMapper;
+import cn.com.ty.lift.system.template.service.ItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 模板项 服务实现类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+@Service
+public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements ItemService {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/template/service/impl/TemplateServiceImpl.java

@@ -0,0 +1,64 @@
+package cn.com.ty.lift.system.template.service.impl;
+
+import cn.com.ty.lift.system.template.dao.entity.Item;
+import cn.com.ty.lift.system.template.dao.entity.Template;
+import cn.com.ty.lift.system.template.dao.entity.model.TemplateReq;
+import cn.com.ty.lift.system.template.dao.mapper.TemplateMapper;
+import cn.com.ty.lift.system.template.service.ItemService;
+import cn.com.ty.lift.system.template.service.TemplateService;
+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;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 模板 服务实现类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-06
+ */
+@Service
+@AllArgsConstructor
+public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> implements TemplateService {
+    private final ItemService itemService;
+
+    public RestResponse removeItemOfTemplate(Long id) {
+        if (this.remove(new QueryWrapper<Template>().eq("id", id)) && itemService.remove(new QueryWrapper<Item>().eq("template_id", id))) {
+            return RestResponse.ok(null, "1", "删除成功");
+        }
+        return RestResponse.ok(null, "1", "删除失败");
+    }
+
+    public RestResponse getItems(TemplateReq templateReq) {
+//        IPage<Item> itemIPage = itemService.page(
+//                new Page<>(templateReq.getPageNum(), templateReq.getPageSize()),
+//                new QueryWrapper<Item>().eq("template_id", templateReq.getId()));
+//        if (itemIPage.getRecords().isEmpty()) {
+//            return RestResponse.ok(null, "9", "无数据");
+//        }
+//        return RestResponse.ok(itemIPage, "1", "查询成功");
+        List<Item> items = itemService.list(new QueryWrapper<Item>().eq("template_id", templateReq.getId()));
+        if (items.isEmpty()) {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+        return RestResponse.ok(items, "1", "查询成功");
+    }
+
+    public RestResponse deleteItem(Item item) {
+        Item byId = itemService.getById(item.getId());
+        if (this.getById(byId.getTemplateId()).getEdit() != 1) {
+            return RestResponse.ok(null, "0", "此模板项无法删除");
+        }
+        if (itemService.removeById(item.getId())) {
+            return RestResponse.ok(null, "1", "删除成功");
+        }
+        return RestResponse.ok(null, "0", "删除失败");
+    }
+}

pom.xml

@@ -7,7 +7,6 @@
         <module>lift-demo-service</module>
         <module>lift-portal-service</module>
         <module>lift-business-service</module>
-        <module>lift-manager-service</module>
         <module>lift-enterprise-service</module>
         <module>lift-system-service</module>
         <module>lift-common</module>