[chg] 年检查询条件，信鸽push集成demo

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

@@ -1,7 +1,7 @@
 package cn.com.ty.lift.business.annualinspection.controller;
 
 
-import cn.com.ty.lift.business.annualinspection.dto.InspectionCondition;
+import cn.com.ty.lift.business.annualinspection.dto.InspectionRequest;
 import cn.com.ty.lift.business.annualinspection.entity.AnnualInspection;
 import cn.com.ty.lift.business.annualinspection.service.impl.AnnualInspectionServiceImpl;
 import cn.com.ty.lift.business.common.RestResult;
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
@@ -42,7 +41,8 @@ public class AnnualInspectionController {
      * @return
      */
     @PostMapping("findOne")
-    public RestResponse findOne(Long id){
+    public RestResponse findOne(@RequestBody InspectionRequest request){
+        Long id = request.getId();
         if(null == id || id <= 0){
             return RestResult.errParam();
         }
@@ -60,16 +60,16 @@ public class AnnualInspectionController {
      * @return
      */
     @PostMapping("page")
-    public RestResponse page(@RequestBody InspectionCondition condition){
-        if(null == condition){
+    public RestResponse page(@RequestBody InspectionRequest request){
+        if(null == request){
             return RestResult.errParam();
         }
-        String info = condition.getInfo();
+        String info = request.getInfo();
         if(StrUtil.isNotBlank(info)){
-            condition.setInfo(StrUtil.format("%{}%",info));
+            request.setInfo(StrUtil.format("%{}%",info));
         }
 
-        IPage<AnnualInspection> page = annualInspectionService.listByCondition(condition);
+        IPage<AnnualInspection> page = annualInspectionService.listByCondition(request);
         if(null == page){
             return RestResult.fail();
         }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/dto/InspectionCondition.java

@@ -9,8 +9,9 @@ import lombok.Data;
  * @description
  */
 @Data
-public class InspectionCondition extends BaseRequestModel{
+public class InspectionRequest extends BaseRequestModel{
 
+    private long id;
     /**
      * 区域id
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/dto/InspectionResult.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @description
  */
 @Data
-public class InspectionResult extends AnnualInspection{
+public class InspectionResponse extends AnnualInspection{
 
     /**
      * 区域名称

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/mapper/AnnualInspectionMapper.java

@@ -1,9 +1,10 @@
 package cn.com.ty.lift.business.annualinspection.mapper;
 
-import cn.com.ty.lift.business.annualinspection.dto.InspectionCondition;
+import cn.com.ty.lift.business.annualinspection.dto.InspectionRequest;
 import cn.com.ty.lift.business.annualinspection.entity.AnnualInspection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -18,5 +19,5 @@ import org.springframework.stereotype.Repository;
 public interface AnnualInspectionMapper extends BaseMapper<AnnualInspection> {
 
 
-    IPage<AnnualInspection> listByCondition(IPage<AnnualInspection> page, InspectionCondition condition);
+    IPage<AnnualInspection> listByCondition(IPage<AnnualInspection> page, @Param("cond") InspectionRequest request);
 }

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

@@ -1,6 +1,6 @@
 package cn.com.ty.lift.business.annualinspection.service;
 
-import cn.com.ty.lift.business.annualinspection.dto.InspectionCondition;
+import cn.com.ty.lift.business.annualinspection.dto.InspectionRequest;
 import cn.com.ty.lift.business.annualinspection.entity.AnnualInspection;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -15,7 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface AnnualInspectionService extends IService<AnnualInspection> {
 
-    IPage<AnnualInspection> listByCondition(InspectionCondition condition);
-
-    boolean finishAnnualInspection(AnnualInspection entity);
+    IPage<AnnualInspection> listByCondition(InspectionRequest request);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/impl/AnnualInspectionServiceImpl.java

@@ -1,11 +1,9 @@
 package cn.com.ty.lift.business.annualinspection.service.impl;
 
-import cn.com.ty.lift.business.annualinspection.dto.InspectionCondition;
+import cn.com.ty.lift.business.annualinspection.dto.InspectionRequest;
 import cn.com.ty.lift.business.annualinspection.entity.AnnualInspection;
 import cn.com.ty.lift.business.annualinspection.mapper.AnnualInspectionMapper;
 import cn.com.ty.lift.business.annualinspection.service.AnnualInspectionService;
-import cn.com.ty.lift.business.library.dao.entity.LiftExtension;
-import cn.com.ty.lift.business.library.dao.mapper.LiftExtensionMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,26 +24,13 @@ public class AnnualInspectionServiceImpl extends ServiceImpl<AnnualInspectionMap
     @Autowired
     private AnnualInspectionMapper annualInspectionMapper;
 
-    private LiftExtensionMapper liftExtensionMapper;
-
     @Override
-    public IPage<AnnualInspection> listByCondition(InspectionCondition condition) {
-        IPage<AnnualInspection> page = new Page<>(condition.getPageNum(),condition.getPageSize());
-        IPage<AnnualInspection> lists = annualInspectionMapper.listByCondition(page,condition);
+    public IPage<AnnualInspection> listByCondition(InspectionRequest request) {
+        long pageNum = request.getPageNum();
+        long pageSize = request.getPageSize();
+        IPage<AnnualInspection> page = new Page<>(pageNum,pageSize);
+        IPage<AnnualInspection> lists = annualInspectionMapper.listByCondition(page,request);
         return lists;
     }
 
-
-    @Override
-    public boolean finishAnnualInspection(AnnualInspection entity) {
-        boolean ai = saveOrUpdate(entity);
-        if(!ai) return false;
-        LiftExtension liftExtension = liftExtensionMapper.selectById(entity.getLiftId());
-        if(null == liftExtension){
-
-        }
-        return false;
-    }
-
-
 }

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

@@ -122,4 +122,29 @@ public class EmergencyRepairController {
         }
         return RestResult.fail();
     }
+
+    /**
+     * @description 关闭急修单
+     * @date 2019/12/11 9:25
+     * @param
+     * @return
+     */
+    @PostMapping("close")
+    public RestResponse close(@RequestBody RepairRequest request){
+        Long id = request.getId();
+        if(null == id){
+            return RestResult.errParam();
+        }
+        EmergencyRepair entity = emergencyRepairService.getById(id);
+        if(null == entity){
+            return RestResult.errParam();
+        }
+        //状态（0 待完成；1 已签到，待修理；2 已修理；3 待评价；4 完成 5 暂停中 6 关闭）
+        entity.setStatus(6);
+        boolean result = emergencyRepairService.saveOrUpdate(entity);
+        if(result){
+            return RestResult.okData(result);
+        }
+        return RestResult.fail();
+    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/aspect/GlobalDefaultExceptionHandler.java

@@ -66,7 +66,7 @@ public class GlobalDefaultExceptionHandler {
         errorMap.put("url", req.getRequestURI());
         errorMap.put("status", resp.getStatus());
         errorMap.put("message", error);
-        log.error(">>>>> ERROR:{}, {}",errorMap.toString(),error.toString());
+        log.error(">>>>> GlobalDefaultException:{}, {}",errorMap,error);
         if (error instanceof BusinessBasicException) {
             final BusinessBasicException businessBasicException = (BusinessBasicException) error;
             return RestResult.err(businessBasicException.addSuffix(error.getMessage()).replace("()", ""));

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.com.ty.lift.business.annualinspection.mapper.AnnualInspectionMapper" >
-	<resultMap id="BaseResultMap" type="cn.com.ty.lift.business.annualinspection.dto.InspectionResult" >
+	<resultMap id="BaseResultMap" type="cn.com.ty.lift.business.annualinspection.dto.InspectionResponse" >
 		<id column="id" property="id" jdbcType="BIGINT" />
 		<result column="lift_id" property="liftId" jdbcType="BIGINT" />
 		<result column="mt_company_id" property="mtCompanyId" jdbcType="BIGINT" />
@@ -27,8 +27,8 @@
 		<result column="device_position" property="devicePosition" jdbcType="VARCHAR" />
 	</resultMap>
 
-
-	<select id="listByCondition" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionCondition" >
+    <!--多条件查询年检记录-->
+	<select id="listByCondition" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionRequest" >
         SELECT
             ai.*,
             re.area_name AS area_name,
@@ -44,22 +44,22 @@
             LEFT JOIN region re ON re.mt_company_id = ai.mt_company_id
             LEFT JOIN project pr ON pr.mt_company_id = ai.mt_company_id
         WHERE
-            ai.status = #{condition.status}
+            ai.status = #{cond.status}
         
-            <if test="condition.workerId != null">
-                AND ui.user_id = #{condition.workerId}
+            <if test="cond.workerId != null and cond.workerId > 0">
+                AND ui.user_id = #{cond.workerId}
             </if>
-            <if test="condition.info != null and condition.info != ''">
-                AND li.registration_code LIKE #{condition.info}
+            <if test="cond.info != null and cond.info != ''">
+                AND li.registration_code LIKE #{cond.info}
             </if>
-            <if test="condition.regionId != null">
-                AND re.id = #{condition.regionId}
+            <if test="cond.regionId != null and cond.regionId > 0">
+                AND re.id = #{cond.regionId}
             </if>
-            <if test="condition.projectId != null">
-                AND pr.id = #{condition.projectId}
+            <if test="cond.projectId != null and cond.projectId > 0">
+                AND pr.id = #{cond.projectId}
             </if>
-            <if test="condition.stepStatus != null">
-                AND ai.step_status = #{condition.stepStatus}
+            <if test="cond.stepStatus != null">
+                AND ai.step_status = #{cond.stepStatus}
             </if>
 
 	</select>

lift-business-service/src/main/resources/mapper/emergency/EmergencyRepairMapper.xml

@@ -47,6 +47,7 @@
 		<result column="lift_company_status" property="liftCompanyStatus" jdbcType="VARCHAR" />
 	</resultMap>
 
+	<!--查询急修中-->
     <select id="listByRepairing" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest">
         SELECT
             er.*,
@@ -62,9 +63,10 @@
             LEFT JOIN project pr ON pr.id = er.project_id
             LEFT JOIN platform_company_lift_relevance pclr ON pclr.lift_id = li.id
         WHERE
-          er.`status` <![CDATA[ <> ]]> #{cond.status}
+          er.`status` <![CDATA[ <> ]]> 4
     </select>
 
+	<!--根据条件查询急修记录-->
     <select id="listByCondition" resultMap="BaseResultMap" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest" >
         SELECT
             er.*,

lift-common/pom.xml

@@ -48,6 +48,11 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.tencent</groupId>
+            <artifactId>xinge-push</artifactId>
+            <version>1.2.0</version>
+        </dependency>
     </dependencies>
 
 </project>

lift-common/src/main/java/cn.com.ty.lift.common/utils/XingePush.java

@@ -0,0 +1,78 @@
+package cn.com.ty.lift.common.utils;
+
+import com.tencent.xinge.XingeApp;
+import com.tencent.xinge.bean.AudienceType;
+import com.tencent.xinge.bean.Message;
+import com.tencent.xinge.bean.MessageType;
+import com.tencent.xinge.bean.Platform;
+import com.tencent.xinge.push.app.PushAppRequest;
+
+import java.util.ArrayList;
+
+/**
+ * @author wcz
+ * @date 2019/12/17
+ * @description 腾讯信鸽推动 https://xg.qq.com/docs/server_api/v3/push_api_v3.html
+ */
+public class XingePush {
+
+    private static final String appId = "40d4e2e854433";
+    private static final String secretKey = "fa99dc19157b00fc71cf8d7e840273a3";
+
+    private static final String token = "ROysXgvKpZnC2ratqNZsZiq82UqrSGKvAo4j9KeM";
+
+    public static void main(String[] args) {
+        setPushApp();
+    }
+    /**
+     * 消息推送(单推)
+     */
+    public static void setPushApp() {
+        //消息推送（>>>）
+        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("测试信鸽推送" + System.currentTimeMillis());
+        //推送请求信息
+        PushAppRequest pushAppRequest = new PushAppRequest();
+        //消息体
+        pushAppRequest.setMessage(message);
+        /**
+         * 消息类型
+         1）notify：通知
+         2）message：透传消息/静默消息
+         */
+        pushAppRequest.setMessage_type(MessageType.message);
+        /**
+         * 推送目标
+         1）all：全量推送
+         2）tag：标签推送
+         3）token：单设备推送
+         4）token_list：设备列表推送
+         5）account：单账号推送
+         6）account_list：账号列表推送
+         */
+        pushAppRequest.setAudience_type(AudienceType.token);
+        /**
+         * 客户端平台类型
+         1）android：安卓
+         2）ios：苹果
+         */
+        pushAppRequest.setPlatform(Platform.android);
+        //账号
+        ArrayList<String> account_list = new ArrayList<>();
+        account_list.add(token);
+        //推送账号
+        //pushAppRequest.setAccount_list(account_list);
+        pushAppRequest.setToken_list(account_list);
+        //打印下推送数据
+        System.out.println(pushAppRequest.toString());
+        //推送结果 0是推送成功
+
+
+        System.out.println(xingeApp.pushApp(pushAppRequest.toString()));
+    }
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/GlobalDefaultExceptionHandler.java

@@ -64,7 +64,7 @@ public class GlobalDefaultExceptionHandler {
         errorMap.put("url", req.getRequestURI());
         errorMap.put("status", resp.getStatus());
         errorMap.put("message", error);
-        log.error(">>>>> ERROR:{}, {}",errorMap.toString(),error.toString());
+        log.error(">>>>> GlobalDefaultException:{}, {}",errorMap,error);
         if (error instanceof EnterpriseBasicException) {
             final EnterpriseBasicException enterpriseBasicException = (EnterpriseBasicException) error;
             return RestResult.err(enterpriseBasicException.addSuffix(error.getMessage()).replace("()", ""));