更新

lift-business-service/pom.xml

@@ -10,10 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>lift-business-service</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>lift-protal-service</module>
-    </modules>
 
 
     <dependencies>

lift-enterprise-service/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+<packaging>jar</packaging>
     <artifactId>lift-enterprise-service</artifactId>
 
     <dependencies>
@@ -22,7 +22,24 @@
             <groupId>cn.com.xwy</groupId>
             <artifactId>xwy-cloud-dependencies</artifactId>
         </dependency>-->
-
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>cn.com.ty.lift.enterprise.EnterpriseApplication</mainClass>
+                </configuration>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <goals>-->
+<!--                            <goal>repackage</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+            </plugin>
+        </plugins>
+    </build>
 </project>

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

@@ -29,7 +29,7 @@ public class PropertyCertificateController {
      */
     public RestResponse page(@RequestParam Integer current,@RequestParam Integer size) {
         Page<PropertyCertificate> page = new Page<>(current, size);
-        return RestResponse.ok(propertyCertificateService.page(page), "查询成功");
+        return RestResponse.ok(propertyCertificateService.page(page), "1","查询成功");
     }
 
     @GetMapping("/{id}")
@@ -42,9 +42,9 @@ public class PropertyCertificateController {
     public RestResponse propertyCertificate(@PathVariable int id) {
         PropertyCertificate byId = propertyCertificateService.getById(id);
         if (null != byId) {
-            return RestResponse.ok(byId, "查询成功");
+            return RestResponse.ok(byId, "1","查询成功");
         } else {
-            return RestResponse.ok(null,"无数据");
+            return RestResponse.ok(null,"9","无数据");
         }
     }
 
@@ -57,9 +57,9 @@ public class PropertyCertificateController {
      */
     public RestResponse save(@RequestBody PropertyCertificate propertyCertificate) {
         if (propertyCertificateService.save(propertyCertificate)) {
-            return RestResponse.ok(null, "保存成功");
+            return RestResponse.ok(null,"1", "保存成功");
         } else {
-            return RestResponse.ok(null,"保存失败");
+            return RestResponse.ok(null,"0","保存失败");
         }
     }
 
@@ -72,9 +72,9 @@ public class PropertyCertificateController {
      */
     public RestResponse update(@RequestBody PropertyCertificate propertyCertificate) {
         if (propertyCertificateService.updateById(propertyCertificate)) {
-            return RestResponse.ok(null, "更新成功");
+            return RestResponse.ok(null,"1", "更新成功");
         } else {
-            return RestResponse.ok(null,"更新失败");
+            return RestResponse.ok(null,"0","更新失败");
         }
     }
 
@@ -87,9 +87,9 @@ public class PropertyCertificateController {
      */
     public RestResponse delete(@RequestParam int id) {
         if (propertyCertificateService.removeById(id)) {
-            return RestResponse.ok(null, "删除成功");
+            return RestResponse.ok(null, "1","删除成功");
         } else {
-            return RestResponse.ok(null,"删除失败");
+            return RestResponse.ok(null,"0","删除失败");
         }
     }
 }

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

@@ -3,10 +3,15 @@ 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.service.impl.PropertyCompanyServiceImpl;
 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.HashMap;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/property-company")
@@ -24,26 +29,26 @@ public class PropertyCompanyController {
     /**
      * @description id顺序+分页客户列表
      * @date 2019/11/27 11:33
-     * @param [mtCompanyId, pageNum, pageSize]
+     * @param [维保公司id, 页码, 页大小]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompanies(@RequestParam Long mtCompanyId,@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        return RestResponse.ok(propertyCompanyService.propertyCompanyListResponse(mtCompanyId, pageNum, pageSize), "查询成功");
+    public RestResponse propertyCompanies(@RequestParam Long mtCompanyId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return RestResponse.ok(propertyCompanyService.propertyCompanies(mtCompanyId, pageNum, pageSize), "1", "查询成功");
     }
 
     @GetMapping("/{id}")
     /**
      * @description 根据id获取客户详细信息
      * @date 2019/11/27 11:36
-     * @param [id]
+     * @param [客户id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse propertyCompany(@PathVariable Long id) {
         PropertyCompany byId = propertyCompanyService.getById(id);
         if (byId != null) {
-            return RestResponse.ok(byId,"查询成功");
+            return RestResponse.ok(byId, "1", "查询成功");
         } else {
-            return RestResponse.ok(null, "无数据");
+            return RestResponse.ok(null, "0", "无数据");
         }
     }
 
@@ -51,60 +56,67 @@ public class PropertyCompanyController {
     /**
      * @description 根据客户名称分页获取客户列表
      * @date 2019/11/27 11:37
-     * @param [name, mtCompanyId, current, size]
+     * @param [客户名称, 维保公司id, 页码, 页大小]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompaniesFromName(@RequestParam String name,@RequestParam Long mtCompanyId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId,pageNum, pageSize, "name", name);
+    public RestResponse propertyCompaniesFromName(@RequestParam String name, @RequestParam Long mtCompanyId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId, pageNum, pageSize, "name", name);
     }
 
     @GetMapping("/list/address")
     /**
      * @description 根据客户地址分页获取客户列表
      * @date 2019/11/27 11:38
-     * @param [address, mtCompanyId, current, size]
+     * @param [客户地址, 维保公司id, 页码, 页大小]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompaniesFromAddress(@RequestParam String address,@RequestParam Long mtCompanyId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId,pageNum, pageSize, "address", address);
+    public RestResponse propertyCompaniesFromAddress(@RequestParam String address, @RequestParam Long mtCompanyId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId, pageNum, pageSize, "address", address);
     }
 
     @GetMapping("/list/phone")
     /**
      * @description 根据客户电话分页获取客户列表
      * @date 2019/11/27 11:39
-     * @param [phone, mtCompanyId, current, size]
+     * @param [客户手机, 维保公司id, 页码, 页大小]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse propertyCompaniesFromPhone(@RequestParam String phone, @RequestParam Long mtCompanyId,@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
-        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId,pageNum, pageSize, "telephone", phone);
+    public RestResponse propertyCompaniesFromPhone(@RequestParam String phone, @RequestParam Long mtCompanyId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        return propertyCompanyService.propertyCompaniesFromRowName(mtCompanyId, pageNum, pageSize, "telephone", phone);
+    }
+
+    @PostMapping("/list/condition")
+    public RestResponse propertyCompaniesForCondition(@RequestBody HashMap map) {
+//        IPage<PropertyCompany> iPage = propertyCompanyService.page(page, new QueryWrapper<PropertyCompany>().eq("mt_company_id", mtCompanyId).allEq(conditions, false));
+        return propertyCompanyService.propertyCompaniesForCondition(map);
     }
 
+
     @PostMapping("/add")
     /**
      * @description 新增客户
      * @date 2019/11/27 11:45
-     * @param [propertyCompany]
+     * @param [客户]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse add(@RequestBody PropertyCompany propertyCompany) {
         //service层判断了是否有相同名称的name
         propertyCompany.setCreateDate(LocalDateTime.now());
-        return RestResponse.ok(null, propertyCompanyService.savePropertyCompany(propertyCompany));
+        return propertyCompanyService.savePropertyCompany(propertyCompany);
     }
 
     @PostMapping("/update")
     /**
      * @description 更新客户信息
      * @date 2019/11/27 11:45
-     * @param [propertyCompany]
+     * @param [客户]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse update(@RequestBody PropertyCompany propertyCompany) {
         if (propertyCompanyService.updateById(propertyCompany)) {
-            return RestResponse.ok(null, "更新成功");
+            return RestResponse.ok(null, "1", "更新成功");
         } else {
-            return RestResponse.ok(null, "更新失败");
+            return RestResponse.ok(null, "0", "更新失败");
         }
     }
 
@@ -115,7 +127,7 @@ public class PropertyCompanyController {
      * @param [id]
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
-    public RestResponse delete(@PathVariable Long id) {
+    public RestResponse delete(@PathVariable("id") Long propertyCompanyId) {
 
         //判断维保电梯台数是否为0
         //判断维保电梯台数是否为0
@@ -130,26 +142,26 @@ public class PropertyCompanyController {
         //判断维保电梯台数是否为0
         //也就是客户公司创建的所有项目的总电梯的在保电梯是否为0
 
-        return RestResponse.ok(null, propertyCompanyService.delete(id));
+        return RestResponse.ok(null, propertyCompanyService.delete(propertyCompanyId));
     }
 
     @GetMapping("/list/current")
     public RestResponse currentProject(@RequestParam Long propertyCompanyId) {
-    //分页查询正在服务的项目列表
-    //分页查询正在服务的项目列表
-    //分页查询正在服务的项目列表
-    //分页查询正在服务的项目列表
-    //分页查询正在服务的项目列表
+        //分页查询正在服务的项目列表
+        //分页查询正在服务的项目列表
+        //分页查询正在服务的项目列表
+        //分页查询正在服务的项目列表
+        //分页查询正在服务的项目列表
         return RestResponse.ok(null, "待实现");
     }
 
     @GetMapping("/list/previous")
     public RestResponse previousProject(@RequestParam Long propertyCompanyId) {
-    //分页查询曾经服务的项目列表
-    //分页查询曾经服务的项目列表
-    //分页查询曾经服务的项目列表
-    //分页查询曾经服务的项目列表
-    //分页查询曾经服务的项目列表
+        //分页查询曾经服务的项目列表
+        //分页查询曾经服务的项目列表
+        //分页查询曾经服务的项目列表
+        //分页查询曾经服务的项目列表
+        //分页查询曾经服务的项目列表
         return RestResponse.ok(null, "待实现");
     }
 }

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

@@ -36,9 +36,9 @@ public class PropertyContactController {
                 .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,"查询成功");
+            return RestResponse.ok(records,"1","查询成功");
         } else {
-            return RestResponse.ok(null, "无数据");
+            return RestResponse.ok(null, "9","无数据");
         }
     }
 
@@ -53,9 +53,9 @@ public class PropertyContactController {
         propertyContact.setCreateDate(LocalDateTime.now());
         System.out.println(propertyContact.getPpCompanyId());
         if (propertyContactService.save(propertyContact)) {
-            return RestResponse.ok(null, "新增成功");
+            return RestResponse.ok(null, "1","新增成功");
         } else {
-            return RestResponse.ok(null, "新增失败");
+            return RestResponse.ok(null, "0","新增失败");
         }
     }
 
@@ -68,9 +68,9 @@ public class PropertyContactController {
      */
     public RestResponse update(@RequestBody PropertyContact propertyContact) {
         if (propertyContactService.updateById(propertyContact)) {
-            return RestResponse.ok(null, "更新成功");
+            return RestResponse.ok(null, "1","更新成功");
         } else {
-            return RestResponse.ok(null, "更新失败");
+            return RestResponse.ok(null,"0", "更新失败");
         }
     }
 

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

@@ -7,15 +7,15 @@ import cn.com.ty.lift.enterprise.custom.dao.mapper.PropertyContactMapper;
 import cn.com.ty.lift.enterprise.custom.service.PropertyCompanyService;
 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.additional.query.impl.QueryChainWrapper;
 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.List;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -32,15 +32,15 @@ import java.util.Map;
 public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMapper, PropertyCompany> implements PropertyCompanyService {
     private final PropertyContactMapper contactMapper;
 
-    public String savePropertyCompany(@RequestBody PropertyCompany propertyCompany) {
+    public RestResponse savePropertyCompany(@RequestBody PropertyCompany propertyCompany) {
         if (null == this.getOne(new QueryWrapper<PropertyCompany>().eq("name", propertyCompany.getName()))) {
             if (this.save(propertyCompany)) {
-                return "新增客户成功";
+                return RestResponse.ok(null, "1", "新增客户成功");
             } else {
-                return "新增客户失败";
+                return RestResponse.ok(null, "0", "新增客户失败");
             }
         } else {
-            return "客户已存在";
+            return RestResponse.ok(null, "0", "客户已存在");
         }
     }
 
@@ -86,27 +86,81 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
         return 888;
     }
 
-    public List<Map<String, Object>> propertyCompanyListResponse(Long mtCompanyId, Integer pageNum, Integer pageSize) {
+    /**
+     * @param
+     * @return
+     * @description 根据id分页查询客户
+     * @date 2019/12/2 10:15
+     */
+    public RestResponse propertyCompanies(Long mtCompanyId, Integer pageNum, Integer pageSize) {
         Page<PropertyCompany> page = new Page<>(pageNum, pageSize);
-        List<Map<String, Object>> records = this.pageMaps(page, new QueryWrapper<PropertyCompany>()
+        IPage<Map<String, Object>> records = this.pageMaps(page, new QueryWrapper<PropertyCompany>()
                 .select("id", "code", "name", "address", "telephone")
-                .eq("mt_company_id", mtCompanyId)).getRecords();
-        records.forEach(record -> {
+                .eq("mt_company_id", mtCompanyId));
+        records.getRecords().forEach(record -> {
             record.put("maintenanceLiftNum", this.getMaintenanceLiftNum());
         });
-        return records;
+        return RestResponse.ok(records, "查询成功");
     }
 
-
+    /**
+     * @param
+     * @return
+     * @description 根据rowName(字段名)，分页查询
+     * @date 2019/12/2 10:16
+     */
     public RestResponse propertyCompaniesFromRowName(Long mtCompanyId, Integer pageNum, Integer pageSize, String rowName, Object rowValue) {
         Page<PropertyCompany> page = new Page<>(pageNum, pageSize);
-        List<Map<String, Object>> records = this.pageMaps(page, new QueryWrapper<PropertyCompany>()
+        IPage<Map<String, Object>> records = this.pageMaps(page, new QueryWrapper<PropertyCompany>()
                 .select("id", "code", "name", "address", "telephone").like(rowName, rowValue)
-                .eq("mt_company_id", mtCompanyId))
-                .getRecords();
-        records.forEach(record -> {
+                .eq("mt_company_id", mtCompanyId));
+        records.getRecords().forEach(record -> {
             record.put("maintenanceLiftNum", this.getMaintenanceLiftNum());
         });
-        return RestResponse.ok(records, "查询成功");
+        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");
+
+        Integer pageNum = (Integer) map.get("pageNum");
+        Integer pageSize = (Integer) map.get("pageSize");
+        Object mtCompanyId = map.get("mtCompanyId");
+
+//        HashMap<String, Object> conditions = new HashMap<>();
+//        conditions.put("name", name);
+//        conditions.put("address", address);
+//        conditions.put("telephone", telephone);
+
+        Page<PropertyCompany> page = new Page<>(pageNum, pageSize);
+        IPage<Map<String, Object>> records = this
+                .pageMaps(page, new QueryWrapper<PropertyCompany>()
+                        .select("id", "code", "name", "address", "telephone")
+                        .eq("mt_company_id", mtCompanyId)
+                        .like(false, "name", name).like(false, "address", address).like(false, "telephone", telephone));
+        if (!records.getRecords().isEmpty()) {
+            records.getRecords().forEach(record -> {
+                record.put("maintenanceLiftNum", this.getMaintenanceLiftNum());
+            });
+            return RestResponse.ok(records, "1", "查询成功");
+        } else {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+
+
+//        if (name == null & address == null & telephone == null) {
+//            IPage<PropertyCompany> iPage = this.page(page, new QueryWrapper<PropertyCompany>()
+//                    .select("id", "code", "name", "address", "telephone")
+//                    .eq("mt_company_id", mtCompanyId));
+//        } else if (name != null & address == null & telephone == null) {
+//            IPage<PropertyCompany> iPage = this
+//                    .page(page, new QueryWrapper<PropertyCompany>()
+//                            .select("id", "code", "name", "address", "telephone")
+//                            .eq("mt_company_id", mtCompanyId)
+//                            .like("name", name));
+//        }
+
     }
 }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/QuanApplication.java

@@ -21,4 +21,4 @@ public class QuanApplication {
         SpringApplication application = new SpringApplication(QuanApplication.class);
         application.run(args);
     }
-}
+}

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

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.quan.news.controller;
-
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class NewsController {
-}

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

@@ -0,0 +1,153 @@
+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.service.impl.QuanNewsServiceImpl;
+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.mysql.cj.jdbc.Blob;
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.sql.rowset.serial.SerialBlob;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.sql.SQLException;
+
+
+/**
+ * <p>
+ * 电梯圈新闻公告 前端控制器
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-02
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/quan-news")
+public class QuanNewsController {
+    private final QuanNewsServiceImpl quanNewsService;
+
+    @GetMapping("/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) {
+        Page<QuanNews> page = new Page<>(pageNum, pageSize);
+        IPage<QuanNews> top_serial = quanNewsService.page(page, new QueryWrapper<QuanNews>().eq("top_serial", "0"));
+        if (!top_serial.getRecords().isEmpty()) {
+            return RestResponse.ok(top_serial, "1", "查询成功");
+        } else {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+    }
+
+    @GetMapping("/top")
+    /**
+     * @description 置顶
+     * @date 2019/12/2 15:40
+     * @param [id]
+     * @return cn.com.xwy.boot.web.dto.RestResponse
+     */
+    public RestResponse top(@RequestParam int id) {
+        return quanNewsService.top(id);
+    }
+
+    @GetMapping("/{id}")
+    /**
+     * @description 根据id获取新闻
+     * @date 2019/12/2 15:48
+     * @param [id]
+     * @return cn.com.xwy.boot.web.dto.RestResponse
+     */
+    public RestResponse news(@PathVariable int id) {
+        QuanNews byId = quanNewsService.getById(id);
+        if (null != byId) {
+            return RestResponse.ok(byId, "1", "查询成功");
+        } else {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+    }
+
+    @GetMapping("/top1")
+    /**
+     * @description 获取置顶新闻
+     * @date 2019/12/2 15:48
+     * @param [id]
+     * @return cn.com.ty.lift.quan.news.dao.entity.News
+     */
+    public RestResponse top1(@RequestParam int id) {
+        QuanNews one = quanNewsService.getOne(new QueryWrapper<QuanNews>().eq("top_serial", 1));
+        if (null != one) {
+            return RestResponse.ok(one, "1", "查询成功");
+        } else {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+    }
+
+    @PostMapping("/add")
+    /**
+     * @description 新增新闻
+     * @date 2019/12/2 15:48
+     * @param [title, content, videoFile, releaseId]
+     * @return org.springframework.http.ResponseEntity
+     */
+    public RestResponse add(@RequestParam String title, @RequestParam String content, @RequestParam MultipartFile videoFile, @RequestParam Long releaseId) throws Exception {
+        QuanNews news = new QuanNews();
+        SerialBlob blob = new SerialBlob(content.getBytes("UTF8"));
+        news.setTitle(title).setContent(blob).setReleaseId(releaseId);
+        System.out.println("视频名称:" + videoFile.getOriginalFilename());
+        FileOutputStream fos;
+        fos = new FileOutputStream("c:/" + videoFile.getOriginalFilename());
+        fos.write(videoFile.getBytes());
+        fos.close();
+        return RestResponse.ok(null,"1","新增成功");
+    }
+
+//    @PostMapping("/add/top")
+//    @ApiOperation("新增置顶新闻")
+//    public ResponseEntity addTop() {
+//
+//    }
+
+//    @GetMapping("/top/up")
+//    @ApiOperation("置顶上移")
+//    @GetMapping("/top/down")
+//    @ApiOperation("置顶下移")
+
+    @PostMapping("/update")
+    /**
+     * @description 根据id更新新闻信息
+     * @date 2019/12/2 15:49
+     * @param [新闻id, 新闻标题, 新闻内容]
+     * @return org.springframework.http.ResponseEntity
+     */
+    public RestResponse updateNews(@RequestParam int id, @RequestParam String title, @RequestParam Blob content) {
+        return quanNewsService.updateNews(id, title, content);
+    }
+
+    @PostMapping("/delete")
+    /**
+     * @description 根据id删除新闻
+     * @date 2019/12/2 15:49
+     * @param [id]
+     * @return org.springframework.http.ResponseEntity
+     */
+    public RestResponse delete(@RequestParam int id) {
+        if (quanNewsService.removeById(id)) {
+            return RestResponse.ok(null, "0", "删除失败");
+        } else {
+            return RestResponse.ok(null, "1", "删除成功");
+        }
+    }
+}

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

@@ -0,0 +1,78 @@
+package cn.com.ty.lift.quan.news.dao.entity;
+
+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.sql.Blob;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电梯圈新闻公告
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class QuanNews implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 新闻id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 置顶排序
+     */
+    @TableField("top_serial")
+    private Integer topSerial;
+
+    /**
+     * 标题
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 内容+图片
+     */
+    @TableField("content")
+    private Blob content;
+
+    /**
+     * 视频地址
+     */
+    @TableField("video")
+    private String video;
+
+    /**
+     * 发布时间
+     */
+    @TableField("release_date")
+    private LocalDateTime releaseDate;
+
+    /**
+     * 发布人名称
+     */
+    @TableField("release_user")
+    private String releaseUser;
+
+    /**
+     * 发布人id
+     */
+    @TableField("release_id")
+    private Long releaseId;
+
+
+}

lift-quan-service/src/main/java/cn/com/ty/lift/quan/news/dao/mapper/QuanNewsMapper.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.quan.news.dao.mapper;
+
+import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 电梯圈新闻公告 Mapper 接口
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-02
+ */
+public interface QuanNewsMapper extends BaseMapper<QuanNews> {
+
+}

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

@@ -1,7 +0,0 @@
-package cn.com.ty.lift.quan.news.service;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class NewsService {
-}

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

@@ -0,0 +1,17 @@
+package cn.com.ty.lift.quan.news.service;
+
+import cn.com.ty.lift.quan.news.dao.entity.QuanNews;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+
+/**
+ * <p>
+ * 电梯圈新闻公告 服务类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-02
+ */
+public interface QuanNewsService extends IService<QuanNews> {
+
+}

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

@@ -0,0 +1,50 @@
+package cn.com.ty.lift.quan.news.service.impl;
+
+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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mysql.cj.jdbc.Blob;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 电梯圈新闻公告 服务实现类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-02
+ */
+@Service
+public class QuanNewsServiceImpl extends ServiceImpl<QuanNewsMapper, QuanNews> implements QuanNewsService {
+
+    public RestResponse updateNews(int id, String title, Blob content) {
+        QuanNews byId = this.getById(id);
+        if (null == byId) {
+            return RestResponse.ok(null, "0", "不存在此新闻");
+        } else {
+            byId.setTitle(title).setContent(content);
+            if (this.updateById(byId)) {
+                return RestResponse.ok(null, "1", "更新成功");
+            } else {
+                return RestResponse.ok(null, "0", "更新失败");
+            }
+        }
+    }
+
+    public RestResponse top(int id) {
+        QuanNews one = this.getOne(new QueryWrapper<QuanNews>().eq("id", id));
+        if (one != null) {
+            QuanNews top_serial = this.getOne(new QueryWrapper<QuanNews>().eq("top_serial", 1));
+            top_serial.setTopSerial(0);
+            this.updateById(top_serial);
+            one.setTopSerial(1);
+            this.updateById(one);
+            return RestResponse.ok(null, "1", "置顶成功");
+        } else {
+            return RestResponse.ok(null, "0", "新闻不存在");
+        }
+    }
+}

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

@@ -7,9 +7,9 @@ spring:
   profiles:
     active: dev
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/portal?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
-    username: mysql
-    password: mysql
+    url: jdbc:mysql://132.232.206.88/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
+    username: root
+    password: ms.c88pocY/
 
 #自动添加createTime、isDelete 等字段
 xwy:

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

@@ -30,7 +30,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse one() {
-        return RestResponse.ok(faqService.list(new QueryWrapper<Faq>().eq("type", 1).eq("parent_id", 0).orderByAsc("serial")), "查询成功");
+        return RestResponse.ok(faqService.list(new QueryWrapper<Faq>().eq("type", 1).eq("parent_id", 0).orderByAsc("serial")), "1", "查询成功");
     }
 
     @GetMapping("/list/child")
@@ -41,7 +41,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse child(@RequestParam Integer parentId) {
-        return RestResponse.ok(faqService.list(new QueryWrapper<Faq>().eq("type", 1).eq("parent_id", parentId).orderByAsc("serial")), "查询成功");
+        return RestResponse.ok(faqService.list(new QueryWrapper<Faq>().eq("type", 1).eq("parent_id", parentId).orderByAsc("serial")), "1", "查询成功");
     }
 
     @GetMapping("/list/question")
@@ -54,9 +54,9 @@ public class FaqController {
     public RestResponse question(@RequestParam Integer parentId) {
         List<Faq> list = faqService.list(new QueryWrapper<Faq>().eq("type", 2).eq("parent_id", parentId).orderByAsc("serial"));
         if (!list.isEmpty()) {
-            return RestResponse.ok(list, "查询成功");
-        }else {
-            return RestResponse.ok(null, "无数据");
+            return RestResponse.ok(list, "1", "查询成功");
+        } else {
+            return RestResponse.ok(null, "9", "无数据");
         }
     }
 
@@ -68,7 +68,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse answer(@RequestParam Integer parentId) {
-        return RestResponse.ok(faqService.getOne(new QueryWrapper<Faq>().eq("type", 3).eq("parent_id", parentId).orderByAsc("serial")), "查询成功");
+        return RestResponse.ok(faqService.getOne(new QueryWrapper<Faq>().eq("type", 3).eq("parent_id", parentId).orderByAsc("serial")), "1", "查询成功");
     }
 
     @PostMapping("/add/one")
@@ -79,7 +79,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse addOne(@RequestBody Faq faq) {
-        return RestResponse.ok(null, faqService.addOne(faq.getContent(), faq.getDescription()));
+        return faqService.addOne(faq.getContent(), faq.getDescription());
     }
 
     @PostMapping("/add/child")
@@ -90,7 +90,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse addChild(@RequestBody Faq faq) {
-        return RestResponse.ok(null, faqService.addChild(faq.getParentId(), faq.getContent(), faq.getDescription()));
+        return faqService.addChild(faq.getParentId(), faq.getContent(), faq.getDescription());
     }
 
     @PostMapping("/add/question")
@@ -101,7 +101,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse addQuestion(@RequestBody Faq faq) {
-        return RestResponse.ok(null, faqService.addQuestion(faq.getParentId(), faq.getContent(), faq.getDescription()));
+        return faqService.addQuestion(faq.getParentId(), faq.getContent(), faq.getDescription());
     }
 
     @PostMapping("/add/answer")
@@ -112,7 +112,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse addAnswer(@RequestBody Faq faq) {
-        return RestResponse.ok(null, faqService.addAnswer(faq.getParentId(), faq.getContent(), faq.getDescription()));
+        return faqService.addAnswer(faq.getParentId(), faq.getContent(), faq.getDescription());
     }
 
     @PostMapping("/update")
@@ -123,7 +123,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse updateOne(@RequestBody Faq faq) {
-        return RestResponse.ok(null, faqService.up(faq.getId(), faq.getContent(), faq.getDescription()));
+        return faqService.up(faq.getId(), faq.getContent(), faq.getDescription());
     }
 
     @GetMapping("/delete")
@@ -134,7 +134,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse deleteAll(@RequestParam Integer id) {
-        return RestResponse.ok(null, faqService.delete(id));
+        return faqService.delete(id);
     }
 
     @GetMapping("/up")
@@ -145,7 +145,7 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse up(@RequestParam Integer id) {
-        return RestResponse.ok(null, faqService.up(id));
+        return faqService.up(id);
     }
 
     @GetMapping("/down")
@@ -156,6 +156,6 @@ public class FaqController {
      * @return cn.com.xwy.boot.web.dto.RestResponse
      */
     public RestResponse down(@RequestParam Integer id) {
-        return RestResponse.ok(null, faqService.down(id));
+        return faqService.down(id);
     }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/faq/entity/Faq.java

@@ -59,6 +59,4 @@ public class Faq implements Serializable {
      */
     @TableField("description")
     private String description;
-
-
-}
+}

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

@@ -3,6 +3,7 @@ package cn.com.ty.lift.system.faq.service.impl;
 import cn.com.ty.lift.system.faq.entity.Faq;
 import cn.com.ty.lift.system.faq.mapper.FaqMapper;
 import cn.com.ty.lift.system.faq.service.FaqService;
+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 lombok.AllArgsConstructor;
@@ -24,65 +25,65 @@ import java.util.List;
 @AllArgsConstructor
 public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqService {
 
-    public String  addOne(String title, String description) {
+    public RestResponse addOne(String title, String description) {
         Faq faq = new Faq();
         faq.setContent(title).setType(1).setParentId(0).setDescription(description);
         faq.setSerial(this.count(new QueryWrapper<Faq>().eq("type", 1).eq("parent_id", 0)) + 1);
         if (this.save(faq)) {
-            return "新增一级分类成功";
+            return RestResponse.ok(null, "1", "新增一级分类成功");
         } else {
-            return "新增一级分类失败";
+            return RestResponse.ok(null, "0", "新增一级分类失败");
         }
     }
 
-    public String addChild(int parentId, String title, String description) {
+    public RestResponse addChild(int parentId, String title, String description) {
         Faq faq = new Faq();
         faq.setContent(title).setType(1).setParentId(parentId).setDescription(description);
         faq.setSerial(this.list(new QueryWrapper<Faq>().eq("type", 1).eq("parent_id", parentId)).size() + 1);
         if (this.save(faq)) {
-            return "新增子分类成功";
+            return RestResponse.ok(null, "1", "新增子分类成功");
         } else {
-            return "新增子分类失败";
+            return RestResponse.ok(null, "0", "新增子分类失败");
         }
     }
 
-    public String  addQuestion(int parentId, String title, String description) {
+    public RestResponse addQuestion(int parentId, String title, String description) {
         Faq faq = new Faq();
         faq.setContent(title).setType(2).setParentId(parentId).setDescription(description);
         faq.setSerial(this.list(new QueryWrapper<Faq>().eq("type", 2).eq("parent_id", parentId)).size() + 1);
         if (this.save(faq)) {
-            return "新增问题成功";
+            return RestResponse.ok(null, "1", "新增问题成功");
         } else {
-            return "新增问题失败";
+            return RestResponse.ok(null, "0", "新增问题失败");
         }
     }
 
-    public String  addAnswer(int parentId, String content, String description) {
+    public RestResponse addAnswer(int parentId, String content, String description) {
         Faq faq = new Faq();
         faq.setContent(content).setType(3).setParentId(parentId).setDescription(description);
         faq.setSerial(this.list(new QueryWrapper<Faq>().eq("type", 3).eq("parent_id", parentId)).size() + 1);
         if (this.save(faq)) {
-            return "新增答案成功";
+            return RestResponse.ok(null, "1", "新增答案成功");
         } else {
-            return "新增答案失败";
+            return RestResponse.ok(null, "0", "新增答案失败");
         }
     }
 
-    public String up(int id, String title, String description) {
+    public RestResponse up(int id, String title, String description) {
         Faq byId = this.getById(id);
         byId.setContent(title).setDescription(description);
         if (this.updateById(byId)) {
-            return "更新成功";
+            return RestResponse.ok(null, "1", "更新成功");
         } else {
-            return "更新失败";
+            return RestResponse.ok(null, "0", "更新失败");
         }
     }
 
-    public String delete(int id) {
+    public RestResponse delete(int id) {
         if (deleteAll(id)) {
-            return "删除成功";
+            return RestResponse.ok(null, "1", "删除成功");
         } else {
-            return "删除失败";
+            return RestResponse.ok(null, "0", "删除失败");
         }
     }
 
@@ -111,7 +112,7 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
         }
     }
 
-    public String  up(int id) {
+    public RestResponse up(int id) {
         Faq up = this.getById(id);
         if (up != null) {
             if (up.getSerial() > 1) {
@@ -120,16 +121,16 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
                 up.setSerial(up.getSerial() - 1);
                 this.updateById(one);
                 this.updateById(up);
-                return "上移一位";
+                return RestResponse.ok(null, "1", "上移一位");
             } else {
-                return "已经到顶了";
+                return RestResponse.ok(null, "0", "已经到顶了");
             }
         } else {
-            return "此id不存在";
+            return RestResponse.ok(null, "0", "此id不存在");
         }
     }
 
-    public String down(int id) {
+    public RestResponse down(int id) {
         Faq up = this.getById(id);
         if (up != null) {
             if (this.count(new QueryWrapper<Faq>().eq("type", up.getType()).eq("parent_id", up.getParentId()).eq("serial", up.getSerial())) > up.getSerial()) {
@@ -138,12 +139,12 @@ public class FaqServiceImpl extends ServiceImpl<FaqMapper, Faq> implements FaqSe
                 up.setSerial(one.getSerial() + 1);
                 this.updateById(one);
                 this.updateById(up);
-                return "下移一位";
+                return RestResponse.ok(null, "1", "下移一位");
             } else {
-                return "已经到顶了";
+                return RestResponse.ok(null, "0", "已经到顶了");
             }
         } else {
-            return "此id不存在";
+            return RestResponse.ok(null, "0", "此id不存在");
         }
     }
 }