[chg] 年检修改,xinge-push

.gitignore

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

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);

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;

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){

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

@@ -32,7 +32,7 @@ public class MetaHandler implements MetaObjectHandler {
     public void insertFill(MetaObject metaObject) {
         LocalDateTime now = LocalDateTime.now();
         //获取当前登陆用户id
-        Long userId = getUserId();
+        Long userId = 100L;
         if (ObjectUtil.isEmpty(this.getFieldValByName(CREATE_ID, metaObject))) {
             this.setFieldValByName(CREATE_ID, userId, metaObject);
         }
@@ -50,7 +50,7 @@ public class MetaHandler implements MetaObjectHandler {
     @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);
         }
@@ -62,12 +62,4 @@ public class MetaHandler implements MetaObjectHandler {
             this.setFieldValByName(DELETE_FLAG, DELETED_VALUE, metaObject);
         }
     }
-
-    private Long getUserId() {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
-                .getRequest();
-        HttpSession session = request.getSession();
-        Object userId = session.getAttribute(ApiConstants.CURRENT_USER);
-        return Long.parseLong(Objects.toString(userId));
-    }
 }

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" />

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>

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);
+    }
 }

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;
     }
 }