更新

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

@@ -8,8 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-@RestController
-@RequestMapping("/property-certificate")
+//未使用
+//未使用
+//未使用
+//未使用
+
+//@RestController
+//@RequestMapping("/property-certificate")
 @AllArgsConstructor
 /**
  * @author wang-hai-cheng

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

@@ -1,14 +1,12 @@
 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.PropertyCompanyReq;
 import cn.com.ty.lift.enterprise.custom.service.impl.PropertyCompanyServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.time.LocalDateTime;
-import java.util.HashMap;
-
 @RestController
 @RequestMapping("/property-company")
 @AllArgsConstructor
@@ -44,8 +42,8 @@ public class PropertyCompanyController {
      * @param [客户名称或客户地址或客户联系方式,页码,页大小,维保公司id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompaniesForCondition(@RequestBody HashMap map) {
-        return propertyCompanyService.propertyCompaniesForCondition(map);
+    public RestResponse propertyCompaniesForCondition(@RequestBody PropertyCompanyReq propertyCompany) {
+        return propertyCompanyService.propertyCompaniesForCondition(propertyCompany);
     }
 
 
@@ -58,7 +56,6 @@ public class PropertyCompanyController {
      */
     public RestResponse add(@RequestBody PropertyCompany propertyCompany) {
         //service层判断了是否有相同名称的name
-        propertyCompany.setCreateDate(LocalDateTime.now());
         return propertyCompanyService.savePropertyCompany(propertyCompany);
     }
 
@@ -77,14 +74,14 @@ public class PropertyCompanyController {
         }
     }
 
-    @GetMapping("/delete/{id}")
+    @PostMapping("/delete")
     /**
      * @description RestResponse
      * @date 2019/11/27 11:46
      * @param [id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse delete(@PathVariable("id") Long propertyCompanyId) {
+    public RestResponse delete(@RequestBody PropertyCompany propertyCompany) {
 
         //判断维保电梯台数是否为0
         //判断维保电梯台数是否为0
@@ -99,11 +96,12 @@ public class PropertyCompanyController {
         //判断维保电梯台数是否为0
         //也就是客户公司创建的所有项目的总电梯的在保电梯是否为0
 
-        return RestResponse.ok(null, propertyCompanyService.delete(propertyCompanyId));
+        return RestResponse.ok(null, propertyCompanyService.delete(propertyCompany.getId()));
     }
 
     @GetMapping("/list/current")
-    public RestResponse currentProject(@RequestParam Long propertyCompanyId) {
+    public RestResponse currentProject(@RequestBody PropertyCompany propertyCompany) {
+        propertyCompany.getId();
         //分页查询正在服务的项目列表
         //分页查询正在服务的项目列表
         //分页查询正在服务的项目列表
@@ -113,7 +111,8 @@ public class PropertyCompanyController {
     }
 
     @GetMapping("/list/previous")
-    public RestResponse previousProject(@RequestParam Long propertyCompanyId) {
+    public RestResponse previousProject(@RequestBody PropertyCompany propertyCompany) {
+        propertyCompany.getId();
         //分页查询曾经服务的项目列表
         //分页查询曾经服务的项目列表
         //分页查询曾经服务的项目列表

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

@@ -1,16 +1,15 @@
 package cn.com.ty.lift.enterprise.custom.controller;
 
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyContact;
+import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyContactReq;
 import cn.com.ty.lift.enterprise.custom.service.impl.PropertyContactServiceImpl;
 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.*;
 
-import java.time.LocalDateTime;
-import java.util.List;
-
 @RestController
 @RequestMapping("/property-contact")
 @AllArgsConstructor
@@ -25,20 +24,21 @@ public class PropertyContactController {
 
     @GetMapping("/list")
     /**
-         * @description 根据客户id分页查它的联系人
-         * @date 2019/11/29 8:21
-         * @param [ppCompanyId, userId, pageNum, pageSize]
-         * @return cn.com.xwy.boot.web.dto.RestResponse
-         */
-    public RestResponse propertyContacts(@RequestParam Long ppCompanyId, @RequestParam Long userId, Integer pageNum, Integer pageSize) {
-        Page<PropertyContact> page = new Page<>(pageNum, pageSize);
-        List<PropertyContact> records = propertyContactService.page(page, new QueryWrapper<PropertyContact>()
-                .select("id","pp_company_id","name","dept","job","telephone","gender","age","remarks","status","user_id")
-                .eq("pp_company_id", ppCompanyId).eq("user_id",userId)).getRecords();
-        if (!records.isEmpty()) {
-            return RestResponse.ok(records,"1","查询成功");
+     * @description 根据客户id分页查它的联系人
+     * @date 2019/11/29 8:21
+     * @param [ppCompanyId, userId, pageNum, pageSize]
+     * @return cn.com.xwy.boot.web.dto.RestResponse
+     */
+    public RestResponse propertyContacts(@RequestBody PropertyContactReq propertyContact) {
+        Page<PropertyContact> page = new Page<>(propertyContact.getPageNum(), propertyContact.getPageSize());
+        IPage<PropertyContact> records = propertyContactService.page(page, new QueryWrapper<PropertyContact>()
+                .select("id", "pp_company_id", "name", "dept", "job", "telephone", "gender", "age", "remarks", "status", "user_id")
+                .eq("pp_company_id", propertyContact.getPpCompanyId())
+                .eq("user_id", propertyContact.getUserId()));
+        if (!records.getRecords().isEmpty()) {
+            return RestResponse.ok(records, "1", "查询成功");
         } else {
-            return RestResponse.ok(null, "9","无数据");
+            return RestResponse.ok(null, "9", "无数据");
         }
     }
 
@@ -50,12 +50,10 @@ public class PropertyContactController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse add(@RequestBody PropertyContact propertyContact) {
-        propertyContact.setCreateDate(LocalDateTime.now());
-        System.out.println(propertyContact.getPpCompanyId());
         if (propertyContactService.save(propertyContact)) {
-            return RestResponse.ok(null, "1","新增成功");
+            return RestResponse.ok(null, "1", "新增成功");
         } else {
-            return RestResponse.ok(null, "0","新增失败");
+            return RestResponse.ok(null, "0", "新增失败");
         }
     }
 
@@ -68,26 +66,20 @@ public class PropertyContactController {
      */
     public RestResponse update(@RequestBody PropertyContact propertyContact) {
         if (propertyContactService.updateById(propertyContact)) {
-            return RestResponse.ok(null, "1","更新成功");
+            return RestResponse.ok(null, "1", "更新成功");
         } else {
-            return RestResponse.ok(null,"0", "更新失败");
+            return RestResponse.ok(null, "0", "更新失败");
         }
     }
 
-    @GetMapping("/delete/{id}")
+    @GetMapping("/delete")
     /**
      * @description 删除联系人
      * @date 2019/11/27 11:28
      * @param [id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse delete(@PathVariable Long id) {
-        PropertyContact propertyContact = new PropertyContact();
-        propertyContact.setStatus(0);
-        if (propertyContactService.update(propertyContact,new QueryWrapper<PropertyContact>().eq("id",id))) {
-            return RestResponse.ok(null, "删除成功");
-        } else {
-            return RestResponse.ok(null, "删除失败");
-        }
+    public RestResponse delete(@RequestBody PropertyContact propertyContact) {
+        return propertyContactService.delete(propertyContact.getId());
     }
 }

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

@@ -0,0 +1,121 @@
+package cn.com.ty.lift.enterprise.custom.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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * (甲方公司)客户表
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PropertyCompanyReq extends BaseRequestModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 甲方公司id
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 维保公司id
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
+    /**
+     * 编号
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 地址
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 注册资金
+     */
+    @TableField("registered_capital")
+    private BigDecimal registeredCapital;
+
+    /**
+     * 企业法人
+     */
+    @TableField("corporator")
+    private String corporator;
+
+    /**
+     * 联系电话
+     */
+    @TableField("telephone")
+    private String telephone;
+
+    /**
+     * 主要业务
+     */
+    @TableField("main_business")
+    private String mainBusiness;
+
+    /**
+     * 营业执照编号
+     */
+    @TableField("business_license_code")
+    private String businessLicenseCode;
+
+    /**
+     * 营业执照附件
+     */
+    @TableField("business_license_annex")
+    private String businessLicenseAnnex;
+
+    /**
+     * 备注
+     */
+    @TableField("remarks")
+    private String remarks;
+
+    /**
+     * 状态
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Long creatorId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_date")
+    private LocalDateTime createDate;
+
+
+}

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

@@ -0,0 +1,106 @@
+package cn.com.ty.lift.enterprise.custom.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 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-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PropertyContactReq extends BaseRequestModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 联系人id
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 甲方公司id
+     */
+    @TableId(value = "pp_company_id")
+    private Long ppCompanyId;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 部门
+     */
+    @TableField("dept")
+    private String dept;
+
+    /**
+     * 职位
+     */
+    @TableField("job")
+    private String job;
+
+    /**
+     * 联系电话
+     */
+    @TableField("telephone")
+    private String telephone;
+
+    /**
+     * 0女 1男 默认1
+     */
+    @TableField("gender")
+    private Integer gender;
+
+    /**
+     * 年龄
+     */
+    @TableField("age")
+    private Integer age;
+
+    /**
+     * 备注
+     */
+    @TableField("remarks")
+    private String remarks;
+
+    /**
+     * 0删除 1正常
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 用户id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 创建人id
+     */
+    @TableField("creator_id")
+    private Long creatorId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_date")
+    private LocalDateTime createDate;
+}

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.enterprise.custom.service.impl;
 
 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.PropertyCompanyReq;
 import cn.com.ty.lift.enterprise.custom.dao.mapper.PropertyCompanyMapper;
 import cn.com.ty.lift.enterprise.custom.dao.mapper.PropertyContactMapper;
 import cn.com.ty.lift.enterprise.custom.service.PropertyCompanyService;
@@ -13,9 +14,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -32,16 +30,16 @@ import java.util.Map;
 public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMapper, PropertyCompany> implements PropertyCompanyService {
     private final PropertyContactMapper contactMapper;
 
-    public RestResponse savePropertyCompany(@RequestBody PropertyCompany propertyCompany) {
-        if (null == this.getOne(new QueryWrapper<PropertyCompany>().eq("name", propertyCompany.getName()))) {
-            if (this.save(propertyCompany)) {
-                return RestResponse.ok(null, "1", "新增客户成功");
-            } else {
-                return RestResponse.ok(null, "0", "新增客户失败");
-            }
-        } else {
+    public RestResponse savePropertyCompany(PropertyCompany propertyCompany) {
+        if (null != this.getOne(new QueryWrapper<PropertyCompany>().eq("name", propertyCompany.getName()))) {
             return RestResponse.ok(null, "0", "客户已存在");
         }
+
+        if (this.save(propertyCompany)) {
+            return RestResponse.ok(null, "1", "新增客户成功");
+        } else {
+            return RestResponse.ok(null, "0", "新增客户失败");
+        }
     }
 
     public String delete(Long id) {
@@ -120,19 +118,19 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
         return RestResponse.ok(records, "1", "查询成功");
     }
 
-    public RestResponse propertyCompaniesForCondition(HashMap map) {
-        String name = (String) map.get("name");
-        String address = (String) map.get("address");
-        String telephone = (String) map.get("telephone");
+    public RestResponse propertyCompaniesForCondition(PropertyCompanyReq propertyCompany) {
+        String name = propertyCompany.getName();
+        String address = propertyCompany.getAddress();
+        String telephone = propertyCompany.getTelephone();
         boolean nameFlag = name != null;
         boolean addressFlag = address != null;
         boolean telephoneFlag = telephone != null;
 
-        Page<PropertyCompany> page = new Page<>((Integer) map.get("pageNum"), (Integer) map.get("pageSize"));
+        Page<PropertyCompany> page = new Page<>(propertyCompany.getPageNum(), propertyCompany.getPageSize());
         IPage<Map<String, Object>> records = this
                 .pageMaps(page, new QueryWrapper<PropertyCompany>()
                         .select("id", "code", "name", "address", "telephone")
-                        .eq("mt_company_id", map.get("mtCompanyId"))
+                        .eq("mt_company_id", propertyCompany.getMtCompanyId())
                         .like(nameFlag, "name", name).like(addressFlag, "address", address).like(telephoneFlag, "telephone", telephone));
         if (!records.getRecords().isEmpty()) {
             records.getRecords().forEach(record -> {

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

@@ -3,6 +3,8 @@ package cn.com.ty.lift.enterprise.custom.service.impl;
 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;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,4 +21,21 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class PropertyContactServiceImpl extends ServiceImpl<PropertyContactMapper, PropertyContact> implements PropertyContactService {
 
+    public RestResponse delete(Long id) {
+        PropertyContact byId = this.getById(id);
+        if (null == byId) {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+
+        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, "删除成功");
+        } else {
+            return RestResponse.ok(null, "删除失败");
+        }
+    }
 }

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

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.quan.news.controller;
 
 import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
+import cn.com.ty.lift.quan.news.dao.entity.model.QuanNewsReq;
 import cn.com.ty.lift.quan.news.service.impl.QuanNewsServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import lombok.AllArgsConstructor;
@@ -22,15 +23,15 @@ import org.springframework.web.multipart.MultipartFile;
 public class QuanNewsController {
     private final QuanNewsServiceImpl quanNewsService;
 
-    @GetMapping("/list")
+    @PostMapping("/list")
     /**
      * @description 分页展示置顶新闻+普通新闻
      * @date 2019/12/2 15:39
      * @param [页码, 页大小]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse list(@RequestParam int pageNum, @RequestParam int pageSize, @RequestParam int haveTops) {
-        return quanNewsService.news(pageNum, pageSize, haveTops);
+    public RestResponse list(@RequestBody QuanNewsReq quanNews) {
+        return quanNewsService.news(quanNews.getPageNum(), quanNews.getPageSize(), quanNews.getHaveTops());
     }
 
     @PostMapping("/top")
@@ -40,8 +41,8 @@ public class QuanNewsController {
      * @param [新闻id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse top(@RequestParam Integer id) {
-        return quanNewsService.top(id);
+    public RestResponse top(@RequestBody QuanNews quanNews) {
+        return quanNewsService.top(quanNews.getId());
     }
 
     @PostMapping("/top/cancel")
@@ -51,8 +52,8 @@ public class QuanNewsController {
      * @param [新闻id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse cancelTop(@RequestParam Integer id) {
-        return quanNewsService.cancelTop(id);
+    public RestResponse cancelTop(@RequestBody QuanNews quanNews) {
+        return quanNewsService.cancelTop(quanNews.getId());
     }
 
     @GetMapping("/{id}")
@@ -78,10 +79,13 @@ public class QuanNewsController {
      * @param [新闻标题, 新闻内容, 视频文件, 发布人id]
      * @return org.springframework.http.ResponseEntity
      */
-    public RestResponse add(@RequestParam String title, @RequestParam String content, @RequestParam MultipartFile videoFile, @RequestParam Integer isTop, @RequestParam Long releaseId, @RequestParam String releaseUser) {
+    public RestResponse add(@RequestParam String title, @RequestParam String content, @RequestParam Long releaseId, @RequestParam String releaseUser, @RequestParam MultipartFile videoFile, @RequestParam Integer haveTops) {
         QuanNews quanNews = new QuanNews();
-        quanNews.setTitle(title).setContent(content).setReleaseId(releaseId).setReleaseUser(releaseUser);
-        return quanNewsService.addNew(quanNews,videoFile, isTop);
+        quanNews.setTitle(title)
+                .setContent(content)
+                .setReleaseId(releaseId)
+                .setReleaseUser(releaseUser);
+        return quanNewsService.addNew(quanNews, videoFile, haveTops);
     }
 
     @PostMapping("/update")
@@ -91,8 +95,14 @@ public class QuanNewsController {
      * @param [新闻id, 新闻标题, 新闻内容]
      * @return org.springframework.http.ResponseEntity
      */
-    public RestResponse updateNews(@RequestBody QuanNews quanNews) {
-        return quanNewsService.updateNews(quanNews.getId(), quanNews.getTitle(), quanNews.getContent());
+    public RestResponse updateNews(@RequestParam Integer id, @RequestParam String title, @RequestParam String content, @RequestParam Long releaseId, @RequestParam String releaseUser, @RequestParam MultipartFile videoFile) {
+        QuanNews quanNews = new QuanNews();
+        quanNews.setId(id)
+                .setTitle(title)
+                .setContent(content)
+                .setReleaseId(releaseId)
+                .setReleaseUser(releaseUser);
+        return quanNewsService.updateNews(quanNews, videoFile);
     }
 
     @PostMapping("/delete")
@@ -102,7 +112,7 @@ public class QuanNewsController {
      * @param [新闻id]
      * @return org.springframework.http.ResponseEntity
      */
-    public RestResponse delete(@RequestParam int id) {
-        return quanNewsService.delete(id);
+    public RestResponse delete(@RequestBody QuanNews quanNews) {
+        return quanNewsService.delete(quanNews.getId());
     }
 }

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

@@ -0,0 +1,80 @@
+package cn.com.ty.lift.quan.news.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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电梯圈新闻公告
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class QuanNewsReq extends BaseRequestModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 新闻id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 置顶排序 0不置顶 非0就是置顶(按照数字大小排序)
+     */
+    @TableField("top_serial")
+    private Integer topSerial;
+
+    /**
+     * 标题
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 内容+图片
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 视频地址
+     */
+    @TableField("video_path")
+    private String videoPath;
+
+    /**
+     * 发布时间
+     */
+    @TableField("release_date")
+    private LocalDateTime releaseDate;
+
+    /**
+     * 发布人名称
+     */
+    @TableField("release_user")
+    private String releaseUser;
+
+    /**
+     * 发布人id
+     */
+    @TableField("release_id")
+    private Long releaseId;
+
+    private Integer haveTops;
+
+}

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

@@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 
@@ -28,57 +27,43 @@ import java.util.List;
 @Transactional
 public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> implements QuanNewsService {
 
-    public RestResponse updateNews(int id, String title, String content) {
-        QuanNews byId = this.getById(id);
-        if (null != byId) {
-            byId.setTitle(title).setContent(content);
-            if (this.updateById(byId)) {
-                return RestResponse.ok(null, "1", "更新成功");
-            } else {
-                return RestResponse.ok(null, "0", "更新失败");
-            }
-        } else {
-            return RestResponse.ok(null, "0", "不存在此新闻");
-        }
-    }
-
     /**
      * @description 将新闻置顶
      * @date 2019/12/3 11:23
      */
     public RestResponse top(int id) {
         QuanNews byId = this.getById(id);
-        if (byId != null) {
-            if (byId.getTopSerial() != 0) {
-                //如果新闻在置顶新闻中
-                QuanNews top = this.getOne(new QueryWrapper<QuanNews>().eq("top_serial", 1));
-                top.setTopSerial(byId.getTopSerial());
-                byId.setTopSerial(1);
-                //更新排序
-                this.updateById(top);
-                this.updateById(byId);
+        if (byId == null) {
+            return RestResponse.ok(null, "0", "新闻不存在");
+        }
+
+        if (byId.getTopSerial() != 0) {
+            //如果新闻在置顶新闻中
+            QuanNews top = this.getOne(new QueryWrapper<QuanNews>().eq("top_serial", 1));
+            top.setTopSerial(byId.getTopSerial());
+            byId.setTopSerial(1);
+            //更新排序
+            this.updateById(top);
+            this.updateById(byId);
+        } else {
+            //如果新闻不是置顶新闻
+            //获取置顶新闻
+            List<QuanNews> news = this.list(new QueryWrapper<QuanNews>().select("id", "top_serial").ne("top_serial", 0));
+            if (!news.isEmpty()) {
+                //如果有置顶新闻
+                news.forEach(n -> {
+                    n.setTopSerial(n.getTopSerial() + 1);
+                });
+            }
+            byId.setTopSerial(1);
+            //更新置顶新闻列表，新闻
+            if (this.updateBatchById(news, 100) && this.updateById(byId)) {
+                return RestResponse.ok(null, "1", "置顶成功");
             } else {
-                //如果新闻不是置顶新闻
-                //获取置顶新闻
-                List<QuanNews> news = this.list(new QueryWrapper<QuanNews>().select("id", "top_serial").ne("top_serial", 0));
-                if (!news.isEmpty()) {
-                    //如果有置顶新闻
-                    news.forEach(n -> {
-                        n.setTopSerial(n.getTopSerial() + 1);
-                    });
-                }
-                byId.setTopSerial(1);
-                //更新置顶新闻列表，新闻
-                if (this.updateBatchById(news, 100) && this.updateById(byId)) {
-                    return RestResponse.ok(null, "1", "置顶成功");
-                } else {
-                    return RestResponse.ok(null, "0", "置顶失败");
-                }
+                return RestResponse.ok(null, "0", "置顶失败");
             }
-            return RestResponse.ok(null, "1", "置顶成功");
-        } else {
-            return RestResponse.ok(null, "0", "新闻不存在");
         }
+        return RestResponse.ok(null, "1", "置顶成功");
     }
 
     /**
@@ -88,38 +73,34 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
     public RestResponse cancelTop(Integer id) {
         QuanNews byId = this.getById(id);
         if (null != byId) {
-            //如果有这个新闻
-            if (byId.getTopSerial() != 0) {
-                byId.setTopSerial(0);
-                //如果有这个置顶新闻
-                List<QuanNews> tops = this.list(new QueryWrapper<QuanNews>().select("id", "top_serial").ne("top_serial", 0).ne("id", id));
-                //如果没有置顶新闻
-                if (tops.isEmpty()) {
-                    if (this.updateById(byId)) {
-                        return RestResponse.ok(null, "1", "取消置顶成功");
-                    } else {
-                        return RestResponse.ok(null, "0", "取消置顶失败");
-                    }
-                }
-
-                //比这个新闻排序大的都 序号-1
-                tops.forEach(top -> {
-                    if (top.getTopSerial() > byId.getTopSerial()) {
-                        top.setTopSerial(top.getTopSerial() - 1);
-                    }
-                });
-                if (this.updateById(byId) && this.updateBatchById(tops)) {
-                    return RestResponse.ok(null, "1", "取消置顶成功");
-                } else {
-                    return RestResponse.ok(null, "0", "取消置顶失败");
-                }
+            //没有这个新闻
+            return RestResponse.ok(null, "9", "无此新闻");
+        }
+        if (byId.getTopSerial() == 0) {
+            //如果不是置顶新闻
+            return RestResponse.ok(null, "1", "不是置顶新闻");
+        }
+        byId.setTopSerial(0);
+        List<QuanNews> tops = this.list(new QueryWrapper<QuanNews>().select("id", "top_serial").ne("top_serial", 0).ne("id", id));
+        //如果置顶新闻为0个
+        if (tops.isEmpty()) {
+            if (this.updateById(byId)) {
+                return RestResponse.ok(null, "1", "取消置顶成功");
             } else {
-                //如果不是置顶新闻
-                return RestResponse.ok(null, "1", "不是置顶新闻");
+                return RestResponse.ok(null, "0", "取消置顶失败");
+            }
+        }
+
+        //比这个新闻排序大的都 序号-1
+        tops.forEach(top -> {
+            if (top.getTopSerial() > byId.getTopSerial()) {
+                top.setTopSerial(top.getTopSerial() - 1);
             }
+        });
+        if (this.updateById(byId) && this.updateBatchById(tops)) {
+            return RestResponse.ok(null, "1", "取消置顶成功");
         } else {
-            //没有这个新闻
-            return RestResponse.ok(null, "9", "无此新闻");
+            return RestResponse.ok(null, "0", "取消置顶失败");
         }
     }
 
@@ -127,18 +108,17 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
      * @description 时间倒序查询置顶新闻+普通新闻列表
      * @date 2019/12/3 10:30
      */
-    public RestResponse news(Integer pageNum, Integer pageSize, Integer haveTops) {
+    public RestResponse news(Long pageNum, Long pageSize, Integer haveTops) {
         Page<QuanNews> page = new Page<>(pageNum, pageSize);
         IPage<QuanNews> news = this.page(page, new QueryWrapper<QuanNews>().eq("top_serial", "0").orderByDesc("release_date"));
-        if (haveTops != 0) {
-            List topNews = this.list(new QueryWrapper<QuanNews>().ne("top_serial", "0").orderBy(true, true, "top_serial"));
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("topNews", topNews);
-            map.put("news", news);
-            return RestResponse.ok(map, "1", "查询成功");
-        } else {
+        if (haveTops == 0) {
             return RestResponse.ok(news, "1", "查询成功");
         }
+        List topNews = this.list(new QueryWrapper<QuanNews>().ne("top_serial", "0").orderByAsc("top_serial"));
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("topNews", topNews);
+        map.put("news", news);
+        return RestResponse.ok(map, "1", "查询成功");
     }
 
     public RestResponse addNew(QuanNews quanNews, MultipartFile videoFile, Integer isTop) {
@@ -155,7 +135,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
             //获取置顶新闻列表
             tops = this.list(new QueryWrapper<QuanNews>().ne("top_serial", 0));
             //设置新添加新闻的数据
-            quanNews.setReleaseDate(LocalDateTime.now()).setVideoPath("videoPath").setTopSerial(1);
+            quanNews.setVideoPath("videoPath").setTopSerial(1);
             //遍历排序加1
             if (!tops.isEmpty()) {
                 tops.forEach(top -> {
@@ -175,7 +155,7 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
             }
         }
         //设置新添加新闻的数据
-        quanNews.setReleaseDate(LocalDateTime.now()).setVideoPath("videoPath");
+        quanNews.setVideoPath("videoPath");
         if (this.save(quanNews)) {
             return RestResponse.ok(null, "1", "新增成功");
         } else {
@@ -183,19 +163,52 @@ public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> i
         }
     }
 
+    /**
+     * @description 更新新闻
+     * @date 2019/12/4 13:34
+     */
+    public RestResponse updateNews(QuanNews quanNews, MultipartFile videoFile) {
+
+        QuanNews byId = this.getById(quanNews.getId());
+        if (null == byId) {
+            return RestResponse.ok(null, "0", "不存在此新闻");
+        }
+
+        byId.setTitle(quanNews.getTitle()).setContent(quanNews.getContent());
+        if (null != videoFile) {
+            //上传视频到Oss,获取视频地址
+            //上传视频到Oss,获取视频地址
+            //上传视频到Oss,获取视频地址
+            //上传视频到Oss,获取视频地址
+            //上传视频到Oss,获取视频地址
+            //上传视频到Oss,获取视频地址
+            byId.setVideoPath("videoPath");
+        }
+
+        if (this.updateById(byId)) {
+            return RestResponse.ok(null, "1", "更新成功");
+        } else {
+            return RestResponse.ok(null, "0", "更新失败");
+        }
+    }
+
+    /**
+     * @description 删除新闻
+     * @date 2019/12/4 13:55
+     */
     public RestResponse delete(int id) {
         QuanNews byId = this.getById(id);
-        if (null != byId) {
-            if (byId.getTopSerial() != 0) {
-                this.cancelTop(id);
-            }
-            if (this.removeById(id)) {
-                return RestResponse.ok(null, "1", "删除成功");
-            } else {
-                return RestResponse.ok(null, "0", "删除失败");
-            }
-        } else {
+        if (null == byId) {
             return RestResponse.ok(null, "9", "无数据");
+
+        }
+        if (byId.getTopSerial() != 0) {
+            this.cancelTop(id);
+        }
+        if (this.removeById(id)) {
+            return RestResponse.ok(null, "1", "删除成功");
+        } else {
+            return RestResponse.ok(null, "0", "删除失败");
         }
     }
 }