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

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/DynamicMessageResponse.java

@@ -2,9 +2,12 @@ package cn.com.ty.lift.business.maintenance.dao.entity.model.response;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class DynamicMessageResponse {
     private Long id;
+    private LocalDateTime recoveryDate;
     private String devicePosition;
     private Integer hasEvaluate;
 }

lift-common/src/main/java/cn.com.ty.lift.common/constants/SqlConstants.java

@@ -84,7 +84,7 @@ public interface SqlConstants {
 
     //物管。动态消息，当日急修完成是否已经评价列表
     String QUERY_EMERGENCY_REPAIR_DYNAMIC_MESSAGE =
-            "select     er.id id,l.device_position devicePosition, has_evaluate hasEvaluate" +
+            "select     er.id id, l.device_position devicePosition, er.recovery_date recoveryDate, has_evaluate hasEvaluate" +
                     "    from emergency_repair er" +
                     "       left join lift l on er.lift_id = l.id" +
                     "    where DATE_FORMAT(er.recovery_date, '%Y%m%d') = DATE_FORMAT(CURDATE(), '%Y%m%d')" +

lift-system-service/src/main/java/cn/com/ty/lift/system/version/controller/VersionController.java

@@ -0,0 +1,53 @@
+package cn.com.ty.lift.system.version.controller;
+
+import cn.com.ty.lift.common.constants.ApiConstants;
+import cn.com.ty.lift.system.version.dao.entity.Version;
+import cn.com.ty.lift.system.version.dao.mapper.VersionMapper;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 软件版本信息
+ */
+@RestController
+@AllArgsConstructor
+public class VersionController {
+    VersionMapper versionMapper;
+
+    /**
+     * 获取软件版本信息
+     *
+     * @param request 获取请求头信息
+     * @return 版本信息
+     */
+    @PostMapping("version")
+    public RestResponse<?> version(HttpServletRequest request) {
+        String mobileType = request.getHeader("mobileType");
+        if (mobileType == null) {
+            return RestResponse.fail();
+        }
+        int type = Integer.parseInt(mobileType);
+        QueryWrapper<Version> query = Wrappers.query();
+        switch (type) {
+            case ApiConstants.ACCESS_TYPE_PC:
+                query.eq("device", ApiConstants.ACCESS_TYPE_PC);
+                break;
+            case ApiConstants.ACCESS_TYPE_APP:
+                query.eq("device", ApiConstants.ACCESS_TYPE_APP);
+                break;
+            case ApiConstants.ACCESS_TYPE_PUBLIC:
+                query.eq("device", ApiConstants.ACCESS_TYPE_PUBLIC);
+                break;
+            case ApiConstants.ACCESS_TYPE_APPLETS:
+                query.eq("device", ApiConstants.ACCESS_TYPE_APPLETS);
+                break;
+        }
+        return RestResponse.success(versionMapper.selectOne(query));
+    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/version/dao/entity/Version.java

@@ -0,0 +1,17 @@
+package cn.com.ty.lift.system.version.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class Version {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    private Integer device;
+    private String content;
+    private String version;
+    private String url;
+    private Integer code;
+    private Integer forceUpdate;
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/version/dao/mapper/VersionMapper.java

@@ -0,0 +1,7 @@
+package cn.com.ty.lift.system.version.dao.mapper;
+
+import cn.com.ty.lift.system.version.dao.entity.Version;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface VersionMapper extends BaseMapper<Version> {
+}