删除无用引用，修改动态表单默认值，添加危化品

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

@@ -8,17 +8,11 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.TransactionSystemException;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.ConstraintViolationException;
-import java.util.HashMap;
-
 /**
  * 基础控制器
  *

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java

 package com.yeejoin.amos.boot.biz.common.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
 /**
  * 基础DTO
  * @author kinky

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

 package com.yeejoin.amos.boot.biz.common.utils;
 
-import java.util.Map;
-import java.util.HashMap;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * Created by magintursh on 2017-06-26.

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

 package com.yeejoin.amos.boot.biz.common.utils;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-import org.apache.commons.lang.StringUtils;
-
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.FileOutConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.ITypeConvert;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.TemplateConfig;
+import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
 import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
 
 /**
  * @author DELL

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+* 危化品
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FireChemicalDto", description="危化品")
+public class FireChemicalDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+
+    @ApiModelProperty(value = "casNo")
+    private String casNo;
+
+    @ApiModelProperty(value = "国际危险号")
+    private String dangerId;
+
+    @ApiModelProperty(value = "防护处理")
+    private String defendWay;
+
+    @ApiModelProperty(value = "处理措施")
+    private String dispose;
+
+    @ApiModelProperty(value = "英文名")
+    private String englishName;
+
+    @ApiModelProperty(value = "分子式")
+    private String formula;
+
+    @ApiModelProperty(value = "主要成分")
+    private String ingredient;
+
+    @ApiModelProperty(value = "泄漏处理")
+    private String leakWay;
+
+    @ApiModelProperty(value = "中文名")
+    private String name;
+
+    @ApiModelProperty(value = "性状")
+    private String property;
+
+    @ApiModelProperty(value = "贮藏方法")
+    private String store;
+
+    @ApiModelProperty(value = "症状")
+    private String symptom;
+
+    @ApiModelProperty(value = "禁忌物/禁忌")
+    private String tabu;
+
+    @ApiModelProperty(value = "类型code")
+    private String typeCode;
+
+    @ApiModelProperty(value = "类型名称")
+    private String type;
+
+    @ApiModelProperty(value = "国标号")
+    private String un;
+
+    @ApiModelProperty(value = "化学品图片")
+    private String image;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * @author system_generator
  * @date 2021-06-25

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 /**
 * 微型消防站
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireChemical.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+/**
+* 危化品
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_fire_chemical")
+@ApiModel(value="FireChemical对象", description="危化品")
+public class FireChemical extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "casNo")
+    private String casNo;
+
+    @ApiModelProperty(value = "国际危险号")
+    private String dangerId;
+
+    @ApiModelProperty(value = "防护处理")
+    private String defendWay;
+
+    @ApiModelProperty(value = "处理措施")
+    private String dispose;
+
+    @ApiModelProperty(value = "英文名")
+    private String englishName;
+
+    @ApiModelProperty(value = "分子式")
+    private String formula;
+
+    @ApiModelProperty(value = "主要成分")
+    private String ingredient;
+
+    @ApiModelProperty(value = "泄漏处理")
+    private String leakWay;
+
+    @ApiModelProperty(value = "中文名")
+    private String name;
+
+    @ApiModelProperty(value = "性状")
+    private String property;
+
+    @ApiModelProperty(value = "贮藏方法")
+    private String store;
+
+    @ApiModelProperty(value = "症状")
+    private String symptom;
+
+    @ApiModelProperty(value = "禁忌物/禁忌")
+    private String tabu;
+
+    @ApiModelProperty(value = "类型code")
+    private String typeCode;
+
+    @ApiModelProperty(value = "类型名称")
+    private String type;
+
+    @ApiModelProperty(value = "国标号")
+    private String un;
+
+    @ApiModelProperty(value = "化学品图片")
+    private String image;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireExperts.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author system_generator
  * @date 2021-06-25

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireStation.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import java.util.Date;
 /**
 * 微型消防站
 *

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

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
+
+/**
+* 危化品 Mapper 接口
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface FireChemicalMapper extends BaseMapper<FireChemical> {
+
+}

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
 
 /**
 *  Mapper 接口

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
-
-import java.util.List;
-import java.util.Map;
-
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import java.util.Map;
 
 /**
 * 微型消防站 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireChemicalService.java

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+* 危化品接口类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+public interface IFireChemicalService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireStationService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * 微型消防站接口类

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireChemicalMapper.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.common.api.mapper.FireChemicalMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledRo.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.io.Serializable;
-
 import com.yeejoin.amos.component.rule.Label;
 import com.yeejoin.amos.component.rule.RuleFact;
-
 import lombok.Data;
+
+import java.io.Serializable;
 /**
  * 
  * <pre>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ESAlertCalledDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import java.util.Date;
-
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 
  * <pre>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/ESAlertCalledRequestDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/EquipSpecificDto.java

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormValue.java

@@ -69,4 +69,16 @@ public class AlertFormValue extends BaseEntity {
         this.block = block;
         this.alertTypeCode = alertTypeCode;
     }
+
+    public AlertFormValue(Long alertFormId,  String fieldName, String fieldCode,boolean block, String alertTypeCode,String fieldValue, String fieldValueCode) {
+        this.alertFormId = alertFormId;
+        this.fieldName = fieldName;
+        this.fieldCode = fieldCode;
+        this.block = block;
+        this.alertTypeCode = alertTypeCode;
+        this.fieldValue = fieldValue;
+        this.fieldValueCode = fieldValueCode;
+
+
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/ESAlertCalled.java

 package com.yeejoin.amos.boot.module.jcs.api.entity;
 
-import java.util.Date;
-
+import lombok.Data;
+import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
-import lombok.Data;
-import lombok.experimental.Accessors;
+import java.util.Date;
 
 /**
  * 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/OrgUsr.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
 
+import java.util.List;
+
 /**
 *  Mapper 接口
 *

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

@@ -2,12 +2,11 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Param;
-
 
 /**
 * 机构/部门/人员表 Mapper 接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertSubmittedService.java

@@ -5,7 +5,6 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 /**
 * 警情报送记录 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFireTeamService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamListVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FireTeamVo;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 消防队伍 服务类
  *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersJacketService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import java.util.List;
-
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
 
 /**
 * 消防人员配装记录 服务类

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirefightersService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
 
+import java.util.List;
+import java.util.Map;
+
 /**
 * 消防队员 服务类
 *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IOrgUsrService.java

@@ -3,18 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
-import org.springframework.web.bind.annotation.PathVariable;
-
-
-import javax.servlet.http.HttpServletRequest;
+import com.yeejoin.amos.boot.module.jcs.api.vo.*;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertFormVo.java

@@ -36,13 +36,12 @@ public class AlertFormVo{
 		
 		super();
 	}
-	public AlertFormVo(String key, String label, String type, Items data, AlertFormValue formItemDescr) {
+	public AlertFormVo(String key, String label, String type, Items data) {
 		super();		
 		this.key = key;
 		this.label = label;
 		this.type = type;
 		this.data = data;
-		this.formItemDescr = formItemDescr;
 	}
 
     

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertSubmittedSMSVo.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FormList.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
-import com.yeejoin.amos.boot.module.jcs.api.service.IDataDictionaryService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
-
 @Component
 public class FormList {
 	/**

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonFormVo.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonVo.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import java.io.Serializable;
-import java.util.List;
-
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
 * 机构/部门/人员表
 *

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

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireChemicalServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+
+/**
+* 危化品
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@RestController
+@Api(tags = "危化品Api")
+@RequestMapping(value = "/common/fire-chemical")
+public class FireChemicalController extends BaseController {
+
+    @Autowired
+    FireChemicalServiceImpl fireChemicalServiceImpl;
+
+    /**
+             * 新增危化品
+    * @return
+    */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增危化品", notes = "新增危化品")
+	public ResponseModel<FireChemicalDto> save(@RequestBody FireChemicalDto model)
+	{
+	    model=fireChemicalServiceImpl.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<FireChemicalDto> updateBySequenceNbrFireChemical(@RequestBody FireChemicalDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.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(fireChemicalServiceImpl.removeById(sequenceNbr));
+    }
+    /**
+             * 根据sequenceNbr查询
+    * @param sequenceNbr  主键
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个危化品",  notes = "根据sequenceNbr查询单个危化品")
+	public ResponseModel<FireChemicalDto> seleteOne(@PathVariable Long sequenceNbr)
+	{
+	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryBySeq(sequenceNbr));
+	}
+	/**
+             * 列表分页查询
+    *@param current 当前页
+    *@param current 每页大小
+    * @return
+    */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "危化品分页查询",  notes = "危化品分页查询")
+	public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	{
+	    Page<FireChemicalDto> page=new Page<FireChemicalDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page));
+	}
+	/**
+	*列表全部数据查询
+	*@return
+	*/
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "危化品列表全部数据查询",   notes = "危化品列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<FireChemicalDto>>  selectForList()
+	{
+	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalList());
+	}
+}

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

@@ -2,31 +2,29 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.biz.common.utils.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.utils.BeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
-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.*;
-import java.util.stream.Collectors;
-
-import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-
-
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 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.*;
+import java.util.stream.Collectors;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.common.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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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.common.api.dto.FireStationDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 
 /**

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

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FireChemicalDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FireChemical;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireChemicalMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFireChemicalService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+/**
+* 危化品服务实现类
+*
+* @author system_generator
+* @date 2021-06-29
+*/
+@Service
+public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChemical,FireChemicalMapper> implements IFireChemicalService {
+        /**
+         * 分页查询
+         */
+        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page)   {
+                return this.queryForPage(page, null, false);
+        }
+
+        /**
+         * 列表查询 示例
+         */
+        public List<FireChemicalDto> queryForFireChemicalList()   {
+                return this.queryForList("" , false);
+        }
+}

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
 import com.yeejoin.amos.boot.module.common.api.mapper.FireExpertsMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireExpertsService;
-import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 /**
 * 服务实现类

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireStation;
 import com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
-import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
 import java.util.Map;
 /**

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

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.common.biz.utils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ESAlertCalledService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -46,9 +19,27 @@ import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
-
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.ESAlertCalledService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 警情接警记录

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PathVariable;
-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.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 com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,9 +11,21 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -113,7 +106,7 @@ public class AlertFormController extends BaseController {
      * @return
      */
 
-     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
      @RequestMapping(value = "/form/{code}", method = RequestMethod.GET)
      @ApiOperation(httpMethod = "GET", value = "根据表态类型code查询表单数据项", notes = "根据表态类型code查询表单数据项")
      public ResponseModel<Object> selectFormdItem(HttpServletRequest request, @PathVariable String code){

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,9 +7,16 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormType;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormTypeServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,9 +7,16 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 
 /**

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

@@ -11,26 +11,17 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.TemplateVo;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,9 +7,16 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedObjectServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PathVariable;
-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.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 com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.utils.Menu;
-import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.biz.common.utils.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,9 +7,16 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PathVariable;
-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.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 com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -30,9 +11,21 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-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.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 com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -29,25 +9,26 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
-import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
+import com.yeejoin.amos.boot.module.jcs.api.entity.*;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersListVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersVo;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersServiceImpl;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersThoughtServiceImpl;
-
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,9 +7,16 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,10 +9,23 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersJacketServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 消防人员配装记录

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-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.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 com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -35,9 +17,20 @@ import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsSer
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersWorkexperienceServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PathVariable;
-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.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 com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -30,9 +11,21 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersThoughtServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,9 +7,16 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersWorkexperienceServiceImpl;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 
 
 /**

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertForm;
@@ -23,6 +10,16 @@ import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertListvalue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.Items;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
 * 警情表单 服务实现类
@@ -44,12 +41,20 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 		List<AlertFormVo> listfrom = new ArrayList<AlertFormVo>();
 		// 组装数据
 		for (AlertForm alertFrom : alertFormValue) {
-			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("inputDateTime")||alertFrom.getFieldType().equals("textarea")) {	
-				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null,
-						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode()));
+			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("inputDateTime")||alertFrom.getFieldType().equals("textarea")||alertFrom.getFieldType().equals("inputBitmap")) {
+
+
+				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null);
+				AlertFormValue alertFormValu=	new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode(),null, null);
+
 				if(alertFrom.getFieldType().equals("inputDateTime")) {
-					vo.setDefaultValue(new Date());
+					SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					Date date = new Date();
+					String dateString = formatter.format(date);
+					alertFormValu.setFieldValue(dateString);
+					vo.setDefaultValue(date);
 				}
+				vo.setFormItemDescr(alertFormValu);
 				listfrom.add(vo);				
 			}else {
 				// 查询数据项				
@@ -57,12 +62,20 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 				 queryWrappercolumnMap.eq("type", alertFrom.getFieldValueCode());
 				 queryWrappercolumnMap.orderByAsc("sort_num");
 				Collection<DataDictionary> listDataDictionary = iDataDictionaryService.list(queryWrappercolumnMap);
-				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), 
-				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode()));
-				listfrom.add(vo);				
+				List<AlertListvalue> list=getdata(listDataDictionary);
+				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), new Items(list));
+
+				AlertFormValue alertFormValu=	new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode(),null, null);
+
+				if(alertFrom.getFieldType().equals("radio")){
+					alertFormValu.setFieldValue(list.get(0).getLabel());
+					alertFormValu.setFieldValueCode(list.get(0).getValue());
+				}
+
+				vo.setFormItemDescr(alertFormValu);
+			    listfrom.add(vo);
 			}
 		}
-
 		return listfrom;
 	}
 

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

@@ -18,15 +18,10 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilde
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledRequestDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.entity.ESAlertCalled;
-import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
-import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository;
+import javax.annotation.PostConstruct;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  *

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

@@ -34,17 +34,20 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.jcs.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.*;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 机构/部门/人员表 服务实现类