Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_new_patrol

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/ResubmitCheck.java

+package com.yeejoin.amos.boot.biz.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author DELL
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ResubmitCheck {
+
+    /**
+     * 失效时间，即可以第二次提交间隔时长，单位秒
+     */
+    long expireTime() default 3;
+
+    /**
+     * 提示消息
+     */
+    String message() default "您的操作过于频繁，请稍后重试";
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ResubmitCheckAspect.java

+package com.yeejoin.amos.boot.biz.common.aop;
+
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.DigestUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author DELL
+ */
+@Aspect
+@Component
+@Slf4j
+public class ResubmitCheckAspect {
+
+    @Resource
+    HttpServletRequest request;
+
+    @Autowired
+    RedisUtils redisUtils;
+
+    @Pointcut(value = "@annotation(com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck)")
+    public void submit() {
+    }
+
+    @Before("submit()&&@annotation(resubmitCheck)")
+    public void doBefore(JoinPoint joinPoint, ResubmitCheck resubmitCheck) {
+        String token = !StringUtils.isEmpty(request.getHeader("token")) ? request.getHeader("token") : RequestContext.getToken();
+        StringBuilder md5Builder = new StringBuilder(StringUtils.isEmpty(token) ? "unknown" : token);
+        if (joinPoint.getArgs() != null) {
+            for (Object obj : joinPoint.getArgs()) {
+                md5Builder.append(obj.toString());
+            }
+        }
+        String md5String = DigestUtils.md5DigestAsHex(md5Builder.toString().getBytes());
+        Object cache = redisUtils.get(md5String);
+        if (cache != null) {
+            throw new RuntimeException(resubmitCheck.message());
+        }
+        redisUtils.set(md5String, 1, resubmitCheck.expireTime());
+    }
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/config/FeignAuthRequestInterceptor.java

+package com.yeejoin.amos.api.openapi.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author DELL
+ */
+public class FeignAuthRequestInterceptor implements RequestInterceptor {
+    public FeignAuthRequestInterceptor() {
+
+    }
+
+    @Override
+    public void apply(RequestTemplate template) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes != null) {
+            HttpServletRequest request = attributes.getRequest();
+            /* Get token from header */
+            String authToken = StringUtils.isEmpty(request.getHeader("X-Access-Token")) ? request.getHeader("token") : request.getHeader("X-Access-Token");
+            /* If token not found get it from request parameter */
+            String appKey =  request.getHeader("appKey");
+            String product =  request.getHeader("product");
+            if (authToken == null) {
+                authToken = request.getParameter("token");
+            }
+            if (appKey == null) {
+                appKey = request.getParameter("appKey");
+            }
+            if (product == null) {
+                product = request.getParameter("product");
+            }
+            template.header("X-Access-Token", authToken);
+            template.header("token", authToken);
+            template.header("appKey", appKey);
+            template.header("product", product);
+        }
+    }
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/config/FeignConfiguration.java

+package com.yeejoin.amos.api.openapi.config;
+
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author DELL
+ */
+@Configuration
+public class FeignConfiguration {
+
+    /**
+     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
+     * @return
+     */
+    @Bean
+    public FeignAuthRequestInterceptor basicAuthRequestInterceptor() {
+        return new FeignAuthRequestInterceptor();
+    }
+
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignComFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+
+
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java

@@ -40,12 +40,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-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.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -251,7 +246,7 @@ public class SuperviseController {
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "赋码")
     @PostMapping(value = "/generation/code")
     @RestEventTrigger(value = "openapiLogEventHandler")
@@ -259,7 +254,7 @@ public class SuperviseController {
         return ResponseHelper.buildResponse(createCodeService.createCode(map));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "数据状态修改")
     @PostMapping(value = "/update/dateStatus")
     @RestEventTrigger(value = "openapiLogEventHandler")
@@ -267,7 +262,7 @@ public class SuperviseController {
         return ResponseHelper.buildResponse(createCodeService.updateStatus(map));
     }
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "检验检测信息")
     @GetMapping(value = "/inspectionInfo")
     @RestEventTrigger(value = "openapiLogEventHandler")
@@ -275,7 +270,7 @@ public class SuperviseController {
         return ResponseHelper.buildResponse(inspectionInfoService.selectInspect(superviseCode));
     }
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "监管设备信息")
 	@PostMapping(value = "/equipment/info")
 	@RestEventTrigger(value = "openapiLogEventHandler")
@@ -287,4 +282,17 @@ public class SuperviseController {
 		return ResponseHelper.buildResponse(useInfoService.saveEquipmentInfo(equipmentInfoDto));
 	}
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getUnitLicenceMessage", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询许可信息", notes = "根据统一信用代码查询许可信息")
+    public ResponseModel<Object> getUnitLicenceMessage(@RequestParam("unitCode") String unitCode) {
+        return ResponseHelper.buildResponse(useInfoService.getUnitLicenceMessage(unitCode));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getBusinessInformation", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询工商信息", notes = "根据统一信用代码查询工商信息")
+    public ResponseModel<Object> getBusinessInformation(@RequestParam("unitCode") String unitCode) {
+        return ResponseHelper.buildResponse(useInfoService.getBusinessInformation(unitCode));
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/UseInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
 import com.yeejoin.amos.api.openapi.face.dto.EquipmentInfoDto;
+import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
 import com.yeejoin.amos.api.openapi.face.model.UseInfoModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.UseInfoMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
+import com.yeejoin.amos.api.openapi.feign.TzsAccessFeignService;
 import com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
+import com.yeejoin.amos.api.openapi.feign.TzsTcmServiceFeignClient;
 import feign.FeignException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -17,6 +20,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 特种设备基本信息-使用信息 服务类
@@ -32,6 +36,11 @@ public class UseInfoService extends AppBaseService<UseInfoModel, UseInfo, UseInf
 	@Autowired
 	TzsServiceFeignClient tzsServiceFeignClient;
 
+	@Autowired
+	TzsTcmServiceFeignClient tzsTcmServiceFeignClient;
+
+	@Autowired
+	TzsAccessFeignService tzsAccessFeignService;
 //	@Autowired
 //	AmosRequestContext amosRequestContext;
 
@@ -137,5 +146,27 @@ public class UseInfoService extends AppBaseService<UseInfoModel, UseInfo, UseInf
 		}
 		return null;
 	}
+
+	public Object getUnitLicenceMessage(String unitCode){
+		try {
+			ResponseModel<Object> licenceByUnitCode = tzsTcmServiceFeignClient.getLicenceByUnitCode(unitCode);
+			return licenceByUnitCode.getResult();
+		}catch (Exception e){
+			logger.error("查询许可信息失败--->", e);
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public Object getBusinessInformation(String unitCode){
+		try {
+			ResponseModel<Map<String, Object>> data = tzsAccessFeignService.getData(unitCode);
+			return data.getResult();
+		}catch (Exception e){
+			logger.error("查询工商信息失败--->", e);
+			e.printStackTrace();
+		}
+		return null;
+	}
 }
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsAccessFeignService.java

+package com.yeejoin.amos.api.openapi.feign;
+
+import com.yeejoin.amos.api.openapi.config.FeignConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+@FeignClient(name = "AMOS-API-ACCESSAPI", path = "/accessapi" , configuration =
+        {FeignConfiguration.class})
+public interface TzsAccessFeignService {
+
+    /**
+     * 调用accessApi的接口
+     * @param code
+     * @return
+     */
+    @RequestMapping("/business/getData")
+    ResponseModel<Map<String, Object>> getData(@RequestParam String code);
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsServiceFeignClient.java

 package com.yeejoin.amos.api.openapi.feign;
 
 
-import com.yeejoin.amos.api.openapi.config.MultipartSupportConfig;
+import com.yeejoin.amos.api.openapi.config.FeignConfiguration;
 import com.yeejoin.amos.api.openapi.face.dto.EquipmentInfoDto;
 import com.yeejoin.amos.api.openapi.face.model.InspectionDetectionInfoModel;
 import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
@@ -18,7 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 @FeignClient(name = "TZS-YMT", path = "/ymt", configuration =
-        {MultipartSupportConfig.class})
+        {FeignConfiguration.class})
 public interface TzsServiceFeignClient {
 
     /**

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsTcmServiceFeignClient.java

+package com.yeejoin.amos.api.openapi.feign;
+
+
+import com.yeejoin.amos.api.openapi.config.FeignConfiguration;
+import com.yeejoin.amos.api.openapi.config.MultipartSupportConfig;
+import com.yeejoin.amos.api.openapi.face.dto.EquipmentInfoDto;
+import com.yeejoin.amos.api.openapi.face.model.InspectionDetectionInfoModel;
+import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
+import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
+import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "TZS-COMMON", path = "/tcm", configuration =
+        {FeignConfiguration.class})
+public interface TzsTcmServiceFeignClient {
+
+    /**
+     * 根据企业统一信用代码询许可信息
+     *
+     * @param unitCode 企业唯一编码
+     * @return
+     */
+    @RequestMapping(value = "/baseEnterprise/getUnitLicenceMessage", method = RequestMethod.GET)
+    ResponseModel<Object> getLicenceByUnitCode(@RequestParam String unitCode);
+
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/VoiceRecordLog.java

@@ -45,4 +45,16 @@ public class VoiceRecordLog extends BaseEntity {
 	@TableField("deal_times")
     private Integer dealTimes;
 
+    /**
+     * 警情阶段code
+     */
+    @TableField("alert_stage_code")
+    private String alertStageCode;
+
+    /**
+     * 警情阶段
+     */
+    @TableField("alert_stage")
+    private String alertStage;
+
 }

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

@@ -45,7 +45,8 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
      */
     Map<String, Long> queryAlertStatusCount(@Param("beginDate") String beginDate,
                                             @Param("endDate") String endDate,
-                                               @Param("groupCode") String groupCode);
+                                            @Param("groupCode") String groupCode,
+                                            @Param("userId") String userId);
 
     /**
      * 根据查询条件返回警情记录

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

@@ -11,6 +11,7 @@
 			tz_alert_called
 		WHERE
 			skill_group LIKE CONCAT ( #{groupCode}, '%' )
+		  and rec_user_id = #{userId}
 		<if test="beginDate != null and beginDate != ''">
 			and call_time >= #{beginDate}
 		</if>
@@ -148,7 +149,7 @@
 		tz_alert_called a
 		LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjoi.CODE96333 = a.device_id
 		LEFT JOIN idx_biz_jg_use_info ibjui ON ibjoi.RECORD = ibjui.RECORD
-		WHERE a.is_delete = 0
+		WHERE a.is_delete = 0 and a.father_alert is null
 		and a.skill_group = #{groupCode}
 		<if test="workOrderNumber != null and workOrderNumber != ''">
 			AND a.work_order_number like

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertDispatchStatisticsMapper.xml

@@ -5,7 +5,9 @@
     <select id="getMessage" resultType="java.util.Map">
         SELECT *
         from (
-                 SELECT concat(ROUND(date_part('second', arrive_time - dispatch_time) / 60, 2), '分钟') as arriveTime,
+              select
+                  arrive_time  as ddTime,
+                  dispatch_time as pqTime,
                         (
                             SELECT ME_UNIT_NAME
                             from idx_biz_jg_maintenance_record_info
@@ -15,12 +17,13 @@
              (SELECT ORG_BRANCH_CODE
               from idx_biz_jg_supervision_info
               where RECORD = (SELECT equipment_id from tz_alert_called where sequence_nbr = alert_id)) as orgCode,
-             (SELECT address from tz_alert_called where sequence_nbr = alert_id) as address from tz_dispatch_task
+             (SELECT address from tz_alert_called where sequence_nbr = alert_id) as address
+            from tz_dispatch_task
         where org_type_code = 'levelOneUnit'
           and arrive_time is not null
           and dispatch_time between #{startDate}
           and #{endDate}
-          and alert_id in (SELECT sequence_nbr from tz_alert_called where alarm_type_code = '960' and call_time between #{startDate} and #{endDate})
+          and alert_id in (SELECT sequence_nbr from tz_alert_called where alarm_type_code = '960' and call_time between #{startDate} and #{endDate} and father_alert is null)
 
             )
         WHERE orgCode is not null

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertMaintenanceUnitStatisticsMapper.xml

@@ -20,7 +20,8 @@
             LEFT JOIN  idx_biz_jg_supervision_info jsi  on tac.equipment_id = jsi.RECORD
         WHERE tac.alarm_type_code != '962'
           and tac.equipment_id is not null
-          and call_time between #{startDate} and #{endDate}
+          and tac.call_time between #{startDate} and #{endDate}
+          and tac.father_alert is null
             )
         WHERE mainCode is not null
         GROUP BY equipmentId
@@ -34,10 +35,10 @@
 
             )as equipNum,
             (
-                SELECT count(1) from tz_alert_called WHERE equipment_id = #{equipId} and alarm_type_code = '960'
+                SELECT count(1) from tz_alert_called WHERE equipment_id = #{equipId} and alarm_type_code = '960' and father_alert is null
             ) as trappedNum,
             (
-                SELECT count(1) from tz_alert_called WHERE equipment_id = #{equipId} and alarm_type_code = '961'
+                SELECT count(1) from tz_alert_called WHERE equipment_id = #{equipId} and alarm_type_code = '961' and father_alert is null
             ) as faultNum,
             (
                SELECT ME_UNIT_NAME from idx_biz_jg_maintenance_record_info WHERE ME_UNIT_CREDIT_CODE = #{unitCode} limit 1

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertPlaceStatisticsMapper.xml

@@ -8,18 +8,18 @@
 
     <select id="getTotal" resultType="java.util.Map">
 select
-       (select count(1) from tz_alert_called where  alarm_type_code = '961' and call_time between #{startDate} and #{endDate})  as faultNum,
-       (select count(1) from tz_alert_called where  alarm_type_code = '960' and call_time between #{startDate} and #{endDate} )  as trappedNum
+       (select count(1) from tz_alert_called where  alarm_type_code = '961' and call_time between #{startDate} and #{endDate} and father_alert is null)  as faultNum,
+       (select count(1) from tz_alert_called where  alarm_type_code = '960' and call_time between #{startDate} and #{endDate} and father_alert is null )  as trappedNum
     </select>
     <select id="getStatisticsMessage"
             resultType="com.yeejoin.amos.boot.module.elevator.api.entity.AlertPlaceStatistics">
         SELECT
             (SELECT count(1)   FROM
                 tz_alert_called t1
-                    LEFT JOIN idx_biz_jg_use_info t2 ON t1.equipment_id = t2.RECORD  WHERE  t2.USE_PLACE = #{placeCode} and t1.alarm_type_code = '960' and t1.call_time between #{startDate} and #{endDate}) as trappedNum,
+                    LEFT JOIN idx_biz_jg_use_info t2 ON t1.equipment_id = t2.RECORD  WHERE  t2.USE_PLACE = #{placeCode} and t1.alarm_type_code = '960' and t1.call_time between #{startDate} and #{endDate} and father_alert is null) as trappedNum,
             (SELECT count(1)   FROM
                 tz_alert_called t1
-                    LEFT JOIN idx_biz_jg_use_info t2 ON t1.equipment_id = t2.RECORD  WHERE  t2.USE_PLACE = #{placeCode} and t1.alarm_type_code = '961' and t1.call_time between #{startDate} and #{endDate}) as faultNum
+                    LEFT JOIN idx_biz_jg_use_info t2 ON t1.equipment_id = t2.RECORD  WHERE  t2.USE_PLACE = #{placeCode} and t1.alarm_type_code = '961' and t1.call_time between #{startDate} and #{endDate} and father_alert is null) as faultNum
 
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertRescueStatisticsMapper.xml

@@ -6,25 +6,45 @@
             resultType="com.yeejoin.amos.boot.module.elevator.api.entity.AlertRescueStatistics">
         SELECT (select count(1)
                 from tz_dispatch_task
-                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960')
+                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960' and father_alert is null)
                   and org_type_code = 'levelOneUnit') as          levelOne,
                (select count(1)
                 from tz_dispatch_task
-                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960')
+                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960' and father_alert is null)
                   and org_type_code = 'levelTwoUnit') as          levelTwo,
                (select count(1)
                 from tz_dispatch_task
-                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960')
+                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960' and father_alert is null)
                   and org_type_code = '953')          as          levelThree,
                (select count(DISTINCT (response_org_id))
                 from tz_dispatch_task
-                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960')
+                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960'  and father_alert is null)
                   and org_type_code = 'levelOneUnit') as          maintenanceUnit,
-               (select count(1)
-                from tz_dispatch_task
-                where alert_id in (SELECT sequence_nbr from tz_alert_called where biz_org_code like concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960')
-                  and org_type_code = 'levelOneUnit'
-                  and date_part('minute', arrive_time - rec_date) < 30) as lessNum,
-        (SELECT sum(times) from (SELECT date_part('second', arrive_time - rec_date)as times from  tz_dispatch_task  where  alert_id in (SELECT sequence_nbr from  tz_alert_called where biz_org_code like  concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}  and alarm_type_code = '960')  and  org_type_code = 'levelOneUnit')) as avgNum
+               (			SELECT count(1) from (
+
+                        SELECT
+                        t1.sequence_nbr,
+                        (SELECT min(arrive_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and arrive_time is not null) as arr,
+
+                        (SELECT min(dispatch_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and dispatch_time is not null ) as dis
+
+                        from tz_alert_called t1 where t1.biz_org_code like concat(#{orgCode}, '%')  and t1.alarm_type_code = '960' and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is null
+
+                        ) where   extract(epoch from  arr  -  dis ) < 1800
+                        ) as lessNum,
+        (SELECT count(1) from  tz_alert_called where biz_org_code like concat(#{orgCode}, '%')  and alarm_type_code = '960' and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is null) as greaterNum,
+        (
+
+                   SELECT sum(extract(epoch from  arr  -  dis )) from
+
+                       (   SELECT
+                               t1.sequence_nbr,
+                               (SELECT min(arrive_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and arrive_time is not null) as arr,
+
+                               (SELECT min(dispatch_time)  from tz_dispatch_task where alert_id = t1.sequence_nbr and dispatch_time is not null ) as dis
+
+                           from tz_alert_called t1 where t1.biz_org_code like concat('50', '%')  and t1.alarm_type_code = '960' and t1.call_time BETWEEN #{startDate} and  #{endDate} and t1.father_alert is null
+
+                       ) ) as avgNum
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertStatisticsMapper.xml

@@ -21,19 +21,19 @@
                         ) AS elevatorNum,
                         (SELECT COUNT(1)
                          FROM tz_alert_called
-                         WHERE  biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}) AS emergencyEventsAll,
+                         WHERE  biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is  null ) AS emergencyEventsAll,
                         (SELECT COUNT(1)
                          FROM tz_alert_called
                          WHERE alarm_type_code = '960'
-                           AND biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}) AS trappedPeople,
+                           AND biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is  null) AS trappedPeople,
                         (SELECT COUNT(1)
                          FROM tz_alert_called
                          WHERE alarm_type_code = '961'
-                           AND biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}) AS breakdownRescue,
+                           AND biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is  null) AS breakdownRescue,
                         (SELECT COUNT(1)
                          FROM tz_alert_called
                          WHERE alarm_type_code = '962'
-                           AND biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate}) AS complaint,
+                           AND biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is  null) AS complaint,
                         (
                             SELECT (
                                            (
@@ -42,7 +42,7 @@
                                                WHERE alert_called_id IN (
                                                    SELECT sequence_nbr
                                                    FROM tz_alert_called
-                                                   WHERE biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate})
+                                                   WHERE biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is  null)
                                                  AND field_code = 'trapped_num'
                                            ) - (
                                                SELECT ifnull(SUM(field_value), 0)
@@ -50,7 +50,7 @@
                                                WHERE alert_called_id IN (
                                                    SELECT sequence_nbr
                                                    FROM tz_alert_called
-                                                   WHERE biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate})
+                                                   WHERE biz_org_code  LIKE concat(#{orgCode}, '%') and call_time BETWEEN #{startDate} and  #{endDate} and father_alert is  null)
                                                  AND field_code = 'die_num'
                                            )
                                        ))                                                            AS rescuePersonnel

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertUseUnitStatisticsMapper.xml

@@ -22,6 +22,7 @@
           and tac.equipment_id is not null
           and use.ADDRESS is not null
           and  tac.call_time between  #{startDate} and #{endDate}
+          and tac.father_alert is null
             )
         GROUP BY mainName, useName, address
         ORDER BY address
@@ -34,10 +35,12 @@
             ) as equipNum,
             (
                 SELECT count(1) from tz_alert_called where alarm_type_code = '960' and equipment_id = #{equipmentId} and  call_time between  #{startDate} and #{endDate}
+                                                       and father_alert is null
             ) as trappedNum,
 
             (
                 SELECT count(1) from tz_alert_called where alarm_type_code = '961' and equipment_id = #{equipmentId} and  call_time between  #{startDate} and #{endDate}
+                                                       and father_alert is null
             ) as faultNum
     </select>
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -125,6 +126,7 @@ public class AlertCalledController extends BaseController {
 	 *
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录")
@@ -147,31 +149,8 @@ public class AlertCalledController extends BaseController {
 		}
 		AgencyUserModel userModel = reginParams.getUserModel();
 		alertCalledObjsDto = iAlertCalledService.createAlertCalled(alertCalledObjsDto, userModel);
-		try {
 		//更新警情历史记录表
-			AlertCalledDto alertCalledDto = alertCalledObjsDto.getAlertCalledDto();
-			List<AlertFormValue> alertFormValue = alertCalledObjsDto.getAlertFormValue();
-			HashMap<String, String> formMap = new HashMap<>();
-			alertFormValue.forEach(x-> formMap.put(x.getFieldCode(),x.getFieldValue()));
-			AlertFormRecordDto alertFormRecordDto = new AlertFormRecordDto();
-			alertFormRecordDto.setAlertCalledId(alertCalledDto.getSequenceNbr());
-			alertFormRecordDto.setAlertTypeCode(alertCalledDto.getAlertSourceCode());
-			alertFormRecordDto.setName(alertCalledDto.getEmergencyPerson());
-			alertFormRecordDto.setPhone(alertCalledDto.getContactPhone());
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			alertFormRecordDto.setTrappedTime(sdf.parse(formMap.getOrDefault("trapped_time", new Date().toString())));
-			alertFormRecordDto.setTrappedNum(Integer.parseInt(formMap.getOrDefault("trapped_num", "0")));
-			alertFormRecordDto.setInjuredNum(Integer.parseInt(formMap.getOrDefault("injured_num", "0")));
-			alertFormRecordDto.setDieNum(Integer.parseInt(formMap.getOrDefault("die_num", "0")));
-			alertFormRecordDto.setTrappedFloorNum(Integer.parseInt(formMap.getOrDefault("trapped_floor_num", "0")));
-			alertFormRecordDto.setIsLight("是".equals(formMap.get("is_light")) ? 1 : 0);
-			alertFormRecordDto.setDescription((String) formMap.getOrDefault("desc", ""));
-			alertFormRecordDto.setSourcesInfo(SourcesInfoEnum.Submit.getCode().toString());
-			alertFormRecordService.saveAlertFormRecord(alertFormRecordDto);
-		}catch (Exception e){
-			e.printStackTrace();
-		}
-
+		saveAlertCallRecord(alertCalledObjsDto);
 
 		// 坐席接警后，辅屏由常态化切换为处置态
 		JSONObject jsonObject = new JSONObject();
@@ -195,12 +174,47 @@ public class AlertCalledController extends BaseController {
 		return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto());
 	}
 
+	private void saveAlertCallRecord(AlertCalledObjsDto alertCalledObjsDto) {
+		try {
+			AlertCalledDto alertCalledDto = alertCalledObjsDto.getAlertCalledDto();
+			List<AlertFormValue> alertFormValue = alertCalledObjsDto.getAlertFormValue();
+			HashMap<String, String> formMap = new HashMap<>();
+			alertFormValue.forEach(x-> formMap.put(x.getFieldCode(),x.getFieldValue()));
+			AlertFormRecordDto alertFormRecordDto = new AlertFormRecordDto();
+			alertFormRecordDto.setAlertCalledId(alertCalledDto.getSequenceNbr());
+			alertFormRecordDto.setAlertTypeCode(alertCalledDto.getAlertSourceCode());
+			alertFormRecordDto.setName(alertCalledDto.getEmergencyPerson());
+			alertFormRecordDto.setPhone(alertCalledDto.getContactPhone());
+			if (AlertStageEnums.KRJY.getId().equals(alertCalledDto.getAlarmTypeCode())){
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+				alertFormRecordDto.setTrappedTime(sdf.parse(formMap.getOrDefault("trapped_time", new Date().toString())));
+				alertFormRecordDto.setTrappedNum(Integer.parseInt(formMap.getOrDefault("trapped_num", "0")));
+				alertFormRecordDto.setInjuredNum(Integer.parseInt(formMap.getOrDefault("injured_num", "0")));
+				alertFormRecordDto.setDieNum(Integer.parseInt(formMap.getOrDefault("die_num", "0")));
+				alertFormRecordDto.setTrappedFloorNum(Integer.parseInt(formMap.getOrDefault("trapped_floor_num", "0")));
+				alertFormRecordDto.setIsLight("是".equals(formMap.getOrDefault("is_light","是")) ? 1 : 0);
+				alertFormRecordDto.setDescription(formMap.getOrDefault("desc", ""));
+			}
+			if (AlertStageEnums.GZWX.getId().equals(alertCalledDto.getAlarmTypeCode())){
+				alertFormRecordDto.setFaultReport(formMap.getOrDefault("fault_report", ""));
+			}
+			if (AlertStageEnums.TSZX.getId().equals(alertCalledDto.getAlarmTypeCode())){
+				alertFormRecordDto.setComplaintConsulttation(formMap.getOrDefault("complaint_consulttation", ""));
+			}
+			alertFormRecordDto.setSourcesInfo(SourcesInfoEnum.Submit.getCode().toString());
+			alertFormRecordService.saveAlertFormRecord(alertFormRecordDto);
+		}catch (Exception e){
+			e.printStackTrace();
+		}
+	}
+
 	/**
 	 * 公众号投诉建议与故障报销
 	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ResubmitCheck
 	@PostMapping(value = "/saveMobile")
 	@ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录")
 	public ResponseModel<AlertCalledDto> saveMobile(@RequestBody AlertCalledDto alertCalledDto) {
@@ -293,18 +307,12 @@ public class AlertCalledController extends BaseController {
 	 * </pre>
 	 *
 	 * @param
-	 * @param current
-	 * @param size
-	 * @return
-	 * @throws Exception
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(value = "相似警情分页查询")
 	@PostMapping(value = "/page/similar")
-	public ResponseModel<Page<ESAlertCalledDto>> pageBySimilar(@RequestBody ESAlertCalledRequestDto alertCalledVo,
-			@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) throws Exception {
-
-		Page<ESAlertCalledDto> esAlertCalledDtoPage = eSAlertCalledService.queryByKeys(alertCalledVo, current, size);
+	public ResponseModel<Page<ESAlertCalledDto>> pageBySimilar(@RequestBody ESAlertCalledRequestDto alertCalledVo) {
+		Page<ESAlertCalledDto> esAlertCalledDtoPage = eSAlertCalledService.queryByKeys(alertCalledVo);
 		return ResponseHelper.buildResponse(esAlertCalledDtoPage);
 	}
 
@@ -314,7 +322,7 @@ public class AlertCalledController extends BaseController {
 	 * @param id 主键
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/{id}")
 	@ApiOperation(httpMethod = "GET", value = "根据id查询单个警情接警填报记录", notes = "根据id查询单个警情接警填报记录")
 	public ResponseModel<Object> selectOne(@PathVariable Long id) {
@@ -598,6 +606,7 @@ public class AlertCalledController extends BaseController {
 	 * 
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveFinalReason")
 	@ApiOperation(httpMethod = "POST", value = "工单结案-投诉", notes = "工单结案-投诉")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertFormController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -54,6 +55,7 @@ public class AlertFormController extends BaseController {
     * 新增警情表单
     * @return
     */
+    @ResubmitCheck
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增警情表单", notes = "新增警情表单")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/AlertFormRecordController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertFormRecordDto;
 import com.yeejoin.amos.boot.module.elevator.api.service.IAlertFormRecordService;
 import io.swagger.annotations.Api;
@@ -30,6 +31,7 @@ public class AlertFormRecordController {
     private IAlertFormRecordService iAlertFormRecordService;
 
 
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/saveRecord")
     @ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录")
@@ -37,7 +39,7 @@ public class AlertFormRecordController {
         return ResponseHelper.buildResponse(iAlertFormRecordService.saveAlertFormRecord(record));
     }
 
-
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/recordByCalledId")
     @ApiOperation(httpMethod = "POST", value = "根据警情id查询修改记录", notes = "根据警情id查询修改记录")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/DispatchPaperController.java

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -72,6 +73,7 @@ public class DispatchPaperController extends BaseController {
 	 * @param dispatchSaveFeedbackDto
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/feedback/save")
 	@ApiOperation(httpMethod = "POST", value = "保存救援回访信息", notes = "保存救援回访信息")
@@ -111,6 +113,7 @@ public class DispatchPaperController extends BaseController {
 	 * @param dispatchRepairFeedbackDto
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/feedback/repair")
 	@ApiOperation(httpMethod = "POST", value = "保存维修回访信息", notes = "保存维修回访信息")
@@ -155,6 +158,7 @@ public class DispatchPaperController extends BaseController {
 	 * @param dispatchConsultFeedbackDto
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/feedback/consult")
 	@ApiOperation(httpMethod = "POST", value = "保存投诉回访信息", notes = "保存投诉回访信息")

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 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.elevator.api.dto.MainPersonDto;
@@ -83,6 +84,7 @@ public class DispatchTaskController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增派遣任务", notes = "新增派遣任务")
@@ -112,6 +114,7 @@ public class DispatchTaskController extends BaseController {
 	 *
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveWechatFeed")
 	@ApiOperation(httpMethod = "POST", value = "微信公众号维修反馈接口", notes = "微信公众号维修反馈接口")
@@ -137,6 +140,7 @@ public class DispatchTaskController extends BaseController {
 	 *
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveUserFeed")
 	@ApiOperation(httpMethod = "POST", value = "微信公众号上报人反馈接口", notes = "微信公众号上报人反馈接口")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/ElevatorAlarmController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorAlarmDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.ElevatorAlarm;
@@ -46,6 +47,7 @@ public class ElevatorAlarmController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
@@ -60,6 +62,7 @@ public class ElevatorAlarmController extends BaseController {
      * @param sequenceNbr 主键
      * @return
      */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
@@ -111,6 +112,7 @@ public class ElevatorController extends BaseController {
      * @param elevatorDto 新增参数
      * @return 返回结果
      */
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增电梯", notes = "新增电梯")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/ElevatorInsureController.java

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class ElevatorInsureController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增保险信息", notes = "新增保险信息")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/EquipmentCategoryController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
@@ -66,6 +67,7 @@ public class EquipmentCategoryController extends BaseController {
 	 *
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增装备分类", notes = "新增装备分类")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/EquipmentRegionNumController.java

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class EquipmentRegionNumController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增设备区域数量中间表", notes = "新增设备区域数量中间表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/MaintainInfoController.java

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class MaintainInfoController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增维保信息表", notes = "新增维保信息表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/MaintenanceUnitController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.elevator.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
@@ -69,6 +70,7 @@ public class MaintenanceUnitController extends BaseController {
      * @param maintenanceUnitDto 新增参数
      * @return 返回结果
      */
+    @ResubmitCheck
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保单位")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/RepairConsultController.java

@@ -6,6 +6,7 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -48,6 +49,7 @@ public class RepairConsultController extends BaseController {
      *
      * @return
      */
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增警情填报业务数据项", notes = "新增警情填报业务数据项")
@@ -93,7 +95,7 @@ public class RepairConsultController extends BaseController {
         String formattedDate = sdf.format(currentDate);
         TreeMap<Object, Object> map = new TreeMap<>();
         map.put("rec_user_id", reginParams.getUserModel().getUserId());
-        map.put("rec_user_name", reginParams.getUserModel().getUserName());
+        map.put("rec_user_name", reginParams.getUserModel().getRealName());
         map.put("rec_date", formattedDate);
         map.put("remark", model.getRemarks());
         list.add(map);

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/RescueProcessController.java

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +46,7 @@ public class RescueProcessController extends BaseController {
 	 * @param model
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/updateByAlertId")
 	@ApiOperation(httpMethod = "POST", value = "根据警情id 更新救援信息表", notes = "根据警情id 更新救援信息表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/RescueStationController.java

@@ -8,6 +8,7 @@ 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;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
@@ -73,6 +74,7 @@ public class RescueStationController extends BaseController {
      * @param map 救援站
      * @return 返回结果
      */
+    @ResubmitCheck
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增救援站", notes = "新增救援站")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/TestInfoController.java

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class TestInfoController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增检验信息表", notes = "新增检验信息表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/TzBaseEnterpriseInfoController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -54,6 +55,7 @@ public class TzBaseEnterpriseInfoController {
      *
      * @return
      */
+    @ResubmitCheck
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增企业数据信息", notes = "新增企业数据信息")
     public boolean saveTzBaseEnterpriseInfo(HttpServletRequest request,

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/TzsQyLogController.java

 package com.yeejoin.amos.boot.module.elevator.biz.controller;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.elevator.api.entity.TzsQyLog;
@@ -48,6 +49,7 @@ public class TzsQyLogController extends BaseController {
     * 新增96333操作记录日志表
     * @return
     */
+    @ResubmitCheck
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增96333操作记录日志表", notes = "新增96333操作记录日志表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/TzsUserInfoController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.elevator.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.TzsUserInfo;
@@ -38,6 +39,7 @@ public class TzsUserInfoController extends BaseController {
     private ITzsUserInfoService tzsUserInfoService;
 
 
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
@@ -120,6 +122,7 @@ public class TzsUserInfoController extends BaseController {
     }
 
 
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/BindAccount")
     @ApiOperation(httpMethod = "POST", value = "人员绑定用户", notes = "人员绑定用户")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/UseUnitController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.elevator.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
@@ -69,6 +70,7 @@ public class UseUnitController extends BaseController {
      * @param useUnit 使用单位
      * @return 返回结果
      */
+    @ResubmitCheck
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增使用单位", notes = "新增使用单位")

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

@@ -157,11 +157,18 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
     @Override
     public Object selectAlertCalledById(Long id) {
+        AlertCalled alertCalled = this.getBaseMapper().selectById(id);
+        if (!ObjectUtils.isEmpty(alertCalled.getFatherAlert())){
+            id = alertCalled.getFatherAlert();
+        }
         if(redisUtils.hasKey(RedisKey.TZS_ALERTCALLED_ID+id)){
             Object obj= redisUtils.get(RedisKey.TZS_ALERTCALLED_ID+id);
             return obj;
         }else{
             AlertCalledFormDto alertCalledFormVo = getAlertCalledFormDto(id);
+            if (!ObjectUtils.isEmpty(alertCalled.getFatherAlert())){
+                alertCalledFormVo.getAlertCalledDto().setType(alertCalled.getType());
+            }
             redisUtils.set(RedisKey.TZS_ALERTCALLED_ID+id, JSON.toJSON(alertCalledFormVo),time);
             return alertCalledFormVo;
         }
@@ -869,20 +876,22 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             QueryWrapper<AlertCalled> todoNumQueryWrapper = new QueryWrapper<>();
             todoNumQueryWrapper.eq("alert_status", false);
             todoNumQueryWrapper.eq("skill_group", groupCode);
+            todoNumQueryWrapper.eq("rec_user_id", reginParams.getUserModel().getUserId());
             alarmStatisticsDto.setTodoNum(this.count(todoNumQueryWrapper));
 
             Map<String, Long> map = alertCalledMapper.queryAlertStatusCount(
                     DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN),
                     DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), 1).getTime(), DateUtils.DATE_PATTERN),
-                    groupCode);
+                    groupCode,
+                    reginParams.getUserModel().getUserId());
 
             // 当天接警
-//            alarmStatisticsDto.setTodayAlarmNum(
-//                    map.get("calledCount") == null ? 0 : map.get("calledCount"));
-//            // 当天提交
-//            alarmStatisticsDto.setSubmitNum(
-//                    map.get("majorAlertCount") == null ? 0 : map.get("majorAlertCount"));
-//            alarmStatisticsDto.setAllNum(this.count(allNumQueryWrapper));
+            alarmStatisticsDto.setTodayAlarmNum(
+                    map.get("calledCount") == null ? 0 : map.get("calledCount"));
+            // 当天提交
+            alarmStatisticsDto.setSubmitNum(
+                    map.get("majorAlertCount") == null ? 0 : map.get("majorAlertCount"));
+            alarmStatisticsDto.setAllNum(this.count(allNumQueryWrapper));
 
 
             LinkedHashMap<String, Long> recordMap = new LinkedHashMap<>();

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertDispatchStatisticsServiceImpl.java

@@ -14,7 +14,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -41,6 +43,7 @@ public class AlertDispatchStatisticsServiceImpl extends BaseService<AlertDispatc
     @Override
     public void statisticalGeneration(String type) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat formatTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar cal = Calendar.getInstance();
         cal.setTime(new Date());
         if (ObjectUtils.isEmpty(type)) {
@@ -66,6 +69,18 @@ public class AlertDispatchStatisticsServiceImpl extends BaseService<AlertDispatc
                         alertDispatchStatistics.setStartDate(format.format(firstDayOfMonth));
                         alertDispatchStatistics.setEndDate(format.format(lastDayOfMonth));
                         alertDispatchStatistics.setStatisticsDate(format.format(lastDayOfMonth).substring(0, 7));
+                        if (data.containsKey("ddTime") && data.containsKey("pqTime")){
+                            try {
+                                Date ddTime = formatTime.parse(String.valueOf(data.get("ddTime")));
+                                Date pqTime = formatTime.parse(String.valueOf(data.get("pqTime")));
+                                BigDecimal bigDecimal = new BigDecimal(String.valueOf(ddTime.getTime() - pqTime.getTime()));
+
+                                BigDecimal divide = bigDecimal.divide(new BigDecimal(60000), 2, BigDecimal.ROUND_HALF_UP);
+                                alertDispatchStatistics.setArriveTime(divide+"分钟");
+                            } catch (ParseException e) {
+                                e.printStackTrace();
+                            }
+                        }
                         list.add(alertDispatchStatistics);
                     });
                 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertRescueStatisticsServiceImpl.java

@@ -51,14 +51,14 @@ public class AlertRescueStatisticsServiceImpl extends BaseService<AlertRescueSta
         Date lastDayOfMonth = cal.getTime();
         ArrayList<AlertRescueStatistics> list = new ArrayList<>();
         List<LinkedHashMap> supervisionList = alertStatisticsService.getSupervisionList();
-        DecimalFormat decimalFormat = new DecimalFormat("0.000");
+        DecimalFormat decimalFormat = new DecimalFormat("0.00");
         if (!ObjectUtils.isEmpty(supervisionList)) {
             supervisionList.forEach(item -> {
                 AlertRescueStatistics statisticsMessage = this.baseMapper.getStatisticsMessage(String.valueOf(item.get("orgCode")), format.format(firstDayOfMonth) + " 00:00:00", format.format(lastDayOfMonth) + " 23:59:59");
                 statisticsMessage.setSupervisoryUnitName(String.valueOf(item.get("companyName")));
                 statisticsMessage.setSupervisoryUnitOrgCode(String.valueOf(item.get("orgCode")));
                 statisticsMessage.setSupervisoryUnitId(String.valueOf(item.get("sequenceNbr")));
-                statisticsMessage.setGreaterNum(statisticsMessage.getMaintenanceUnit() - statisticsMessage.getLessNum());
+                statisticsMessage.setGreaterNum(statisticsMessage.getGreaterNum() - statisticsMessage.getLessNum());
                 if (ObjectUtils.isEmpty(statisticsMessage.getAvgNum()) || ObjectUtils.isEmpty(statisticsMessage.getMaintenanceUnit()) || statisticsMessage.getAvgNum().equals("0") || statisticsMessage.getMaintenanceUnit() == 0) {
                     statisticsMessage.setAvgNum("0");
                 } else {

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ESAlertCalledService.java

@@ -130,14 +130,12 @@ public class ESAlertCalledService {
      * 根据关键字查询文档，关键字不为空时按相关性从大到小排序
      *
      * @param alertCalledVo 关键字
-     * @param current  当前页码
-     * @param size     页面大小
      * @return
      */
     @SuppressWarnings({ "rawtypes" })
-	public Page<ESAlertCalledDto> queryByKeys(ESAlertCalledRequestDto alertCalledVo, int current, int size)
+	public Page<ESAlertCalledDto> queryByKeys(ESAlertCalledRequestDto alertCalledVo)
     {
-    	Page<ESAlertCalledDto> result = new Page<ESAlertCalledDto>(current, size);
+    	Page<ESAlertCalledDto> result = new Page<ESAlertCalledDto>();
     	String[] alertStatus = alertCalledVo.getAlertStatus();
     	if (ValidationUtil.isEmpty(alertStatus))
 		{
@@ -234,7 +232,7 @@ public class ESAlertCalledService {
         // 创建查询构造器
         NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
                 // 分页
-                .withPageable(PageRequest.of(current, size))
+//                .withPageable(PageRequest.of(current, size))
                 // 排序
 //                .withSort(SortBuilders.fieldSort("callTimeLong").order(SortOrder.DESC))
                 //过滤条件

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/RescueProcessServiceImpl.java

@@ -29,10 +29,12 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 救援过程表服务实现类
@@ -180,28 +182,18 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
             }
         } else {
             if (Boolean.TRUE.equals(rescueProcessDto.getCasualtiesStatus())){
-                updateMessage(rescueProcessDto, "injured_num");
-                updateMessage(rescueProcessDto, "die_num");
                try {
-                   //更新警情历史记录表
                    AlertCalledFormDto calledFormDto = iAlertCalledService.getAlertCalledFormDto(rescueProcessDto.getAlertId());
                    List<FormValue> dynamicFormAlert = calledFormDto.getDynamicFormAlert();
                    HashMap<String, String> formMap = new HashMap<>();
                    dynamicFormAlert.forEach(x->formMap.put(x.getKey(),x.getValue()));
-                   AlertCalledDto alertCalledDto = calledFormDto.getAlertCalledDto();
-                   AlertFormRecordDto alertFormRecordDto = new AlertFormRecordDto();
-                   alertFormRecordDto.setAlertCalledId(rescueProcessDto.getAlertId());
-                   alertFormRecordDto.setAlertTypeCode(alertCalledDto.getAlarmTypeCode());
-                   alertFormRecordDto.setName(alertCalledDto.getEmergencyPerson());
-                   alertFormRecordDto.setPhone(alertCalledDto.getEmergencyCall());
-                   SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                   alertFormRecordDto.setTrappedTime(sdf.parse(formMap.getOrDefault("trapped_time",new Date().toString())));
-                   alertFormRecordDto.setTrappedNum(Integer.valueOf(formMap.getOrDefault("trapped_num","0")));
-                   alertFormRecordDto.setTrappedFloorNum(Integer.parseInt(formMap.getOrDefault("trapped_floor_num","0")));
-                   alertFormRecordDto.setInjuredNum(Integer.valueOf(rescueProcessDto.getCasualtiesInfo()));
-                   alertFormRecordDto.setDieNum(Integer.valueOf(rescueProcessDto.getDieNum()));
-                   alertFormRecordDto.setSourcesInfo(SourcesInfoEnum.Process.getCode().toString());
-                   alertFormRecordService.saveAlertFormRecord(alertFormRecordDto);
+                   if (!formMap.get("injured_num").equals(rescueProcessDto.getCasualtiesInfo()) || !formMap.get("die_num").equals(rescueProcessDto.getDieNum())){
+                       //更新动态表单
+                       updateMessage(rescueProcessDto, "injured_num");
+                       updateMessage(rescueProcessDto, "die_num");
+                       //更新警情历史记录表
+                       saveAlertFormRecord(rescueProcessDto, calledFormDto, formMap);
+                   }
                }catch (Exception e){
                    e.printStackTrace();
                }
@@ -287,6 +279,26 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
         return flag;
     }
 
+    private void saveAlertFormRecord(RescueProcessDto rescueProcessDto, AlertCalledFormDto calledFormDto, HashMap<String, String> formMap) throws ParseException {
+        AlertCalledDto alertCalledDto = calledFormDto.getAlertCalledDto();
+        AlertFormRecordDto alertFormRecordDto = new AlertFormRecordDto();
+        alertFormRecordDto.setAlertCalledId(rescueProcessDto.getAlertId());
+        alertFormRecordDto.setAlertTypeCode(alertCalledDto.getAlarmTypeCode());
+        alertFormRecordDto.setName(alertCalledDto.getEmergencyPerson());
+        alertFormRecordDto.setPhone(alertCalledDto.getEmergencyCall());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        alertFormRecordDto.setTrappedTime(sdf.parse(formMap.getOrDefault("trapped_time",new Date().toString())));
+        alertFormRecordDto.setTrappedNum(Integer.valueOf(formMap.getOrDefault("trapped_num","0")));
+        alertFormRecordDto.setTrappedFloorNum(Integer.parseInt(formMap.getOrDefault("trapped_floor_num","0")));
+        int injuredNumBefore = Integer.parseInt(formMap.getOrDefault("injured_num", "0"));
+        int dieNumBefore = Integer.parseInt(formMap.getOrDefault("die_num", "0"));
+        alertFormRecordDto.setInjuredNum(Optional.ofNullable(rescueProcessDto.getCasualtiesInfo()).map(Integer::valueOf).orElse(injuredNumBefore));
+        alertFormRecordDto.setDieNum(Optional.ofNullable(rescueProcessDto.getDieNum()).map(Integer::valueOf).orElse(dieNumBefore));
+        alertFormRecordDto.setSourcesInfo(SourcesInfoEnum.Process.getCode().toString());
+        alertFormRecordDto.setIsLight("是".equals(formMap.getOrDefault("is_light", "是"))? 1 : 0);
+        alertFormRecordService.saveAlertFormRecord(alertFormRecordDto);
+    }
+
     private void updateMessage(RescueProcessDto rescueProcessDto, String fieldCode){
         LambdaQueryWrapper<AlertFormValue> lambda = new QueryWrapper<AlertFormValue>().lambda();
         lambda.eq(AlertFormValue::getAlertCalledId, rescueProcessDto.getAlertId());

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/VoiceRecordFileServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledQueryDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.VoiceRecordFileDto;
@@ -73,12 +74,16 @@ public class VoiceRecordFileServiceImpl extends BaseService<VoiceRecordFileDto,V
 
     @Override
     public void publishRecord(final VoiceRecordFileDto model) {
+        AlertCalledFormDto alertCalledFormDto = iAlertCalledService.getAlertCalledFormDto(model.getAlertId());
+        AlertCalledDto alertCalledDto = alertCalledFormDto.getAlertCalledDto();
         // 保存到日志表中
         VoiceRecordLog log = new VoiceRecordLog();
         log.setAlertId(model.getAlertId());
         log.setConnectId(model.getConnectId());
         log.setIsDeal(false);
         log.setDealTimes(0);
+        log.setAlertStage(alertCalledDto.getAlertStage());
+        log.setAlertStageCode(alertCalledDto.getAlertStageCode());
         iVoiceRecordLogServiceImpl.save(log);
     }
 

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/VoiceRecordLogServiceImpl.java

@@ -143,13 +143,13 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
                 for(Map.Entry<String,String> file : downloadFile.entrySet()) {
                     model.setFilePath(file.getKey());
                 }
-                AlertCalledFormDto alertDto = iAlertCalledService.selectAlertCalledByIdNoCache(model.getAlertId());
-                if(alertDto == null || alertDto.getAlertCalledDto() == null) {
-                    this.updateById(l);
-                    continue;
-                }
-                model.setAlertStage(alertDto.getAlertCalledDto().getAlertStage());
-                model.setAlertStageCode(alertDto.getAlertCalledDto().getAlertStageCode());
+//                AlertCalledFormDto alertDto = iAlertCalledService.selectAlertCalledByIdNoCache(model.getAlertId());
+//                if(alertDto == null || alertDto.getAlertCalledDto() == null) {
+//                    this.updateById(l);
+//                    continue;
+//                }
+                model.setAlertStage(l.getAlertStage());
+                model.setAlertStageCode(l.getAlertStageCode());
                 model.setSourceId(-1l);
                 voiceRecordFileServiceImpl.createWithModel(model);
                 JSONObject json = new JSONObject();

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderAreaDataController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.CylinderAreaDataDto;
 import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.CylinderAreaDataServiceImpl;
@@ -34,6 +35,7 @@ public class CylinderAreaDataController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶区域统计表", notes = "新增气瓶区域统计表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderFillingCheckDataUnitController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderFillingCheckDataUnitController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶充装检查情况统计表-企业", notes = "新增气瓶充装检查情况统计表-企业")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderFillingDataUnitController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderFillingDataUnitController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶充装总量统计表-企业", notes = "新增气瓶充装总量统计表-企业")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderFillingUnloadDataController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderFillingUnloadDataController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶充卸统计表", notes = "新增气瓶充卸统计表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderFillingUnloadDataUnitController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderFillingUnloadDataUnitController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶充卸统计表-企业", notes = "新增气瓶充卸统计表-企业")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderInfoController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -103,6 +104,7 @@ public class CylinderInfoController extends BaseController {
 	 *
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶基本信息", notes = "新增气瓶基本信息")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderInfoDataController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderInfoDataController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶总量统计表", notes = "新增气瓶总量统计表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderInfoDataUnitController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderInfoDataUnitController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶总量统计表-企业", notes = "新增气瓶总量统计表-企业")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderIntegrityDataController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderIntegrityDataController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶数据完整度表", notes = "新增气瓶数据完整度表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderIntegrityDataUnitController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderIntegrityDataUnitController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶数据完整度表-企业", notes = "新增气瓶数据完整度表-企业")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderTagsDataUnitController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderTagsDataUnitController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶及标签数量比表-企业", notes = "新增气瓶及标签数量比表-企业")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderUnitDataController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderUnitDataController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增企业总量统计表", notes = "新增企业总量统计表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/CylinderUnloadFakeController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class CylinderUnloadFakeController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增卸液数据表-假数据", notes = "新增卸液数据表-假数据")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/EndUserController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class EndUserController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增气瓶终端用户", notes = "新增气瓶终端用户")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/EquipmentAssociatedController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.module.elevator.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.elevator.flc.api.entity.Equipment;
@@ -48,6 +49,7 @@ public class EquipmentAssociatedController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增配套设备设施部件", notes = "新增配套设备设施部件")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/EquipmentController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -74,6 +75,7 @@ public class EquipmentController extends BaseController {
      *
      * @return
      */
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增装备信息表", notes = "新增装备信息表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/EquipmentIndexController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -38,6 +39,7 @@ public class EquipmentIndexController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增设备指标", notes = "新增设备指标")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/EquipmentIndexInformController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class EquipmentIndexInformController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增设备指标", notes = "新增设备指标")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/EquipmentUseInfoController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class EquipmentUseInfoController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增设备使用信息表", notes = "新增设备使用信息表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/InformEquipmentController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.InformEquipmentDto;
@@ -45,6 +46,7 @@ public class InformEquipmentController extends BaseController {
 	 * @param model
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveInformEquipment")
 	@ApiOperation(httpMethod = "POST", value = "新增告知书设备", notes = "新增告知书设备")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/PersonEducationController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.PersonEducationDto;
 import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.PersonEducationServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,6 +37,7 @@ public class PersonEducationController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增企业人员资质信息表", notes = "新增企业人员资质信息表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/PersonQualityController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.PersonQualityDto;
 import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.PersonQualityServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,6 +37,7 @@ public class PersonQualityController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增企业人员资质信息表", notes = "新增企业人员资质信息表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/RegUnitIcController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.RegUnitIcServiceImpl;
@@ -35,6 +36,7 @@ public class RegUnitIcController extends BaseController {
      *
      * @return
      */
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增注册单位工商信息表", notes = "新增注册单位工商信息表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/RegUnitInfoController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -56,6 +57,7 @@ public class RegUnitInfoController extends BaseController {
     private int timeout;
 
 
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "单位注册", notes = "单位注册")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/TaskController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.module.elevator.flc.api.enums.TaskStatusEnum;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -44,6 +45,7 @@ public class TaskController extends BaseController {
      *
      * @return
      */
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增任务表", notes = "新增任务表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/UnitInfoApproveController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.elevator.flc.api.dto.UnitInfoApproveDto;
 import com.yeejoin.amos.boot.module.elevator.flc.biz.service.impl.UnitInfoApproveServiceImpl;
@@ -39,6 +40,7 @@ public class UnitInfoApproveController extends BaseController {
      *
      * @return
      */
+    @ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增企业信息审批意见表", notes = "新增企业信息审批意见表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/UnitInfoChangeController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@ public class UnitInfoChangeController extends BaseController {
      *
      * @return
      */
+	@ResubmitCheck
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增企业信息变更表", notes = "新增企业信息变更表")

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/controller/UnitPersonController.java

 package com.yeejoin.amos.boot.module.elevator.flc.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.annotation.ResubmitCheck;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -84,6 +85,7 @@ public class UnitPersonController extends BaseController {
 	 *
 	 * @return
 	 */
+	@ResubmitCheck
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylinderFillingRecordMapper.xml

@@ -174,7 +174,8 @@
                        af.check_results                  AS checkResult
         FROM
             ( SELECT * FROM tz_cylinder_filling_record WHERE is_not_es IS NULL AND filling_before_id IS NOT NULL
-                                                         AND filling_check_id IS NOT NULL and LENGTH(filling_startTime) >= 10 LIMIT 5000  ) r
+                                                         AND filling_check_id IS NOT NULL and LENGTH(filling_startTime) >= 10
+                                                         and  app_id in (SELECT app_id from tz_cylinder_unit) LIMIT 5000  ) r
                 LEFT JOIN tz_cylinder_filling b ON b.filling_before_id = r.filling_before_id
                 AND r.filling_before_id IS NOT NULL and b.inspection_date NOT LIKE'16%'
                 AND date_format ( b.inspection_date, '%Y-%m-%d' ) = date_format ( r.filling_startTime, '%Y-%m-%d' ) and b.sequence_code is not null AND b.app_id is not null

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserInfoMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
 public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
     Page<TzsUserInfoDto> selectPageMessage(@Param("page") Page<TzsUserInfoDto> page, @Param("dto") TzsUserInfoDto dto);
 
-    List<Map<String, Object>> getUserType(@Param("unitType")String unitType);
+    List<Map<String, Object>> getUserType(@Param("unitType")String unitType, @Param("install") String install);
 
     Map<String, Integer> getArrangementStatistic(String companyCode);
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzBaseEnterpriseInfoService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.tcm.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 
@@ -44,4 +45,6 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 	TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode);
 
 	String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels);
+
+	BaseUnitLicence getUnitLicenceMessage(String unitCode);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -146,9 +146,12 @@
         WHERE
            <if test="unitType != null and unitType != ''">
                type = 'QYRYGW'  or  type = #{unitType}
+               <if test="install != null and install != ''">
+                   or  type = #{install}
+               </if>
            </if>
             <if test="unitType == null or unitType == ''">
-                type like concat('QYRYGW','%')
+                type like concat('QYRYGW','%')  and type != 'QYRYGW-INSTALL'
             </if>
 
     </select>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tcm.api.dto.EquEnterDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.tcm.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
@@ -268,4 +269,16 @@ public class TzBaseEnterpriseInfoController {
         Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
         return ResponseHelper.buildResponse(resourceJson.get(EquipmentClassifityEnum.BDLS.getCode()));
     }
+
+    /**
+     * 监管对接
+     * @param unitCode
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getUnitLicenceMessage", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询许可信息", notes = "根据统一信用代码查询许可信息")
+    public ResponseModel<BaseUnitLicence> getUnitLicenceMessage(@RequestParam("unitCode") String unitCode) {
+        return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getUnitLicenceMessage(unitCode));
+    }
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -181,22 +181,22 @@ public class TzsUserInfoController extends BaseController {
     @PostMapping(value = "/deleteBatch")
     @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
     public ResponseModel<Object> deleteBatch(@RequestBody JSONObject map) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        if (ObjectUtils.isEmpty(reginParams)) {
-            return null;
-        }
-        TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectOne(new QueryWrapper<TzsUserInfo>().eq("amos_user_id", reginParams.getUserModel().getUserId()));
+//        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+//        if (ObjectUtils.isEmpty(reginParams)) {
+//            return null;
+//        }
+//        TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectOne(new QueryWrapper<TzsUserInfo>().eq("amos_user_id", reginParams.getUserModel().getUserId()));
         Object[] ids = ((List<Long>) map.get("ids")).toArray();
-        Boolean flag = false;
-        for (Object id : ids) {
-            if (id.equals(tzsUserInfo.getSequenceNbr().toString())) {
-                flag = true;
-                break;
-            }
-        }
-        if (flag) {
-            throw new BadRequest("不能删除当前登录人所对应的数据，请取消勾选后再做删除处理");
-        }
+//        Boolean flag = false;
+//        for (Object id : ids) {
+//            if (id.equals(tzsUserInfo.getSequenceNbr().toString())) {
+//                flag = true;
+//                break;
+//            }
+//        }
+//        if (flag) {
+//            throw new BadRequest("不能删除当前登录人所对应的数据，请取消勾选后再做删除处理");
+//        }
         tzsUserInfoService.deleteBatch(ids);
         return ResponseHelper.buildResponse("ok");
     }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -616,4 +616,14 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return map;
 	}
 
+	@Override
+	public BaseUnitLicence getUnitLicenceMessage(String unitCode) {
+		// 许可信息
+		LambdaQueryWrapper<BaseUnitLicence> lambda = new QueryWrapper<BaseUnitLicence>().lambda();
+		lambda.eq(BaseUnitLicence::getUnitCode, unitCode);
+		lambda.orderByDesc(BaseUnitLicence::getExpiryDate);
+		lambda.last("limit 1");
+		return baseUnitLicenceService.getBaseMapper().selectOne(lambda);
+
+	}
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -366,6 +366,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         result.put("creditCode", companyModels.get(0).getCompanyCode());
         boolean productCompany = false;
         boolean useCompany = false;
+        boolean installCompany = false;
         for (CompanyModel companyModel : companyModels) {
             String companyType = companyModel.getCompanyType();
             if (companyType.contains("使用单位") || companyType.contains("个人主体")) {
@@ -374,6 +375,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
             if (companyType.contains("充装单位") || companyType.contains("安装改造维修单位") || companyType.contains("制造单位") || companyType.contains("设计单位")) {
                 productCompany = true;
             }
+            if (companyType.contains("安装改造维修单位")){
+                installCompany = true;
+            }
         }
         String companyType = null;
         if (useCompany) {
@@ -385,6 +389,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         if (useCompany && productCompany) {
             companyType = "useAndPro";
         }
+        if (installCompany) {
+            companyType = companyType + "AndInstall";
+        }
         result.put("companyType", companyType);
         return result;
     }
@@ -521,11 +528,15 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     @Override
     public List<Map<String, Object>> getUserType(String unitType) {
         if (unitType.equals("pro")) {
-            return tzsUserInfoMapper.getUserType("QYRYGW-SCDW");
+            return tzsUserInfoMapper.getUserType("QYRYGW-SCDW", null);
         } else if (unitType.equals("use")) {
-            return tzsUserInfoMapper.getUserType("QYRYGW-SYDW");
-        } else {
-            return tzsUserInfoMapper.getUserType(null);
+            return tzsUserInfoMapper.getUserType("QYRYGW-SYDW", null);
+        } else if (unitType.equals("useAndInstall")){
+            return tzsUserInfoMapper.getUserType("QYRYGW-SYDW", "QYRYGW-INSTALL");
+        }  else if (unitType.equals("proAndInstall")){
+            return tzsUserInfoMapper.getUserType("QYRYGW-SCDW", "QYRYGW-INSTALL");
+        }else {
+            return tzsUserInfoMapper.getUserType(null, null);
         }
 
     }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java

@@ -229,7 +229,7 @@ public class EquipmentCategoryController extends BaseController {
 	 *
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/createSupervisorCode", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "生成监管码和96333码", notes = "生成监管码和96333码")
 	public ResponseModel<Object> createSupervisorCode(@RequestBody Map<String,Object> map) {
@@ -240,7 +240,7 @@ public class EquipmentCategoryController extends BaseController {
 	 * 修改数据状态是否显示编辑按钮
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/updateOtherInfo", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "修改数据状态", notes = "修改数据状态")
 	public ResponseModel<Object> updateOtherInfo(@RequestBody Map<String,Object> map) {
@@ -560,33 +560,33 @@ public class EquipmentCategoryController extends BaseController {
 	}
 
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveSupervisoryData")
 	@ApiOperation(httpMethod = "POST", value = "监管设备数据保存", notes = "监管设备保存")
 	public ResponseModel<Boolean> saveSupervisoryData(@RequestBody EquipmentMessageDto data) {
 		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.saveSupervisoryData(data));
 	}
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveConstructionInfoData")
 	@ApiOperation(httpMethod = "POST", value = "监管设备施工数据保存", notes = "监管设备施工数据保存")
 	public ResponseModel<Boolean> saveConstructionInfoData(@RequestBody IdxBizJgConstructionInfo data) {
 		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.saveConstructionInfoData(data));
 	}
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveMaintenanceRecordInfoData")
 	@ApiOperation(httpMethod = "POST", value = "监管设备维保数据保存", notes = "监管设备维保数据保存")
 	public ResponseModel<Boolean> saveMaintenanceRecordInfoData(@RequestBody IdxBizJgMaintenanceRecordInfo data) {
 		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.saveMaintenanceRecordInfoData(data));
 	}
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/saveDetectionInfoData")
 	@ApiOperation(httpMethod = "POST", value = "监管设备检验检测数据保存", notes = "监管设备检验检测数据保存")
 	public ResponseModel<Boolean> saveDetectionInfoData(@RequestBody IdxBizJgInspectionDetectionInfo data) {
 		return ResponseHelper.buildResponse(equipmentCategoryServiceImpl.saveDetectionInfoData(data));
 	}
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/deleteByRecord")
 	@ApiOperation(httpMethod = "POST", value = "数据异常回滚", notes = "数据异常回滚")
 	public ResponseModel<Boolean> saveDetectionInfoData(@RequestParam("record") String record) {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -2340,10 +2340,20 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 idxBizJgTechParamsElevatorService.update(idxBizJgTechParamsElevator, lambda);
             }
         }
+        // 同步es
         checkEsData(supervisoryCode);
+        // 修改码表状态
+        updateStatus(supervisoryCode);
         return true;
     }
 
+    public void updateStatus(String supervisoryCode){
+        SupervisoryCodeInfo info = new SupervisoryCodeInfo();
+        info.setStatus("1");
+        LambdaQueryWrapper<SupervisoryCodeInfo> lambda = new QueryWrapper<SupervisoryCodeInfo>().lambda();
+        lambda.eq(SupervisoryCodeInfo::getSupervisoryCode, supervisoryCode);
+        supervisoryCodeInfoMapper.update(info, lambda);
+    }
 
     @Transactional
     public Boolean saveConstructionInfoData(IdxBizJgConstructionInfo data) {