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

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/ScanRecordController.java

@@ -19,6 +19,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 电梯二维码扫码Controller
  */
@@ -58,13 +62,13 @@ public class ScanRecordController {
     //维保项list结构
     @PostMapping("maintenance/option/list")
     public RestResponse<?> listOptions(@RequestBody ScanRecordRequest request) {
-        String sort;
+        List<Integer> sort;
         switch (request.getLiftType()) {
             case 1:
-                sort = "1,2,3,4,5";
+                sort = new ArrayList<>(Arrays.asList(1, 2, 3, 4, 5));
                 break;
             case 2:
-                sort = "-1";
+                sort = new ArrayList<>(Arrays.asList(-1));
                 break;
             default:
                 sort = null;
@@ -110,7 +114,13 @@ public class ScanRecordController {
      * @return 操作结果
      */
     @PostMapping("record/add")
-    public RestResponse add(@RequestBody ScanRecord scanRecord) {
-        return RestResponse.success(scanRecordService.save(scanRecord));
+    public RestResponse<?> add(@RequestBody ScanRecord scanRecord) {
+        List<ScanRecord> list = scanRecordService.list(Wrappers.<ScanRecord>query()
+                .eq(scanRecord.getOpenId() != null, "open_id", scanRecord.getOpenId())
+                .eq(scanRecord.getLiftId() != null, "lift_id", scanRecord.getLiftId()));
+        if (list.isEmpty()) {
+            return RestResponse.success(scanRecordService.save(scanRecord));
+        }
+        return RestResponse.fail("该电梯扫码记录已存在");
     }
 }

lift-common/src/main/java/cn.com.ty.lift.common/model/PushMessage.java

@@ -410,8 +410,8 @@ public class PushMessage implements Serializable {
      * 公司发送公告
      * 有一条公司公告，请查收
      */
-    public static PushMessage announcementNotice() {
-        return create("公司公告", "有一条公司公告，请查收");
+    public static PushMessage announcementNotice(String content) {
+        return create("公司公告", content);
     }
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AnnouncementController.java

@@ -107,7 +107,7 @@ public class AnnouncementController {
                 pages = iPage.getPages();
                 List<PushUserInfo> pushUserInfos = iPage.getRecords();
                 if(pushUserInfos.size() > 0){
-                    PushMessage.announcementNotice().sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
+                    PushMessage.announcementNotice(entity.getContent()).sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfos);
                 }
                 pageNum++;
             } while (pageNum <= pages);

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

@@ -45,7 +45,8 @@ public class MaintenanceOptionController {
                         .in("mt_company_id", 10086L, req.getMtCompanyId())
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftCategory() != null, "lift_category", req.getLiftCategory())
-                        .eq(req.getStatus() != null, "status", req.getStatus()));
+                        .eq(req.getStatus() != null, "status", req.getStatus())
+                        .orderByDesc("id"));
         if (page.getRecords().isEmpty()) {
             return RestResponse.success();
         }
@@ -64,7 +65,7 @@ public class MaintenanceOptionController {
         String sort = null;
         if (category == 4 || category == 5) {
             req.setLiftCategory(3);
-            sort = "-1,1";
+            sort = "-1";
         }
         if (category == 3) {
             req.setLiftCategory(4);
@@ -91,6 +92,9 @@ public class MaintenanceOptionController {
      */
     @PostMapping("/add")
     public RestResponse add(@RequestBody MaintenanceOption option) {
+        if (option.getLiftCategory() == 3) {
+            option.setSort(-1);
+        }
         return RestResponse.success(optionService.save(option));
     }
 

lift-push/src/main/java/cn/com/ty/lift/push/app/PushConsumer.java

@@ -143,6 +143,7 @@ public class PushConsumer {
             timeMessage.setUserId(k);
             timeMessage.setContent(pushMessage.getContent());
             switch (pushMessage.getTitle()) {
+                case "公司公告":
                 case "团队消息":
                     timeMessage.setType(1);
                     break;

lift-push/src/main/java/cn/com/ty/lift/push/app/PushProducer.java

@@ -25,7 +25,7 @@ public class PushProducer {
     //发送queue类型消息
     @GetMapping("/announcement")
     public Object announcement() {
-        PushMessage pushMessage = PushMessage.announcementNotice();
+        PushMessage pushMessage = PushMessage.announcementNotice("有一条公司公告，请注意查收");
         pushMessage.sendAllOnPlatform(jmsMessagingTemplate);
         return pushMessage;
     }