Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java

@@ -26,7 +26,7 @@ public class MyBatisPlusCodeGenerator {
     /**
      * 项目名称缩写
      */
-    static String projectShortName = "common";
+    static String projectShortName = "tzs";
 
     /**
      * 项目api目录
@@ -102,7 +102,7 @@ public class MyBatisPlusCodeGenerator {
         gc.setActiveRecord(false);
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://172.16.6.60:3306/amos-jcs-biz?serverTimezone=GMT%2B8");
+        dsc.setUrl("jdbc:mysql://172.16.6.60:3306/amos-tzs-biz?serverTimezone=GMT%2B8");
         // dsc.setSchemaName("public");
 //        dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireExpertsDto.java

@@ -63,48 +63,51 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "政治面貌")
     private String politicalOutlook;
 
-    @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
-    @ExcelProperty(value = "籍贯", index = 8)
+   // @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
+    @ExcelIgnore
+ //   @ExcelProperty(value = "籍贯", index = 8)
     @ApiModelProperty(value = "籍贯")
     private String nativePlace;
 
 //    @ExplicitConstraint(indexNum = 9, sourceClass = RoleNameExplicitConstraint.class, method = "getAdministrativeDivisions") //固定下拉内容
-
-    @ExcelProperty(value = "籍贯/户口所在地详细地址", index = 9)
+    @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
+    @ExcelProperty(value = "籍贯/户口所在地详细地址", index = 8)
     @ApiModelProperty(value = "籍贯/户口所在地详细地址")
     private String nativePlaceVal;
 
-    @ExplicitConstraint(indexNum = 10,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+   // @ExplicitConstraint(indexNum = 10,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
     @ApiModelProperty(value = "现居住地")
-    @ExcelProperty(value = "现居住地", index = 10)
+    @ExcelIgnore
+    //@ExcelProperty(value = "现居住地", index = 10)
     private String residence;
 
 
-
-    @ExplicitConstraint(indexNum =11,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
-    @ExcelProperty(value = "现居住地", index = 11)
+  //  @ExcelIgnore
+    //@ExplicitConstraint(indexNum =11,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+    @ExcelProperty(value = "现居住地", index = 10)
     @ApiModelProperty(value = "居住地详情")
     private String residenceDetails;
 
-    @ExcelProperty(value = "现居住地详细地址", index = 12)
+    @ExplicitConstraint(indexNum =9,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
+    @ExcelProperty(value = "现居住地", index = 9)
     @ApiModelProperty(value = "现居住地详细地址")
     private String residenceDetailVal;
 
-    @ExcelProperty(value = "办公电话", index = 13)
+    @ExcelProperty(value = "办公电话", index = 11)
     @ApiModelProperty(value = "办公电话")
     private String officePhone;
 
-    @ExcelProperty(value = "移动电话", index = 14)
+    @ExcelProperty(value = "移动电话", index = 12)
     @ApiModelProperty(value = "移动电话")
     private String mobilePhone;
 
-    @ExplicitConstraint(type = "XLLX", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "最高学历", index = 15)
+    @ExplicitConstraint(type = "XLLX", indexNum = 13, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "最高学历", index = 13)
     @ApiModelProperty(value = "最高学历")
     private String highestEducation;
 
-    @ExplicitConstraint(type = "GWMC", indexNum = 16, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "岗位名称", index = 16)
+    @ExplicitConstraint(type = "GWMC", indexNum = 14, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位名称", index = 14)
     @ApiModelProperty(value = "岗位名称")
     private String jobs;
 
@@ -112,8 +115,8 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "岗位名称code")
     private String jobsCode;
 
-    @ExplicitConstraint(type = "ZJLY", indexNum = 17, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防专家领域", index = 17)
+    @ExplicitConstraint(type = "ZJLY", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防专家领域", index = 15)
     @ApiModelProperty(value = "消防专家领域")
     private String expert;
 
@@ -147,7 +150,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "消防机构name")
     private Long fireTeamName;
 
-    @ExcelProperty(value = "备注", index = 18)
+    @ExcelProperty(value = "备注", index = 16)
     @ApiModelProperty(value = "备注")
     private String note;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgMenuDto.java

@@ -72,4 +72,12 @@ public class OrgMenuDto {
 	public OrgMenuDto() {
 		// TODO Auto-generated constructor stub
 	}
+
+    public OrgMenuDto(Long key, Long value, String title, String name, List<OrgMenuDto> children) {
+        this.key = key;
+        this.value = value;
+        this.title = title;
+        this.name = name;
+        this.children = children;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -65,8 +65,8 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "管理单位id")
     private Long managementUnitId;
 
-    @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
-    @ExcelProperty(value = "管理单位", index = 5)
+    @ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
+    @ExcelProperty(value = "管理单位", index = 9)
     @ApiModelProperty(value = "管理单位")
     private String managementUnit;
 
@@ -74,8 +74,8 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "维保单位id")
     private Long maintenanceUnitId;
 
-    @ExplicitConstraint(indexNum = 6, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
-    @ExcelProperty(value = "维保单位", index = 6)
+    @ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
+    @ExcelProperty(value = "维保单位", index = 10)
     @ApiModelProperty(value = "维保单位")
     private String maintenanceUnit;
 
@@ -103,11 +103,11 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "实景图")
     private String realityImg;
 
-    @ExcelProperty(value = "联系人姓名", index = 9)
+    @ExcelProperty(value = "联系人姓名", index = 41)
     @ApiModelProperty(value = "联系人姓名")
     private String contactUser;
 
-    @ExcelProperty(value = "联系人电话", index = 10)
+    @ExcelProperty(value = "联系人电话", index = 42)
     @ApiModelProperty(value = "联系人电话")
     private String contactPhone;
 
@@ -143,7 +143,7 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "水源可用状态类别代码")
     private String statusCode;
 
-    @ExplicitConstraint(type = "SYKYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "SYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "水源可用状态", index = 12)
     @ApiModelProperty(value = "水源可用状态类别名称")
     private String status;
@@ -160,7 +160,7 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "消防给水管网形式类型代码")
     private String pipeTypeCode;
 
-    @ExplicitConstraint(type = "XFJSGWXS", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "XFJSGW", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
     @ExcelProperty(value = "消防给水管网形式", index = 15)
     @ApiModelProperty(value = "消防给水管网形式")
     private String pipeTypeName;
@@ -254,11 +254,19 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "四季变化简要情况")
     private String seasonChangeInfo;
 
-    @ExplicitConstraint(indexNum = 32, source = {"1", "0"}) //固定下拉内容
-    @ExcelProperty(value = "有无枯水期", index = 32)
+//    @ExplicitConstraint(indexNum = 32, source = {"0", "1"}) //固定下拉内容
+//    @ExcelProperty(value = "有无枯水期", index = 32)
+    @ExcelIgnore
     @ApiModelProperty(value = "有无枯水期")
     private Boolean hasDrySeason;
 
+    @ExplicitConstraint(indexNum = 32, source = {"有", "无"}) //固定下拉内容
+    @ExcelProperty(value = "有无枯水期", index = 32)
+    @ApiModelProperty(value = "有无枯水期")
+    private Boolean hasDrySeasonType;
+
+
+
     @ExcelProperty(value = "枯水期跨度简要情况", index = 33)
     @ApiModelProperty(value = "枯水期跨度简要情况")
     private String dryPeriodSpan;
@@ -305,8 +313,8 @@ public class WaterResourceDto extends BaseDto {
     private Long equipId;
 
     @ApiModelProperty("设施定义名称")
-    @ExcelProperty(value = "设施定义名称", index = 41)
-    @ExplicitConstraint(indexNum = 41, sourceClass = CommonExplicitConstraint.class, method = "getEquipDefinition")
+    @ExcelProperty(value = "设施定义名称", index = 5)
+    @ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getEquipDefinition")
     private String equipName;
 
     @ExcelIgnore
@@ -324,7 +332,7 @@ public class WaterResourceDto extends BaseDto {
     private String equipCode;
 
     @ApiModelProperty("维保周期")
-    @ExcelProperty(value = "维保周期(月)", index = 42)
+    @ExcelProperty(value = "维保周期(月)", index = 6)
     private String maintenancePeriod;
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -17,6 +17,8 @@
                r.contact_user,
                r.contact_phone,
                r.equip_name,
+               r.longitude,
+               r.latitude,
 			   r.equip_category_name,
 			   r.equip_code,
 			   r.maintenance_period,
@@ -45,6 +47,7 @@
                rn.quality_situation_info,
                rn.season_change_info,
                rn.has_dry_season,
+               (case r.has_dry_season when 0 then '有' when 1 then '无' end) hasDrySeasonType,
                rn.dry_period_span,
                rp.intake_height,
                rp.elevation_difference,

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/CheckTypeSuEnum.java

@@ -13,7 +13,10 @@ public enum CheckTypeSuEnum {
      */
     DAILY("日常检查", "1", "daily"),
     SPECIAL_RQ("燃气专项", "2", "special"),
-    SPECIAL_GW("高温专项", "3", "special");
+    SPECIAL_GW("高温专项", "3", "special"),
+    SPECIAL_DQ("电气专项", "4", "special"),
+    SPECIAL_HD("重大活动专项", "5", "special"),
+    SPECIAL_BZ("重大保障专项", "6", "special");
 
     /**
      * 名字

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/WorkFlowBranchEnum.java

@@ -13,7 +13,7 @@ public enum WorkFlowBranchEnum {
 
     DAILY("日常检查", "company", "daily", "daily"),
     SPECIAL_C("专项检查", "company", "special", "special"),
-    SPECIAL_E("专项检查", "external", "special", "special"),
+    SPECIAL_E("专项检查", "external", "special-daily", "special"),
     SUPERVISED_DW("单位级审核", "department", "special-daily", "supervised");
 
     /**

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/DispatchConsultFeedbackDto.java

@@ -28,7 +28,7 @@ public class DispatchConsultFeedbackDto extends BaseDto {
     private String emergencyCall;
 
     @ApiModelProperty(value = "投诉反馈方式")
-    private String consultFeedbackType;
+    private String consultFeedbackCode;
 
     @ApiModelProperty(value = "投诉反馈结果")
     private String feedbackResult;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/DispatchRepairFeedbackDto.java

@@ -28,7 +28,7 @@ public class DispatchRepairFeedbackDto extends BaseDto {
     private String emergencyCall;
 
     @ApiModelProperty(value = "报修反馈方式")
-    private String fixFeedbackType;
+    private String fixFeedbackCode;
 
     @ApiModelProperty(value = "报修反馈结果")
     private String feedbackResult;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorInfoDto.java

@@ -16,4 +16,6 @@ public class ElevatorInfoDto {
     ElevatorMaintenanceInfoDto elevatorMaintenanceInfoDto;
 
     ElevatorTestInfoDto elevatorTestInfoDto;
+
+    boolean hasFocus;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorListDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 电梯列表dto
+ */
+@Data
+@ApiModel(value = "ElevatorInfoDto", description = "ElevatorInfoDto")
+public class ElevatorListDto {
+
+    @ApiModelProperty(value = "电梯id")
+    private String elevatorId;
+
+    @ApiModelProperty(value = "电梯地址")
+    private String elevatorAddress;
+
+    @ApiModelProperty(value = "电梯救援码")
+    private String rescueCode;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/EnevatorRelationDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorRelationDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import java.util.Date;
 
 /**
  * 关注电梯关系表
  *
- * @author litw
- * @date 2021-09-22
+ * @author system_generator
+ * @date 2021-10-08
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel(value="EnevatorRelationDto", description="关注电梯关系表")
-public class EnevatorRelationDto  extends BaseDto {
+@ApiModel(value="ElevatorRelationDto", description="关注电梯关系表")
+public class ElevatorRelationDto  {
 
    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "openid个人识别id")
-    private Long openId;
+    private String openId;
 
     @ApiModelProperty(value = "电梯id")
-    private String enevatorId;
+    private Long elevatorId;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatMyBusinessListDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 微信公众号我的业务列表
+ */
+@Data
+@ApiModel(value="WechatMyBusinessListDto", description="微信公众号业务列表dto类")
+public class WechatMyBusinessListDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "任务类型")
+    private String taskType;
+
+    @ApiModelProperty(value = "是否结案")
+    private Boolean taskStatus;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date dispatchTime;
+
+    @ApiModelProperty(value = "业务状态")
+    private String bussinessStatus;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatMyBussinessDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 微信公众号返回我的业务dto类
+ * kongfm
+ */
+@Data
+@ApiModel(value="WechatMyBussinessDto", description="微信公众号返回我的业务dto类")
+public class WechatMyBussinessDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "派遣单id")
+    private Long paperId;
+
+    @ApiModelProperty(value = "任务状态")
+    private String taskStatus;
+
+    @ApiModelProperty(value = "任务类别")
+    private String taskType;
+
+    @ApiModelProperty(value = "任务类别code")
+    private String taskTypeCode;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "电梯识别码")
+    private String rescueCode;
+
+    @ApiModelProperty(value = "被困楼层")
+    private String trappedFloorNum;
+
+    @ApiModelProperty(value = "被困人数")
+    private String trappedNum;
+
+    @ApiModelProperty(value = "派遣时间")
+    private Date dispatchTime;
+
+    @ApiModelProperty(value = "有无人员伤亡")
+    private String hasDeadHurt;
+
+    @ApiModelProperty(value = "使用单位")
+    private String useUnit;
+
+    @ApiModelProperty(value = "使用单位id")
+    private Long useUnitId;
+
+    @ApiModelProperty(value = "使用单位主管机构")
+    private String useUnitAuthority;
+
+    @ApiModelProperty(value = "求援人电话")
+    private String emergencyCall;
+
+    @ApiModelProperty(value = "求援时间/ 报修时间/ 投诉时间")
+    private Date recDate;
+
+    @ApiModelProperty(value = "到达时间")
+    private Date arriveTime;
+
+    @ApiModelProperty(value = "救援完成时间")
+    private Date saveTime;
+
+    @ApiModelProperty(value = "救援单位")
+    private String saveOrg;
+
+    @ApiModelProperty(value = "维修完成时间")
+    private Date fixFinishTime;
+
+    @ApiModelProperty(value = "维修单位")
+    private String responseOrg;
+
+    @ApiModelProperty(value = "维修人")
+    private String responseUser;
+
+    @ApiModelProperty(value = "故障原因")
+    private String errorResult;
+
+    @ApiModelProperty(value = "维修结果")
+    private String fixResult;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "现场照片")
+    private List<AttachmentDto> fixImgs;
+
+    @ApiModelProperty(value = "故障描述")
+    private String errorContent;
+
+    @ApiModelProperty(value = "故障照片")
+    private List<AttachmentDto> errorImgs;
+
+    @ApiModelProperty(value = "反馈时间")
+    private Date responseTime;
+
+    @ApiModelProperty(value = "反馈人")
+    private String feedbackUname;
+
+    @ApiModelProperty(value = "结果评价")
+    private String feedbackResult;
+
+    @ApiModelProperty(value = "反馈备注")
+    private String feedbackRemark;
+
+    @ApiModelProperty(value = "反馈现场照片")
+    private List<AttachmentDto> feedBackImgs;
+
+    @ApiModelProperty(value = "处置时间")
+    private Date dealTime;
+
+    @ApiModelProperty(value = "处置单位")
+    private String dealOrg;
+
+    @ApiModelProperty(value = "处置人")
+    private String dealUser;
+
+    @ApiModelProperty(value = "处置结果")
+    private String actionResult;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatUserFeedbackDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 微信公众号维修反馈dto 类
+ */
+@Data
+@ApiModel(value="WechatUserFeedbackDto", description="微信公众号上报人反馈DTO")
+public class WechatUserFeedbackDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "警情id")
+    private Long alertId;
+
+    @ApiModelProperty(value = "结果评价")
+    private String feedBackResult;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "现场照片")
+    private List<AttachmentDto>  imgs;
+
+
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/EnevatorRelation.java → amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/ElevatorRelation.java

@@ -2,19 +2,22 @@ package com.yeejoin.amos.boot.module.tzs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import java.util.Date;
 
 /**
  * 关注电梯关系表
  *
- * @author litw
- * @date 2021-09-22
+ * @author system_generator
+ * @date 2021-10-08
  */
 @Data
 @Accessors(chain = true)
-@TableName("tz_enevator_relation")
-public class EnevatorRelation  {
+@TableName("tz_elevator_relation")
+public class ElevatorRelation {
 
     private static final long serialVersionUID = 1L;
 
@@ -22,12 +25,12 @@ public class EnevatorRelation  {
      * openid个人识别id
      */
 	@TableField("open_id")
-    private Long openId;
+    private String openId;
 
     /**
      * 电梯id
      */
-	@TableField("enevator_id")
-    private String enevatorId;
+	@TableField("elevator_id")
+    private Long elevatorId;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/AlertStageEnums.java

@@ -19,9 +19,9 @@ public  enum  AlertStageEnums {
 	TSZX("962","TSZX",	"投诉咨询"),
 
 	// 来源类型JQLYLX
-	DHBJ("963","233","电话报警"),
-	// 来源类型JQLYLX
-	GZHSB("972","APPJJ","移动端上报"),
+	DHBJ("963","96333","电话报警"),
+	WLJR("1014","WLJR","物联接入"),
+	APPJJ("1015","APPJJ","移动端上报"),
 
 	// 警情阶段 JQJD
 	JJ("964","JJ","接警"),

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/AlertCalledMapper.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
 import org.apache.ibatis.annotations.Param;
 
@@ -71,4 +74,8 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
     List<Map<String, Object>> getTodayEmergencyDetail(String rescueTotal,String rescueComplete, String regionCode);
 
+    WechatMyBussinessDto getBussinessInfoById(@Param("alertId")  Long alertId);
+
+    List<WechatMyBusinessListDto> getBussinessListByPhonePager(@Param("phone") String phone, @Param("bussinessCode") String bussinessCode, @Param("current") Long current);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ElevatorRelationMapper.java

+package com.yeejoin.amos.boot.module.tzs.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorListDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorRelation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 关注电梯关系表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-10-08
+ */
+public interface ElevatorRelationMapper extends BaseMapper<ElevatorRelation> {
+
+    /**
+     * 获取是否关注电梯
+     * @param openId
+     * @param elevatorId
+     * @return
+     */
+    Integer hasFocusElevator(@Param("openId") String openId, @Param("elevatorId") Long elevatorId);
+
+    /**
+     * 关注电梯
+     * @param openId
+     * @param elevatorId
+     * @return
+     */
+    Integer focusElevator(@Param("openId")  String openId, @Param("elevatorId")  String elevatorId);
+
+    /**
+     * 取消关注电梯
+     * @param openId
+     * @param elevatorId
+     * @return
+     */
+    Integer cancelFocusElevator(@Param("openId")  String openId,  @Param("elevatorId")  String elevatorId);
+
+    /**
+     * 获取用户关注电梯列表
+     * @param openId
+     * @return
+     */
+    List<ElevatorListDto> getMyFocusElevator(@Param("openId")  String openId);
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/EnevatorRelationMapper.java

-package com.yeejoin.amos.boot.module.tzs.api.mapper;
-
-import com.yeejoin.amos.boot.module.tzs.api.entity.EnevatorRelation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 关注电梯关系表 Mapper 接口
- *
- * @author litw
- * @date 2021-09-22
- */
-public interface EnevatorRelationMapper extends BaseMapper<EnevatorRelation> {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IAlertCalledService.java

@@ -7,10 +7,17 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
 import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
+import org.apache.ibatis.annotations.Param;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 
+import java.util.List;
+
 /**
  * 警情接警填报记录接口类
  *
@@ -65,4 +72,8 @@ public interface IAlertCalledService {
     AlertHandlerDto getHandlerInfo(String alertId);
 
     Object getCalledInfo();
+
+    WechatMyBussinessDto getBussinessInfoById(Long alertId);
+
+    List<WechatMyBusinessListDto> getBussinessListByPhonePager(String phone, String bussinessCode, Long current);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IDispatchTaskService.java

@@ -5,8 +5,10 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.MainPersonDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatDispatchFeedbackDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMessageDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatUserFeedbackDto;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,5 +48,7 @@ public interface IDispatchTaskService {
 
     List<MainPersonDto> todayTaskPerson();
 
+    WechatMyBussinessDto saveUserFeed(WechatUserFeedbackDto wechatUserFeedbackDto);
+
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IElevatorRelationService.java

+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorListDto;
+
+import java.util.List;
+
+/**
+ * 关注电梯关系表接口类
+ *
+ * @author system_generator
+ * @date 2021-10-08
+ */
+public interface IElevatorRelationService {
+
+    /**
+     * 获取是否关注电梯
+     * @param phone
+     * @param elevatorId
+     * @return
+     */
+    Boolean hasFocusElevator(String phone, Long elevatorId);
+
+    /**
+     * 关注电梯
+     * @param openId
+     * @param elevatorId
+     * @return
+     */
+    Boolean focusElevator(String openId, String elevatorId);
+
+    /**
+     * 取消关注电梯
+     * @param openId
+     * @param elevatorId
+     * @return
+     */
+    Boolean cancelFocusElevator(String openId, String elevatorId);
+
+    /**
+     * 获取用户关注电梯列表
+     * @param openId
+     * @return
+     */
+    List<ElevatorListDto> getMyFocusElevator(String openId);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IEnevatorRelationService.java

-package com.yeejoin.amos.boot.module.tzs.api.service;
-
-
-/**
- * 关注电梯关系表接口类
- *
- * @author litw
- * @date 2021-09-22
- */
-public interface IEnevatorRelationService {
-
-
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -387,7 +387,7 @@
 			AND te.region_code  like  CONCAT(CONCAT('%',#{regionCode}),'%')
 		</if>
 		<if test="rescueTotal != null and rescueTotal != ''">
-			AND tzs.alert_stage_code  in ('861','862')
+			AND tzs.alert_stage_code  in ('860','861','862')
 		</if>
 		<if test="rescueComplete != null and rescueComplete != ''">
 			AND tzs.alert_stage_code  in ('864','865','866')
@@ -420,13 +420,65 @@
 			AND te.region_code  like  CONCAT(CONCAT('%',#{regionCode}),'%')
 		</if>
 		<if test="rescueTotal != null and rescueTotal != ''">
-			AND tzs.alert_stage_code  in ('861','862')
+			AND tzs.alert_stage_code  in ('860','861','862')
 		</if>
 		<if test="rescueComplete != null and rescueComplete != ''">
 			AND tzs.alert_stage_code  in ('864','865','866')
 		</if>
 
 	</select>
+
+
+	<select id="getBussinessInfoById" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto">
+			select
+			a.sequence_nbr,
+			p.sequence_nbr as paperId,
+			a.alert_stage as taskStatus,
+			a.alarm_type as taskType,
+			a.alarm_type_code as taskTypeCode,
+			e.address,
+			e.rescue_code as rescueCode,
+			p.dispatch_time as dispatchTime,
+			e.use_unit as useUnit,
+			e.use_unit_id as useUnitId,
+			e.use_unit_authority as useUnitAuthority,
+			a.emergency_call as emergencyCall,
+			a.rec_date as recDate,
+			p.arrive_time as arriveTime,
+			p.save_org_name as saveOrg,
+			p.feedback_finish_time as fixFinishTime,
+			p.repair_org_name as responseOrg,
+			p.repair_user as responseUser,
+			p.remark as feedbackRemark,
+			p.feedback_time as responseTime,
+			p.feedback_uname as feedbackUname,
+			p.feedback_finish_time as dealTime,
+			p.deal_org_name as dealOrg,
+			p.deal_user as dealUser
+			from tz_alert_called a
+			LEFT JOIN tcb_elevator e on e.sequence_nbr = a.equipment_id
+			LEFT JOIN tz_dispatch_paper p on p.alert_id = a.sequence_nbr
+			where a.sequence_nbr = #{alertId}
+    </select>
+
+	<select id="getBussinessListByPhonePager" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto">
+			select
+			a.sequence_nbr,
+			a.alarm_type as taskType,
+			a.alert_status as taskStatus,
+			e.address,
+			a.call_time as dispatchTime,
+			a.alert_stage as bussinessStatus
+			from tz_alert_called a
+			LEFT JOIN tcb_elevator e on e.sequence_nbr = a.equipment_id
+			LEFT JOIN tz_dispatch_paper p on p.alert_id = a.sequence_nbr
+			where a.emergency_call =#{phone}
+			and a.is_delete = 0
+			and a.father_alert is null
+			and a.alarm_type_code = #{bussinessCode}
+			ORDER BY a.rec_date desc
+			limit #{current},5
+    </select>
 </mapper>
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/ElevatorRelationMapper.xml

+<?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="com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorRelationMapper">
+
+    <select id="hasFocusElevator" resultType="java.lang.Integer">
+        select count(1) from tz_elevator_relation el
+        where el.elevator_id = #{elevatorId} and el.open_id = #{openId}
+    </select>
+
+    <insert id="focusElevator" >
+        insert into tz_elevator_relation values (#{openId}, #{elevatorId})
+    </insert>
+
+
+    <delete id="cancelFocusElevator" >
+        delete el from tz_elevator_relation el where  el.open_id =  #{openId}  and el.elevator_id = #{elevatorId}
+    </delete>
+
+
+    <select id="getMyFocusElevator" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorListDto">
+    SELECT
+	e.sequence_nbr AS elevatorId,
+	e.address AS elevatorAddress,
+	e.rescue_code AS rescueCode
+    FROM
+        tz_elevator_relation el
+    LEFT JOIN tcb_elevator e ON e.sequence_nbr = el.elevator_id
+    WHERE
+        el.open_id = #{openId}
+    </select>
+
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/EnevatorRelationMapper.xml

-<?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="com.yeejoin.amos.boot.module.tzs.api.mapper.EnevatorRelationMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.command.biz.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,24 +16,7 @@ import com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils;
 import com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao;
 import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireStationzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FireTeamZhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
-import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
-import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitZhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgusrDataxDto;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
@@ -90,6 +74,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -132,7 +117,8 @@ public class CommandController extends BaseController {
     
     @Autowired
     IFirefightersService firefightersService;
-
+    @Autowired
+    private IAlertFormValueService iAlertFormValueService;
     @Autowired
     private IAircraftService aircraftService;
     @Autowired
@@ -150,7 +136,6 @@ public class CommandController extends BaseController {
     IKeySiteService keySiteService;
     @Autowired
     IPowerTransferCompanyService powerTransferCompanyService;
-
     @Autowired
     ISourceFileService sourceFileService;
 
@@ -1003,14 +988,41 @@ public class CommandController extends BaseController {
 
         AlertCalled AlertCalled=iAlertCalledService.getAlertCalledById(id);
         Long buildId=null;
+        String buildIdName="";
+        Long zdid=null;
+        String zdname="";
         OrgusrDataxDto orgusrDataxDto=new OrgusrDataxDto();
         if(AlertCalled.getUnitInvolved()!=null&&!"".equals(AlertCalled.getUnitInvolved())) {
             List<OrgUsrzhDto> orgUsrzhDto= iOrgUsrService.getOrgUsrzhDto( AlertCalled.getUnitInvolved());
             if(orgUsrzhDto!=null&&orgUsrzhDto.size()>0&&orgUsrzhDto.get(0)!=null){
                 buildId=orgUsrzhDto.get(0).getBuildId()==null?null:Long.valueOf(orgUsrzhDto.get(0).getBuildId());
+                buildIdName=orgUsrzhDto.get(0).getBuildId()==null?null:orgUsrzhDto.get(0).getBuildName();
+            }
+        }
+
+
+        // 警情动态表单数据
+        List<KeyValueLabel> listdate = new ArrayList<>();
+        List<AlertFormValue> list = buildId==null?null:iAlertFormValueService.getzqlist(id);
+        if (list != null && list.size() > 0) {
+            for (AlertFormValue alertFormValue : list) {
+               if("keySiteExcle".equals(alertFormValue.getFieldCode())&&alertFormValue.getFieldValue()!=null){
+                   List<OrgMenuDto> list1 = new ArrayList<OrgMenuDto>();
+                   List<OrgMenuDto> children = new ArrayList<OrgMenuDto>();
+                   OrgMenuDto date= new OrgMenuDto( Long.valueOf(alertFormValue.getFieldValueCode()),  Long.valueOf(alertFormValue.getFieldValueCode()),  alertFormValue.getFieldValue(),  alertFormValue.getFieldValue(),null);
+                   children.add(date);
+                   OrgMenuDto orgMenuDto =new OrgMenuDto();
+                   orgMenuDto.setKey(buildId);
+                   orgMenuDto.setValue(buildId);
+                   orgMenuDto.setChildren(children);
+                   orgMenuDto.setName(buildIdName);
+                   orgMenuDto.setTitle(buildIdName);
+                   list1.add(orgMenuDto);
+                   return ResponseHelper.buildResponse(list1);
+               }
             }
         }
-        return ResponseHelper.buildResponse(buildId==null?null:keySiteService.getBuildAndKeyTree(buildId));
+            return ResponseHelper.buildResponse(buildId==null?null:keySiteService.getBuildAndKeyTree(buildId));
     }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java

@@ -55,7 +55,7 @@ public class FireExpertsController extends BaseController {
 
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
-    
+
 
 
     /**
@@ -67,6 +67,9 @@ public class FireExpertsController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<FireExpertsDto> save(@RequestBody FireExpertsDto model) {
+        String expertCode = model.getExpertCode();
+        DataDictionary zjly = dataDictionaryService.getByCode(expertCode, "ZJLY");
+        model.setExpert(zjly.getName());
         model = fireExpertsServiceImpl.createWithModel(model);
         return ResponseHelper.buildResponse(model);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersPostController.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.Arrays;
 
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -57,6 +59,9 @@ public class FirefightersPostController extends BaseController {
 	@Autowired
 	FirefightersWorkexperienceServiceImpl ifirefightersWorkexperienceService;
 	@Autowired
+	DataDictionaryServiceImpl dataDictionaryService;
+
+	@Autowired
 	RedisUtils redisUtils;
 	@Value("${redis.cache.failure.time}")
 	private long time;
@@ -81,6 +86,13 @@ public class FirefightersPostController extends BaseController {
 			queryWrapper.eq("firefighters_id", firefightersDataDto.getFirefightersPost().getFirefightersId());
 			FirefightersPost firefightersPost = iFirefightersPostService.getOne(queryWrapper);
 
+			/*bug3071 消防人员，专家领域选择子分类时概要信息中专家领域未显示 2021-10-09 chenzhao */
+			if (firefightersDataDto.getFirefightersPost().getAreasExpertiseCode() != null){
+				String areasExpertiseCode = firefightersDataDto.getFirefightersPost().getAreasExpertiseCode();
+				DataDictionary zjly = dataDictionaryService.getByCode(areasExpertiseCode, "ZJLY");
+				firefightersDataDto.getFirefightersPost().setAreasExpertise(zjly.getName());
+			}
+			/*bug3071 消防人员，专家领域选择子分类时概要信息中专家领域未显示 2021-10-09 chenzhao */
 			if (firefightersPost == null) {
 				iFirefightersPostService.save(firefightersDataDto.getFirefightersPost());
 			} else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
+import com.yeejoin.amos.boot.module.jcs.api.enums.ExcelEnums;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ExcelServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -19,14 +22,8 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.common.api.dto.ExcelDto;
-import com.yeejoin.amos.boot.module.jcs.api.enums.ExcelEnums;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ExcelServiceImpl;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 导出导入
@@ -188,9 +185,9 @@ public class ExcelController extends BaseController {
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导出给提供设备接口")
-    @PostMapping("/exportForEquipment")
-    public  ResponseModel<String[]> getFireStationFileByParams(@RequestParam(value = "type") String type,
-                                           @RequestParam(value = "method") String method) {
+    @GetMapping(value = "/exportForEquipment")
+    public  ResponseModel<String[]> getFireStationFileByParams( String type,
+                                          String method) {
         try {
             return ResponseHelper.buildResponse(dataSources.selectList(type,method));
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -768,6 +768,10 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 		List<WaterResourceDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, WaterResourceDto.class, 1);
 
 		excelDtoList.forEach(item -> {
+			/*Bug 2950 消防水源，缺失设施分类、设施定义等必填字段可以上传成功 陈召 2021-10-09 */
+			if (item.getEquipName() == null || item.getEquipName().equals(" ")) {
+				throw new RuntimeException("设备定义名称为必填字段，填写后重新上传");
+			}
 			//BUG 2953  导入模板没有设备编码生成 2021-09-18 陈召开始
 			item.setEquipCode(QRCodeUtil.generateQRCode());
 			//BUG 2953  导入模板没有设备编码生成 2021-09-18 陈召结束
@@ -837,6 +841,10 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 				item.setEquipCategoryId(Long.parseLong(equipCategory[1]));
 			}
 
+			if (item.getHasDrySeasonType() != null) {
+				boolean flag=  "有".equals(item.getHasDrySeasonType())?true:false;
+				item.setHasDrySeason(flag);
+			}
 			if (item.getEquipName() != null) {
 				String[] equipCategory = item.getEquipName().split("@");
 				item.setEquipId(Long.parseLong(equipCategory[1]));
@@ -876,6 +884,16 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 				String[] highestEducation = fireExperts.getHighestEducation().split("@");
 				fireExperts.setHighestEducation(highestEducation[1]);  // BUG  2942 by litw 2021年9月18日 导入学历编号
 			}
+			if (fireExperts.getNativePlaceVal() != null){
+				String[] nativePlaceVal = fireExperts.getNativePlaceVal().split("@");
+				fireExperts.setNativePlace(nativePlaceVal[1]);
+				fireExperts.setNativePlaceVal(nativePlaceVal[0]);
+			}
+			if (fireExperts.getResidenceDetailVal() != null){
+				String[] residenceDetailVal = fireExperts.getResidenceDetailVal().split("@");
+				fireExperts.setResidence(residenceDetailVal[1]);
+				fireExperts.setResidenceDetailVal(residenceDetailVal[0]);
+			}
 			excelEntityList.add(fireExperts);
 		});
 		fireExpertsServiceImpl.saveBatch(excelEntityList);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -265,10 +265,11 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         result.put("checkMode", hiddenDangerDto.getDangerType());
         result.put("planId", plan.getId());
         result.put("planName", plan.getName());
-        result.put("pointId", point.getId());
+        result.put("pointId", point.getOriginalId());
         result.put("pointName", point.getName());
         result.put("bizId", hiddenDangerDto.getCheckInputId());
         result.put("bizName", hiddenDangerDto.getInputItemName());
+        result.put("routeId", plan.getRouteId());
         result.put("accompanyingUserId", plan.getLeadPeopleIds());
         result.put("accompanyingUserName", plan.getLeadPeopleNames());
         result.put("checkUnitId",plan.getCheckUnitId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -31,6 +31,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -94,12 +96,17 @@ public class PlanServiceImpl implements IPlanService {
         Set<String> distinctUserIds = new HashSet<>(Arrays.asList(temp));
         List<AgencyUserModel> userModels = remoteSecurityService.listUserByUserIds(Joiner.on(",").join(distinctUserIds));
         Map<String, String> userIdNameMap = userModels.stream().collect(Collectors.toMap(AgencyUserModel::getUserId, AgencyUserModel::getRealName));
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         content.forEach(c -> {
             this.buildUserName(c, "createBy", userIdNameMap);
             if (c.containsKey("status")) {
                 String finishStatusDesc = PlanStatusEnum.getName(Integer.parseInt(c.get("status").toString()));
                 c.put("statusDesc", finishStatusDesc);
             }
+            if (c.containsKey("createDate")) {
+                String createTime = dateTimeFormatter.format((TemporalAccessor) c.get("createDate"));
+                c.put("createDateStr", createTime);
+            }
         });
         return new PageImpl<>(content, param, total);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/util/CheckParamUtil.java

@@ -45,6 +45,8 @@ public class CheckParamUtil {
                     param.setPlanId(Long.parseLong(queryRequests.get(i).getValue().toString()));
                 } else if ("companyId".equals(name)) {
                     param.setCompanyId(Long.parseLong(queryRequests.get(i).getValue().toString()));
+                } else if ("pointId".equals(name)) {
+                    param.setPointId(Long.parseLong(queryRequests.get(i).getValue().toString()));
                 }
             }
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

@@ -399,6 +399,8 @@ public class AlertCalledController extends BaseController {
 			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
 		}
 		page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
+		int num= iAlertCalledService.count(alertCalledQueryWrapper);
+		pageBean.setTotal(num);
 		IPage<AlertCalledDto> calledVoIPage = AlertBeanDtoVoUtils.alertCalledIPageDto(page);
 		return ResponseHelper.buildResponse(calledVoIPage);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import com.yeejoin.amos.boot.module.tzs.api.dto.MainPersonDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatDispatchFeedbackDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatUserFeedbackDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -14,7 +25,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -46,6 +59,15 @@ public class DispatchTaskController extends BaseController {
 	@Autowired
 	RedisUtils redisUtils;
 
+	@Autowired
+	ISourceFileService sourceFileService;
+
+	@Autowired
+	IDispatchTaskService dispatchTaskService;
+
+	@Autowired
+	AlertFormValueServiceImpl iAlertFormValueService;
+
 	/**
 	 * 根据派遣单位类型和警情id 获取任务模板
 	 * @param orgTypeCode
@@ -111,4 +133,206 @@ public class DispatchTaskController extends BaseController {
 		List<MainPersonDto> list = dispatchTaskServiceImpl.todayTaskPerson();
 		return ResponseHelper.buildResponse(list);
 	}
+
+
+	/**
+	 * 微信公众号维修反馈接口
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/saveUserFeed")
+	@ApiOperation(httpMethod = "POST", value = "微信公众号上报人反馈接口", notes = "微信公众号上报人反馈接口")
+	public ResponseModel<WechatMyBussinessDto> saveUserFeed(@RequestBody WechatUserFeedbackDto model) {
+		return ResponseHelper.buildResponse(dispatchTaskServiceImpl.saveUserFeed(model));
+	}
+
+	/**
+	 * 点击到达触发事件
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/taskArrive/{taskId}")
+	@ApiOperation(httpMethod = "GET", value = "点击到达触发事件", notes = "点击到达触发事件")
+	public ResponseModel<WechatMyTaskDto> taskArrive(@PathVariable Long taskId) {
+		if (ValidationUtil.isEmpty(taskId)){
+			throw new BadRequest("参数校验失败.");
+		}
+		if(dispatchTaskServiceImpl.taskArrive(taskId)) {
+			return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
+		} else {
+			return ResponseHelper.buildResponse(new WechatMyTaskDto());
+		}
+	}
+
+
+	/**
+	 * 点击救援完成触发事件
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/saveFinish/{taskId}")
+	@ApiOperation(httpMethod = "GET", value = "点击救援完成触发事件", notes = "点击救援完成触发事件")
+	public ResponseModel<WechatMyTaskDto> saveFinish(@PathVariable Long taskId) {
+		if (ValidationUtil.isEmpty(taskId)){
+			throw new BadRequest("参数校验失败.");
+		}
+		if(dispatchTaskServiceImpl.saveFinish(taskId)) {
+			return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
+		} else {
+			return ResponseHelper.buildResponse(new WechatMyTaskDto());
+		}
+	}
+
+
+	/**
+	 * 获取任务详情
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getTaskInfo/{taskId}")
+	@ApiOperation(httpMethod = "GET", value = "获取任务详情", notes = "获取任务详情")
+	public ResponseModel<WechatMyTaskDto> getTaskInfo(@PathVariable Long taskId) {
+		if (ValidationUtil.isEmpty(taskId)){
+			throw new BadRequest("参数校验失败.");
+		}
+		return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
+	}
+
+
+
+
+	private WechatMyTaskDto getTaskDtoByTaskId(Long taskId) {
+		WechatMyTaskDto temp = dispatchTaskService.getTaskInfoByTaskId(taskId);
+		List<AlertFormValue> paperList = null;
+		Map<String, List<AttachmentDto>> imgMap = null;
+		List<AttachmentDto> imgDtos = null;
+		Map<String, List<AttachmentDto>> errorImgMap = null;
+		List<AttachmentDto> errorImgDtos = null;
+		List<AttachmentDto> feedbackDtos = null;
+		LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+		switch (temp.getTaskTypeCode()) {
+			case "960" : // 困人救援
+				temp.setHasDeadHurt("无");
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getAlertId());
+				// 警情动态表单数据
+				List<AlertFormValue> alertList = iAlertFormValueService.list(queryWrapper);
+				alertList.stream().forEach(t -> {
+					String value = t.getFieldValue();
+					if("trapped_floor_num".equals(t.getFieldCode())) {
+						// 被困楼层
+						temp.setTrappedFloorNum(value);
+					} else if("trapped_num".equals(t.getFieldCode())) {
+						// 被困人数
+						temp.setTrappedNum(value);
+					} else if("injured_num".equals(t.getFieldCode())) {
+						// 受伤人数
+						if(StringUtils.isNotEmpty(value)) {
+							temp.setHasDeadHurt("有");
+						}
+					} else if("die_num".equals(t.getFieldCode())) {
+						// 死亡人数
+						if(StringUtils.isNotEmpty(value)) {
+							temp.setHasDeadHurt("有");
+						}
+					}
+				});
+				queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
+				// 派遣动态表单
+				paperList = iAlertFormValueService.list(queryWrapper);
+				paperList.stream().forEach(t -> {
+					String value = t.getFieldValue();
+					if("save_time".equals(t.getFieldCode())) {
+						// 救援完成时间
+						if(StringUtils.isNotBlank(value)) {
+							temp.setSaveTime(DateUtils.longStr2Date(value));
+						}
+					} else if("error_result".equals(t.getFieldCode())) {
+						// 故障原因
+						temp.setErrorResult(value);
+					} else if("fix_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setFixResult(value);
+					} else if("fix_remark".equals(t.getFieldCode())) {
+						// 维修备注
+						temp.setRemark(value);
+					}
+				});
+
+
+				imgMap = sourceFileService.getAttachments(temp.getPaperId());
+				imgDtos = imgMap.get("imgs");
+				temp.setFixImgs(imgDtos);
+
+				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
+				break;
+			case "961" : // 故障维修
+				queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
+				// 派遣动态表单
+				paperList = iAlertFormValueService.list(queryWrapper);
+				paperList.stream().forEach(t -> {
+					String value = t.getFieldValue();
+					if("save_time".equals(t.getFieldCode())) {
+						// 救援完成时间
+						if(StringUtils.isNotBlank(value)) {
+							temp.setSaveTime(DateUtils.longStr2Date(value));
+						}
+					} else if("error_result".equals(t.getFieldCode())) {
+						// 故障原因
+						temp.setErrorResult(value);
+					} else if("fix_result".equals(t.getFieldCode())) {
+						// 维修结果
+						temp.setFixResult(value);
+					} else if("fix_remark".equals(t.getFieldCode())) {
+						// 维修备注
+						temp.setRemark(value);
+					} else if("feedback_result".equals(t.getFieldCode())) {
+						// 反馈结果
+						temp.setFeedbackResult(value);
+					}
+				});
+
+
+				imgMap = sourceFileService.getAttachments(temp.getPaperId());
+				imgDtos = imgMap.get("imgs");
+				temp.setFixImgs(imgDtos);
+				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
+				errorImgDtos = errorImgMap.get("imgs");
+				temp.setErrorImgs(errorImgDtos);
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
+				break;
+			case "962" : // 投诉建议
+				queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getPaperId());
+				// 派遣动态表单
+				paperList = iAlertFormValueService.list(queryWrapper);
+				paperList.stream().forEach(t -> {
+					String value = t.getFieldValue();
+					if("action_result".equals(t.getFieldCode())) {
+						//	处置结果
+						temp.setActionResult(value);
+					}
+				});
+
+				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
+				errorImgDtos = errorImgMap.get("imgs");
+				temp.setErrorImgs(errorImgDtos);
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
+				break;
+		}
+
+
+
+
+		return temp;
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorBaseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorListDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorMaintenanceInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorNewDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorTestInfoDto;
@@ -18,6 +19,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.EsElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.MaintainInfo;
 import com.yeejoin.amos.boot.module.tzs.api.entity.TestInfo;
+import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorRelationService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ESElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
@@ -90,6 +92,9 @@ public class ElevatorController extends BaseController {
     @Value("${mqtt.topic.elevator.push}")
     private String elevatorpushTopic;
 
+    @Autowired
+    private IElevatorRelationService elevatorRelationService;
+
     /**
      * 新增电梯
      *
@@ -313,9 +318,9 @@ public class ElevatorController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getElevatorInfo", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据电梯id或电梯救援识别码获取电梯信息", notes = "根据电梯id或电梯救援识别码获取电梯信息")
-    public ResponseModel<ElevatorInfoDto> getElevatorInfo(Long sequenceNbr,String rescueCode) {
+    public ResponseModel<ElevatorInfoDto> getElevatorInfo(Long sequenceNbr,String rescueCode, String openId) {
 
-        if(StringUtils.isBlank(rescueCode) && sequenceNbr == null) {
+        if(StringUtils.isBlank(rescueCode) && sequenceNbr == null && StringUtils.isBlank(openId)) {
             throw new BadRequest("参数错误");
         }
         Elevator elevator;
@@ -354,6 +359,9 @@ public class ElevatorController extends BaseController {
             Bean.toPo(testInfo,elevatorTestInfoDto);
             elevatorInfoDto.setElevatorTestInfoDto(elevatorTestInfoDto);
         }
+        if(elevator != null) {
+            elevatorInfoDto.setHasFocus(elevatorRelationService.hasFocusElevator(openId, elevator.getSequenceNbr()));
+        }
 
         return ResponseHelper.buildResponse(elevatorInfoDto);
     }
@@ -473,5 +481,43 @@ public class ElevatorController extends BaseController {
         return ResponseHelper.buildResponse(null);
     }
 
+    /**
+     * 关注电梯
+     * @param elevatorId
+     * @param openId
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/focusElevator/{elevatorId}/{openId}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "关注电梯", notes = "关注电梯")
+    public ResponseModel<Boolean> focusElevator(@PathVariable String elevatorId, @PathVariable String openId){
+        return ResponseHelper.buildResponse(elevatorRelationService.focusElevator(openId,elevatorId));
+    }
+
+    /**
+     * 取消关注电梯
+     * @param elevatorId
+     * @param openId
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/cancelFocusElevator/{elevatorId}/{openId}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "取消关注电梯", notes = "取消关注电梯")
+    public ResponseModel<Boolean> cancelFocusElevator(@PathVariable String elevatorId, @PathVariable String openId){
+        return ResponseHelper.buildResponse(elevatorRelationService.cancelFocusElevator(openId,elevatorId));
+    }
+
+    /**
+     * 获取关注电梯列表
+     * @param openId
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getMyFocusElevator/{openId}", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取关注电梯列表", notes = "获取关注电梯列表")
+    public ResponseModel<List<ElevatorListDto>> cancelFocusElevator(@PathVariable String openId){
+        return ResponseHelper.buildResponse(elevatorRelationService.getMyFocusElevator(openId));
+    }
+
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EnevatorRelationController.java

-package com.yeejoin.amos.boot.module.tzs.biz.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.tzs.api.dto.EnevatorRelationDto;
-import com.yeejoin.amos.boot.module.tzs.biz.service.impl.EnevatorRelationServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * 关注电梯关系表
- *
- * @author litw
- * @date 2021-09-22
- */
-@RestController
-@Api(tags = "关注电梯关系表Api")
-@RequestMapping(value = "/enevator-relation")
-public class EnevatorRelationController extends BaseController {
-
-    @Autowired
-    EnevatorRelationServiceImpl enevatorRelationServiceImpl;
-
-    /**
-     * 新增关注电梯关系表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增关注电梯关系表", notes = "新增关注电梯关系表")
-	public ResponseModel<EnevatorRelationDto> save(@RequestBody EnevatorRelationDto model) {
-	    model = enevatorRelationServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-
-	/**
-     * 根据sequenceNbr删除 -- 取消关注
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{openId}/{enevatorId}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除关注电梯关系表", notes = "根据sequenceNbr删除关注电梯关系表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "openId") Long openId,
-													  @PathVariable(value = "enevatorId") String sequenceNbr){
-        return ResponseHelper.buildResponse(enevatorRelationServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个关注电梯关系表",  notes = "根据sequenceNbr查询单个关注电梯关系表")
-	public ResponseModel<EnevatorRelationDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(enevatorRelationServiceImpl.queryBySeq(sequenceNbr));
-	}
-
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "关注电梯关系表分页查询",  notes = "关注电梯关系表分页查询")
-	public ResponseModel<Page<EnevatorRelationDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<EnevatorRelationDto> page = new Page<EnevatorRelationDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(enevatorRelationServiceImpl.queryForEnevatorRelationPage(page));
-	}
-
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "关注电梯关系表列表全部数据查询",   notes = "关注电梯关系表列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<EnevatorRelationDto>> selectForList() {
-	    return ResponseHelper.buildResponse(enevatorRelationServiceImpl.queryForEnevatorRelationList());
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatController.java

@@ -12,6 +12,8 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.SignatureDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatAccessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMessageDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.WechatRelationDto;
@@ -123,6 +125,7 @@ public class WechatController extends BaseController {
 	@Autowired
 	ISourceFileService sourceFileService;
 
+
 	/**
 	 * 获取微信回调信息返回验证是否通过
 	 * @param signature
@@ -424,78 +427,60 @@ public class WechatController extends BaseController {
 	}
 
 
-	/**
-	 * 获取任务详情
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/getTaskInfo/{taskId}")
-	@ApiOperation(httpMethod = "GET", value = "获取任务详情", notes = "获取任务详情")
-	public ResponseModel<WechatMyTaskDto> getTaskInfo(@PathVariable Long taskId) {
-		if (ValidationUtil.isEmpty(taskId)){
-			throw new BadRequest("参数校验失败.");
-		}
-		return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
-	}
 
 	/**
-	 * 点击到达触发事件
+	 * 获取业务详情
 	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/taskArrive/{taskId}")
-	@ApiOperation(httpMethod = "GET", value = "点击到达触发事件", notes = "点击到达触发事件")
-	public ResponseModel<WechatMyTaskDto> taskArrive(@PathVariable Long taskId) {
-		if (ValidationUtil.isEmpty(taskId)){
+	@GetMapping(value = "/getBussinessInfo/{bussinessId}")
+	@ApiOperation(httpMethod = "GET", value = "获取业务详情", notes = "获取业务详情")
+	public ResponseModel<WechatMyBussinessDto> getBussinessInfo(@PathVariable Long bussinessId) {
+		if (ValidationUtil.isEmpty(bussinessId)){
 			throw new BadRequest("参数校验失败.");
 		}
-		if(dispatchTaskService.taskArrive(taskId)) {
-			return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
-		} else {
-			return ResponseHelper.buildResponse(new WechatMyTaskDto());
-		}
+		return ResponseHelper.buildResponse(getBussinessDtoById(bussinessId));
 	}
 
 
 	/**
-	 * 点击救援完成触发事件
+	 * 获取任务列表
 	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/saveFinish/{taskId}")
-	@ApiOperation(httpMethod = "GET", value = "点击救援完成触发事件", notes = "点击救援完成触发事件")
-	public ResponseModel<WechatMyTaskDto> saveFinish(@PathVariable Long taskId) {
-		if (ValidationUtil.isEmpty(taskId)){
+	@GetMapping(value = "/getTaskList")
+	@ApiOperation(httpMethod = "GET", value = "根据用户手机号获取任务列表", notes = "根据用户手机号获取任务列表")
+	public ResponseModel<List<WechatMyTaskListDto>> getTaskList(@ApiParam(value = "电话号码", required = true) @RequestParam String phone,
+																@ApiParam(value = "任务类别", required = true) @RequestParam String taskType,
+																@ApiParam(value = "当前页码", required = true) @RequestParam Long currentPage) {
+		if (ValidationUtil.isEmpty(phone) ||
+			ValidationUtil.isEmpty(taskType) ||
+			ValidationUtil.isEmpty(currentPage)){
 			throw new BadRequest("参数校验失败.");
 		}
-		if(dispatchTaskService.saveFinish(taskId)) {
-			return ResponseHelper.buildResponse(getTaskDtoByTaskId(taskId));
-		} else {
-			return ResponseHelper.buildResponse(new WechatMyTaskDto());
-		}
+		return ResponseHelper.buildResponse(dispatchTaskService.getTaskListByPhonePager(phone, taskType, currentPage));
 	}
 
 
 	/**
-	 * 获取任务列表
+	 * 获取我的业务列表
 	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/getTaskList")
-	@ApiOperation(httpMethod = "GET", value = "根据用户手机号获取任务列表", notes = "根据用户手机号获取任务列表")
-	public ResponseModel<List<WechatMyTaskListDto>> getTaskList(@ApiParam(value = "电话号码", required = true) @RequestParam String phone,
-																@ApiParam(value = "任务类别", required = true) @RequestParam String taskType,
-																@ApiParam(value = "当前页码", required = true) @RequestParam Long currentPage) {
+	@GetMapping(value = "/getBussinessList")
+	@ApiOperation(httpMethod = "GET", value = "根据用户手机号获取业务列表", notes = "根据用户手机号获取业务列表")
+	public ResponseModel<List<WechatMyBusinessListDto>> getBussinessList(@ApiParam(value = "电话号码", required = true) @RequestParam String phone,
+																	@ApiParam(value = "业务类别", required = true) @RequestParam String businessType,
+																	@ApiParam(value = "当前页码", required = true) @RequestParam Long currentPage) {
 		if (ValidationUtil.isEmpty(phone) ||
-			ValidationUtil.isEmpty(taskType) ||
-			ValidationUtil.isEmpty(currentPage)){
+				ValidationUtil.isEmpty(businessType) ||
+				ValidationUtil.isEmpty(currentPage)){
 			throw new BadRequest("参数校验失败.");
 		}
-		return ResponseHelper.buildResponse(dispatchTaskService.getTaskListByPhonePager(phone, taskType, currentPage));
+		return ResponseHelper.buildResponse(iAlertCalledService.getBussinessListByPhonePager(phone, businessType, currentPage));
 	}
 
 	/**
@@ -526,47 +511,22 @@ public class WechatController extends BaseController {
 
 
 
-	/**
-	 * 测试模板消息
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/testDispatch/{taskId}")
-	@ApiOperation(httpMethod = "GET", value = "测试模板消息", notes = "测试模板消息")
-	public ResponseModel<JSONObject> testDispatch(@PathVariable Long taskId) {
-		DispatchTask task = dispatchTaskServiceImpl.getById(taskId);
-		String tel = task.getResponseUserTel();
-		tel = "15353367807";
-		// 获取openId
-		WechatRelation relation = wechatRelationServiceImpl.getOne(new LambdaQueryWrapper<WechatRelation>().eq(WechatRelation::getPhone,tel));
-		if(relation == null ) {
-			throw new BadRequest("该用户未在系统中注册，无法发送模板消息"); // 接口迁移到服务中时改成日志形式；
-		}
-		WechatMessageDto test = new WechatMessageDto();
-		Map<String, String> data = new HashMap<>();
-		data.put("dispatchTime", DateUtils.date2LongStr(task.getDispatchTime()));
-		AlertCalledFormDto dto = iAlertCalledService.selectAlertCalledByIdNoCache(task.getAlertId());
-		data.put("address",dto.getAlertCalledDto().getAddress());
-		test.setUrl("www.baidu.com");
-		test.setTemplateId("SLjmNJoCNLC3FBcYzWzR-u3el0kqXf8WMTmzw8dAQm4");
-		test.setData(data);
-		JSONObject result = wechatService.sendWechatModelMessage(relation.getOpenId(),test);
-		return ResponseHelper.buildResponse(result);
-	}
 
-	private WechatMyTaskDto getTaskDtoByTaskId(Long taskId) {
-		WechatMyTaskDto temp = dispatchTaskService.getTaskInfoByTaskId(taskId);
+	private WechatMyBussinessDto getBussinessDtoById(Long alertId) {
+
+		WechatMyBussinessDto temp = iAlertCalledService.getBussinessInfoById(alertId);
+
 		List<AlertFormValue> paperList = null;
 		Map<String, List<AttachmentDto>> imgMap = null;
 		List<AttachmentDto> imgDtos = null;
 		Map<String, List<AttachmentDto>> errorImgMap = null;
 		List<AttachmentDto> errorImgDtos = null;
+		List<AttachmentDto> feedbackDtos = null;
 		LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
 		switch (temp.getTaskTypeCode()) {
 			case "960" : // 困人救援
 				temp.setHasDeadHurt("无");
-				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getAlertId());
+				queryWrapper.eq(AlertFormValue::getAlertCalledId, temp.getSequenceNbr());
 				// 警情动态表单数据
 				List<AlertFormValue> alertList = iAlertFormValueService.list(queryWrapper);
 				alertList.stream().forEach(t -> {
@@ -649,11 +609,11 @@ public class WechatController extends BaseController {
 				imgMap = sourceFileService.getAttachments(temp.getPaperId());
 				imgDtos = imgMap.get("imgs");
 				temp.setFixImgs(imgDtos);
-
-
-				errorImgMap = sourceFileService.getAttachments(temp.getAlertId());
+				errorImgMap = sourceFileService.getAttachments(temp.getSequenceNbr());
 				errorImgDtos = errorImgMap.get("imgs");
 				temp.setErrorImgs(errorImgDtos);
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
 				break;
 			case "962" : // 投诉建议
 				queryWrapper = new LambdaQueryWrapper<>();
@@ -667,6 +627,11 @@ public class WechatController extends BaseController {
 						temp.setActionResult(value);
 					}
 				});
+				errorImgMap = sourceFileService.getAttachments(temp.getSequenceNbr());
+				errorImgDtos = errorImgMap.get("imgs");
+				temp.setErrorImgs(errorImgDtos);
+				feedbackDtos = errorImgMap.get("feedbacks");
+				temp.setFeedBackImgs(feedbackDtos);
 				break;
 		}
 		return temp;

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -20,6 +20,8 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertPaperInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
@@ -336,6 +338,16 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         return list;
     }
 
+    @Override
+    public WechatMyBussinessDto getBussinessInfoById(Long alertId) {
+        return  baseMapper.getBussinessInfoById(alertId);
+    }
+
+    @Override
+    public List<WechatMyBusinessListDto> getBussinessListByPhonePager(String phone, String bussinessCode, Long current) {
+        return baseMapper.getBussinessListByPhonePager(phone, bussinessCode, current*5);
+    }
+
     private void dataInit(AlertHandlerInfoDto alertHandlerInfoDto, String process,String answerThePolice, String report, String notice, String arrive, String complete,String returnVisit) {
         alertHandlerInfoDto.setAbProcess(process);
         alertHandlerInfoDto.setAcAnswerThePolice(answerThePolice);
@@ -453,8 +465,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
             // 警情报送
             alertCalled.setAlertStatus(false);
-            alertCalled.setAlertSource(AlertStageEnums.GZHSB.getValue());
-            alertCalled.setAlertSourceCode(AlertStageEnums.GZHSB.getCode());
+            alertCalled.setAlertSource(AlertStageEnums.APPJJ.getValue());
+            alertCalled.setAlertSourceCode(AlertStageEnums.APPJJ.getCode());
             alertCalled.setIsDelete(false);
             alertCalled.setAlertStage(AlertStageEnums.JJ.getValue());
             alertCalled.setAlertStageCode(AlertStageEnums.JJ.getId());

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESElevatorServiceImpl.java

@@ -6,9 +6,7 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EsElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
-import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorAlarm;
 import com.yeejoin.amos.boot.module.tzs.api.entity.EsElevator;
-import com.yeejoin.amos.boot.module.tzs.api.enums.LiftAlarmDealStatusEnum;
 import com.yeejoin.amos.boot.module.tzs.biz.dao.ESElavtorRepository;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -123,7 +121,6 @@ public class ESElevatorServiceImpl {
                 queryWrapper.ge(AlertCalled::getCallTime, DateUtils.stampToDate(System.currentTimeMillis(),DateUtils.DATE_PATTERN));
                 queryWrapper.le(AlertCalled::getCallTime, DateUtils.stampToDate(DateUtils.dateAddDays(new Date(),1).getTime(),DateUtils.DATE_PATTERN));
             }
-
             alertCalleds  = iAlertCalledService.list(queryWrapper);
             List<Long> stringList = new ArrayList<>();
             for (AlertCalled al: alertCalleds
@@ -169,33 +166,18 @@ public class ESElevatorServiceImpl {
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
                 EsElevatorDto esElevatorDto =JSONObject.toJavaObject(jsonObject, EsElevatorDto.class);
 
-                if(null != alertCalled) {
-                   // Elevator elevator = elevatorService.getById(esElevatorDto.getSequenceNbr());
-                    LambdaQueryWrapper<ElevatorAlarm> queryWrapper1 = new LambdaQueryWrapper<>();
-                    queryWrapper1.eq(ElevatorAlarm::getRegisterCode,esElevatorDto.getRegisterCode());
-                    queryWrapper1.orderByDesc(ElevatorAlarm::getStartDate);
-                    List<ElevatorAlarm>  elevatorAlarms = elevatorAlarmServiceImpl.list(queryWrapper1);
-                    if(null != elevatorAlarms && elevatorAlarms.size() > 0) {
-                        esElevatorDto.setType(elevatorAlarms.get(0).getType());
-                        esElevatorDto.setStatus(LiftAlarmDealStatusEnum.getEnum(elevatorAlarms.get(0).getDealStatus()).getName());
-
-                    }
-                    esElevatorDto.setHappenTime(alertCalled.getCallTime());
-                    esElevatorDto.setAlertId(String.valueOf(alertCalled.getSequenceNbr()));
-                    esElevatorDto.setAlarmTypeCode(alertCalled.getAlarmTypeCode());
-
-                } else {
+                if(null != alertCalleds) {
                     for (AlertCalled al: alertCalleds
                     ) {
                         if(al.getEquipmentId().equals(esElevatorDto.getSequenceNbr())) {
                             esElevatorDto.setHappenTime(al.getCallTime());
                             esElevatorDto.setAlertId(String.valueOf(al.getSequenceNbr()));
                             esElevatorDto.setAlarmTypeCode(al.getAlarmTypeCode());
+                            list.add(esElevatorDto);
                             break;
                         }
                     }
                 }
-                list.add(esElevatorDto);
             }
         }
         catch (Exception e)

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ElevatorRelationServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorRelationDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorRelation;
+import com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorRelationMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorRelationService;
+import com.yeejoin.amos.boot.module.tzs.biz.controller.AlertCalledController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 关注电梯关系表服务实现类
+ *
+ * @author system_generator
+ * @date 2021-10-08
+ */
+@Service
+public class ElevatorRelationServiceImpl extends BaseService<ElevatorRelationDto, ElevatorRelation, ElevatorRelationMapper> implements IElevatorRelationService {
+
+    private final Logger logger = LoggerFactory.getLogger(ElevatorRelationServiceImpl.class);
+
+    @Override
+    public Boolean hasFocusElevator(String phone, Long elevatorId) {
+        return baseMapper.hasFocusElevator(phone, elevatorId) == 1;
+    }
+
+    @Override
+    public Boolean focusElevator(String openId, String elevatorId) {
+        Boolean flag = false;
+        try {
+            int result = baseMapper.focusElevator(openId, elevatorId);
+            flag = true;
+        } catch (Exception e) {
+            logger.error("关注电梯失败" + e.getMessage());
+        }
+
+        return  flag;
+    }
+
+    @Override
+    public Boolean cancelFocusElevator(String openId, String elevatorId) {
+        return baseMapper.cancelFocusElevator(openId, elevatorId) == 1;
+    }
+
+    @Override
+    public List<ElevatorListDto> getMyFocusElevator(String openId) {
+        return baseMapper.getMyFocusElevator(openId);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EnevatorRelationServiceImpl.java

-package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
-
-import com.yeejoin.amos.boot.module.tzs.api.entity.EnevatorRelation;
-import com.yeejoin.amos.boot.module.tzs.api.mapper.EnevatorRelationMapper;
-import com.yeejoin.amos.boot.module.tzs.api.service.IEnevatorRelationService;
-import com.yeejoin.amos.boot.module.tzs.api.dto.EnevatorRelationDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-
-/**
- * 关注电梯关系表服务实现类
- *
- * @author litw
- * @date 2021-09-22
- */
-@Service
-public class EnevatorRelationServiceImpl extends BaseService<EnevatorRelationDto,EnevatorRelation,EnevatorRelationMapper> implements IEnevatorRelationService {
-    /**
-     * 分页查询
-     */
-    public Page<EnevatorRelationDto> queryForEnevatorRelationPage(Page<EnevatorRelationDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
-
-    /**
-     * 列表查询 示例
-     */
-    public List<EnevatorRelationDto> queryForEnevatorRelationList()   {
-        return this.queryForList("" , false);
-    }
-
-}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/RepairConsultServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
@@ -64,6 +65,10 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
     @Autowired
     RescueProcessServiceImpl rescueProcessServiceImpl;
 
+
+    @Autowired
+    AlertFormValueServiceImpl iAlertFormValueService;
+
     @Autowired
     private EmqKeeper emqKeeper;
 
@@ -197,15 +202,19 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             String person = dispatchTask.getResponseUserName();
             content = content.replace("$createTime",createTime).replace("$person",person);
             DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
-            DispatchPaper dispatchPaper = dispatchPaperFormDto.getDispatchPaper();
             List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
             Map<String,String> tempMap = new HashMap<String,String>();
             dynamicForm.stream().forEach(alertFormValue -> {
                  if(TzsCommonParam.FIX_RESULT.equals(alertFormValue.getFieldCode())) {
                     tempMap.put("fixResult",alertFormValue.getFieldValue());
                 }
+                if(TzsCommonParam.FIX_FEEDBACK_TYPE.equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("FKFS",alertFormValue.getFieldValue());
+                }
             });
-            content = content.replace("$FKFS",dispatchPaper.getFeedbackType()).replace("$fixResult",tempMap.get("fixResult"));
+            // 反馈方式从动态表单中取得
+            String FKFS = tempMap.get("FKFS") == null ? "" :  tempMap.get("FKFS");
+            content = content.replace("$FKFS",FKFS).replace("$fixResult",tempMap.get("fixResult"));
         } else if(TzsCommonParam.WXFK_TS.equals(type)) { //从派遣单获取数据
             //投诉的维修反馈修改成维保已处置
             CZHJ = DispatchPaperEnums.disposed;
@@ -219,44 +228,40 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             dynamicForm.stream().forEach(alertFormValue -> {
                 if(TzsCommonParam.ACTION_RESULT.equals(alertFormValue.getFieldCode())) {
                     tempMap.put("fixResult",alertFormValue.getFieldValue());
+                } else if(TzsCommonParam.CONSULT_FEEDBACK_TYPE.equals(alertFormValue.getFieldCode())) {
+                    tempMap.put(TzsCommonParam.FKFS,alertFormValue.getFieldValue());
                 }
             });
-            content = content.replace("$FKFS",dispatchPaper.getFeedbackType()).replace("$fixResult",tempMap.get("fixResult"));
+            content = content.replace("$FKFS",tempMap.get(TzsCommonParam.FKFS)).replace("$fixResult",tempMap.get("fixResult"));
             type = TzsCommonParam.WXFK;
         } else if(TzsCommonParam.BXFK.equals(type)) {
             //报修反馈
             CZHJ = DispatchPaperEnums.reportorBack;
-            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
-            String person = dispatchTask.getResponseUserName();
+            String person = alertCalledVo.getEmergencyPerson() + "(" + alertCalledVo.getEmergencyCall() + ")";
             content = content.replace("$createTime",createTime).replace("$person",person);
             DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
             List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
             Map<String,String> tempMap = new HashMap<String,String>();
             dynamicForm.stream().forEach(alertFormValue -> {
-                if(TzsCommonParam.FIX_FEEDBACK_TYPE.equals(alertFormValue.getFieldCode())) {
-                    tempMap.put(TzsCommonParam.FKFS,alertFormValue.getFieldValue());
-                } else if(TzsCommonParam.FIX_RESULT.equals(alertFormValue.getFieldCode())) {
-                    tempMap.put("fixResult",alertFormValue.getFieldValue());
+                if(TzsCommonParam.FEEDBACK_RESULT.equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("feedbackResult",alertFormValue.getFieldValue());
                 }
             });
-            content = content.replace("$FKFS",tempMap.get(TzsCommonParam.FKFS)).replace("$feedbackResult",tempMap.get("fixResult"));
+            content = content.replace("$FKFS",dispatchPaperFormDto.getDispatchPaper().getFeedbackType()).replace("$feedbackResult",tempMap.get("feedbackResult"));
         } else if(TzsCommonParam.TSRFK.equals(type)) {
             //投诉人已反馈
             CZHJ = DispatchPaperEnums.complainantBack;
-            DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
-            String person = dispatchTask.getResponseUserName();
+            String person = alertCalledVo.getEmergencyPerson() + "(" + alertCalledVo.getEmergencyCall() + ")";
             content = content.replace("$createTime",createTime).replace("$person",person);
             DispatchPaperFormDto dispatchPaperFormDto = dispatchPaperServiceImpl.selectDispatchPaperDtoByAlertId(alertId);
             List<AlertFormValue> dynamicForm = dispatchPaperFormDto.getDynamicFormAlert();
             Map<String,String> tempMap = new HashMap<String,String>();
             dynamicForm.stream().forEach(alertFormValue -> {
-                if(TzsCommonParam.CONSULT_FEEDBACK_TYPE.equals(alertFormValue.getFieldCode())) {
-                    tempMap.put(TzsCommonParam.FKFS,alertFormValue.getFieldValue());
-                } else if(TzsCommonParam.ACTION_RESULT.equals(alertFormValue.getFieldCode())) {
-                    tempMap.put("action_result",alertFormValue.getFieldValue());
+                if(TzsCommonParam.FEEDBACK_RESULT.equals(alertFormValue.getFieldCode())) {
+                    tempMap.put("feedbackResult",alertFormValue.getFieldValue());
                 }
             });
-            content = content.replace("$FKFS",tempMap.get(TzsCommonParam.FKFS)).replace("$feedbackResult",tempMap.get("action_result"));
+            content = content.replace("$FKFS",dispatchPaperFormDto.getDispatchPaper().getFeedbackType()).replace("$feedbackResult",tempMap.get("feedbackResult"));
         }
         AlertStageEnums RZHJ = AlertStageEnums.getEnumByCode(type);
         repairConsult.setType(RZHJ.getCode());

amos-boot-system-supervision/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1996,7 +1996,7 @@
             <if test="companyId != null">
                 AND pp.original_id = #{companyId}
             </if>
-            <if test="pointId != null">
+            <if test="pointId != null  and pointId != -1">
                 AND pp.id = #{pointId}
             </if>
 <!--            <if test="orgCode != null">-->
@@ -2029,7 +2029,7 @@
             <if test="companyId != null">
                 AND pp.original_id = #{companyId}
             </if>
-            <if test="pointId != null">
+            <if test="pointId != null and pointId != -1">
                 AND pp.id = #{pointId}
             </if>
 <!--            <if test="orgCode != null">-->

amos-boot-system-tzs/src/main/resources/application-dev.properties

@@ -42,9 +42,9 @@ tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
 tzs.cti.url=http://36.46.151.113:8000
 
 tzs.wechat.url=https://api.weixin.qq.com
-##wechatAPPID wx79aca5bb1cb4af92  wx8918c1aaad956617
-tzs.wechat.appid=wx79aca5bb1cb4af92
-##wechatSECRET 337c3d8f3e749140d4f9aedc8311033b  f3a12323ba731d282c3d4698c27c3e97
+##wechatAPPID wx79aca5bb1cb4af92   uat-wx8918c1aaad956617
+tzs.wechat.appid=wx8918c1aaad956617
+##wechatSECRET f3a12323ba731d282c3d4698c27c3e97 uat-337c3d8f3e749140d4f9aedc8311033b
 tzs.wechat.secret=337c3d8f3e749140d4f9aedc8311033b
 
 ##wechatToken