Kaynağa Gözat

Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into develop

黄远 5 yıl önce
ebeveyn
işleme
45451b06de
17 değiştirilmiş dosya ile 166 ekleme ve 90 silme
  1. 1 0
      .gitignore
  2. 13 6
      lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java
  3. 11 6
      lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/entity/AnnualInspection.java
  4. 7 7
      lift-business-service/src/main/java/cn/com/ty/lift/business/common/BaseEntity.java
  5. 1 1
      lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java
  6. 16 12
      lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/MetaHandler.java
  7. 8 6
      lift-business-service/src/main/java/cn/com/ty/lift/business/library/controller/LiftController.java
  8. 0 10
      lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/Lift.java
  9. 2 1
      lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/mapper/LiftMapper.java
  10. 31 14
      lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java
  11. 0 10
      lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/Project.java
  12. 1 0
      lift-business-service/src/main/resources/locale/response.properties
  13. 2 0
      lift-business-service/src/main/resources/mapper/annualinspection/AnnualInspectionMapper.xml
  14. 10 2
      lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml
  15. 1 1
      lift-push/pom.xml
  16. 27 0
      lift-push/src/main/java/cn/com/ty/lift/push/app/MsgRequest.java
  17. 35 14
      lift-push/src/main/java/cn/com/ty/lift/push/app/XingePush.java

+ 1 - 0
.gitignore

@@ -11,6 +11,7 @@
 .springBeans
 .sts4-cache
 ./logs
+rest-client.env.json
 
 ### IntelliJ IDEA ###
 .idea

+ 13 - 6
lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -127,14 +127,15 @@ public class AnnualInspectionController {
         //1 维保工确认年检计划
         if(oldStepStatus == 0 && (stepStatus != 0 && stepStatus != 1)){
             return RestResponse.fail("请执行[维保工确认年检计划]操作");
-        }
-        if(stepStatus == 1 && ObjectUtil.isEmpty(entity.getSelfcheckReportImg())){
-
         }
         //2  维保工上传自检报告
         if(oldStepStatus == 1 && stepStatus != 2){
             return RestResponse.fail("请执行[维保工上传自检报告]操作");
         }
+        if(stepStatus == 1 && ObjectUtil.isEmpty(entity.getSelfcheckReportImg())){
+            return RestResponse.fail("请执行[维保工上传自检报告]操作");
+        }
+
         //3  企业文员确认开始执行年检时间
         if(oldStepStatus == 2 && stepStatus != 3){
             return RestResponse.fail("请执行[企业文员确认开始执行年检时间]操作");
@@ -154,9 +155,15 @@ public class AnnualInspectionController {
             }
 
         }
-        // 4  维保工上传检验结果
+        // 4  维保工上传检验结果和确认检验时间
         if(oldStepStatus == 3 && stepStatus != 4){
-            return RestResponse.fail("请执行[维保工上传检验结果]操作");
+            return RestResponse.fail("请执行[上传检验结果]操作");
+        }
+        if(stepStatus == 4 && ObjectUtil.isEmpty(entity.getCheckResultImg())){
+            return RestResponse.fail("请执行[上传检验结果]操作");
+        }
+        if(stepStatus == 4 && ObjectUtil.isEmpty(entity.getCheckDate())){
+            return RestResponse.fail("请确认检验时间");
         }
         /**
          *  5	企业文员确认检验结果-合格
@@ -192,7 +199,7 @@ public class AnnualInspectionController {
 
         if(stepStatus == 0){
             entity.setStepName(0);
-        }else if(stepStatus == 1 || stepStatus == 2){
+        }else if(stepStatus >= 1 && stepStatus <= 2){
             entity.setStepName(1);
         }else if(stepStatus == 3){
             entity.setStepName(2);

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

@@ -49,13 +49,13 @@ public class AnnualInspection implements Serializable {
      * 是否检查限速器(0 否;1 是;默认0)
      */
     @TableField("is_check_governer")
-    private Integer isCheckGoverner;
+    private Boolean isCheckGoverner;
 
     /**
      * 是否荷载年检设置(0 否;1 是;默认0)
      */
     @TableField("load_inspection_setting")
-    private Integer loadInspectionSetting;
+    private Boolean loadInspectionSetting;
 
     /**
      * 完成时间
@@ -128,7 +128,11 @@ public class AnnualInspection implements Serializable {
      */
     @TableField("check_result_img")
     private String checkResultImg;
-
+    /**
+     * 现场检验时间
+     */
+    @TableField("check_date")
+    private LocalDateTime checkDate;
     /**
      * 年检报告图片路径
      */
@@ -140,9 +144,10 @@ public class AnnualInspection implements Serializable {
      * 未开始0,第一阶段 1-2,第二阶段 3,第三阶段 4-7,第四阶段 8-10
      *
      1  维保工确认年检计划
-     --------------------------------
      2  维保工上传自检报告
-     3  企业文员确认开始执行年检时间
+     3  企业文员确认自检报告
+     --------------------------------
+     4  企业文员确认开始执行年检时间
      --------------------------------
      4	维保工上传检验结果
      5	企业文员确认检验结果-合格
@@ -158,7 +163,7 @@ public class AnnualInspection implements Serializable {
 
     /**
      * 年检阶段名称
-     * 0 未开始 1 第一阶段 1,2 第二阶段 2-3,3 第三阶段 4-7,4 第四阶段 8-10
+     * 0 未开始; 1 第一阶段 1-2;2 第二阶段 3;3 第三阶段 4-7;4 第四阶段 8-10
      */
     @TableField("step_name")
     private Integer stepName;

+ 7 - 7
lift-business-service/src/main/java/cn/com/ty/lift/business/common/BaseEntity.java

@@ -18,20 +18,20 @@ public abstract class BaseEntity implements Serializable {
     /**
      * 创建时间 默认为系统当前时间
      */
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
-    private LocalDateTime createTime;
+    @TableField(value = "create_date", fill = FieldFill.INSERT)
+    private LocalDateTime createDate;
 
     /**
      * 创建者id
      */
-    @TableField(value = "create_id", fill = FieldFill.INSERT)
-    private Long createId;
+    @TableField(value = "creator_id", fill = FieldFill.INSERT)
+    private Long creatorId;
 
     /**
      * 修改时间 默认为系统当前时间
      */
-    @TableField(value = "update_Time", fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime updateTime;
+    @TableField(value = "update_date", fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateDate;
 
     /**
      * 修改者id
@@ -43,5 +43,5 @@ public abstract class BaseEntity implements Serializable {
      * 逻辑删除标识
      */
     @TableField(value = "delete_flag", fill = FieldFill.UPDATE)
-    private String deleteFlag;
+    private boolean deleteFlag;
 }

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -50,9 +50,9 @@ public class EmergencyRepairController {
 
     /**
      * @description 新增急修单
-     * @date 2019/12/9 9:43
      * @param
      * @return
+     * @date 2019/12/9 9:43
      */
     @PostMapping("add")
     public RestResponse add(@RequestBody EmergencyRepair entity){

+ 16 - 12
lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/MetaHandler.java

@@ -21,36 +21,37 @@ import java.util.Objects;
 @Component
 public class MetaHandler implements MetaObjectHandler {
 
-    private static final String CREATE_ID = "createId";
-    private static final String CREATE_TIME = "createTime";
+    private static final String CREATOR_ID = "creatorId";
+    private static final String CREATE_DATE = "createDate";
     private static final String UPDATE_ID = "updateId";
-    private static final String UPDATE_TIME = "updateTime";
+    private static final String UPDATE_DATE = "updateDate";
     private static final String DELETE_FLAG = "deleteFlag";
-    private static final String DELETED_VALUE = "1";
+    private static final boolean DELETED_VALUE = true;
 
     @Override
     public void insertFill(MetaObject metaObject) {
         LocalDateTime now = LocalDateTime.now();
         //获取当前登陆用户id
+
         Long userId = getUserId();
-        if (ObjectUtil.isEmpty(this.getFieldValByName(CREATE_ID, metaObject))) {
-            this.setFieldValByName(CREATE_ID, userId, metaObject);
+        if (ObjectUtil.isEmpty(this.getFieldValByName(CREATOR_ID, metaObject))) {
+            this.setFieldValByName(CREATOR_ID, userId, metaObject);
         }
-        if (ObjectUtil.isEmpty(this.getFieldValByName(CREATE_TIME, metaObject))) {
-            this.setFieldValByName(CREATE_TIME, now, metaObject);
+        if (ObjectUtil.isEmpty(this.getFieldValByName(CREATE_DATE, metaObject))) {
+            this.setFieldValByName(CREATE_DATE, now, metaObject);
         }
         if (ObjectUtil.isEmpty(this.getFieldValByName(UPDATE_ID, metaObject))) {
             this.setFieldValByName(UPDATE_ID, userId, metaObject);
         }
-        if (ObjectUtil.isEmpty(this.getFieldValByName(UPDATE_TIME, metaObject))) {
-            this.setFieldValByName(UPDATE_TIME, now, metaObject);
+        if (ObjectUtil.isEmpty(this.getFieldValByName(UPDATE_DATE, metaObject))) {
+            this.setFieldValByName(UPDATE_DATE, now, metaObject);
         }
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
         //获取当前登陆用户id
-        Long userId = getUserId();
+        Long userId = 100L;
         if (ObjectUtil.isEmpty(this.getFieldValByName(UPDATE_ID, metaObject))) {
             this.setFieldValByName(UPDATE_ID, userId, metaObject);
         }
@@ -68,6 +69,9 @@ public class MetaHandler implements MetaObjectHandler {
                 .getRequest();
         HttpSession session = request.getSession();
         Object userId = session.getAttribute(ApiConstants.CURRENT_USER);
-        return Long.parseLong(Objects.toString(userId));
+        if (ObjectUtil.isNotEmpty(userId)) {
+            return Long.parseLong(Objects.toString(userId));
+        }
+        return null;
     }
 }

+ 8 - 6
lift-business-service/src/main/java/cn/com/ty/lift/business/library/controller/LiftController.java

@@ -10,6 +10,7 @@ import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
 
@@ -86,7 +87,12 @@ public class LiftController {
      */
     @PostMapping("preJudgment")
     public RestResponse preJudgment(@RequestBody LiftExtensionRequest request) {
-        return liftService.preJudgment(request.getMtCompanyId(), request.getCode());
+        Lift lift = request.getLift();
+        String liftId = StrUtil.EMPTY;
+        if (ObjectUtil.isNotEmpty(lift)) {
+            liftId = lift.getId().toString();
+        }
+        return liftService.preJudgment(request.getMtCompanyId(), request.getCode(), liftId);
     }
 
     /**
@@ -108,11 +114,7 @@ public class LiftController {
      */
     @PostMapping("modify")
     public RestResponse modify(@RequestBody Lift lift) {
-        Integer result = liftService.modify(lift);
-        if (result > 0) {
-            return RestResponse.success();
-        }
-        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+       return liftService.modify(lift);
     }
 
     /**

+ 0 - 10
lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/Lift.java

@@ -156,16 +156,6 @@ public class Lift extends BaseEntity {
      */
     private String remarks;
 
-    /**
-     * 创建人ID
-     */
-    private Long creatorId;
-
-    /**
-     * 创建时间
-     */
-    private Date createDate;
-
     /**
      * 钢带
      */

+ 2 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/mapper/LiftMapper.java

@@ -21,10 +21,11 @@ public interface LiftMapper extends BaseMapper<Lift> {
 
     /**
      * @param registrationCode 电梯注册代码
+     * @param liftId 0:新增电梯,1:修改电梯
      * @return 条数
      * @description 查询电梯是否存在
      * @date 2019/12/20 11:04 AM
      */
-    Long findLiftExist(String registrationCode);
+    Long findLiftExist(@Param("registrationCode") String registrationCode, @Param("liftId") String liftId);
 
 }

+ 31 - 14
lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -16,6 +16,7 @@ import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
@@ -87,17 +88,16 @@ public class LiftService {
 
     /**
      * @param mtCompanyId 公司id
-     * @param code 注册代码
+     * @param code        注册代码
+     * @param liftId      电梯id
      * @return RestResponse 判断结果
-     * @description 新增电梯前置判断条件
+     * @description 新增/修改电梯前置判断条件
      * @date 2019/12/20 2:31 PM
      */
-    public RestResponse preJudgment(Long mtCompanyId, String code) {
-        /*if (judge(mtCompanyId))
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));*/
+    public RestResponse preJudgment(Long mtCompanyId, String code, String liftId) {
         //查询电梯表是否有该电梯
-        Long id = findLiftExist(code);
-        if (ObjectUtil.isNotEmpty(id)) {
+        Long id = findLiftExist(code, liftId);
+        if (ObjectUtil.isNotEmpty(id) && ObjectUtil.isEmpty(liftId)) {
             Map<String, Object> paramMap = new HashMap<>(2);
             paramMap.put("id", id);
             paramMap.put("mtCompanyId", mtCompanyId);
@@ -109,6 +109,8 @@ public class LiftService {
                 Lift detail = detail(id);
                 return RestResponse.success(detail, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.lift.company.exist"));
             }
+        } else if (ObjectUtil.isNotEmpty(id) && ObjectUtil.isNotEmpty(liftId)) {
+            return RestResponse.fail(MessageUtils.get("msg.lift.library.exist"));
         } else {
             return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.pre.judge"));
         }
@@ -131,12 +133,13 @@ public class LiftService {
 
     /**
      * @param registrationCode 电梯注册代码
+     * @param liftId 电梯id
      * @return 电梯id
      * @description 查询电梯是否存在
      * @date 2019/12/20 11:04 AM
      */
-    public Long findLiftExist(String registrationCode) {
-        return liftMapper.findLiftExist(registrationCode);
+    public Long findLiftExist(String registrationCode, String liftId) {
+        return liftMapper.findLiftExist(registrationCode, liftId);
     }
 
     /**
@@ -150,7 +153,13 @@ public class LiftService {
         //获取新增标记 (0:新增,1:查询后带入)
         String mark = request.getMark();
         Lift lift = request.getLift();
-        if ("0".equals(mark)){
+        //公司id
+        Long mtCompanyId = request.getMtCompanyId();
+        /*if (judge(mtCompanyId))
+        return RestResponse.fail(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));*/
+        RestResponse response = preJudgment(mtCompanyId, lift.getRegistrationCode(), null);
+        if (ObjectUtil.isNotEmpty(response.getData())) return response;
+        if ("0".equals(mark)) {
             //按当前日期时间戳自动生成电梯编号
             String liftCode = ApiConstants.STRAIGHT_LADDER + DateUtils.generateCode();
             if (CommonEnum.LiftType.STAIRCASE.getCode().equals(Objects.toString(lift.getLiftType()))) {
@@ -164,8 +173,6 @@ public class LiftService {
         }
         //电梯id
         Long id = lift.getId();
-        //公司id
-        Long mtCompanyId = request.getMtCompanyId();
         //新增电梯来源
         String source = request.getSource();
         switch (source) {
@@ -212,8 +219,18 @@ public class LiftService {
      * @description 修改电梯
      * @date 2019/11/27 2:22 PM
      */
-    public Integer modify(Lift lift) {
-        return liftMapper.updateById(lift);
+    public RestResponse modify(Lift lift) {
+        String liftId = StrUtil.EMPTY;
+        if (ObjectUtil.isNotEmpty(lift)) {
+            liftId = lift.getId().toString();
+        }
+        RestResponse response = preJudgment(null, lift.getRegistrationCode(), liftId);
+        if (ObjectUtil.isNotEmpty(response.getData())) return response;
+        int result = liftMapper.updateById(lift);
+        if (result > 0) {
+            return RestResponse.success();
+        }
+        return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
     }
 
     /**

+ 0 - 10
lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/Project.java

@@ -126,16 +126,6 @@ public class Project extends BaseEntity {
      */
     private Byte isLocked;
 
-    /**
-     * 创建人ID
-     */
-    private Long creatorId;
-
-    /**
-     * 创建时间
-     */
-    private Date createDate;
-
     /**
      * 评价方式 0是默认 24  1天后自动评价 48  48小时候默认好评
      */

+ 1 - 0
lift-business-service/src/main/resources/locale/response.properties

@@ -9,6 +9,7 @@ msg.modify.batch.success=\u6279\u91CF\u4FEE\u6539\u6210\u529F
 msg.modify.batch.fail=\u6279\u91CF\u4FEE\u6539\u5931\u8D25
 msg.limit.num=\u5F53\u524D\u7535\u68AF\u53F0\u91CF\u5927\u4E8E\u4F01\u4E1A\u8BBE\u7F6E\u7535\u68AF\u53F0\u91CF
 msg.param.empty=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
+msg.lift.library.exist=\u7535\u68AF\u5E93\u5DF2\u5B58\u5728\u8BE5\u7535\u68AF
 msg.lift.exist=\u516C\u53F8\u4E0B\u5DF2\u6709\u6B64\u7535\u68AF\uFF0C\u4E0D\u80FD\u91CD\u590D\u6DFB\u52A0
 msg.lift.company.exist=\u5176\u4ED6\u516C\u53F8\u5DF2\u6709\u6B64\u7535\u68AF\uFF0C\u8FD4\u56DE\u7535\u68AF\u4FE1\u606F
 msg.pre.judge=\u524D\u7F6E\u6821\u9A8C\u901A\u8FC7

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

@@ -7,6 +7,7 @@
 		<result column="mt_company_id" property="mtCompanyId" jdbcType="BIGINT" />
 		<result column="plan_date" property="planDate" jdbcType="TIMESTAMP" />
 		<result column="is_check_governer" property="isCheckGoverner" jdbcType="TINYINT" />
+		<result column="load_inspection_setting" property="loadInspectionSetting" jdbcType="TINYINT" />
 		<result column="finish_time" property="finishTime" jdbcType="TIMESTAMP" />
 		<result column="inspector" property="inspector" jdbcType="VARCHAR" />
 		<result column="telephone" property="telephone" jdbcType="VARCHAR" />
@@ -18,6 +19,7 @@
 		<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="check_date" property="checkDate" jdbcType="TIMESTAMP" />
 		<result column="annual_inspection_img" property="annualInspectionImg" jdbcType="VARCHAR" />
 		<result column="step_status" property="stepStatus" jdbcType="INTEGER" />
 		<result column="begin_inspection_date" property="beginInspectionDate" jdbcType="TIMESTAMP" />

+ 10 - 2
lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -71,7 +71,7 @@
 		l.device_position        AS devicePosition,
 		lb.name                  AS liftBrand,
 		pclr.lift_company_status AS liftStatus,
-		le.first_time            AS firstMaintenanceTime,
+		plr.first_time           AS firstMaintenanceTime,
 		p.project_name           AS projectName
         FROM platform_company_lift_relevance pclr
         LEFT JOIN lift l ON pclr.lift_id = l.id
@@ -123,7 +123,15 @@
 
 	<!--根据注册代码查询电梯是否存在,返回电梯id -->
 	<select id="findLiftExist" parameterType="java.lang.String" resultType="java.lang.Long">
-		SELECT id FROM lift WHERE registration_code = #{registrationCode,jdbcType=VARCHAR}
+		SELECT id FROM lift
+		WHERE 1=1
+		<if test="liftId == null and liftId = ''">
+			AND registration_code = #{registrationCode,jdbcType=VARCHAR}
+		</if>
+		<if test="liftId!=null and liftId!=''">
+			AND registration_code = #{registrationCode,jdbcType=VARCHAR}
+			AND id != #{liftId,jdbcType=VARCHAR}
+		</if>
 	</select>
 
 </mapper>

+ 1 - 1
lift-push/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>lift-server</artifactId>
         <groupId>cn.com.ty</groupId>
+        <artifactId>lift-server</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -1,15 +1,21 @@
 package cn.com.ty.lift.push.app;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.util.ArrayList;
+
 /**
  * @author wcz
  * @date 2019/12/23
  * @description
  */
 @Data
+@AllArgsConstructor
 public class MsgRequest {
 
+    public static final Integer Android = 1;
+    public static final Integer Ios = 2;
     /**
      * 消息标题
      */
@@ -29,4 +35,25 @@ public class MsgRequest {
      */
     private Boolean allPlatform;
 
+    private ArrayList<String> accountList;
+
+    public static MsgRequest me(String title,String content,Integer platform,Boolean allPlatform,ArrayList<String> accountList){
+        return new MsgRequest(title,content,platform,allPlatform,accountList);
+    }
+
+    public static MsgRequest android(String title,String content,ArrayList<String> accountList){
+        return new MsgRequest(title,content,Android,false,accountList);
+    }
+
+    public static MsgRequest android(String title,String content){
+        return new MsgRequest(title,content,Android,true,null);
+    }
+
+    public static MsgRequest ios(String title,String content,ArrayList<String> accountList){
+        return new MsgRequest(title,content,Ios,false,accountList);
+    }
+
+    public static MsgRequest ios(String title,String content){
+        return new MsgRequest(title,content,Ios,true,null);
+    }
 }

+ 35 - 14
lift-push/src/main/java/cn/com/ty/lift/push/app/XingePush.java

@@ -10,7 +10,6 @@ import com.tencent.xinge.push.app.PushAppRequest;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.Date;
 
 /**
  * @author wcz
@@ -27,21 +26,22 @@ public class XingePush {
     public static void main(String[] args) {
         ArrayList<String> account_list = new ArrayList<>();
         account_list.add(access);
+        MsgRequest request = MsgRequest.android("天域电梯测试","测试信鸽消息推送,当前时间: " + DateUtil.now(),account_list);
 
-        pushMessage(account_list);
+        pushMessage(request);
     }
     /**
      * 消息推送(单推)
      */
-    public static void pushMessage(ArrayList<String> account_list) {
+    public static Boolean pushMessage(MsgRequest msgRequest) {
         //消息推送(>>>)
         XingeApp xingeApp = new XingeApp(appId, secretKey);
         /**
          * https://xg.qq.com/docs/server_api/v3/push_api_v3.html#message%EF%BC%9A%E6%B6%88%E6%81%AF%E4%BD%93
          */
         Message message = new Message();
-        message.setTitle("信鸽测试");
-        message.setContent("测试信鸽推送" + DateUtil.formatDateTime(new Date()));
+        message.setTitle(msgRequest.getTitle());
+        message.setContent(msgRequest.getContent());
         //推送请求信息
         PushAppRequest pushAppRequest = new PushAppRequest();
         //消息体
@@ -52,6 +52,18 @@ public class XingePush {
          2)message:透传消息/静默消息
          */
         pushAppRequest.setMessage_type(MessageType.notify);
+        /**
+         * 客户端平台类型
+         1)android:安卓
+         2)ios:苹果
+         */
+        if(msgRequest.getPlatform() == 1){
+            pushAppRequest.setPlatform(Platform.android);
+        }else if(msgRequest.getPlatform() == 2){
+            pushAppRequest.setPlatform(Platform.ios);
+        }else{
+            return false;
+        }
         /**
          * 推送目标
          1)all:全量推送
@@ -61,20 +73,29 @@ public class XingePush {
          5)account:单账号推送
          6)account_list:账号列表推送
          */
-        pushAppRequest.setAudience_type(AudienceType.account);
-        /**
-         * 客户端平台类型
-         1)android:安卓
-         2)ios:苹果
-         */
-        pushAppRequest.setPlatform(Platform.android);
 
-        //推送账号
-        pushAppRequest.setAccount_list(account_list);
+        if(msgRequest.getAllPlatform()){
+            pushAppRequest.setAudience_type(AudienceType.all);
+        }else {
+            ArrayList<String> accountList = msgRequest.getAccountList();
+            if(null == accountList || accountList.size() == 0){
+                return false;
+            }
+            if(accountList.size() == 1){
+                pushAppRequest.setAudience_type(AudienceType.account);
+            }else{
+                pushAppRequest.setAudience_type(AudienceType.account_list);
+            }
+            //推送账号
+            pushAppRequest.setAccount_list(msgRequest.getAccountList());
+        }
+
         //打印下推送数据
         System.out.println(pushAppRequest.toString());
         //推送结果 0是推送成功
         JSONObject result = xingeApp.pushApp(pushAppRequest.toString());
         System.out.println(result);
+
+        return true;
     }
 }