合并代码解决冲突

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

@@ -37,6 +37,7 @@ import java.util.Map;
 
 /**
  * controller层切面 用于用户数据缓存 供 sql自动填充使用
+ * (使用粒度过大的Aop会创建大量代理对象，影响性能，占用内存，考虑使用 WebMvcConfigurer#addInterceptors 添加拦截器 )
  *
  * @author Admin
  */
@@ -54,9 +55,9 @@ public class ControllerAop {
     private RedisUtils redisUtils;
 
     @Pointcut("(execution(public * com.yeejoin.amos.boot.module..*.biz.controller..*(..))"
-    		+ "|| execution(public * com.yeejoin.amos.*.business.controller..*(..))"
-    		+ " && !@annotation(org.springframework.scheduling.annotation.Scheduled))"
-    		+ "|| execution(public * com.yeejoin.equipmanage.controller..*.*(..))")
+            + "|| execution(public * com.yeejoin.amos.*.business.controller..*(..))"
+            + " && !@annotation(org.springframework.scheduling.annotation.Scheduled))"
+            + "|| execution(public * com.yeejoin.equipmanage.controller..*.*(..))")
     public void userCache() {
 
     }
@@ -66,11 +67,11 @@ public class ControllerAop {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
         // 不需要添加请求头的接口
-        String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText",
+        String[] url = new String[]{"/api/user/save/curCompany", "/jcs/command/lookHtmlText",
                 "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo"};
         // 获取请求路径
-        for(String uri : url) {
-            if(request.getRequestURI().indexOf(uri) != -1) {
+        for (String uri : url) {
+            if (request.getRequestURI().indexOf(uri) != -1) {
                 return;
             }
         }
@@ -118,10 +119,10 @@ public class ControllerAop {
         CompanyBo company = new CompanyBo();
         DepartmentBo department = new DepartmentBo();
         RoleBo role = new RoleBo();
-        CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null ;
+        CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null;
         Bean.copyExistPropertis(companyM, company);
         Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
-        DepartmentModel departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null ;
+        DepartmentModel departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null;
         Bean.copyExistPropertis(departmentM, department);
         Map<Long, List<RoleModel>> roles = user.getOrgRoles();
         Long sequenceNbr;
@@ -132,7 +133,7 @@ public class ControllerAop {
         }
         RoleModel roleM = null;
         if (sequenceNbr == null) {
-            roleM = companyM != null ?roles.get(companyM.getSequenceNbr()).get(0) : null;
+            roleM = companyM != null ? roles.get(companyM.getSequenceNbr()).get(0) : null;
         } else {
             roleM = roles.get(sequenceNbr).get(0);
         }

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

@@ -41,6 +41,16 @@ public class BaseController {
     protected ReginParams getSelectedOrgInfo() {
         return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
     }
+    
+
+	/**
+	 * 用户选择信息保存redis
+	 */
+	protected void saveSelectedOrgInfo(ReginParams reginParams) {
+		redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParams));
+
+	}
+
 
     protected String getOrgCode(ReginParams reginParams) {
         if (reginParams == null) {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/interceptors/PermissionInterceptor.java

@@ -70,12 +70,14 @@ public class PermissionInterceptor implements Interceptor {
         }
         // 接口地址为空返回空数据
         if (ValidationUtil.isEmpty(dataAuth.interfacePath())) {
+            // method.getReturnType().isPrimitive() = true 是count语句
             return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
         }
 
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId()
                 , RequestContext.getToken())).toString(), ReginParams.class);
         if (ValidationUtil.isEmpty(reginParam) || ValidationUtil.isEmpty(reginParam.getUserModel())) {
+            // method.getReturnType().isPrimitive() = true 是count语句
             return method.getReturnType().isPrimitive() ? invocation.proceed() : null;
         }
         // 用户数据权限配置信息
@@ -88,6 +90,7 @@ public class PermissionInterceptor implements Interceptor {
 
         BoundSql boundSql = (BoundSql) metaObject.getValue("delegate.boundSql");
         String sql = boundSql.getSql();
+        // 将权限规则拼接到原始sql
         sql = processSelectSql(sql, dataAuthorization, reginParam, boundSql);
         metaObject.setValue("delegate.boundSql.sql", sql);
         return invocation.proceed();

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -15,7 +15,6 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.util.Date;
-import java.util.Map;
 
 /**
  * @author Dell
@@ -41,7 +40,6 @@ public class MetaHandler implements MetaObjectHandler {
      */
     @Override
     public void insertFill(MetaObject metaObject) {
-//        autoFillUser(metaObject, metaObject.getOriginalObject());
         Date currentDate = new Date();
         Class clazz = metaObject.getOriginalObject().getClass();
         FillCommonUserField annotation = (FillCommonUserField) clazz.getAnnotation(FillCommonUserField.class);
@@ -50,11 +48,10 @@ public class MetaHandler implements MetaObjectHandler {
         }
         //如果有上传创建时间，不需要修改
 //		if(metaObject.getValue("createDate")==null){
-//			this.setFieldValByName("createDate", currentDate, metaObject);
 //		}
+        this.setFieldValByName("createDate", currentDate, metaObject);
     }
 
-
     private void autoFillUser(MetaObject metaObject, Object entity) {
         //获取用户信息 以及当前用户登录公司部门，角色
         String userId = RequestContext.getExeUserId();
@@ -69,16 +66,10 @@ public class MetaHandler implements MetaObjectHandler {
         if (ObjectUtils.isEmpty(reginParams) || ObjectUtils.isEmpty(agencyUserModel)) {
             return;
         }
-        if (isExistField("recUserId", entity)) {
-            this.setFieldValByName("recUserId", agencyUserModel.getUserId(), metaObject);
-        }
-        if (isExistField("recUserName", entity)) {
-            this.setFieldValByName("recUserName", agencyUserModel.getRealName(), metaObject);
-        }
-        if (isExistField("recDate", entity)) {
-            Date currentDate = new Date();
-            this.setFieldValByName("recDate", currentDate, metaObject);
-        }
+
+        // 更新rec字段
+        recInfoUpdate(metaObject, agencyUserModel);
+
         if (isExistField("allotmentTime", entity)) {
             Date currentDate = new Date();
             this.setFieldValByName("recDate", currentDate, metaObject);
@@ -105,13 +96,14 @@ public class MetaHandler implements MetaObjectHandler {
         if (isExistField("departmentOrgcode", entity)) {
             this.setFieldValByName("departmentOrgcode", ObjectUtils.isEmpty(reginParams.getDepartment()) ? "" : reginParams.getDepartment().getOrgCode(), metaObject);
         }
-//		if (isExistField("updateTime", entity)) {
-//            Date currentDate = new Date();
-//			this.setFieldValByName("updateTime", currentDate, metaObject);
-//		}
-//		if (isExistField("companyName", entity)) {
-//			this.setFieldValByName("companyName", reginParams.getDepartment().getDepartmentName(), metaObject);
-//		}
+    }
+
+    private void recInfoUpdate(MetaObject metaObject, AgencyUserModel agencyUserModel) {
+        this.setFieldValByName("recUserId", agencyUserModel.getUserId(), metaObject);
+        this.setFieldValByName("recUserName", agencyUserModel.getRealName(), metaObject);
+        Date currentDate = new Date();
+        this.setFieldValByName("recDate", currentDate, metaObject);
+        this.setFieldValByName("updateTime", currentDate, metaObject);
     }
 
     private Boolean isExistField(String field, Object obj) {
@@ -133,15 +125,18 @@ public class MetaHandler implements MetaObjectHandler {
      */
     @Override
     public void updateFill(MetaObject metaObject) {
-        //todo  tianbo 逻辑
         Class clazz = metaObject.getOriginalObject().getClass();
         FillCommonUserField annotation = (FillCommonUserField) clazz.getAnnotation(FillCommonUserField.class);
         if (annotation == null || annotation.isAutoFill()) {
-            Object updateEntity = ((Map) metaObject.getOriginalObject()).get("et");
-            autoFillUser(metaObject, updateEntity);
+            String userId = RequestContext.getExeUserId();
+            ReginParams reginParams =
+                    JSONObject.parseObject(null != redisUtils.get(RedisKey.buildReginKey(userId, getToken())) ?
+                            redisUtils.get(RedisKey.buildReginKey(userId, getToken())).toString() : null, ReginParams.class);
+            if (ObjectUtils.isEmpty(reginParams)) {
+                return;
+            }
+            AgencyUserModel agencyUserModel = reginParams.getUserModel();
+            recInfoUpdate(metaObject, agencyUserModel);
         }
-        // 正常只需要更新如下
-        Date currentDate = new Date();
-        this.setFieldValByName("updateTime", currentDate, metaObject);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -195,10 +195,9 @@ public interface EquipFeignClient {
 
 
     @RequestMapping(value = "/monitorView/video/page", method = RequestMethod.GET)
-    ResponseModel<Page<Map<String, Object>>> queryUncheckedVideoList(
-                                            @RequestParam(value = "viewId") Long viewId,
-                                            @RequestParam(value = "videoName" ,required =false) String videoName,
-                                            @RequestParam(value = "videoCode" ,required =false) String videoCode,
+    ResponseModel<Page<Map<String, Object>>> queryVideoPage(
+                                            @RequestParam(value = "nodeId") Long nodeId,
+                                            @RequestParam(value = "nodeType" ,required =false) String nodeType,
                                             @RequestParam(value = "current") int current,
                                             @RequestParam(value = "size") int size
     );

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java

@@ -21,7 +21,7 @@ public interface KeySiteMapper extends BaseMapper<KeySite> {
  */
 
 public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
-			String useNature, String fireFacilitiesInfo, Long belongId);
+			String useNature, String fireFacilitiesInfo, Long belongId,String belongName);
 /**
  * 获取所有的重点部位数据
  * @return

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

@@ -136,7 +136,7 @@
 	</select>
 
 	<select id='getEquipmentForSpecifyDate' resultType='map'>
-	select * from (
+select * from (
 		SELECT
 			MAX(
 		CASE
@@ -173,8 +173,10 @@
 		where cd.group_code =#{groupCode} and cds.instance_id is not null and
 		cd.is_delete=0
 		group by cd.instance_id
-) result group by ${groupByName}
-
+) result 
+		<if test="groupByName != null and  groupByName!='' ">
+			group by ${groupByName}
+		</if>
 	</select>
 	<select id='getInstanceIdForSpecifyDateAndEquipment'
 		resultType='map'>

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

@@ -409,7 +409,7 @@ FROM
 						FROM
 							cb_org_usr
 						WHERE
-							biz_org_name = #{departmentName}
+							biz_org_name = #{departmentName} and is_delete = 0
 						
 					)
 				AND cou.biz_org_type = 'PERSON'

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

@@ -53,6 +53,9 @@
 		<if test="belongId != null and belongId!='-1' and belongId != -1">
 			AND c.`belong_id`= #{belongId}
 		</if>
+		<if test="belongName != null and belongName !=''">
+			AND c.`belong_name` like concat('%',#{belongName},'%')
+		</if>
 		order by c.rec_date desc
 	</select>
 	

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

@@ -137,8 +137,8 @@
             <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
                 AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
             </if>
-            <if test="map.amosOrgId != null and map.amosOrgId != '-1'">
-                AND u.amos_org_id like concat(#{map.amosOrgId}, '%')
+            <if test="map.amosOrgCode != null and map.amosOrgCode != '-1'">
+                AND u.amos_org_code like concat('%',#{map.amosOrgCode}, '%')
             </if>
             GROUP BY
             u.sequence_nbr ,

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/pom.xml

@@ -20,6 +20,20 @@
 			<groupId>org.apache.tika</groupId>
 			<artifactId>tika-parsers</artifactId>
 			<version>1.17</version>
+			<exclusions>
+		        <exclusion>
+		            <artifactId>poi</artifactId>
+		            <groupId>org.apache.poi</groupId>
+		        </exclusion>
+		        <exclusion>
+		            <artifactId>poi-ooxml</artifactId>
+		            <groupId>org.apache.poi</groupId>
+		        </exclusion>
+		        <exclusion>
+		            <artifactId>poi-scratchpad</artifactId>
+		            <groupId>org.apache.poi</groupId>
+		        </exclusion>
+		    </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.yeejoin</groupId>

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/EquipTypeAmountPageDTO.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity.dto;
 
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
 import com.yeejoin.equipmanage.common.entity.publics.BaseDTO;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -45,4 +46,7 @@ public class EquipTypeAmountPageDTO extends BaseDTO<EquipmentSpecific> {
 
     @ApiModelProperty(value = "行业编码")
     private String industryCode;
+    
+    @ApiModelProperty(value = "所在位置名称")
+    private String warehouseStructureName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/exception/handle/GlobalExceptionHandler.java

-//package com.yeejoin.equipmanage.common.exception.handle;
-//
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.http.HttpStatus;
-//import org.springframework.web.bind.annotation.ExceptionHandler;
-//import org.springframework.web.bind.annotation.RestControllerAdvice;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//import org.typroject.tyboot.core.foundation.context.RequestContext;
-//import org.typroject.tyboot.core.restful.utils.ResponseModel;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-///**
-// * @description: 全局异常处理器
-// * @author: duanwei
-// * @create: 2019-08-28 20:07
-// **/
-//@RestControllerAdvice
-//public class GlobalExceptionHandler {
-//
-//	private Logger log = LoggerFactory.getLogger(this.getClass());
-//
-//	public GlobalExceptionHandler() {
-//	}
-//
-//	@ExceptionHandler({ Exception.class })
-//	public ResponseModel<Object> MethodArgumentNotValidHandler(Exception exception) throws Exception {
-//		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
-//				.getRequest();
-//		ResponseModel<Object> response = new ResponseModel<>();
-//
-//		//解析平台返回错误信息，统一返回403,app 端统一跳转到登录页面
-//		if(exception.getMessage()!=null&&exception.getMessage().indexOf("账号已经在其他设备登录")!=-1 ||exception.getMessage().indexOf("请重新登录")!=-1){
-//			response.setStatus(HttpStatus.FORBIDDEN.value());
-//		}else{
-//			response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
-//		}
-//
-//		response.setDevMessage("FAILED");
-//		response.setMessage( exception.getMessage());
-//		response.setTraceId(RequestContext.getTraceId());
-//		response.setPath(request.getServletPath());exception.printStackTrace();
-//		return response;
-//	}
-//
-//}
+package com.yeejoin.equipmanage.common.exception.handle;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @description: 全局异常处理器
+ * @author: duanwei
+ * @create: 2019-08-28 20:07
+ **/
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+	private Logger log = LoggerFactory.getLogger(this.getClass());
+
+	public GlobalExceptionHandler() {
+	}
+
+	@ExceptionHandler({ Exception.class })
+	public ResponseModel<Object> MethodArgumentNotValidHandler(Exception exception) throws Exception {
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+				.getRequest();
+		ResponseModel<Object> response = new ResponseModel<>();
+
+		//解析平台返回错误信息，统一返回403,app 端统一跳转到登录页面
+		if(exception.getMessage()!=null&&exception.getMessage().indexOf("账号已经在其他设备登录")!=-1 ||exception.getMessage().indexOf("请重新登录")!=-1){
+			response.setStatus(HttpStatus.FORBIDDEN.value());
+		}else{
+			response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		}
+
+		response.setDevMessage("FAILED");
+		response.setMessage( exception.getMessage());
+		response.setTraceId(RequestContext.getTraceId());
+		response.setPath(request.getServletPath());exception.printStackTrace();
+		return response;
+	}
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/DateUtils.java

@@ -14,7 +14,7 @@ import java.util.Date;
  * @create: 2020-05-28 13:57
  **/
 public class DateUtils {
-
+	
     public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
     public static final String MINUTE_PATTERN = "yyyy-MM-dd HH:mm";
     public static final String HOUR_PATTERN = "yyyy-MM-dd HH:mm:ss";
@@ -23,6 +23,7 @@ public class DateUtils {
     public static final String YEAR_PATTERN = "yyyy";
     public static final String MINUTE_ONLY_PATTERN = "mm";
     public static final String HOUR_ONLY_PATTERN = "HH";
+    public static final String DATE_TIME_T_PATTERN = "yyyy-MM-dd'T'HH:mm:ss";
     /**
      * 获取当前时间
      *
@@ -135,7 +136,7 @@ public class DateUtils {
      * @throws ParseException
      */
     public static String dateFormat(Date date, String pattern) throws ParseException {
-        if (StringUtils.isNotEmpty(pattern)) {
+        if (StringUtils.isEmpty(pattern)) {
             pattern = DateUtils.DATE_PATTERN;
         }
         SimpleDateFormat sdf = new SimpleDateFormat(pattern);
@@ -183,7 +184,7 @@ public class DateUtils {
      * @throws ParseException
      */
     public static Date dateParse(String dateTimeString, String pattern) throws ParseException {
-        if (StringUtils.isNotEmpty(pattern)) {
+        if (StringUtils.isEmpty(pattern)) {
             pattern = DateUtils.DATE_PATTERN;
         }
         SimpleDateFormat sdf = new SimpleDateFormat(pattern);

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/ExcelUtil.java

@@ -354,10 +354,10 @@ public class ExcelUtil
 		style.setWrapText(true);
 		style.setAlignment(HorizontalAlignment.CENTER);// 左右居中
 		style.setVerticalAlignment(VerticalAlignment.CENTER);
-		style.setLeftBorderColor(HSSFColor.BLACK.index);// 左边框的颜色    
-		style.setRightBorderColor(HSSFColor.BLACK.index);// 右边框的颜色    
-		style.setBottomBorderColor(HSSFColor.BLACK.index); // 设置单元格的边框颜色    
-		style.setFillForegroundColor(HSSFColor.WHITE.index);  
+//		style.setLeftBorderColor(HSSFColor.BLACK.index);// 左边框的颜色    
+//		style.setRightBorderColor(HSSFColor.BLACK.index);// 右边框的颜色    
+//		style.setBottomBorderColor(HSSFColor.BLACK.index); // 设置单元格的边框颜色    
+//		style.setFillForegroundColor(HSSFColor.WHITE.index);  
 		style.setBorderBottom(BorderStyle.THIN);
 		style.setBorderLeft(BorderStyle.THIN);
 		style.setBorderRight(BorderStyle.THIN);

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/ImportFile.java

@@ -7,6 +7,7 @@ import java.util.Set;
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -41,7 +42,7 @@ public interface ImportFile {
 			
 			Cell cell = row.getCell(cellNum);
 			
-			if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING) {
+			if (cell.getCellType() == CellType.STRING) {
 				if (null != cell && StringUtil.isNotEmpty(cell.getStringCellValue())) {
 					ParsePropertyUtil.setting(value_1::add, () -> cell.getStringCellValue());
 					ParsePropertyUtil.setting(value_2::add, () -> cell.getStringCellValue());

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentAlarmDownloadVO.java

@@ -14,38 +14,38 @@ public class EquipmentAlarmDownloadVO implements Serializable {
 
 
     @ExcelProperty(value = "告警类型", index = 0)
-    private String alarmType;
+    private String alarmType = "";
 
     @ExcelProperty(value = "告警设备", index = 1)
-    private String equipName;
+    private String equipName = "";
 
     @ExcelProperty(value = "告警内容", index = 2)
-    private String alarmContent;
+    private String alarmContent = "";
 
     @ExcelProperty(value = "设备编号", index = 3)
-    private String equipCode;
+    private String equipCode = "";
 
     @ExcelProperty(value = "告警位置", index = 4)
-    private String alarmPosition;
+    private String alarmPosition = "";
 
     @ExcelProperty(value = "保护对象", index = 5)
-    private String protectObj;
+    private String protectObj = "";
 
     @ExcelProperty(value = "告警时间", index = 6)
-    private String alarmTime;
+    private String alarmTime = "";
 
     @ExcelProperty(value = "处理状态", index = 7)
-    private String handleStatus;
+    private String handleStatus = "";
 
     @ExcelProperty(value = "处理类型", index = 8)
-    private String handleType;
+    private String handleType = "";
     
     @ExcelProperty(value = "处理时间", index = 9)
-    private String confirmDate;
+    private String confirmDate = "";
     
     @ExcelProperty(value = "报警原因", index = 10)
-    private String alarmReason;
+    private String alarmReason = "";
     
     @ExcelProperty(value = "处理情况", index = 11)
-    private String resolveResult;
+    private String resolveResult = "";
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/ControllerMapper.java

@@ -17,5 +17,5 @@ import java.util.List;
  */
 public interface ControllerMapper extends BaseMapper<Controller> {
 
-    public List<ControllerDto> getCurrentStationController(@Param("sequenceNbr") Long sequenceNbr);
+    List<ControllerDto> getCurrentStationController(@Param("sequenceNbr") Long sequenceNbr);
 }

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

@@ -157,7 +157,7 @@
                 and a.alert_source_code = #{alertSourceCode}
             </if>
             <if test="systemSourceCode!= null ">
-                and a.system_source_code = #{systemSourceCode}
+                and a.system_source_code in  (${systemSourceCode})
             </if>
             <if test="isFatherAlert != null and isFatherAlert == 'true' ">
                 and   j.alert_called_id = a.sequence_nbr

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

@@ -46,5 +46,7 @@ public class TzsCommonParam {
     public static final String LICENCE_INFO = "licenceInfo";
     public static final String ATTACHMENT = "attachment";
 
+    public static final String INSPECTION_UNIT_CODE = "1044";
+    public static final String USE_UNIT_CODE = "1051";
 
 }

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶基本信息
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderInfoDto", description="气瓶基本信息")
+public class CylinderInfoDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "气瓶基本信息ID")
+    private String cylinderId;
+
+    @ApiModelProperty(value = "产权单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "出厂编号")
+    private String factoryNum;
+
+    @ApiModelProperty(value = "气瓶状态")
+    private Integer cylinderStatus;
+
+    @ApiModelProperty(value = "气瓶品种")
+    private Integer cylinderVariety;
+
+    @ApiModelProperty(value = "二维码编号")
+    private String qrCode;
+
+    @ApiModelProperty(value = "电子标签编号")
+    private String electronicLabelCode;
+
+    @ApiModelProperty(value = "充装介质")
+    private String fillingMedium;
+
+    @ApiModelProperty(value = "公称压力(MPa）")
+    private Double pressure;
+
+    @ApiModelProperty(value = "容积（L）")
+    private Double volume;
+
+    @ApiModelProperty(value = "制造日期")
+    private Date manufacturingDate;
+
+    @ApiModelProperty(value = "制造单位")
+    private String manufacturingUnit;
+
+    @ApiModelProperty(value = "气瓶制造许可证")
+    private String license;
+
+    @ApiModelProperty(value = "气瓶重量（kg）")
+    private Double cylinderWeight;
+
+    @ApiModelProperty(value = "单位内部编号")
+    private String unitInnerCode;
+
+    @ApiModelProperty(value = "最近一次检验日期")
+    private Date inspectionDate;
+
+    @ApiModelProperty(value = "下次检验日期")
+    private Date nextInspectionDate;
+
+    @ApiModelProperty(value = "气瓶唯一标识码")
+    private String sequenceCode;
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+    private Date syncDate;
+
+    @ApiModelProperty(value = "1初次同步数据   2上层系统已同步数据   0已删除数据")
+    private Boolean syncState;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String apiCompanyCode;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 气瓶企业信息
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="CylinderUnitDto", description="气瓶企业信息")
+public class CylinderUnitDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "单位ID")
+    private String unitId;
+
+    @ApiModelProperty(value = "所属区域")
+    private String regionCode;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+    @ApiModelProperty(value = "企业类型")
+    private Integer unitType;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String creditCode;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "企业负责人")
+    private String unitPerson;
+
+    @ApiModelProperty(value = "企业负责人手机")
+    private String personMobilePhone;
+
+    @ApiModelProperty(value = "企业负责人固定电话")
+    private String personTelephone;
+
+    @ApiModelProperty(value = "企业邮编")
+    private String postalCode;
+
+    @ApiModelProperty(value = "企业简称")
+    private String unitAbbreviation;
+
+    @ApiModelProperty(value = "充装许可证号")
+    private String fillingLicense;
+
+    @ApiModelProperty(value = "充装许可证有效期")
+    private Date fillingPermitDate;
+
+    @ApiModelProperty(value = "充装许可范围")
+    private String fillingPermScope;
+
+    @ApiModelProperty(value = "检验许可证号")
+    private String inspectionLicense;
+
+    @ApiModelProperty(value = "检验范围")
+    private String inspectionScope;
+
+    @ApiModelProperty(value = "检验许可证有效期")
+    private Date effectiveDate;
+
+    @ApiModelProperty(value = "制造许可证号")
+    private String manufacturingLicense;
+
+    @ApiModelProperty(value = "制造许可证有效期")
+    private Date manufacturingDate;
+
+    @ApiModelProperty(value = "制造许可范围")
+    private String manufacturingScope;
+
+    @ApiModelProperty(value = "制造单位代码")
+    private String manufacturingUnitCode;
+
+    @ApiModelProperty(value = "同步时间  yyyy-MM-dd HH24:mi:ss")
+    private Date syncDate;
+
+    @ApiModelProperty(value = "1初次同步数据   2上层系统已同步数据   0已删除数据")
+    private Boolean syncState;
+
+    @ApiModelProperty(value = "对接公司编码")
+    private String apiCompanyCode;
+
+   @ApiModelProperty(value = "气瓶数量")
+   private Long cylinderNumber;
+
+   @ApiModelProperty(value = "检验过期气瓶数量")
+   private Long cylinderOutOfDate;
+
+
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ @ApiModelProperty(value = "是否过期")
+ private Boolean outOfDate;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备告知单
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="EquipmentInformDto", description="设备告知单")
+public class EquipmentInformDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "施工告知编号")
+    private String productCode;
+
+    @ApiModelProperty(value = "施工告知日期")
+    private Date productInformDate;
+
+    @ApiModelProperty(value = "施工单位")
+    private String productUnit;
+
+    @ApiModelProperty(value = "施工单位id")
+    private Long productUnitId;
+
+    @ApiModelProperty(value = "施工类型")
+    private String productType;
+
+    @ApiModelProperty(value = "施工类型code")
+    private String productTypeCode;
+
+    @ApiModelProperty(value = "生产许可证编号")
+    private String licenceCode;
+
+    @ApiModelProperty(value = "生产许可证有效期")
+    private Date licenceDate;
+
+    @ApiModelProperty(value = "区域编码")
+    private String regionCode;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "县区")
+    private String district;
+
+    @ApiModelProperty(value = "街道")
+    private String stree;
+
+    @ApiModelProperty(value = "小区")
+    private String community;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "施工负责人")
+    private String principal;
+
+    @ApiModelProperty(value = "施工负责人id")
+    private Long principalId;
+
+    @ApiModelProperty(value = "施工负责人电话")
+    private String principalPhone;
+
+    @ApiModelProperty(value = "计划施工日期")
+    private Date planProductDate;
+
+    @ApiModelProperty(value = "接收机构")
+    private String acceptUnit;
+
+    @ApiModelProperty(value = "接收机构id")
+    private Long acceptUnitId;
+
+    @ApiModelProperty(value = "检验机构")
+    private String inspectonUnit;
+
+    @ApiModelProperty(value = "检验机构id")
+    private Long inspectonUnitId;
+
+    @ApiModelProperty(value = "使用单位")
+    private String useUnit;
+
+    @ApiModelProperty(value = "使用单位id")
+    private Long useUnitId;
+
+    @ApiModelProperty(value = "产权单位")
+    private String propertyUnit;
+
+    @ApiModelProperty(value = "产权单位id")
+    private Long propertyUnitId;
+
+    @ApiModelProperty(value = "使用场所")
+    private String useSite;
+
+    @ApiModelProperty(value = "使用场所code")
+    private String useSiteCode;
+
+    @ApiModelProperty(value = "告知书编号")
+    private String informCode;
+
+    @ApiModelProperty(value = "告知单状态 0 暂存 1未接收 9已接收")
+    private String informStatus;
+
+   @ExcelIgnore
+   @ApiModelProperty(value = "附件")
+   @TableField(exist = false)
+   private Map<String, List<AttachmentDto>> attachments;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 告知申请-设备信息表
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="InformEquipmentDto", description="告知申请-设备信息表")
+public class InformEquipmentDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备id")
+    private String equipId;
+
+    @ApiModelProperty(value = "设备编号")
+    private String code;
+
+    @ApiModelProperty(value = "设备名称")
+    private String name;
+
+    @ApiModelProperty(value = "设备类别id")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "设备类别名称")
+    private String categoryName;
+
+    @ApiModelProperty(value = "设备种类id")
+    private Long typeId;
+
+    @ApiModelProperty(value = "设备种类名称")
+    private String typeName;
+
+    @ApiModelProperty(value = "设备品种id")
+    private Long varietyId;
+
+    @ApiModelProperty(value = "设备品种名称")
+    private String varietyName;
+
+    @ApiModelProperty(value = "设备品牌")
+    private String brand;
+
+    @ApiModelProperty(value = "规格型号")
+    private String model;
+
+    @ApiModelProperty(value = "单位内部编号")
+    private String innerCode;
+
+    @ApiModelProperty(value = "设计单位名称")
+    private String designUnitName;
+
+    @ApiModelProperty(value = "制造单位名称")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "设计使用年限")
+    private Integer designLife;
+
+    @ApiModelProperty(value = "出厂日期")
+    private Date factoryDate;
+
+    @ApiModelProperty(value = "产品编号（出厂编号）")
+    private String productCode;
+
+    @ApiModelProperty(value = "监督检验机构")
+    private Long supervisionAgency;
+
+    @ApiModelProperty(value = "检验报告编号")
+    private String inspectionReportCode;
+
+    @ApiModelProperty(value = "设备状态（未安装，已安装...）")
+    private String status;
+
+    @ApiModelProperty(value = "设备所属单位id")
+    private Long equipUnitId;
+
+    @ApiModelProperty(value = "设备所属单位")
+    private String equipUnit;
+
+    @ApiModelProperty(value = "告知单id")
+    private Long informId;
+
+}

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

@@ -98,6 +98,8 @@ public class UnitPersonInfoDto extends BaseDto {
     private List<AttachmentDto> qrcode;
 
 
+    @ApiModelProperty(value = "所属单位 监管端使用")
+    private String organization;
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶基本信息
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+@Data
+
+@Accessors(chain = true)
+@TableName("tz_cylinder_info")
+public class CylinderInfo  {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    protected Long sequenceNbr;
+
+    /**
+     * 气瓶基本信息ID
+     */
+	@TableField("cylinder_id")
+    private String cylinderId;
+
+    /**
+     * 产权单位名称
+     */
+	@TableField("unit_name")
+    private String unitName;
+
+    /**
+     * 出厂编号
+     */
+	@TableField("factory_num")
+    private String factoryNum;
+
+    /**
+     * 气瓶状态
+     */
+	@TableField("cylinder_status")
+    private Integer cylinderStatus;
+
+    /**
+     * 气瓶品种
+     */
+	@TableField("cylinder_variety")
+    private Integer cylinderVariety;
+
+    /**
+     * 二维码编号
+     */
+	@TableField("qrCode")
+    private String qrCode;
+
+    /**
+     * 电子标签编号
+     */
+	@TableField("electronic_label_code")
+    private String electronicLabelCode;
+
+    /**
+     * 充装介质
+     */
+	@TableField("filling_medium")
+    private String fillingMedium;
+
+    /**
+     * 公称压力(MPa）
+     */
+	@TableField("pressure")
+    private Double pressure;
+
+    /**
+     * 容积（L）
+     */
+	@TableField("volume")
+    private Double volume;
+
+    /**
+     * 制造日期
+     */
+	@TableField("manufacturing_date")
+    private Date manufacturingDate;
+
+    /**
+     * 制造单位
+     */
+	@TableField("manufacturing_unit")
+    private String manufacturingUnit;
+
+    /**
+     * 气瓶制造许可证
+     */
+	@TableField("license")
+    private String license;
+
+    /**
+     * 气瓶重量（kg）
+     */
+	@TableField("cylinder_weight")
+    private Double cylinderWeight;
+
+    /**
+     * 单位内部编号
+     */
+	@TableField("unit_inner_code")
+    private String unitInnerCode;
+
+    /**
+     * 最近一次检验日期
+     */
+	@TableField("inspection_date")
+    private Date inspectionDate;
+
+    /**
+     * 下次检验日期
+     */
+	@TableField("next_inspection_date")
+    private Date nextInspectionDate;
+
+    /**
+     * 气瓶唯一标识码
+     */
+	@TableField("sequence_code")
+    private String sequenceCode;
+
+    /**
+     * 同步时间  yyyy-MM-dd HH24:mi:ss
+     */
+	@TableField("sync_date")
+    private Date syncDate;
+
+    /**
+     * 1初次同步数据   2上层系统已同步数据   0已删除数据
+     */
+	@TableField("sync_state")
+    private Boolean syncState;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("api_company_code")
+    private String apiCompanyCode;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderUnit.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 气瓶企业信息
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tz_cylinder_unit")
+public class CylinderUnit  {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    protected Long sequenceNbr;
+
+    /**
+     * 单位ID
+     */
+	@TableField("unit_id")
+    private String unitId;
+
+    /**
+     * 所属区域
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 单位名称
+     */
+	@TableField("unit_name")
+    private String unitName;
+
+    /**
+     * 企业类型
+     */
+	@TableField("unit_type")
+    private Integer unitType;
+
+    /**
+     * 统一社会信用代码
+     */
+	@TableField("credit_code")
+    private String creditCode;
+
+    /**
+     * 详细地址
+     */
+	@TableField("address")
+    private String address;
+
+    /**
+     * 企业负责人
+     */
+	@TableField("unit_person")
+    private String unitPerson;
+
+    /**
+     * 企业负责人手机
+     */
+	@TableField("person_mobile_phone")
+    private String personMobilePhone;
+
+    /**
+     * 企业负责人固定电话
+     */
+	@TableField("person_telephone")
+    private String personTelephone;
+
+    /**
+     * 企业邮编
+     */
+	@TableField("postal_code")
+    private String postalCode;
+
+    /**
+     * 企业简称
+     */
+	@TableField("unit_abbreviation")
+    private String unitAbbreviation;
+
+    /**
+     * 充装许可证号
+     */
+	@TableField("filling_license")
+    private String fillingLicense;
+
+    /**
+     * 充装许可证有效期
+     */
+	@TableField("filling_permit_date")
+    private Date fillingPermitDate;
+
+    /**
+     * 充装许可范围
+     */
+	@TableField("filling_perm_scope")
+    private String fillingPermScope;
+
+    /**
+     * 检验许可证号
+     */
+	@TableField("inspection_license")
+    private String inspectionLicense;
+
+    /**
+     * 检验范围
+     */
+	@TableField("inspection_scope")
+    private String inspectionScope;
+
+    /**
+     * 检验许可证有效期
+     */
+	@TableField("effective_date")
+    private Date effectiveDate;
+
+    /**
+     * 制造许可证号
+     */
+	@TableField("manufacturing_license")
+    private String manufacturingLicense;
+
+    /**
+     * 制造许可证有效期
+     */
+	@TableField("manufacturing_date")
+    private Date manufacturingDate;
+
+    /**
+     * 制造许可范围
+     */
+	@TableField("manufacturing_scope")
+    private String manufacturingScope;
+
+    /**
+     * 制造单位代码
+     */
+	@TableField("manufacturing_unit_code")
+    private String manufacturingUnitCode;
+
+    /**
+     * 同步时间  yyyy-MM-dd HH24:mi:ss
+     */
+	@TableField("sync_date")
+    private Date syncDate;
+
+    /**
+     * 1初次同步数据   2上层系统已同步数据   0已删除数据
+     */
+	@TableField("sync_state")
+    private Boolean syncState;
+
+    /**
+     * 对接公司编码
+     */
+	@TableField("api_company_code")
+    private String apiCompanyCode;
+
+    /**
+     * 经度
+     */
+    @TableField("longitude")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @TableField("latitude")
+    private String latitude;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/EquipmentInform.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 设备告知单
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_equipment_inform")
+public class EquipmentInform extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 施工告知编号
+     */
+	@TableField("product_code")
+    private String productCode;
+
+    /**
+     * 施工告知日期
+     */
+	@TableField("product_inform_date")
+    private Date productInformDate;
+
+    /**
+     * 施工单位
+     */
+	@TableField("product_unit")
+    private String productUnit;
+
+    /**
+     * 施工单位id
+     */
+	@TableField("product_unit_id")
+    private Long productUnitId;
+
+    /**
+     * 施工类型
+     */
+	@TableField("product_type")
+    private String productType;
+
+    /**
+     * 施工类型code
+     */
+	@TableField("product_type_code")
+    private String productTypeCode;
+
+    /**
+     * 生产许可证编号
+     */
+	@TableField("licence_code")
+    private String licenceCode;
+
+    /**
+     * 生产许可证有效期
+     */
+	@TableField("licence_date")
+    private Date licenceDate;
+
+    /**
+     * 区域编码
+     */
+	@TableField("region_code")
+    private String regionCode;
+
+    /**
+     * 省
+     */
+	@TableField("province")
+    private String province;
+
+    /**
+     * 市
+     */
+	@TableField("city")
+    private String city;
+
+    /**
+     * 县区
+     */
+	@TableField("district")
+    private String district;
+
+    /**
+     * 街道
+     */
+	@TableField("stree")
+    private String stree;
+
+    /**
+     * 小区
+     */
+	@TableField("community")
+    private String community;
+
+    /**
+     * 详细地址
+     */
+	@TableField("address")
+    private String address;
+
+    /**
+     * 经度
+     */
+	@TableField("longitude")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("latitude")
+    private String latitude;
+
+    /**
+     * 施工负责人
+     */
+	@TableField("principal")
+    private String principal;
+
+    /**
+     * 施工负责人id
+     */
+	@TableField("principal_id")
+    private Long principalId;
+
+    /**
+     * 施工负责人电话
+     */
+	@TableField("principal_phone")
+    private String principalPhone;
+
+    /**
+     * 计划施工日期
+     */
+	@TableField("plan_product_date")
+    private Date planProductDate;
+
+    /**
+     * 接收机构
+     */
+	@TableField("accept_unit")
+    private String acceptUnit;
+
+    /**
+     * 接收机构id
+     */
+	@TableField("accept_unit_id")
+    private Long acceptUnitId;
+
+    /**
+     * 检验机构
+     */
+	@TableField("inspecton_unit")
+    private String inspectonUnit;
+
+    /**
+     * 检验机构id
+     */
+	@TableField("inspecton_unit_id")
+    private Long inspectonUnitId;
+
+    /**
+     * 使用单位
+     */
+	@TableField("use_unit")
+    private String useUnit;
+
+    /**
+     * 使用单位id
+     */
+	@TableField("use_unit_id")
+    private Long useUnitId;
+
+    /**
+     * 产权单位
+     */
+	@TableField("property_unit")
+    private String propertyUnit;
+
+    /**
+     * 产权单位id
+     */
+	@TableField("property_unit_id")
+    private Long propertyUnitId;
+
+    /**
+     * 使用场所
+     */
+	@TableField("use_site")
+    private String useSite;
+
+    /**
+     * 使用场所code
+     */
+	@TableField("use_site_code")
+    private String useSiteCode;
+
+    /**
+     * 告知书编号
+     */
+	@TableField("inform_code")
+    private String informCode;
+
+    /**
+     * 告知单状态 0 暂存 1未接收 9已接收
+     */
+	@TableField("inform_status")
+    private String informStatus;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/InformEquipment.java

+package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 告知申请-设备信息表
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tcb_inform_equipment")
+public class InformEquipment extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备id
+     */
+	@TableField("equip_id")
+    private String equipId;
+
+    /**
+     * 设备编号
+     */
+	@TableField("code")
+    private String code;
+
+    /**
+     * 设备名称
+     */
+	@TableField("name")
+    private String name;
+
+    /**
+     * 设备类别id
+     */
+	@TableField("category_id")
+    private Long categoryId;
+
+    /**
+     * 设备类别名称
+     */
+	@TableField("category_name")
+    private String categoryName;
+
+    /**
+     * 设备种类id
+     */
+	@TableField("type_id")
+    private Long typeId;
+
+    /**
+     * 设备种类名称
+     */
+	@TableField("type_name")
+    private String typeName;
+
+    /**
+     * 设备品种id
+     */
+	@TableField("variety_id")
+    private Long varietyId;
+
+    /**
+     * 设备品种名称
+     */
+	@TableField("variety_name")
+    private String varietyName;
+
+    /**
+     * 设备品牌
+     */
+	@TableField("brand")
+    private String brand;
+
+    /**
+     * 规格型号
+     */
+	@TableField("model")
+    private String model;
+
+    /**
+     * 单位内部编号
+     */
+	@TableField("inner_code")
+    private String innerCode;
+
+    /**
+     * 设计单位名称
+     */
+	@TableField("design_unit_name")
+    private String designUnitName;
+
+    /**
+     * 制造单位名称
+     */
+	@TableField("manufacturer")
+    private String manufacturer;
+
+    /**
+     * 设计使用年限
+     */
+	@TableField("design_life")
+    private Integer designLife;
+
+    /**
+     * 出厂日期
+     */
+	@TableField("factory_date")
+    private Date factoryDate;
+
+    /**
+     * 产品编号（出厂编号）
+     */
+	@TableField("product_code")
+    private String productCode;
+
+    /**
+     * 监督检验机构
+     */
+	@TableField("supervision_agency")
+    private Long supervisionAgency;
+
+    /**
+     * 检验报告编号
+     */
+	@TableField("inspection_report_code")
+    private String inspectionReportCode;
+
+    /**
+     * 设备状态（未安装，已安装...）
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 设备所属单位id
+     */
+	@TableField("equip_unit_id")
+    private Long equipUnitId;
+
+    /**
+     * 设备所属单位
+     */
+	@TableField("equip_unit")
+    private String equipUnit;
+
+    /**
+     * 告知单id
+     */
+	@TableField("inform_id")
+    private Long informId;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.enums;
+
+import lombok.Getter;
+
+/**
+ * 设备告知书状态枚举
+ */
+@Getter
+public enum EquipmentInformStatusEnum {
+
+    暂存("0", "暂存"),
+    未接收("1", "未接收"),
+    已接收("2", "已接收");
+
+    private String code;
+
+    private String name;
+
+    EquipmentInformStatusEnum(String code, String name) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static EquipmentInformStatusEnum getByCode(String code) {
+        for (EquipmentInformStatusEnum statusEnum : EquipmentInformStatusEnum.values()) {
+            if (statusEnum.getCode().equals(code)) {
+                return statusEnum;
+            }
+        }
+        return null;
+    }
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 气瓶基本信息 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
+
+    /**
+     * 查询根据公司查询气瓶数量以及过期气瓶数
+     * @param sequenceNbr
+     * @return
+     */
+    Map<String, Long> queryNumAndOutOfDateNum(@Param("sequenceNbr")  Long sequenceNbr);
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 气瓶企业信息 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+public interface CylinderUnitMapper extends BaseMapper<CylinderUnit> {
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentInform;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 设备告知单 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+public interface EquipmentInformMapper extends BaseMapper<EquipmentInform> {
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.InformEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 告知申请-设备信息表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+public interface InformEquipmentMapper extends BaseMapper<InformEquipment> {
+
+}

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

 package com.yeejoin.amos.boot.module.tzs.flc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 企业信息表 Mapper 接口
@@ -11,4 +15,5 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
  */
 public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
 
+    List<UnitInfoDto> getUnitByType(@Param("typeCode") String typeCode);
 }

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+import java.util.Map;
+
+/**
+ * 气瓶基本信息接口类
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+public interface ICylinderInfoService {
+
+    /**
+     * 根据企业id 获取气瓶数量及过期气瓶数量
+     * @param unitId
+     * @return
+     */
+    Map<String, Long> queryNumAndOutOfDateNum(Long unitId);
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 气瓶企业信息接口类
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+public interface ICylinderUnitService {
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentInformDto;
+
+/**
+ * 设备告知单接口类
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+public interface IEquipmentInformService {
+
+    EquipmentInformDto createEquipmentInform(EquipmentInformDto model);
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.api.service;
+
+
+/**
+ * 告知申请-设备信息表接口类
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+public interface IInformEquipmentService {
+
+}

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

@@ -6,6 +6,8 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfoChange;
 
+import java.util.List;
+
 /**
  * 企业信息表接口类
  *
@@ -32,4 +34,8 @@ public interface IUnitInfoService {
     UnitInfoDto getDtoByOrgId(Long sequenceNbr);
 
     UnitInfoDto changeUnInfo(UnitInfoDto model);
+
+    List<UnitInfoDto> getInspectionUnit();
+
+    List<UnitInfoDto> getUseUnit();
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderInfoMapper">
+
+
+    <select id="queryNumAndOutOfDateNum" resultType="java.util.Map">
+        SELECT
+        count( sequence_nbr ) AS cylinderNum,
+        count( CASE WHEN t.next_inspection_date <![CDATA[ < ]]> now() THEN 1 ELSE 0 END ) AS outOfDateNum
+        FROM
+        tz_cylinder_info t
+        WHERE
+        t.sequence_nbr IN ( SELECT max( tt.sequence_nbr ) FROM tz_cylinder_info tt GROUP BY tt.sequence_code )
+        AND t.api_company_code = (
+        SELECT
+        u.api_company_code
+        FROM
+        tz_cylinder_unit u
+        WHERE
+        u.sequence_nbr = #{sequenceNbr}
+        )
+    </select>
+
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.CylinderUnitMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.EquipmentInformMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.InformEquipmentMapper">
+
+</mapper>

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

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tzs.flc.api.mapper.UnitInfoMapper">
 
+
+    <select id="getUnitByType" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto">
+			select
+			a.*
+			from tz_flc_unit_info a
+			where a.is_delete = 0 AND
+			(a.unit_status = '1' or  a.is_change = 1)
+			AND a.unit_type_code LIKE CONCAT('%', #{typeCode}, '%')
+    </select>
+
+
 </mapper>

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

@@ -351,13 +351,13 @@ public class CommandController extends BaseController {
     @ApiOperation(value = "分页查询视图下的视频列表")
     @RequestMapping(value = "monitorView/video/page", method = RequestMethod.GET)
     public ResponseModel<Page<Map<String, Object>>> queryUncheckedVideoList(
-            @RequestParam(value = "viewId") Long viewId,
-            @RequestParam(value = "videoName" ,required =false) String videoName,
-            @RequestParam(value = "videoCode" ,required =false) String videoCode,
+             @RequestParam(value = "nodeId") Long nodeId,
+            @RequestParam(value = "nodeType" ,required =false) String nodeType,
             @RequestParam(value = "current") int current,
-            @RequestParam(value = "size") int size) throws Exception
+            @RequestParam(value = "size") int size
+         ) throws Exception
     {
-        ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.queryUncheckedVideoList(viewId,videoName, videoCode,current,size);
+        ResponseModel<Page<Map<String, Object>>> data = equipFeignClient.queryVideoPage(nodeId,nodeType,current,size);
         Page<Map<String, Object>> pag = data != null ? data.getResult() : null;
         List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
         if (records != null && records.size() > 0) {

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

@@ -177,12 +177,12 @@ public class KeySiteController extends BaseController {
 			@RequestParam(value = "size") int size, @RequestParam(required = false) String name,
 			@RequestParam(required = false) Long buildingId, @RequestParam(required = false) String fireEnduranceRate,
 			@RequestParam(required = false) String useNature, @RequestParam(required = false) String fireFacilitiesInfo,
-			@RequestParam(required = false) Long belongId) {
+			@RequestParam(required = false) Long belongId, @RequestParam(required = false) String belongName) {
 		Page<KeySiteDto> page = new Page<KeySiteDto>();
 		page.setCurrent(current);
 		page.setSize(size);
 		return ResponseHelper.buildResponse(keySiteServiceImpl.getPageList(page, name, buildingId, fireEnduranceRate,
-				useNature, fireFacilitiesInfo, belongId));
+				useNature, fireFacilitiesInfo, belongId,belongName));
 	}
 
 	/**

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

@@ -50,6 +50,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -350,18 +351,6 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyUsers(orgUnitId));
     }
 
-    /**
-     * 根据名称模糊匹配
-     *
-     * @param name
-     * @return
-     */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/getList", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "根据名称模糊匹配", notes = "根据名称模糊匹配")
-    public ResponseModel<List<ESOrgUsrDto>> selectById(HttpServletRequest request, String name) throws Exception {
-        return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name));
-    }
 
     /**
      * 根据名称模糊匹配
@@ -372,7 +361,7 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getdataList/unit", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据名称模糊匹配单位", notes = "根据名称模糊匹配单位")
-    public ResponseModel<List<ESOrgUsrDto>> selectByIddata(HttpServletRequest request, String name) throws Exception {
+    public ResponseModel<Set<ESOrgUsrDto>> selectByIddata(HttpServletRequest request, String name) throws Exception {
         return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name));
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

@@ -228,7 +228,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
     @Override
 	public int getDutyCarCount(Long carId) {
 		List<Map<String, Object>> equipmentList = dutyPersonShiftMapper.getEquipmentForSpecifyDate(DateUtils.getDateNowShortStr(),
-				this.getGroupCode(), "carId", "carName", "teamName","result.carId");
+				this.getGroupCode(), "carId", "carName", "teamName","");
 		int count =0;
 		for (Map<String, Object> map : equipmentList) {
 			if(map.containsKey("carId") && map.get("carId").equals(Long.toString(carId))) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ESOrgUsrService.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 import javax.annotation.PostConstruct;
 
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.FuzzyQueryBuilder;
+import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,6 +107,29 @@ public class ESOrgUsrService {
     	return esOrgUsrDto;
     }
 
+	public ESOrgUsrDto saveAlertCalledToESNew(OrgUsr orgUsr) throws Exception
+	{
+		ESOrgUsrDto esOrgUsrDto = new ESOrgUsrDto();
+		String seqStr = String.valueOf(orgUsr.getSequenceNbr());
+		try {
+			Long seq = Long.parseLong(seqStr);
+			esOrgUsrDto.setSequenceNbr(seq);
+			MatchQueryBuilder queryBuilder  =null;
+			//设置模糊搜索
+			if(orgUsr.getBizOrgName()!=null) {
+				queryBuilder =QueryBuilders.matchQuery("bizOrgName", orgUsr.getBizOrgName());
+			}
+			Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
+			if(!search.iterator().hasNext()) {
+				esOrgUsrDto.setBizOrgName(orgUsr.getBizOrgName());
+				esOrgUsrDtoRepository.save(esOrgUsrDto);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return esOrgUsrDto;
+	}
+
     /**
      *
      * <pre>
@@ -125,7 +151,7 @@ public class ESOrgUsrService {
      *
      */
     @SuppressWarnings({ "rawtypes" })
-	public List<ESOrgUsrDto> queryByKeys(String name)
+	public Set<ESOrgUsrDto> queryByKeys(String name)
     {
     	 //创建builder
     	FuzzyQueryBuilder queryBuilder =null;
@@ -135,7 +161,7 @@ public class ESOrgUsrService {
         	queryBuilder =QueryBuilders.fuzzyQuery("bizOrgName", name);
        }
          Iterable<ESOrgUsrDto> search = esOrgUsrDtoRepository.search(queryBuilder);
-        List<ESOrgUsrDto> list = new LinkedList<>();
+        Set<ESOrgUsrDto> list = new LinkedHashSet<>();
 			search.forEach(esOrgUsrDto->{				
 				list.add(esOrgUsrDto);
 			});

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -61,8 +61,8 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	 * 分页查询
 	 */
 	public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
-			String useNature, String fireFacilitiesInfo, Long belongId){
-		return keySiteMapper.getPageList(page,name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId);
+			String useNature, String fireFacilitiesInfo, Long belongId, String belongName){
+		return keySiteMapper.getPageList(page,name,buildingId,fireEnduranceRate,useNature,fireFacilitiesInfo,belongId,belongName);
 	}
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -403,7 +403,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
 		if (req.containsKey("amosOrgId") && !ObjectUtils.isEmpty(req.get("amosOrgId"))) {
-			map.put("amosOrgId", req.get("amosOrgId"));
+			map.put("amosOrgCode", req.get("amosOrgId"));//当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
 		}
 		
 		req.remove("bizOrgName");

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/AddResourceHandlersConfig.java

@@ -3,10 +3,10 @@ package com.yeejoin.equipmanage.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class AddResourceHandlersConfig extends WebMvcConfigurerAdapter {
+public class AddResourceHandlersConfig implements WebMvcConfigurer {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/DownloadController.java

@@ -4,18 +4,23 @@ import java.util.Optional;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.yeejoin.equipmanage.common.entity.vo.AppDownloadVO;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
+import com.yeejoin.equipmanage.common.entity.vo.AppDownloadVO;
 import com.yeejoin.equipmanage.common.utils.ExcelUtil;
 import com.yeejoin.equipmanage.common.utils.FileUploadTypeEnum;
 import com.yeejoin.equipmanage.service.IDownloadFileService;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipSourceFileController.java

@@ -37,6 +37,7 @@ public class EquipSourceFileController {
      * @Date 2020/12/18 14:12
      */
     @GetMapping("/list")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     public List<SourceFile> findBySourceId(@RequestParam Long sourceId) {
         return sourceFileService.findBySourceId(sourceId);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/MonitorViewController.java

@@ -94,15 +94,17 @@ public class MonitorViewController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "分页查询视图下的视频列表")
 	@RequestMapping(value = "/video/page", method = RequestMethod.GET)
-	public ResponseModel<Page<VideoListVo>> queryUncheckedVideoList(@RequestParam(value = "viewId") Long viewId,
-			@RequestParam(value = "videoName", required = false) String videoName,
-			@RequestParam(value = "videoCode", required = false) String videoCode,
-			@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) throws Exception {
+	public ResponseModel<Page<VideoListVo>> queryVideoPage(
+			@RequestParam(value = "nodeId") Long nodeId,
+			@RequestParam(value = "nodeType") String nodeType,
+			@RequestParam(value = "current") int current, 
+			@RequestParam(value = "size") int size) throws Exception {
+		
 		Page<VideoListVo> page = new Page<VideoListVo>();
 		page.setCurrent(current);
 		page.setSize(size);
 		return ResponseHelper
-				.buildResponse(monitorViewService.queryVideoPageByViewId(page, viewId, videoName, videoCode));
+				.buildResponse(monitorViewService.queryVideoPageByViewId(page, nodeId, nodeType));
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/RiskSourceSceneController.java

@@ -247,8 +247,8 @@ public class RiskSourceSceneController extends AbstractBaseController {
     @GetMapping(value = "/getStatus")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public  List<Map> getstatus(){
-        return iRiskSourceSceneService.getstatus();
+    public  List<Map> getstatus(@RequestParam(value = "sceneId", required = false) String sceneId){
+        return iRiskSourceSceneService.getstatus(sceneId);
     }
 
      /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/UserController.java

@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -44,11 +45,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
+import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
@@ -509,7 +513,7 @@ public class UserController extends AbstractBaseController {
 	/**
 	 * APP登录
 	 */
-	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
     @ApiOperation(value = "APP登录", notes = "APP登录")
 	@PostMapping(value = "/mobile/login")
 	public ResponseModel mobileLogin(@ApiParam(value = "账号", required = true) @RequestBody AppLoginUserParam param) {
@@ -604,7 +608,8 @@ public class UserController extends AbstractBaseController {
 					}
 				}
 				Map<String, Object> mapRoles = objectToMap(user.getOrgRoles());
-
+				
+				result.put("userModel", user);
 				result.put("companys", listCompanyModel);
 				result.put("orgRoles", user.getOrgRoles());
 				result.put("companyDepartments", mapdate);
@@ -684,49 +689,49 @@ public class UserController extends AbstractBaseController {
 	/**
 	 * 保存登陆用户选择公司信息
 	 */
-//	    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "保存登陆用户选择公司信息", notes = "保存登陆用户选择公司信息")
-//	@PostMapping(value = "/save/curCompany")
-//	public JSONObject saveCurCompany(
-//			@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody SelectUserInfo selectUserInfo) {
-//		try {
-//			AgencyUserModel user = getUserInfo();
-//
-//			CompanyBo company = new CompanyBo();
-//			DepartmentBo department = new DepartmentBo();
-//			RoleBo role = new RoleBo();
-//			if(ObjectUtils.isEmpty(selectUserInfo.getCompanyModel())){
-//				CompanyModel companyM = user.getCompanys().get(0);
-//				Bean.copyExistPropertis(companyM,company);
-//
-//				Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
-//				DepartmentModel departmentM = mapDepartments.get(companyM.getSequenceNbr()).get(0);
-//				Bean.copyExistPropertis(departmentM,department);
-//				Map<Long, List<RoleModel>> roles = user.getOrgRoles();
-//				RoleModel roleM = roles.get(departmentM.getSequenceNbr()).get(0);
-//
-//				Bean.copyExistPropertis(roleM,role);
-//				selectUserInfo.setCompanyModel(company);
-//				selectUserInfo.setDepartmentModel(department);
-//				selectUserInfo.setRoleModel(role);
-//			}else{
-//				company = selectUserInfo.getCompanyModel();
-//				role = selectUserInfo.getRoleModel();
-//				department = selectUserInfo.getDepartmentModel();
-//			}
-//			ReginParams reginParams = new ReginParams();
-//			reginParams.setCompany(company);
-//			reginParams.setRole(role);
-//			reginParams.setDepartment(department);
-//			saveSelectedOrgInfo(reginParams);
-//
-//			return buildCurCompany(selectUserInfo, user);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//			logger.error("保存登陆用户选择公司信息异常", e);
-//			throw new RuntimeException("系统繁忙，请稍后再试");
-//		}
-//	}
+	@PostMapping(value = "/save/curCompany")
+	public JSONObject saveCurCompany(
+			@ApiParam(value = "当前登陆用户所选单位机构编号", required = true) @RequestBody SelectUserInfo selectUserInfo) {
+		try {
+			AgencyUserModel user = getUserInfo();
+
+			CompanyBo company = new CompanyBo();
+			DepartmentBo department = new DepartmentBo();
+			RoleBo role = new RoleBo();
+			if(ObjectUtils.isEmpty(selectUserInfo.getCompanyModel())){
+				CompanyModel companyM = user.getCompanys().get(0);
+				Bean.copyExistPropertis(companyM,company);
+
+				Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
+				DepartmentModel departmentM = mapDepartments.get(companyM.getSequenceNbr()).get(0);
+				Bean.copyExistPropertis(departmentM,department);
+				Map<Long, List<RoleModel>> roles = user.getOrgRoles();
+				RoleModel roleM = roles.get(departmentM.getSequenceNbr()).get(0);
+
+				Bean.copyExistPropertis(roleM,role);
+				selectUserInfo.setCompanyModel(company);
+				selectUserInfo.setDepartmentModel(department);
+				selectUserInfo.setRoleModel(role);
+			}else{
+				company = selectUserInfo.getCompanyModel();
+				role = selectUserInfo.getRoleModel();
+				department = selectUserInfo.getDepartmentModel();
+			}
+			ReginParams reginParams = new ReginParams();
+			reginParams.setUserModel(user);
+			reginParams.setCompany(company);
+			reginParams.setRole(role);
+			reginParams.setDepartment(department);
+			saveSelectedOrgInfo(reginParams);
+			return buildCurCompany(selectUserInfo, user);
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("保存登陆用户选择公司信息异常", e);
+			throw new RuntimeException("系统繁忙，请稍后再试");
+		}
+	}
 
 	private JSONObject buildCurCompany(SelectUserInfo selectUserInfo, AgencyUserModel user) {
 		JSONObject result = new JSONObject();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/VideoController.java

@@ -186,7 +186,7 @@ public class VideoController extends AbstractBaseController {
     @RequestMapping(value = "/pageVideo", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "视频分页资源查询", notes = "视频分页资源查询")
-    public ResponseModel pageVideo(Integer pageNum, Integer pageSize, Double longitude, Double latitude, Double distance) {
+    public ResponseModel<Page<VideoListVo>> pageVideo(Integer pageNum, Integer pageSize, Double longitude, Double latitude, Double distance) {
 
         if (null == pageNum || null == pageSize) {
             pageNum = 1;

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -69,6 +69,13 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     List<EquipmentSpecificIndex> getEquipMentStatus(@Param("id") String id);
     
     List<EquipmentSpecificIndex> getEquipIndexLatestStatus();
+    
+    /**
+     * 根据画布id获取画布绑定设备最新指标状态
+     * @param sceneId
+     * @return
+     */
+    List<EquipmentSpecificIndex> getEquipLatestStatusBySceneId(String sceneId);
 
     List<String> getEquipmentIotCodeLists();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -99,14 +99,19 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      */
     List<AlarmDataVO> getSystemById(Long id);
 
-    IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page, Long sourceId, Long systemId, Integer confirmType, String createDate, String type);
+    IPage<EquipmentAlarmBySystemIdOrSourceIdVO> getEquipmentAlarmBySystemIdOrSourceIdVO(@Param("page")IPage<EquipmentAlarmBySystemIdOrSourceIdVO> page
+    		, @Param("sourceId")Long sourceId
+    		, @Param("systemId")Long systemId
+    		, @Param("confirmType")Integer confirmType
+    		, @Param("createDate")String createDate
+    		, @Param("type")String type);
 
     IPage<EquipTypeImgAmountVO> getColaCategoryAmountList(@Param("page")IPage page, 
     		@Param("hierarchy")int hierarchy,
     		@Param("codeHead")String codeHead, 
     		@Param("equipTypeAmountPage")EquipTypeAmountPageDTO equipTypeAmountPage);
 
-    List<FireFightingSystem> getFireFightingSystemDetail(FireFightingSystemVo fireFightingSystemVo);
+    List<FireFightingSystem> getFireFightingSystemDetail(@Param("fireFightingSystemVo")FireFightingSystemVo fireFightingSystemVo);
 
     List<FireFightingSystemEntity> getFightingSysByCodes(@Param("ids") String[] idsArr);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/remote/RemoteSecurityService.java

@@ -276,6 +276,7 @@ public class RemoteSecurityService {
         dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
         FeignClientResult feignClientResult = new FeignClientResult();
         RequestContext.setProduct(productApp);
+        RequestContext.setAppKey(appKeyApp);
         feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
         Map map = (Map) feignClientResult.getResult();
         if (map != null) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IRiskSourceSceneService.java

@@ -130,7 +130,7 @@ public interface IRiskSourceSceneService extends IService <RiskSourceScene> {
     List<PointTreeVo>  getSystemmeanLsit();
 
 
-    List<Map> getstatus();
+    List<Map> getstatus(String sceneId);
 	    /**
      * 分页查询部件
      * @param page 分页对象

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java

@@ -43,6 +43,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.util.StringUtil;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -238,8 +239,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
 
     // redi缓存选择的用户信息
     private String buildKey(String userId, String token) {
-
-        return "region_" + userId + "_" + token;
+        return RedisKey.buildReginKey(userId, token);
 
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -249,7 +249,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
             JSONObject jsonObject = unitMap.getJSONObject("map");
             confirmAlamVo.setUnitInvolvedId(equipmentSpecific.getAgencyId());
             confirmAlamVo.setUnitInvolvedName(unitMap.getString("bizOrgName"));
-            confirmAlamVo.setAddress(ent.getAlarmPlace());
+            confirmAlamVo.setAddress(jsonObject.getString("companyLocation"));
             confirmAlamVo.setLongitude(jsonObject.getDouble("longitude"));
             confirmAlamVo.setLatitude(jsonObject.getDouble("latitude"));
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
-import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
+import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
+import com.yeejoin.equipmanage.common.entity.Video;
 import com.yeejoin.equipmanage.common.entity.dto.AlarmDTO;
 import com.yeejoin.equipmanage.common.entity.dto.EquipSpecificAlarmDTO;
 import com.yeejoin.equipmanage.common.entity.vo.VideoVO;
@@ -21,27 +47,16 @@ import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
 import com.yeejoin.equipmanage.common.vo.AlarmEquipMockDataVO;
 import com.yeejoin.equipmanage.common.vo.AlarmListDataVO;
 import com.yeejoin.equipmanage.common.vo.EquipmentAlarmDownloadVO;
-import com.yeejoin.equipmanage.mapper.*;
+import com.yeejoin.equipmanage.mapper.ConfirmAlarmMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmLogMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificAlarmMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
+import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificIndexSerivce;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificSerivce;
 import com.yeejoin.equipmanage.service.IVideoService;
-import com.yeejoin.equipmanage.utils.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import javax.servlet.http.HttpServletResponse;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
 
 /**
  * @author DELL
@@ -89,11 +104,11 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
             throw new RuntimeException("导出数据列表无数据！");
         }
         ExcelUtil.createTemplate(response, "设备告警信息", "设备告警信息", equipmentDownloads, EquipmentAlarmDownloadVO.class, null,
-                null, null, false);
+        		false);
+       
     }
 
     public List<EquipmentAlarmDownloadVO> handleExportData(List<Long> ids, List<HashMap<String, Object>> list) {
-        SimpleDateFormat sdf = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
         List<EquipmentAlarmDownloadVO> equipmentDownloads = new ArrayList<>();
         if (!ObjectUtils.isEmpty(ids) && 0 < ids.size()) {
             if (0 < list.size()) {
@@ -109,13 +124,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                             alarmDownloadVO.setEquipCode(StringUtil.isNotEmpty(alarm.get("fireEquipmentCode")) ? alarm.get("fireEquipmentCode").toString() : "");
                             alarmDownloadVO.setAlarmPosition(StringUtil.isNotEmpty(alarm.get("warehouseStructureName")) ? alarm.get("warehouseStructureName").toString() : "");
                             alarmDownloadVO.setProtectObj(StringUtil.isNotEmpty(alarm.get("equipmentName")) ? alarm.get("equipmentName").toString() : "");
-                            alarmDownloadVO.setAlarmTime(sdf.format(alarm.get("createDate")));
+                            alarmDownloadVO.setAlarmTime(StringUtil.isNotEmpty(alarm.get("createDate")) ? alarm.get("createDate").toString().replace("T", " "):"");
 
                             // 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
                             alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
                             alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
                             alarmDownloadVO.setResolveResult(StringUtil.isNotEmpty(alarm.get("resolveResult")) ? alarm.get("resolveResult").toString() : "");
-                            alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?sdf.format(alarm.get("confirmDate")) : "");
+                            alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?alarm.get("confirmDate").toString().replace("T", " ") : "");
                             alarmDownloadVO.setAlarmReason(StringUtil.isNotEmpty(alarm.get("alarmReason")) ? alarm.get("alarmReason").toString() : "");
                             equipmentDownloads.add(alarmDownloadVO);
                         }
@@ -136,13 +151,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                     alarmDownloadVO.setEquipCode(StringUtil.isNotEmpty(alarm.get("fireEquipmentCode")) ? alarm.get("fireEquipmentCode").toString() : "");
                     alarmDownloadVO.setAlarmPosition(StringUtil.isNotEmpty(alarm.get("warehouseStructureName")) ? alarm.get("warehouseStructureName").toString() : "");
                     alarmDownloadVO.setProtectObj(StringUtil.isNotEmpty(alarm.get("equipmentName")) ? alarm.get("equipmentName").toString() : "");
-                    alarmDownloadVO.setAlarmTime(sdf.format(alarm.get("createDate")));
+                    alarmDownloadVO.setAlarmTime(StringUtil.isNotEmpty(alarm.get("createDate")) ? alarm.get("createDate").toString().replace("T", " "):"");
 
                     // 处理状态、处理类型无业务字段，后期业务功能实现之后需在此处返回相应字段
                     alarmDownloadVO.setHandleStatus(String.valueOf(alarm.get("handleStatus")));
                     alarmDownloadVO.setHandleType(ConfirmAlamEnum.getTypeByCode(String.valueOf(alarm.get("handleType"))));
                     alarmDownloadVO.setResolveResult(StringUtil.isNotEmpty(alarm.get("resolveResult")) ? alarm.get("resolveResult").toString() : "");
-                    alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?sdf.format(alarm.get("confirmDate")) : "");
+                    alarmDownloadVO.setConfirmDate(StringUtil.isNotEmpty(alarm.get("confirmDate")) ?alarm.get("confirmDate").toString().replace("T", " ") : "");
                     alarmDownloadVO.setAlarmReason(StringUtil.isNotEmpty(alarm.get("alarmReason")) ? alarm.get("alarmReason").toString() : "");
                     equipmentDownloads.add(alarmDownloadVO);
                 });
@@ -164,6 +179,11 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
                     x.put("typeCode", type);
                     x.put("type", AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
                 }
+                try {
+					x.put("createDate", DateUtils.dateParse(String.valueOf(x.get("createDate")),DateUtils.DATE_TIME_T_PATTERN));
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
                 x.put("handleType", ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType"))));
                 x.put("fireEquipmentName", x.get("fireEquipmentName"));
             });
@@ -179,9 +199,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         if (mybatisResult.getSize() > 0) {
             mybatisResult.getRecords().forEach(x -> {
                 AlarmListDataVO dataVO = new AlarmListDataVO();
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
                 try {
-                    dataVO.setAlarmTime(simpleDateFormat.parse(String.valueOf(x.get("createDate"))));
+                    dataVO.setAlarmTime(DateUtils.dateParse(String.valueOf(x.get("createDate")),DateUtils.DATE_TIME_T_PATTERN));
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -793,7 +793,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             data = saveIntegrationPageSysData(systemCode);
         } else {
             if (redisUtils.hasKey(systemCode)) {
-                data = JSON.parseObject(redisUtils.get(systemCode).toString());
+                data = JSONObject.parseObject(redisUtils.get(systemCode).toString(),Map.class);
             } else {
                 data = saveIntegrationPageSysData(systemCode);
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MainIotMonitorServiceImpl.java

@@ -27,6 +27,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -602,7 +603,7 @@ public class MainIotMonitorServiceImpl implements IMainIotMonitorSerivce {
 
     // redis缓存选择的用户信息
     private String buildKey(String userId, String token) {
-        return "region_" + userId + "_" + token;
+    	 return RedisKey.buildReginKey(userId, token);
     }
 
     protected AgencyUserModel getUser() {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MonitorViewService.java

@@ -230,8 +230,8 @@ public class MonitorViewService
 	 * @param viewId
 	 * @return
 	 */
-	public Page<VideoListVo> queryVideoPageByViewId(Page<VideoListVo> page, Long viewId,
-			String videoName, String videoCode)
+	public Page<VideoListVo> queryVideoPageByViewId(Page<VideoListVo> page, Long nodeId,
+			String nodeType)
 	{
 		//获取所有行为分析视频
 		List<VideoListVo> videoList = videoService.listByType(VideoTypeEnum.BEHAVIOURAL.getName());
@@ -240,17 +240,27 @@ public class MonitorViewService
 		{
 			videoListVoMap.put(videoListVo.getId(), videoListVo);
 		}
-		//分页获取视图下视频
-		Page<MonitorViewVideoDto> monitorViewVideoDtos = monitorViewVideoService.queryForPage(page, viewId);
-		List<MonitorViewVideoDto> monitorViewVideoDtoList = monitorViewVideoDtos.getRecords();
 		List<VideoListVo> viewVideoList = new ArrayList<>();
-		for (MonitorViewVideoDto monitorViewVideoDto : monitorViewVideoDtoList)
+		long total = 0;
+		if (nodeType.equals("video") && !ValidationUtil.isEmpty(videoListVoMap.get(nodeId)))
 		{
-			viewVideoList.add(videoListVoMap.get(monitorViewVideoDto.getVideoId()));
-		}
+			viewVideoList.add(videoListVoMap.get(nodeId));
+			total = 1;
+		}else 
+			if (nodeType.equals("view")) 
+			{
+				//分页获取视图下视频
+				Page<MonitorViewVideoDto> monitorViewVideoDtos = monitorViewVideoService.queryForPage(page, nodeId);
+				List<MonitorViewVideoDto> monitorViewVideoDtoList = monitorViewVideoDtos.getRecords();
+				for (MonitorViewVideoDto monitorViewVideoDto : monitorViewVideoDtoList)
+				{
+					viewVideoList.add(videoListVoMap.get(monitorViewVideoDto.getVideoId()));
+				}
+				total = monitorViewVideoDtos.getTotal();
+			}
 		
 		page.setRecords(viewVideoList);
-		page.setTotal(monitorViewVideoDtos.getTotal());
+		page.setTotal(total);
 		return page;
 	}
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -301,21 +301,22 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                         BeanUtils.copyProperties(equipmentSpecificIndex, equipmentSpeIndex);
                         String value = iotDataVO.getValue().toString();
                         equipmentSpeIndex.setValue(value);
-                        
+                        equipmentSpecificIndex.setValue(value);
                         String enumStr = equipmentSpecificIndex.getValueEnum();
-        				if (!ObjectUtils.isEmpty(enumStr)) {
-        					try {
-        						JSONArray jsonArray = JSONArray.parseArray(enumStr);
-        						for (int i = 0; i < jsonArray.size(); i++) {
-        							JSONObject jsonObject = jsonArray.getJSONObject(i);
-        							if (jsonObject.get("key").equals(equipmentSpecificIndex.getValue())) {
-        								equipmentSpeIndex.setValueLabel(jsonObject.getString("label"));
-        							}
-        						}
-        					} catch (Exception e) {
-
-        					}
-        				} 
+                        if (!ObjectUtils.isEmpty(enumStr)) {
+                          try {
+                            JSONArray jsonArray = JSONArray.parseArray(enumStr);
+                            for (int i = 0; i < jsonArray.size(); i++) {
+                              JSONObject jsonObject = jsonArray.getJSONObject(i);
+                              if (jsonObject.get("key").equals(value)) {
+                                equipmentSpeIndex.setValueLabel(jsonObject.getString("label"));
+                                equipmentSpecificIndex.setValueLabel(jsonObject.getString("label"));
+                              }
+                            }
+                          } catch (Exception e) {
+
+                          }
+                        }
                         
                         
                         equipmentSpecificIndexList.add(equipmentSpeIndex);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/QREquipmentDefServiceImpl.java

@@ -19,6 +19,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -506,8 +507,7 @@ public class QREquipmentDefServiceImpl implements IQRCodeService<ScanResult<QREq
 
     // redi缓存选择的用户信息
     private String buildKey(String userId, String token) {
-
-        return "region_" + userId + "_" + token;
+    	 return RedisKey.buildReginKey(userId, token);
 
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/QREquipmentKnowledgeServiceImpl.java

@@ -20,6 +20,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -1242,8 +1243,6 @@ public class QREquipmentKnowledgeServiceImpl implements IQRCodeService<ScanResul
 
 	// redi缓存选择的用户信息
 	private String buildKey(String userId, String token) {
-
-		return "region_" + userId + "_" + token;
-
+		 return RedisKey.buildReginKey(userId, token);
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/RiskSourceSceneServiceImpl.java

 package com.yeejoin.equipmanage.service.impl;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.TreeBuilder;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -13,18 +36,23 @@ import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.morphic.Morphic;
 import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-import com.yeejoin.equipmanage.common.entity.*;
+import com.yeejoin.equipmanage.common.entity.Equipment;
+import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
+import com.yeejoin.equipmanage.common.entity.EquipmentSpecificIndex;
+import com.yeejoin.equipmanage.common.entity.RiskSourceScene;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 import com.yeejoin.equipmanage.common.entity.publics.CommonResponse;
-import com.yeejoin.equipmanage.common.entity.vo.*;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
+import com.yeejoin.equipmanage.common.entity.vo.PageSecurityVideoVO;
+import com.yeejoin.equipmanage.common.entity.vo.PersonVo;
+import com.yeejoin.equipmanage.common.entity.vo.PointTreeVo;
+import com.yeejoin.equipmanage.common.entity.vo.RiskSourceTreeVO;
 import com.yeejoin.equipmanage.common.enums.EquipmentRiskTypeEnum;
-import com.yeejoin.equipmanage.common.enums.EquipmentStateEnum;
 import com.yeejoin.equipmanage.common.enums.TrueOrFalseEnum;
 import com.yeejoin.equipmanage.common.exception.CommonException;
 import com.yeejoin.equipmanage.common.exception.errorEnum.CommonErrorEnum;
 import com.yeejoin.equipmanage.common.response.RiskSourceTreeResponse;
 import com.yeejoin.equipmanage.common.utils.EquipmentStateUtil;
-import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.utils.TreeUtil;
 import com.yeejoin.equipmanage.mapper.BuildingMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
@@ -36,20 +64,6 @@ import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
 import com.yeejoin.equipmanage.service.IEquipmentDetailService;
 import com.yeejoin.equipmanage.service.IEquipmentService;
 import com.yeejoin.equipmanage.service.IRiskSourceSceneService;
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.utils.TreeBuilder;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author DELL
@@ -320,28 +334,17 @@ public class RiskSourceSceneServiceImpl extends ServiceImpl<RiskSourceSceneMappe
     public List<PointTreeVo> getSystemmeanLsit() {
         return equipmentSpecificMapper.getSystemmeanLsit();
     }
-
+    
     @Override
-    public List<Map> getstatus() {
-       /* List<Map> data = new ArrayList<>();
-        QueryWrapper<EquipmentSpecific> q = new QueryWrapper<>();
-        q.ne("iot_code", "");
-        List<EquipmentSpecific> equipmentSpecifics = equipmentSpecificMapper.selectList(q);
-        if (equipmentSpecifics.size() == 0) {
-            return data;
-        }
-        Map<String, String> map = null;
-        for (EquipmentSpecific e : equipmentSpecifics) {
-            map = new HashMap<>();
-            String qrCode = e.getQrCode();
-            String status = getStatusByQrCode(qrCode);
-            map.put("equipCode", qrCode);
-            map.put("status", status);
-            data.add(map);
-        }
-        return data;*/
+    public List<Map> getstatus(String sceneId) {
         List<Map> data = new ArrayList<>();
-        List<EquipmentSpecificIndex> equipIndexLatestStatus = equipmentSpecificMapper.getEquipIndexLatestStatus();
+        List<EquipmentSpecificIndex> equipIndexLatestStatus = new ArrayList<>();
+        if(ObjectUtils.isEmpty(sceneId)){
+        	equipIndexLatestStatus = equipmentSpecificMapper.getEquipIndexLatestStatus();
+        }else{
+        	equipIndexLatestStatus = equipmentSpecificMapper.getEquipLatestStatusBySceneId(sceneId);
+        }
+         
         equipIndexLatestStatus.forEach(action->{
         	 Map<String, String> map = new HashMap<>();
         	 map.put("equipCode", action.getQrCode());

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockBillDetailServiceImpl.java

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -130,9 +131,7 @@ public class StockBillDetailServiceImpl extends ServiceImpl<StockBillDetailMappe
     }
     // redi缓存选择的用户信息
     private String buildKey(String userId, String token) {
-
-        return "region_" + userId + "_" + token;
-
+    	 return RedisKey.buildReginKey(userId, token);
     }
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/core/framework/FasApplicationConfig.java

 package com.yeejoin.amos.fas.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.fas.business.constants.FasConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.io.File;
 
-import com.yeejoin.amos.fas.business.constants.FasConstant;;
+;
 
 @Configuration
-public class FasApplicationConfig extends WebMvcConfigurerAdapter{
+public class FasApplicationConfig implements WebMvcConfigurer {
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +28,5 @@ public class FasApplicationConfig extends WebMvcConfigurerAdapter{
     	}    	
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+FasConstant.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

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

@@ -140,12 +140,25 @@ public class AircraftController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
+    @GetMapping(value = "findOne/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个航空器信息", notes = "根据sequenceNbr查询单个航空器信息")
     public ResponseModel<AircraftDto> seleteOne(@PathVariable Long sequenceNbr) {
         return ResponseHelper.buildResponse(aircraftServiceImpl.queryByAircraftSeq(RequestContext.getAgencyCode(),
                 sequenceNbr));
     }
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "查询航空器详情信息", notes = "查询航空器详情信息")
+    public ResponseModel<AircraftDto> queryBySeq(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(aircraftServiceImpl.queryBySeq(RequestContext.getAgencyCode(),
+                sequenceNbr));
+    }
 
     /**
      * 列表分页查询

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

@@ -3,19 +3,14 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Controller;
-import com.yeejoin.amos.boot.module.jcs.api.entity.ControllerLog;
 import com.yeejoin.amos.boot.module.jcs.api.enums.ControllerGroupEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.ControllerTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ControllerEquipServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ControllerLogServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ControllerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -41,7 +36,7 @@ public class ControllerController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "更新联动控制器状态", notes = "更新联动控制器状态")
     @PostMapping(value = "/updateControllerState")
-    public ResponseModel<Object> updateControllerState(@RequestBody Controller[] controllers) {
+    public ResponseModel<Object> updateControllerState(@RequestBody ControllerDto[] controllers) {
         return ResponseHelper.buildResponse(controllerServiceImpl.changeControllerState(controllers));
     }
 
@@ -66,6 +61,7 @@ public class ControllerController extends BaseController {
                     BeanUtils.copyProperties(controller, controllerDto);
                     controllerDto.setTypeEnum(anEnum);
                     controllerDto.setTypeDescription(anEnum.getName());
+                    controllerDto.setState("0");
                     controllerDtos.add(controllerDto);
                 }
             });

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerEquipDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.ControllerEquip;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ControllerEquipServiceImpl;
 import io.swagger.annotations.Api;

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

@@ -9,10 +9,12 @@ import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataSourcesImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ExcelServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
@@ -168,9 +170,12 @@ public class ExcelController extends BaseController {
 	@ApiOperation(value = "导出值班模板", notes = "导出值班模板")
 	@PostMapping (value = "/duty_template")
 	public void dutyCarTemplate(HttpServletResponse response, @RequestParam("beginDate") String beginDate,
-			@RequestParam("endDate") String endDate, ExcelDto excelDto, @RequestParam("ids") String ids) {
+			@RequestParam("endDate") String endDate, ExcelDto excelDto, @RequestBody String ids) {
 		try {
-			excelService.dutyTemplateExport(response, beginDate, endDate, excelDto, ids);
+			if(org.apache.commons.lang3.StringUtils.isNotEmpty(ids)) {
+				ids = ids.substring(1,ids.length()-1);
+				excelService.dutyTemplateExport(response, beginDate, endDate, excelDto, ids);
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			throw new RuntimeException("系统异常！");

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

@@ -98,19 +98,19 @@ public class VoiceRecordFileController extends BaseController {
 		page.setSize(pageSize);
 		String sortParam = "";
 		String sortRule = "";
-//		if(sort!=null) {  // 排序失效
-//			String[] date=  sort.split(",");
-//			if(date[1].equals("ascend")) {
-//				sortParam = RedisKey.humpToLine(date[0]);
-//				sortRule = "asc";
-//			}else {
-//				sortParam =RedisKey.humpToLine(date[0]);
-//				sortRule = "desc";
-//			}
-//		}else {
-//			sortParam = "tel_start_time";
-//			sortRule = "desc";
-//		}
+		if(sort!=null) {  // 排序失效
+			String[] date=  sort.split(",");
+			if(date[1].equals("ascend")) {
+				sortParam = RedisKey.humpToLine(date[0]);
+				sortRule = "asc";
+			}else {
+				sortParam =RedisKey.humpToLine(date[0]);
+				sortRule = "desc";
+			}
+		}else {
+			sortParam = "tel_start_time";
+			sortRule = "desc";
+		}
 		Page<VoiceRecordFileDto> pageBean = voiceRecordFileService.queryRecordListByQueryDto(page,
 				model.getTelStartTimeStr(),model.getTelEndTimeStr(),model.getFileType(),model.getCaller(),
 				model.getCalled(),sortParam,sortRule);

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

@@ -143,7 +143,22 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
         }
         return aircraftDto;
     }
+    public AircraftDto queryBySeq(String agencyCode, Long seq) {
+    	 AircraftDto aircraftDto = this.queryBySeq(seq);
+   
+        FeignClientResult<List<FileInfoModel>> fileInfoModelResult = Systemctl.fileInfoClient.queryByEntity(
+                agencyCode, Aircraft.class.getSimpleName(), String.valueOf(seq));
+        List<FileInfoModel> fileInfoModels = fileInfoModelResult.getResult();
 
+        if (!ValidationUtil.isEmpty(fileInfoModels)) {
+            aircraftDto.setAppearanceImages(processToStr(fileInfoModels, AircraftFileTypeEnum.APPEARANCE.getCode()));
+            aircraftDto.setPlaneImages(processToStr(fileInfoModels, AircraftFileTypeEnum.PLANE.getCode()));
+            aircraftDto.setRescueImages(processToStr(fileInfoModels, AircraftFileTypeEnum.RESCUE.getCode()));
+            aircraftDto.setPositionImages(processToStr(fileInfoModels, AircraftFileTypeEnum.POSITION.getCode()));
+            aircraftDto.setModels(processToStr(fileInfoModels, AircraftFileTypeEnum.MODEL.getCode()));
+        }
+        return aircraftDto;
+    }
 
     /**
      * <pre>

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

@@ -9,7 +9,6 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -28,6 +27,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -43,8 +43,10 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.JcsControlServerClient;
 import com.yeejoin.amos.boot.module.common.api.feign.KnowledgebaseFeignClient;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
@@ -121,6 +123,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 
 	@Autowired
 	private EmqKeeper emqKeeper;
+
+	@Autowired
+	ESOrgUsrService eSOrgUsrService;
 	
 	@Value("${mqtt.topic.command.alert.notice}")
 	private String topic;
@@ -424,6 +429,17 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				 * 同步保存ES
 				 */
 				eSAlertCalledService.saveAlertCalledToES(alertCalled);
+
+				// 事发单位保存进ES
+
+				if(!ValidationUtil.isEmpty(alertCalled.getUnitInvolved())) {
+					OrgUsr orgUsr = new OrgUsr();
+					orgUsr.setSequenceNbr(-1L);
+					orgUsr.setBizOrgName(alertCalled.getUnitInvolved());
+					eSOrgUsrService.saveAlertCalledToESNew(orgUsr);
+				}
+
+
 			}
 		//	toSendCompletePoliceSituationMatch(alertCalled.getSequenceNbr());
 			return alertCalledObjsDto;
@@ -599,7 +615,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 			/*
 			 * if(null == valueCode) { valueCode = alertFormValue.getFieldValue(); }
 			 */
-			listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+			if("flightNumber".equals(alertFormValue.getFieldCode()) || "aircraftModel".equals(alertFormValue.getFieldCode())) {
+				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), alertFormValue.getFieldValueCode()));
+			} else  {
+				listdate.add(new KeyValueLabel(alertFormValue.getFieldName(), alertFormValue.getFieldCode(), valueCode));
+			}
 		});
 		map.put("data", listdate);
 
@@ -1002,6 +1022,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		AlertCalledFormDto dto = (AlertCalledFormDto) selectAlertCalledByIdNoRedis(id);
 		AlertCalled alertCalled = dto.getAlertCalled();
 		List<FormValue> list = dto.getDynamicFormAlert();
+		if(ObjectUtils.isEmpty(alertCalled) ) {
+			return null;
+		}
 		if (alertCalled.getAlertTypeCode().equals(AlertStageEnums.YBHZ.getCode())) {// 一般火灾
 			String condition1 = alertCalled.getAlertType();// 一般火灾
 			String condition2 = alertCalled.getUnitInvolved();// 事发单位

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

@@ -485,7 +485,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             smsParams.put("feedback", calledRo.getFeedback());
         }
         // 短信报送对象
-        alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
+     //   alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
         // 发送任务消息
         // 组织短信内容
         // 调用短信发送接口
@@ -1426,7 +1426,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                                 alertSubmittedObjectSub.setUserPhone(map.get("mobilePhone").toString());
                             }
                             alertSubmittedObjectListSub.add(alertSubmittedObjectSub);
-                            alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectListSub);
+                          //  alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectListSub);
                             // 调用短信发送接口
                             alertCalledAction.sendAlertCalleCmd(sCode, mobile, smsParams);
                             Map<String, String> besidesMap = new HashMap<String, String>();
@@ -1453,7 +1453,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 });
                 smsParams.put("resourcesNum", resourcesNumStr.substring(resourcesNumStr.length() - 2));
                 // 短信报送对象
-                alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
+                // alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
                 // 发送任务消息
                 // 组织短信内容
                 // 调用短信发送接口
@@ -1566,7 +1566,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 });
                 smsParams.put("resourcesNum", companyName);
                 // 短信报送对象
-                alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
+              //  alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
                 // 发送任务消息
                 // 组织短信内容
                 // 调用短信发送接口
@@ -1686,7 +1686,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 });
                 smsParams.put("resourcesNum", companyName);
                 // 短信报送对象
-                alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
+              //  alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
                 // 发送任务消息
                 // 组织短信内容
                 // 调用短信发送接口
@@ -1724,7 +1724,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         pushMessageWebAndAppRo.setMsgType(this.msgType);
         pushMessageWebAndAppRo.setTerminal(RuleConstant.APP_WEB);
         Map<String,String> map= new HashMap<String,String>();
-        map.put("url", "disasterPage");
+        //map.put("url", "disasterPage");
         map.put("sequenceNbr", besidesMap.get("alterId"));
 
         if(AlertBusinessTypeEnum.警情结案.getCode().equals(type)) {
@@ -1751,7 +1751,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             pushMessageWebAndAppRo.setRuleType("followReportAlert");
         }
         if(AlertBusinessTypeEnum.力量调派.getCode().equals(type)) {
-            map.put("url", "powerInformationPage");
+            //map.put("url", "powerInformationPage");
             pushMessageWebAndAppRo.setName(AlertBusinessTypeEnum.力量调派.getName());
             pushMessageWebAndAppRo.setCompanyName(smsParams.get("resourcesNum"));
             pushMessageWebAndAppRo.setAddress(smsParams.get("address"));

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.boot.module.common.api.feign.JcsControlServerClient;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerEquipDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Controller;
+import com.yeejoin.amos.boot.module.jcs.api.entity.ControllerEquip;
+import com.yeejoin.amos.boot.module.jcs.api.entity.ControllerLog;
+import com.yeejoin.amos.boot.module.jcs.api.mapper.ControllerEquipMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IControllerEquipService;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.ControllerEquipDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.ControllerEquip;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.ControllerEquipMapper;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <pre>
@@ -26,10 +32,17 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.ControllerEquipMapper;
  */
 @Service
 public class ControllerEquipServiceImpl extends BaseService<ControllerEquipDto, ControllerEquip, ControllerEquipMapper> implements IControllerEquipService {
+    public static final String CONTROLLER_STATE_CHANGED_TOPIC = "controllerStateChanged";
 
     @Autowired
     JcsControlServerClient jcsControlServerClient;
 
+    @Autowired
+    ControllerLogServiceImpl controllerLogServiceImpl;
+
+    @Autowired
+    private EmqKeeper emqKeeper;
+
     public List<ControllerEquipDto> queryAllForList() {
         return this.queryForList("", false);
     }
@@ -38,8 +51,10 @@ public class ControllerEquipServiceImpl extends BaseService<ControllerEquipDto,
      * 改变警铃状态 0关闭，1开启
      */
     @Async
-    public void changeBell(Controller controller, String type) {
+    public void changeBell(ControllerDto controller, String type) {
         if (controller == null) return;
+        controller.setState(type);
+        saveLog(controller);
         List<ControllerEquip> list = getControllerEquips(controller);
         list.forEach(controllerEquip -> jcsControlServerClient.sendBellAction(controllerEquip.getNum(), type));
     }
@@ -48,8 +63,10 @@ public class ControllerEquipServiceImpl extends BaseService<ControllerEquipDto,
      * 改变广播状态 0关闭，1开启
      */
     @Async
-    public void changeBroadcast(Controller controller, String type) {
+    public void changeBroadcast(ControllerDto controller, String type) {
         if (controller == null) return;
+        controller.setState(type);
+        saveLog(controller);
         List<ControllerEquip> list = getControllerEquips(controller);
         list.forEach(controllerEquip -> jcsControlServerClient.sendFileAction(controllerEquip.getNum(), ""));
     }
@@ -58,14 +75,35 @@ public class ControllerEquipServiceImpl extends BaseService<ControllerEquipDto,
      * 改变车库门状态 0关闭，1开启
      */
     @Async
-    public void changeDoor(Controller controller, String type) {
+    public void changeDoor(ControllerDto controller, String type) {
         if (controller == null) return;
+        controller.setState(type);
+        saveLog(controller);
         List<ControllerEquip> list = getControllerEquips(controller);
         list.forEach(controllerEquip -> jcsControlServerClient.writeStateAction(controller.getIp(), controller.getPort(), Integer.parseInt(controllerEquip.getNum()), type));
     }
 
-    private List<ControllerEquip> getControllerEquips(Controller controller) {
+    private List<ControllerEquip> getControllerEquips(ControllerDto controller) {
         LambdaQueryWrapper<ControllerEquip> wrapper = new LambdaQueryWrapper<ControllerEquip>().eq(ControllerEquip::getControllerSeq, controller.getSequenceNbr());
         return list(wrapper);
     }
+
+    /**
+     * 保存操作日志
+     */
+    private void saveLog(ControllerDto controller) {
+        if (controller == null) return;
+        ControllerLog controllerLog = new ControllerLog();
+        controllerLog.setControllerSeq(controller.getSequenceNbr());
+        controllerLog.setState(controller.getState());
+        controllerLog.setExecuteDate(new Date());
+        controllerLogServiceImpl.save(controllerLog);
+        // 分发状态变更通知
+        try {
+            String value = new ObjectMapper().writeValueAsString(controller);
+            emqKeeper.getMqttClient().publish(CONTROLLER_STATE_CHANGED_TOPIC, value.getBytes(), 2, true);
+        } catch (MqttException | JsonProcessingException e) {
+            e.printStackTrace();
+        }
+    }
 }

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import java.util.*;
+import java.util.function.Function;
+import java.util.function.IntFunction;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -35,17 +38,6 @@ import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyCarServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
-import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferResourceDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ResourceStatisticsDto;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertFeedbackStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.DutyInfoEnum;
 import com.yeejoin.amos.boot.module.jcs.api.enums.FireBrigadeTypeEnum;
@@ -424,8 +416,9 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         List<AlertFormValue> alertFormValue = alertCalledObjsDto.getAlertFormValue();
 
         String responseLevel = "";
-        List<AlertFormValue> list1 =  alertFormValue.stream().filter(formValue -> formValue.getFieldCode().equals("responseLevel") ).collect(Collectors.toList());;
-        if(list1.size() > 0) {
+        List<AlertFormValue> list1 = alertFormValue.stream().filter(formValue -> formValue.getFieldCode().equals("responseLevel")).collect(Collectors.toList());
+        ;
+        if (list1.size() > 0) {
             responseLevel = list1.get(0).getFieldValue();
         }
 
@@ -483,12 +476,17 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                 powerTransferCompanyDto.setPowerTransferCompanyResourcesDtoList(resourcesDtoList);
                 // 更新车辆状态
                 equipFeignService.updateCarStatus(carStatusInfoDtoList);
-
                 // 警情力量调派时，点击【任务派发】后，如果被调派的 力量包含消防车，那么该消防车所在的 大队的警铃、广播自动 启动，消防车所在的车库门自动开启
                 try {
                     List<Controller> controllers = controllerServiceImpl.list(new LambdaQueryWrapper<Controller>().eq(Controller::getFireTeamSeq, powerTransferCompanyDto.getCompanyId()));
                     if (controllers.size() > 0) {
-                        controllerServiceImpl.changeControllerState(controllers.toArray(new Controller[0]));
+                        ControllerDto[] controllerDtos = new ControllerDto[controllers.size()];
+                        for (int i = 0; i < controllers.size(); i++) {
+                            ControllerDto controllerDto = new ControllerDto();
+                            BeanUtils.copyProperties(controllers.get(i), controllerDto);
+                            controllerDtos[i] = controllerDto;
+                        }
+                        controllerServiceImpl.changeControllerState(controllerDtos);
                     }
                 } catch (Exception e) {
                     log.error(e.getMessage());

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/core/framework/PatrolApplicationConfig.java

 package com.yeejoin.amos.latentdanger.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.latentdanger.business.constants.Constants;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.yeejoin.amos.latentdanger.business.constants.Constants;
+import java.io.File;
 
 @Configuration
-public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
+public class PatrolApplicationConfig implements WebMvcConfigurer {
 
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +26,5 @@ public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
     	}
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+ Constants.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/core/framework/PatrolApplicationConfig.java

 package com.yeejoin.amos.maintenance.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.yeejoin.amos.maintenance.business.constants.XJConstant;
+import java.io.File;
 
 @Configuration
-public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
+public class PatrolApplicationConfig implements WebMvcConfigurer {
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +26,5 @@ public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
     	}    	
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+XJConstant.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/core/framework/PatrolApplicationConfig.java

 package com.yeejoin.amos.patrol.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.yeejoin.amos.patrol.business.constants.XJConstant;
+import java.io.File;
 
 @Configuration
-public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
+public class PatrolApplicationConfig implements WebMvcConfigurer {
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +26,5 @@ public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
     	}    	
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+XJConstant.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/feign/MultipartSupportConfig.java

-package com.yeejoin.amos.patrol.feign;
-
-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;
-import org.springframework.web.context.request.RequestContextListener;
-
-/**
- * @Author: xinglei
- * @Description:
- * @Date: 2020/3/30 16:26
- */
-@Configuration
-public class MultipartSupportConfig {
-
-    @Autowired
-    private ObjectFactory<HttpMessageConverters> messageConverters;
-
-    @Bean
-    public Encoder feignFormEncoder() {
-        return new SpringFormEncoder(new SpringEncoder(messageConverters));
-    }
-
-    /**
-     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
-     * @return
-     */
-    @Bean
-    public RequestContextListener requestInterceptor() {
-        return new RequestContextListener();
-    }
-}
+//package com.yeejoin.amos.patrol.feign;
+//
+//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;
+//import org.springframework.web.context.request.RequestContextListener;
+//
+///**
+// * @Author: xinglei
+// * @Description:
+// * @Date: 2020/3/30 16:26
+// */
+//@Configuration
+//public class MultipartSupportConfig {
+//
+//    @Autowired
+//    private ObjectFactory<HttpMessageConverters> messageConverters;
+//
+//    @Bean
+//    public Encoder feignFormEncoder() {
+//        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+//    }
+//
+//    /**
+//     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
+//     * @return
+//     */
+//    @Bean
+//    public RequestContextListener requestInterceptor() {
+//        return new RequestContextListener();
+//    }
+//}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/feign/PushFeign.java

 package com.yeejoin.amos.patrol.feign;
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/core/framework/PatrolApplicationConfig.java

 package com.yeejoin.amos.supervision.core.framework;
 
-import java.io.File;
-
+import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.yeejoin.amos.supervision.business.constants.XJConstant;
+import java.io.File;
 
 @Configuration
-public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
+public class PatrolApplicationConfig implements WebMvcConfigurer {
 	
 	@Value("${windows.img.path}")
 	private String winImgPath;
@@ -27,6 +26,5 @@ public class PatrolApplicationConfig extends WebMvcConfigurerAdapter{
     	}    	
         registry.addResourceHandler("/upload/**").addResourceLocations("file:"+localPath.trim()+XJConstant.UPLOAD_ROOT_PATH + File.separator);
 //        registry.addResourceHandler("/upload/video/**").addResourceLocations("file:G:/upload/video/");
-        super.addResourceHandlers(registry);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/feign/MultipartSupportConfig.java

+/*
 package com.yeejoin.amos.supervision.feign;
 
 import feign.codec.Encoder;
@@ -10,11 +11,13 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.context.request.RequestContextListener;
 
+*/
 /**
  * @Author: xinglei
  * @Description:
  * @Date: 2020/3/30 16:26
- */
+ *//*
+
 @Configuration
 public class MultipartSupportConfig {
 
@@ -26,12 +29,15 @@ public class MultipartSupportConfig {
         return new SpringFormEncoder(new SpringEncoder(messageConverters));
     }
 
-    /**
+    */
+/**
      * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
      * @return
-     */
+     *//*
+
     @Bean
     public RequestContextListener requestInterceptor() {
         return new RequestContextListener();
     }
 }
+*/

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/feign/PushFeign.java

 package com.yeejoin.amos.supervision.feign;
+
+import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
+import com.yeejoin.amos.supervision.business.param.PushMsgParam;
 import com.yeejoin.amos.supervision.business.util.CommonResponse;
+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 com.yeejoin.amos.supervision.business.param.PushMsgParam;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.cloud.openfeign.FeignClient;
 
 
 

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

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderInfoServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderInfoDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 气瓶基本信息
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+@RestController
+@Api(tags = "气瓶基本信息Api")
+@RequestMapping(value = "/cylinder-info")
+public class CylinderInfoController extends BaseController {
+
+    @Autowired
+    CylinderInfoServiceImpl cylinderInfoServiceImpl;
+
+    /**
+     * 新增气瓶基本信息
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增气瓶基本信息", notes = "新增气瓶基本信息")
+	public ResponseModel<CylinderInfoDto> save(@RequestBody CylinderInfoDto model) {
+	    model = cylinderInfoServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新气瓶基本信息", notes = "根据sequenceNbr更新气瓶基本信息")
+	public ResponseModel<CylinderInfoDto> updateBySequenceNbrCylinderInfo(@RequestBody CylinderInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(cylinderInfoServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除气瓶基本信息", notes = "根据sequenceNbr删除气瓶基本信息")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(cylinderInfoServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶基本信息",  notes = "根据sequenceNbr查询单个气瓶基本信息")
+	public ResponseModel<CylinderInfoDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(cylinderInfoServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶基本信息分页查询",  notes = "气瓶基本信息分页查询")
+	public ResponseModel<Page<CylinderInfoDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderInfoDto> page = new Page<CylinderInfoDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderInfoServiceImpl.queryForCylinderInfoPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "气瓶基本信息列表全部数据查询",   notes = "气瓶基本信息列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<CylinderInfoDto>> selectForList() {
+	    return ResponseHelper.buildResponse(cylinderInfoServiceImpl.queryForCylinderInfoList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.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.controller.BaseController;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.CylinderUnitDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.CylinderUnit;
+import com.yeejoin.amos.boot.module.tzs.flc.api.service.ICylinderInfoService;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.CylinderUnitServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 气瓶企业信息
+ *
+ * @author system_generator
+ * @date 2021-12-14
+ */
+@RestController
+@Api(tags = "气瓶企业信息Api")
+@RequestMapping(value = "/cylinder-unit")
+public class CylinderUnitController extends BaseController {
+
+    @Autowired
+    CylinderUnitServiceImpl cylinderUnitServiceImpl;
+
+	@Autowired
+	ICylinderInfoService iCylinderInfoService;
+
+	/**
+	 * 通过regionCode查询气瓶企业
+	 *
+	 * @return 查询结果
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/queryCylinderUnitList", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "通过regionCode查询气瓶企业", notes = "通过regionCode查询气瓶企业")
+	public ResponseModel<List<CylinderUnitDto>> querySpecialEquipmentList(@RequestParam String regionCode){
+		List<CylinderUnit> unitList = cylinderUnitServiceImpl.list(new LambdaQueryWrapper<CylinderUnit>().like(CylinderUnit::getRegionCode,regionCode));
+
+		List<CylinderUnitDto> result = new ArrayList<>();
+		unitList.stream().forEach(t -> {
+			CylinderUnitDto temp = new CylinderUnitDto();
+			BeanUtils.copyProperties(t,temp);
+			if(t.getFillingPermitDate() != null && t.getFillingPermitDate().getTime() < System.currentTimeMillis()) {
+				temp.setOutOfDate(true);
+			} else {
+				temp.setOutOfDate(false);
+			}
+			result.add(temp);
+		});
+		return ResponseHelper.buildResponse(result);
+	}
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param id  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getUnitInfo")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个气瓶企业信息",  notes = "根据sequenceNbr查询单个气瓶企业信息")
+	public ResponseModel<CylinderUnitDto> selectOne(@RequestParam Long id) {
+		CylinderUnitDto unit = cylinderUnitServiceImpl.queryBySeq(id);
+		// 查询气瓶数量以及过期数量
+		Map<String, Long> cylinderInfo = iCylinderInfoService.queryNumAndOutOfDateNum(unit.getSequenceNbr());
+		if(cylinderInfo != null) {
+			if(cylinderInfo.get("cylinderNum") != null) {
+				unit.setCylinderNumber(cylinderInfo.get("cylinderNum"));
+			}
+			if(cylinderInfo.get("outOfDateNum") != null) {
+				unit.setCylinderOutOfDate(cylinderInfo.get("outOfDateNum"));
+			}
+		}
+	    return ResponseHelper.buildResponse(unit);
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "气瓶企业信息分页查询",  notes = "气瓶企业信息分页查询")
+	public ResponseModel<Page<CylinderUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<CylinderUnitDto> page = new Page<CylinderUnitDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(cylinderUnitServiceImpl.queryForCylinderUnitPage(page));
+	}
+
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.EquipmentInform;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.EquipmentInformServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.EquipmentInformDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 设备告知单
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+@RestController
+@Api(tags = "设备告知单Api")
+@RequestMapping(value = "/equipment-inform")
+public class EquipmentInformController extends BaseController {
+
+    @Autowired
+    EquipmentInformServiceImpl equipmentInformServiceImpl;
+
+	/**
+	 * 根据regionCode 获取设备告知单单号
+	 * @param regionCode
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getInformCode/{regionCode}")
+	@ApiOperation(httpMethod = "GET",value = "根据regionCode 获取设备告知单单号",  notes = "根据regionCode 获取设备告知单单号")
+	public ResponseModel<String> getInformCode(@PathVariable String regionCode) {
+		// 行政编码 + 年月 + 顺序号
+		String code = regionCode +DateUtils.getDateNowShortNumber();
+		int number = equipmentInformServiceImpl.count(new LambdaQueryWrapper<EquipmentInform>().like(EquipmentInform::getProductCode,code));
+		String numberStr = String.format("%04d", number);
+		code += numberStr;
+		return ResponseHelper.buildResponse(code);
+	}
+
+    /**
+     * 新增设备告知单
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增设备告知单", notes = "新增设备告知单")
+	public ResponseModel<EquipmentInformDto> save(@RequestBody EquipmentInformDto model) {
+	    model = equipmentInformServiceImpl.createEquipmentInform(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新设备告知单", notes = "根据sequenceNbr更新设备告知单")
+	public ResponseModel<EquipmentInformDto> updateBySequenceNbrEquipmentInform(@RequestBody EquipmentInformDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(equipmentInformServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除设备告知单", notes = "根据sequenceNbr删除设备告知单")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(equipmentInformServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个设备告知单",  notes = "根据sequenceNbr查询单个设备告知单")
+	public ResponseModel<EquipmentInformDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(equipmentInformServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "设备告知单分页查询",  notes = "设备告知单分页查询")
+	public ResponseModel<Page<EquipmentInformDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<EquipmentInformDto> page = new Page<EquipmentInformDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(equipmentInformServiceImpl.queryForEquipmentInformPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "设备告知单列表全部数据查询",   notes = "设备告知单列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<EquipmentInformDto>> selectForList() {
+	    return ResponseHelper.buildResponse(equipmentInformServiceImpl.queryForEquipmentInformList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.InformEquipmentServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.InformEquipmentDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 告知申请-设备信息表
+ *
+ * @author system_generator
+ * @date 2021-12-10
+ */
+@RestController
+@Api(tags = "告知申请-设备信息表Api")
+@RequestMapping(value = "/inform-equipment")
+public class InformEquipmentController extends BaseController {
+
+    @Autowired
+    InformEquipmentServiceImpl informEquipmentServiceImpl;
+
+    /**
+     * 新增告知申请-设备信息表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增告知申请-设备信息表", notes = "新增告知申请-设备信息表")
+	public ResponseModel<InformEquipmentDto> save(@RequestBody InformEquipmentDto model) {
+	    model = informEquipmentServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新告知申请-设备信息表", notes = "根据sequenceNbr更新告知申请-设备信息表")
+	public ResponseModel<InformEquipmentDto> updateBySequenceNbrInformEquipment(@RequestBody InformEquipmentDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(informEquipmentServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除告知申请-设备信息表", notes = "根据sequenceNbr删除告知申请-设备信息表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(informEquipmentServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个告知申请-设备信息表",  notes = "根据sequenceNbr查询单个告知申请-设备信息表")
+	public ResponseModel<InformEquipmentDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(informEquipmentServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "告知申请-设备信息表分页查询",  notes = "告知申请-设备信息表分页查询")
+	public ResponseModel<Page<InformEquipmentDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<InformEquipmentDto> page = new Page<InformEquipmentDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(informEquipmentServiceImpl.queryForInformEquipmentPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "告知申请-设备信息表列表全部数据查询",   notes = "告知申请-设备信息表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<InformEquipmentDto>> selectForList() {
+	    return ResponseHelper.buildResponse(informEquipmentServiceImpl.queryForInformEquipmentList());
+	}
+}

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

 package com.yeejoin.amos.boot.module.tzs.flc.biz.controller;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -447,6 +448,28 @@ public class UnitInfoController extends BaseController {
 	}
 
 
+	/**
+	 * 获取检验机构列表
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getInspectionUnit")
+	@ApiOperation(httpMethod = "GET", value = "获取检验机构列表", notes = "获取检验机构列表")
+	public ResponseModel<List<UnitInfoDto>> getInspectionUnit() {
+		List<UnitInfoDto> result = unitInfoServiceImpl.getInspectionUnit();
+		return ResponseHelper.buildResponse(result);
+	}
+
+	/**
+	 * 获取使用单位列表
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getUseUnit")
+	@ApiOperation(httpMethod = "GET", value = "获取使用单位列表", notes = "获取使用单位列表")
+	public ResponseModel<List<UnitInfoDto>> getUseUnit() {
+		List<UnitInfoDto> result = unitInfoServiceImpl.getUseUnit();
+		return ResponseHelper.buildResponse(result);
+	}
+
 
 
 }

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

@@ -45,6 +45,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -189,7 +190,7 @@ public class UnitPersonController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/listMyUnitPerson")
-	@ApiOperation(httpMethod = "GET",value = "根据当前登录人获取人员信息 带分页搜索",  notes = "根据当前登录人获取人员信息 带分页搜索")
+	@ApiOperation(httpMethod = "GET",value = "企业端-根据当前登录人获取人员信息 带分页搜索",  notes = "企业端-根据当前登录人获取人员信息 带分页搜索")
 	public ResponseModel<Object> listMyUnitPerson(@RequestParam(required = false) Map<String, Object> requestBody)  {
 		List<Long> unitIds = getMyUnitList();
 		List<Long> parentIds = new ArrayList<>();
@@ -205,6 +206,28 @@ public class UnitPersonController extends BaseController {
 		return ResponseHelper.buildResponse(iUnitPersonService.pagePerson(parentIds,requestBody.get("pageNum").toString(),requestBody.get("pageSize").toString(), requestBody));
 	}
 
+	/**
+	 * 企业端-根据当前登录人获取人员信息不分页
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/listMyUnitPersonAll")
+	@ApiOperation(httpMethod = "GET",value = "企业端-根据当前登录人获取人员信息不分页",  notes = "企业端-据当前登录人获取人员信息不分页")
+	public ResponseModel<Object> listMyUnitPerson()  {
+		List<Long> unitIds = getMyUnitList();
+		List<Long> parentIds = new ArrayList<>();
+		unitIds.stream().forEach( id-> {
+			OrgUsr unit = iOrgUsrService.getOne(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getAmosOrgId,id));
+			if(unit != null) {
+				parentIds.add(unit.getSequenceNbr());
+			}
+		});
+		if(parentIds.size() == 0) {
+			parentIds.add(-1l);
+		}
+		return ResponseHelper.buildResponse(iUnitPersonService.pagePerson(parentIds,"1",Integer.MAX_VALUE+"", new HashMap<String, Object>()));
+	}
+
 
 	/**
 	 * 获取本单位拥有的角色信息