[chg] 年检增加自检时间,消息推送增加消息体

lift-business-service/pom.xml

@@ -24,7 +24,12 @@
             <artifactId>lift-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
+        <!--集成Hutool是一个小而全的Java工具类库：https://www.hutool.cn/docs/#/-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.0.6</version>
+        </dependency>
         <!--<dependency>
             <groupId>cn.com.xwy</groupId>
             <artifactId>xwy-cloud-dependencies</artifactId>

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/entity/AnnualInspection.java

@@ -117,6 +117,12 @@ public class AnnualInspection implements Serializable {
     @TableField("selfcheck_report_img")
     private String selfcheckReportImg;
 
+    /**
+     * 自检时间
+     */
+    @TableField("selfcheck_date")
+    private LocalDateTime selfcheckDate;
+
     /**
      * 检验结果图片路径
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/ProjectLiftRelevance.java

@@ -53,10 +53,6 @@ public class ProjectLiftRelevance extends BaseEntity {
      */
     private Byte isLiftLocked;
 
-    /**
-     * 是否删除 0否 1是
-     */
-    private Byte deleteFlag;
     /**
      * 首保时间
      */

lift-business-service/src/main/resources/mapper/annualinspection/AnnualInspectionMapper.xml

@@ -16,6 +16,7 @@
 		<result column="status" property="status" jdbcType="TINYINT" />
 		<result column="next_inspection_time" property="nextInspectionTime" jdbcType="TIMESTAMP" />
 		<result column="selfcheck_report_img" property="selfcheckReportImg" jdbcType="VARCHAR" />
+		<result column="selfcheck_date" property="selfcheckDate" jdbcType="TIMESTAMP" />
 		<result column="check_result_img" property="checkResultImg" jdbcType="VARCHAR" />
 		<result column="annual_inspection_img" property="annualInspectionImg" jdbcType="VARCHAR" />
 		<result column="step_status" property="stepStatus" jdbcType="INTEGER" />

lift-common/pom.xml

@@ -16,6 +16,7 @@
             <groupId>cn.com.xwy</groupId>
             <artifactId>xwy-util</artifactId>
         </dependency>
+        <!--集成Hutool是一个小而全的Java工具类库：https://www.hutool.cn/docs/#/-->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>

lift-demo-service/src/main/java/cn/com/ty/demo/controller/TestRestController.java

@@ -36,6 +36,6 @@ public class TestRestController {
         RestResponse<BasePageResult<RoleVo>> roleVoRestResponse = portalFeignApi.queryMenuByRole(dto);
         List<RoleVo> dataList = roleVoRestResponse.getData().getRows();
         System.out.println(dataList);
-        return RestResponse.ok(env.getProperty("test.config.name"));
+        return RestResponse.success(env.getProperty("test.config.name"));
     }
 }

lift-push/pom.xml

@@ -25,7 +25,7 @@
             <artifactId>lift-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
+        <!--集成Hutool是一个小而全的Java工具类库：https://www.hutool.cn/docs/#/-->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>

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

@@ -1,13 +0,0 @@
-package cn.com.ty.lift.push.app;
-
-/**
- * @author wcz
- * @date 2019/12/23
- * @description
- */
-
-public class MgsRequest {
-
-    private String title;
-    private String content;
-}

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

@@ -0,0 +1,32 @@
+package cn.com.ty.lift.push.app;
+
+import lombok.Data;
+
+/**
+ * @author wcz
+ * @date 2019/12/23
+ * @description
+ */
+@Data
+public class MsgRequest {
+
+    /**
+     * 消息标题
+     */
+    private String title;
+    /**
+     * 消息内容
+     */
+    private String content;
+
+    /**
+     * 消息推送的平台 1:andorid 2:ios
+     */
+    private Integer platform;
+
+    /**
+     * 消息是否全平台发布(平台内所有账号全部推动)
+     */
+    private Boolean allPlatform;
+
+}