Skip to content

A
amos-boot-biz
Commit 4ca9028d authored by chenhao's avatar chenhao
Browse files
Options

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

parents 9c09373b 302086bc
Hide whitespace changes
Inline Side-by-side
Showing with 935 additions and 393 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java
View file @ 4ca9028d
......@@ -7,25 +7,28 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 基础DTO
* @author kinky
*
*/
@Data
public class BaseDto implements Serializable{
/**
/**
*
*/
@ExcelIgnore
private static final long serialVersionUID = 1L;
@ExcelIgnore
@ApiModelProperty(value = "主键ID")
protected Long sequenceNbr;
@ExcelIgnore
@ApiModelProperty(value = "更新时间")
protected Date recDate;
@ExcelIgnore
@ApiModelProperty(value = "更新人")
protected String recUserId;
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java
View file @ 4ca9028d
......@@ -19,7 +19,7 @@ public class BaseEntity implements Serializable{
private static final long serialVersionUID = 1L;
@TableId(value = "sequence_nbr" , type = IdType.ID_WORKER)
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
protected Long sequenceNbr;
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
......@@ -28,6 +28,9 @@ public class BaseEntity implements Serializable{
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
protected String recUserId;
@TableField(value = "rec_user_name", fill = FieldFill.INSERT_UPDATE)
protected String recUserName;
/**
* 是否删除
*/
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java
View file @ 4ca9028d
......@@ -635,7 +635,7 @@ public class DateUtils {
int year = calendar.get(Calendar.YEAR);//年份
int day = calendar.getActualMaximum(Calendar.DATE);
for (int i = 1; i <= day; i++) {
String source = year+"-"+month+"-"+i;
String source = year + "-" + month + "-" + i;
list.add(shortSdf.parse(source));
}
} catch (ParseException e) {
......@@ -644,4 +644,23 @@ public class DateUtils {
return list;
}
/**
* 判断一个时间是否在一个时间段内
*
* @param nowTime 当前时间
* @param beginTime 开始时间
* @param endTime 结束时间
*/
public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
Calendar date = Calendar.getInstance();
date.setTime(nowTime);
Calendar begin = Calendar.getInstance();
begin.setTime(beginTime);
Calendar end = Calendar.getInstance();
end.setTime(endTime);
return date.after(begin) && date.before(end);
}
}
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java
View file @ 4ca9028d
......@@ -285,7 +285,8 @@ public class MyBatisPlusCodeGenerator {
// 公共父类-开启将导致swagger无效化
//strategy.setSuperControllerClass("com.test.base.BaseController");
// 写于父类中的公共字段
strategy.setSuperEntityColumns(new String[]{"sequence_nbr", "rec_date", "rec_user_id", "is_delete"});
strategy.setSuperEntityColumns("sequence_nbr", "rec_date", "rec_user_id", "rec_user_name",
"is_delete");
// 建议以后开启
strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
strategy.setControllerMappingHyphenStyle(true);
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java
View file @ 4ca9028d
......@@ -19,14 +19,12 @@ import java.util.Date;
* @author Dell
*/
@Component
public class MetaHandler implements MetaObjectHandler {
public class MetaHandler implements MetaObjectHandler {
@Autowired
private RedisUtils redisUtils;
protected String getToken() {
String authToken = RequestContext.getToken();
// if (authToken == null) {
// authToken = request.getHeader("X-Access-Token");
......@@ -54,7 +52,7 @@ public class MetaHandler implements MetaObjectHandler {
}
AgencyUserModel agencyUserModel = reginParams.getUserModel();
if(ObjectUtils.isEmpty(reginParams)||ObjectUtils.isEmpty(agencyUserModel)){
if(ObjectUtils.isEmpty(reginParams) || ObjectUtils.isEmpty(agencyUserModel)){
return;
}
Object entity = metaObject.getOriginalObject();
......
amos-boot-biz-common/src/main/resources/template/bean.java.ftl
View file @ 4ca9028d
......@@ -9,11 +9,11 @@ import lombok.experimental.Accessors;
import java.util.Date;
/**
* ${table.comment!}
*
* @author ${author}
* @date ${date}
*/
* ${table.comment!}
*
* @author ${author}
* @date ${date}
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
......@@ -29,5 +29,6 @@ public class ${entity} extends BaseEntity {
*/
@TableField("${field.name}")
private ${field.propertyType} ${field.propertyName};
</#list>
}
amos-boot-biz-common/src/main/resources/template/controller.java.ftl
View file @ 4ca9028d
package ${package.Controller};
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
......@@ -22,7 +23,6 @@ import ${package.Xml}.${entity}Dto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* ${table.comment!}
*
......
amos-boot-biz-common/src/main/resources/template/mapper.java.ftl
View file @ 4ca9028d
......@@ -4,11 +4,11 @@ import ${package.Entity}.${entity};
import ${superMapperClassPackage};
/**
* ${table.comment!} Mapper 接口
*
* @author ${author}
* @date ${date}
*/
* ${table.comment!} Mapper 接口
*
* @author ${author}
* @date ${date}
*/
<#if kotlin>
interface ${table.mapperName} : ${superMapperClass}<${entity}>
<#else>
......
amos-boot-biz-common/src/main/resources/template/service.java.ftl
View file @ 4ca9028d
......@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.${package.ModuleName}.api.service;
/**
* ${table.comment!}接口类
*
* @author ${author}
* @date ${date}
*/
* ${table.comment!}接口类
*
* @author ${author}
* @date ${date}
*/
<#if kotlin>
interface ${table.serviceName} : ${superServiceClass}<${entity}>
<#else>
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamZhDto.java
View file @ 4ca9028d
......@@ -36,6 +36,9 @@ public class FireTeamZhDto {
@ApiModelProperty(value = "消防队类型")
private String type;
@ApiModelProperty(value = "队伍类型code")
private String typeCode;
@ApiModelProperty(value = "队伍地址")
private String address;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/LinkageUnitDto.java
View file @ 4ca9028d
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
......@@ -15,10 +16,10 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="LinkageUnitDto", description="联动单位")
public class LinkageUnitDto extends BaseDto {
@ApiModel(value = "LinkageUnitDto", description = "联动单位")
public class LinkageUnitDto extends BaseDto {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "单位名称")
......@@ -78,4 +79,19 @@ public class LinkageUnitDto extends BaseDto {
@ApiModelProperty(value = "操作人名称")
private String recUserName;
@ApiModelProperty(value = "是否在协议期 ")
private String inAgreement;
@ApiModelProperty(value = "消防救援能力")
private String fireRescueCapability;
@ApiModelProperty(value = "职责_简要情况")
private String responsibilitiesSituation;
@ApiModelProperty(value = "应急服务内容")
private String emergencyServiceContent;
@ApiModelProperty(value = "单位_简要情况")
private String unitSituation;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/SourceFileDto.java 0 → 100644
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.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-07-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="SourceFileDto", description="公共附件")
public class SourceFileDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "文件地址")
private String filePath;
@ApiModelProperty(value = "文件名称")
private String fileName;
@ApiModelProperty(value = "文件类型")
private String fileCategory;
@ApiModelProperty(value = "所属者id")
private Long sourceId;
@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/WaterResourceDto.java
View file @ 4ca9028d
......@@ -45,7 +45,7 @@ public class WaterResourceDto extends BaseDto {
private Double latitude;
@ExcelIgnore
@ApiModelProperty(value = "资源类型（消火栓、消防水鹤、天然水源、消防水池）")
@ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）")
private String resourceType;
@ExplicitConstraint(type = "XFSYLX", indexNum = 2, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/Contract.java
View file @ 4ca9028d
......@@ -73,11 +73,6 @@ public class Contract extends BaseEntity {
@TableField("company_id")
private Long companyId;
/**
* 更新人名称
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 单位类型（1维保单位，0联动单位）
*/
@TableField("company_type")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DataDictionary.java
View file @ 4ca9028d
......@@ -36,8 +36,6 @@ public class DataDictionary extends BaseEntity {
@ApiModelProperty(value = "父级")
private Long parent;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
//新加排序字段
@ApiModelProperty(value = "排序字段")
private int sortNum;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DutyPersonShift.java
View file @ 4ca9028d
......@@ -38,11 +38,6 @@ public class DutyPersonShift extends BaseEntity {
*/
@TableField("instance_id")
private Long instanceId;
/**
* 更新人员
*/
@TableField("rec_user_name")
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/DutyShift.java
View file @ 4ca9028d
......@@ -42,11 +42,6 @@ public class DutyShift extends BaseEntity {
@TableField("color")
private String color;
/**
* 更新人员
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 系统标识（数据隔离使用）
*/
@TableField("app_key")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormColumn.java
View file @ 4ca9028d
......@@ -70,11 +70,6 @@ public class DynamicFormColumn extends BaseEntity {
@TableField(value = "column_config", typeHandler = JacksonTypeHandler.class)
private JSONObject columnConfig;
/**
* 操作人名称
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 提示信息
*/
@TableField("remark")
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormGroup.java
View file @ 4ca9028d
......@@ -52,9 +52,4 @@ public class DynamicFormGroup extends BaseEntity {
*/
@TableField("sort")
private Integer sort;
/**
* 操作人名称
*/
@TableField("rec_user_name")
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/DynamicFormInstance.java
View file @ 4ca9028d
......@@ -75,11 +75,6 @@ public class DynamicFormInstance extends BaseEntity {
@TableField("query_strategy")
private String queryStrategy;
/**
* 操作人名称
*/
@TableField("rec_user_name")
private String recUserName;
/**
* 应用标识（数据隔离使用）
*/
@TableField("app_key")
......
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
View file @ 4ca9028d
......@@ -78,8 +78,4 @@ public class FireChemical extends BaseEntity {
@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
View file @ 4ca9028d
......@@ -99,10 +99,6 @@ public class FireExperts extends BaseEntity {
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
@ApiModelProperty(value = "出生日期")
private Date birthdayTime;
}
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
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.api.entity;
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;
......@@ -26,7 +28,6 @@ public class FireStation extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "微型消防站名称")
private String name;
......@@ -84,9 +85,6 @@ public class FireStation extends BaseEntity {
private String img;
@ApiModelProperty(value = "更新时间")
@TableField(fill = FieldFill.UPDATE)
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/FireTeam.java
View file @ 4ca9028d
......@@ -71,15 +71,10 @@ public class FireTeam extends BaseEntity {
@ApiModelProperty(value = "队伍code")
private String typeCode;
@ApiModelProperty(value = "更新时间")
@TableField(fill=FieldFill.UPDATE)
@TableField(fill = FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
private String recUserName;
@ApiModelProperty(value = "树结构层级code")
private String treeCode;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/Firefighters.java
View file @ 4ca9028d
......@@ -117,11 +117,6 @@ public class Firefighters extends BaseEntity {
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
private String recUserName;
@ApiModelProperty(value = "机构名称")
private String companyName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersContacts.java
View file @ 4ca9028d
......@@ -43,9 +43,4 @@ public class FirefightersContacts extends BaseEntity {
@ApiModelProperty(value = "更新时间")
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
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/FirefightersContract.java
View file @ 4ca9028d
......@@ -61,9 +61,4 @@ public class FirefightersContract extends BaseEntity {
@ApiModelProperty(value = "更新时间")
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
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/FirefightersEducation.java
View file @ 4ca9028d
......@@ -50,13 +50,6 @@ public class FirefightersEducation extends BaseEntity {
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
private String recUserName;
@ApiModelProperty(value = "学历资质文件")
@TableField(fill=FieldFill.INSERT_UPDATE)
private String qualifications;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FirefightersJacket.java
View file @ 4ca9028d
......@@ -59,9 +59,4 @@ public class FirefightersJacket extends BaseEntity {
@ApiModelProperty(value = "更新时间")
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
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/FirefightersPost.java
View file @ 4ca9028d
......@@ -86,9 +86,4 @@ public class FirefightersPost extends BaseEntity {
@ApiModelProperty(value = "更新时间")
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
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/FirefightersThought.java
View file @ 4ca9028d
......@@ -28,13 +28,17 @@ public class FirefightersThought extends BaseEntity {
*
*/
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "消防救援人员")
private Long firefightersId;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "谈话时间")
private Date talkingTime;
@ApiModelProperty(value = "谈话人")
private String speaker;
@ApiModelProperty(value = "思想和现实表现情况")
private String thoughtMorality;
......@@ -46,15 +50,8 @@ public class FirefightersThought extends BaseEntity {
@ApiModelProperty(value = "附件")
private String enclosure;
@ApiModelProperty(value = "更新时间")
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
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/FirefightersWorkexperience.java
View file @ 4ca9028d
......@@ -40,9 +40,4 @@ public class FirefightersWorkexperience extends BaseEntity {
@ApiModelProperty(value = "更新时间")
@TableField(fill=FieldFill.UPDATE)
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(fill=FieldFill.INSERT_UPDATE)
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/LinkageUnit.java
View file @ 4ca9028d
......@@ -27,94 +27,106 @@ public class LinkageUnit extends BaseEntity {
*/
@TableField("unit_name")
private String unitName;
/**
* 单位id
*/
@TableField("unit_id")
private String unitId;
/**
* 父级单位id
*/
@TableField("parent_id")
private String parentId;
/**
* 联动单位类别
*/
@TableField("linkage_unit_type")
private String linkageUnitType;
/**
* 联动单位类别code
*/
@TableField("linkage_unit_type_code")
private String linkageUnitTypeCode;
/**
* 行政区划
*/
@TableField("administrative_divisions")
private String administrativeDivisions;
/**
* 行政区划代码
*/
@TableField("administrative_divisions_code")
private String administrativeDivisionsCode;
/**
* 地址
*/
@TableField("address")
private String address;
/**
* 经度
*/
@TableField("longitude")
private Double longitude;
/**
* 纬度
*/
@TableField("latitude")
private Double latitude;
/**
* 协议开始日期
*/
@TableField("agreement_start_date")
private Date agreementStartDate;
/**
* 协议结束日期
*/
@TableField("agreement_end_date")
private Date agreementEndDate;
/**
* 应急联动单位类别
*/
@TableField("emergency_linkage_unit")
private String emergencyLinkageUnit;
/**
* 应急联动单位类别code
*/
@TableField("emergency_linkage_unit_code")
private String emergencyLinkageUnitCode;
/**
* 联系人
*/
@TableField("contact_user")
private String contactUser;
/**
* 联系人电话
*/
@TableField("contact_phone")
private String contactPhone;
/**
* 实例id
*/
@TableField("instance_id")
private Long instanceId;
/**
* 组织机构代码
*/
@TableField("org_code")
private String orgCode;
/**
* 操作人名称
*/
@TableField("rec_user_name")
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/MaintenanceCompany.java
View file @ 4ca9028d
......@@ -27,49 +27,52 @@ public class MaintenanceCompany extends BaseEntity {
*/
@TableField("name")
private String name;
/**
* 单位编码
*/
@TableField("code")
private String code;
/**
* 类型（COMPANY单位，PERSON人员）
*/
@TableField("type")
private String type;
/**
* 上级单位
*/
@TableField("parent_id")
private Long parentId;
/**
* 业务编码
*/
@TableField("biz_code")
private String bizCode;
/**
* 组织机构代码用于权限过滤
*/
@TableField("org_code")
private String orgCode;
/**
* 纬度
*/
@TableField("latitude")
private String latitude;
/**
* 经度
*/
@TableField("longitude")
private String longitude;
/**
* 动态表单实例id
*/
@TableField("instance_id")
private Long instanceId;
/**
* 更新人
*/
@TableField("rec_user_name")
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/OrgUsr.java
View file @ 4ca9028d
......@@ -70,10 +70,4 @@ public class OrgUsr extends BaseEntity {
private String orgExpandAttr7;
private String orgExpandAttr8;
@ApiModelProperty(value = "更新人")
@TableField(fill=FieldFill.INSERT_UPDATE)
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/OrgUsrAuth.java
View file @ 4ca9028d
......@@ -23,8 +23,6 @@ public class OrgUsrAuth extends BaseEntity {
*/
private static final long serialVersionUID = 1L;
private String recUserName;
private String sourceId;
private String sourceCode;
......@@ -32,5 +30,4 @@ public class OrgUsrAuth extends BaseEntity {
private String targetCode;
private String targetId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/SourceFile.java 0 → 100644
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.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;
/**
* 公共附件
*
* @author system_generator
* @date 2021-07-16
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("cb_source_file")
public class SourceFile extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 文件地址
*/
@TableField("file_path")
private String filePath;
/**
* 文件名称
*/
@TableField("file_name")
private String fileName;
/**
* 文件类型
*/
@TableField("file_category")
private String fileCategory;
/**
* 所属者id
*/
@TableField("source_id")
private Long sourceId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/LinkageUnitMapper.java
View file @ 4ca9028d
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.LinkageUnitDto;
import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* 联动单位 Mapper 接口
*
* @author system_generator
* @date 2021-07-16
*/
* 联动单位 Mapper 接口
*
* @author system_generator
* @date 2021-07-16
*/
public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
/**
* 列转行查询单个
*
* @param fieldCodes 列
* @param groupCode 分组code
* @param sequenceNbr 主键
* @return List<Map>
*/
LinkageUnitDto selectOne(
@Param("isDelete") Boolean isDelete,
@Param("fieldCodes") Map<String, Object> fieldCodes,
@Param("groupCode") String groupCode,
@Param("sequenceNbr") Long sequenceNbr
);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/SourceFileMapper.java 0 → 100644
View file @ 4ca9028d
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.SourceFile;
/**
* 公共附件 Mapper 接口
*
* @author system_generator
* @date 2021-07-16
*/
public interface SourceFileMapper extends BaseMapper<SourceFile> {
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
......@@ -34,4 +35,5 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
Integer getWaterResourceListCount(@Param("par")RequestData par);
List<WaterResourceDto> getWaterResourceTypeList();
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/ISourceFileService.java 0 → 100644
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.api.service;
/**
* 公共附件接口类
*
* @author system_generator
* @date 2021-07-16
*/
public interface ISourceFileService {
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireStationMapper.xml
View file @ 4ca9028d
......@@ -9,6 +9,7 @@
a.sequence_nbr sequenceNbr,
a.person_charge_name personChargeName,
a.longitude,
a.name,
a.latitude,
a.person_charge_telephone personChargeTelephone,
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml
View file @ 4ca9028d
......@@ -91,6 +91,7 @@
a.latitude,
a.address,
a.type ,
a.type_code typeCode,
a.name ,
a.contact_user contactUser,
a.contact_phone contactPhone,
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml
View file @ 4ca9028d
<?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.LinkageUnitMapper">
<select id="selectOne" resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
select
d.*,
lu.*
from
(
select
i.INSTANCE_ID instanceId,
i.GROUP_CODE groupCode,
<foreach collection="fieldCodes" item="value" index="key" separator=",">
MAX(CASE WHEN i.FIELD_CODE = #{key} THEN i.FIELD_VALUE END) as ${key}
</foreach>
from
cb_dynamic_form_instance i
where i.GROUP_CODE = #{groupCode}
and is_delete = #{isDelete}
GROUP by
i.INSTANCE_ID ) d,
cb_linkage_unit lu
where
d.instanceId = lu.instance_id
and lu.sequence_nbr = #{sequenceNbr}
and is_delete = #{isDelete}
</select>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/SourceFileMapper.xml 0 → 100644
View file @ 4ca9028d
<?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.SourceFileMapper">
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml
View file @ 4ca9028d
......@@ -17,8 +17,11 @@
r.contact_user,
r.contact_phone,
(case r.resource_type when 'crane' then rc.height when 'natural' then rn.height end) height,
(case r.resource_type when 'crane' then rc.status when 'pool' then rp.status when 'natural' then rn.status end) status,
(case r.resource_type when 'crane' then rc.section when 'pool' then rp.section end) section,
(case r.resource_type
when 'crane' then rc.status
when 'pool' then rp.status
when 'natural' then rn.status end) status,
(case r.resource_type when 'crane' then rc.section when 'pool' then rp.section end) section,
(case r.resource_type when 'crane' then rc.pipe_network when 'hydarant' then rh.pipe_network end) pipe_network,
(case r.resource_type when 'crane' then rc.pipe_type_name when 'hydarant' then rh.pipe_type_name when 'pool' then rp.pipe_type_name end) pipe_type_name,
(case r.resource_type when 'crane' then rc.pipe_diameter when 'hydarant' then rh.pipe_diameter end) pipe_diameter,
......@@ -58,8 +61,6 @@
</select>
<select id="getWaterResourceList" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto">
SELECT
......@@ -76,48 +77,34 @@
a.maintenance_unit maintenanceUnit,
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
FROM cb_water_resource a
where a.is_delete=0 and a.longitude is not null and a.latitude is not null
where a.is_delete=0 and a.longitude is not null and a.latitude is not null
<if test='par.resourceType!=null'>
and a.resource_type= #{par.resourceType}
and a.resource_type= #{par.resourceType}
</if>
<if test='par.distance!=null'>
and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;= #{par.distance}
and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
#{par.distance}
</if>
ORDER BY distance limit #{pageNum},#{pageSize}
ORDER BY distance limit #{pageNum},#{pageSize}
</select>
<select id="getWaterResourceListCount" resultType="Integer">
SELECT
COUNT(a.sequence_nbr) num
FROM cb_water_resource a
where a.is_delete=0 and a.longitude is not null and a.latitude is not null
where a.is_delete=0 and a.longitude is not null and a.latitude is not null
<if test='par.resourceType!=null'>
and a.resource_type= #{par.resourceType}
and a.resource_type= #{par.resourceType}
</if>
<if test='par.distance!=null'>
and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;= #{par.distance}
and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
#{par.distance}
</if>
</select>
<select id="getWaterResourceTypeList" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
select distinct belong_fighting_system_id, belong_fighting_system, resource_type, resource_type_name
from cb_water_resource
</select>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledZhDto.java
View file @ 4ca9028d
......@@ -32,6 +32,8 @@ public class AlertCalledZhDto {
@ApiModelProperty(value = "警情类型")
private String alertType;
@ApiModelProperty(value = "报警类型code")
private String alarmTypeCode;
@ApiModelProperty(value = "事发单位")
private String unitInvolved;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Aircraft.java
View file @ 4ca9028d
......@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -20,7 +20,6 @@ public class Aircraft extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 飞机型号
*/
......@@ -171,10 +170,4 @@ public class Aircraft extends BaseEntity {
*/
@TableField("remark")
private String remark;
/**
* 是否删除
*/
@TableField("is_delete")
private Boolean isDelete;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java
View file @ 4ca9028d
......@@ -101,12 +101,10 @@ public class AlertCalled extends BaseEntity {
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "发送人名称")
private String recUserName;
@ApiModelProperty(value = "接警时间开始---用于列表过滤")
@TableField(exist=false)
private Date callTimeStart ;
@ApiModelProperty(value = "接警时间结束---用于列表过滤")
@TableField(exist=false)
private Date callTimeEnd ;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertForm.java
View file @ 4ca9028d
......@@ -37,17 +37,16 @@ public class AlertForm extends BaseEntity {
@ApiModelProperty(value = "字段类型")
private String fieldType;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
@ApiModelProperty(value = "字段值字典code")
private String fieldValueCode;
@ApiModelProperty(value = "是否一行显示")
private Boolean block;
//新加排序字段
@ApiModelProperty(value = "排序字段")
private int sortNum;
@ApiModelProperty(value = "接口地址")
private String url;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormType.java
View file @ 4ca9028d
......@@ -29,8 +29,4 @@ public class AlertFormType extends BaseEntity {
@ApiModelProperty(value = "类型名称")
private String alertTypeName;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
}
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
View file @ 4ca9028d
......@@ -44,9 +44,6 @@ public class AlertFormValue extends BaseEntity {
@ApiModelProperty(value = "字段值字典code")
private String fieldValueCode;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
@ApiModelProperty(value = "是否一行显示")
private Boolean block;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertSubmitted.java
View file @ 4ca9028d
......@@ -63,9 +63,4 @@ public class AlertSubmitted extends BaseEntity {
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
@TableField(value = "rec_user_name",fill= FieldFill.INSERT_UPDATE )
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertSubmittedObject.java
View file @ 4ca9028d
......@@ -46,9 +46,4 @@ public class AlertSubmittedObject extends BaseEntity {
@ApiModelProperty(value = "人员电话")
private String userPhone;
@ApiModelProperty(value = "操作人名称")
@TableField(value = "rec_user_name",fill= FieldFill.INSERT_UPDATE )
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransfer.java
View file @ 4ca9028d
......@@ -62,9 +62,4 @@ public class PowerTransfer extends BaseEntity {
@ApiModelProperty(value = "车坐标y")
private String carCoordinateY;
@TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value = "操作人名称")
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompany.java
View file @ 4ca9028d
......@@ -40,9 +40,4 @@ public class PowerTransferCompany extends BaseEntity {
@ApiModelProperty(value = "任务信息")
private String taskInformation;
@TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value = "操作人名称")
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java
View file @ 4ca9028d
......@@ -39,9 +39,4 @@ public class PowerTransferCompanyResources extends BaseEntity {
@ApiModelProperty(value = "资源编号（如车牌号）")
private String resourcesNum;
@TableField(value = "REC_USER_NAME", fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value = "操作人名称")
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/ShiftChange.java
View file @ 4ca9028d
......@@ -23,7 +23,6 @@ public class ShiftChange extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 基本信息id（来源动态表单）
*/
......@@ -44,9 +43,4 @@ public class ShiftChange extends BaseEntity {
*/
@TableField("remark")
private String remark;
/**
* 操作人名称
*/
@TableField("rec_user_name")
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/Template.java
View file @ 4ca9028d
......@@ -35,8 +35,4 @@ public class Template extends BaseEntity {
@ApiModelProperty(value = "格式(0--json 1: 富文本)")
private Boolean format;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/feign/EquipFeignClient.java
View file @ 4ca9028d
......@@ -21,7 +21,7 @@ import java.util.Map;
*
* @author Dell
*/
@FeignClient(name = "AMOS-EQUIPMANAGE-KY", path = "equip", configuration = {MultipartSupportConfig.class})
@FeignClient(name = "AMOS-EQUIPMANAGE", path = "equip", configuration = {MultipartSupportConfig.class})
public interface EquipFeignClient {
/**
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ 4ca9028d
......@@ -25,6 +25,7 @@
a.alert_stage alertStage,
a.call_time callTime,
a.alert_type alertType,
a.alarm_type_code alarmTypeCode,
a.unit_involved unitInvolved,
a.trapped_num trappedNum,
a.casualties_num casualtiesNum,
......
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
View file @ 4ca9028d
......@@ -43,9 +43,6 @@ public class CommandController extends BaseController {
IFireTeamService iFireTeamService;
@Autowired
IWaterResourceService iWaterResourceService;
/**
* 警情列表
*
......@@ -81,9 +78,32 @@ public class CommandController extends BaseController {
* @return
*/
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "SY/list")
@GetMapping(value = "SY500/list")
@ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
public ResponseModel<IPage<WaterResourceZhDto>> listPageSY500(Integer pageNum, Integer pageSize, RequestData par) {
par.setDistance(500D);
Page<WaterResourceZhDto> pageBean = new Page<>(pageNum, pageSize);
List<WaterResourceZhDto> list= iWaterResourceService.getWaterResourceList(pageNum,pageSize,par);
Integer num= iWaterResourceService.getWaterResourceListCount(par);
pageBean.setRecords(list);
pageBean.setTotal(num);
return ResponseHelper.buildResponse(pageBean);
}
/**
* 水源列表分页查询
*
* @return
*/
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@GetMapping(value = "SY1000/list")
@ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
public ResponseModel<IPage<WaterResourceZhDto>> listPageSy(Integer pageNum, Integer pageSize, RequestData par) {
public ResponseModel<IPage<WaterResourceZhDto>> listPageSY1000(Integer pageNum, Integer pageSize, RequestData par) {
par.setDistance(1000D);
Page<WaterResourceZhDto> pageBean = new Page<>(pageNum, pageSize);
List<WaterResourceZhDto> list= iWaterResourceService.getWaterResourceList(pageNum,pageSize,par);
Integer num= iWaterResourceService.getWaterResourceListCount(par);
......@@ -91,6 +111,27 @@ public class CommandController extends BaseController {
pageBean.setTotal(num);
return ResponseHelper.buildResponse(pageBean);
}
// /**
// * 水源列表分页查询
// *
// * @return
// */
// @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
// @GetMapping(value = "SYTY/list")
// @ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
// public ResponseModel<IPage<WaterResourceZhDto>> listPageSYTY(Integer pageNum, Integer pageSize, RequestData par) {
// Page<WaterResourceZhDto> pageBean = new Page<>(pageNum, pageSize);
// List<WaterResourceZhDto> list= iWaterResourceService.getWaterResourceList(pageNum,pageSize,par);
// Integer num= iWaterResourceService.getWaterResourceListCount(par);
// pageBean.setRecords(list);
// pageBean.setTotal(num);
// return ResponseHelper.buildResponse(pageBean);
// }
/**
* 消防队伍列表分页查询
*
......@@ -171,5 +212,5 @@ public class CommandController extends BaseController {
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DataDictionaryController.java
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.biz.controller;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
......@@ -40,11 +37,11 @@ import io.swagger.annotations.ApiOperation;
/**
* 数据字典
*
* @author tb
* @date 2021-06-07
*/
* 数据字典
*
* @author tb
* @date 2021-06-07
*/
@RestController
@Api(tags = "数据字典Api")
@RequestMapping(value = "/data-dictionary")
......@@ -57,67 +54,69 @@ public class DataDictionaryController extends BaseController {
@Value("${redis.cache.failure.time}")
private long time;
/**
* 新增数据字典
* @return
*/
* 新增数据字典
*
* @return
*/
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增数据字典", notes = "新增数据字典")
public boolean saveDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){
public boolean saveDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary) {
return iDataDictionaryService.save(dataDictionary);
}
/**
* 根据id删除
* @param id
* @return
*/
* 根据id删除
*
* @param id
* @return
*/
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(HttpServletRequest request, @PathVariable Long id){
public boolean deleteById(HttpServletRequest request, @PathVariable Long id) {
return iDataDictionaryService.removeById(id);
}
/**
* 修改数据字典
* @return
*/
* 修改数据字典
*
* @return
*/
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改数据字典", notes = "修改数据字典")
public boolean updateByIdDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary){
public boolean updateByIdDataDictionary(HttpServletRequest request, @RequestBody DataDictionary dataDictionary) {
return iDataDictionaryService.updateById(dataDictionary);
}
/**
* 根据id查询
* @param id
* @return
*/
* 根据id查询
*
* @param id
* @return
*/
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public DataDictionary selectById(HttpServletRequest request, @PathVariable Long id){
public DataDictionary selectById(HttpServletRequest request, @PathVariable Long id) {
return iDataDictionaryService.getById(id);
}
/**
* 列表分页查询
* @return
*/
* 列表分页查询
*
* @return
*/
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<DataDictionary> listPage(String pageNum,String pageSize, DataDictionary dataDictionary){
public IPage<DataDictionary> listPage(String pageNum, String pageSize, DataDictionary dataDictionary) {
Page<DataDictionary> pageBean;
QueryWrapper<DataDictionary> dataDictionaryQueryWrapper = new QueryWrapper<>();
......@@ -144,7 +143,7 @@ public class DataDictionaryController extends BaseController {
}
}
} catch (Exception e) {
throw new RuntimeException("系统异常");
throw new RuntimeException("系统异常");
}
});
IPage<DataDictionary> page;
......@@ -154,25 +153,26 @@ public class DataDictionaryController extends BaseController {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iDataDictionaryService.page(pageBean, dataDictionaryQueryWrapper);
return page;
}
return page;
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/gwmcDataDictionary/{type}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
public ResponseModel<Object> gwmcDataDictionary( @PathVariable String type) throws Exception{
public ResponseModel<Object> gwmcDataDictionary(@PathVariable String type) throws Exception {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type);
queryWrapper.orderByAsc("sort_num");
if(redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE+type)){
Object obj= redisUtils.get(RedisKey.DATA_DICTIONARY_CODE+type);
if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
return ResponseHelper.buildResponse(obj);
}else{
Collection<DataDictionary> list=iDataDictionaryService.list(queryWrapper);
List<Menu> menus =TreeParser.getTree(null, list, DataDictionary.class.getName(),"getCode",0, "getName", "getParent",null);
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE+type, JSON.toJSON(menus),time);
} else {
Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
, "getParent", null);
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
return ResponseHelper.buildResponse(menus);
}
}
......@@ -191,67 +191,88 @@ public class DataDictionaryController extends BaseController {
return ResponseHelper.buildResponse(obj);
} else {
Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName", "getParent",null);
List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
, "getParent", null);
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
return ResponseHelper.buildResponse(menus);
}
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/gwmcDataDictionary/FireChemical/{type}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据字典类型查询危险品字典", notes = "根据字典类型查询危险品字典")
public ResponseModel<Object> gwmcDataDictionaryFireChemical( @PathVariable String type) throws Exception{
public ResponseModel<Object> gwmcDataDictionaryFireChemical(@PathVariable String type) throws Exception {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type);
queryWrapper.orderByAsc("sort_num");
if(redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE+type)){
Object obj= redisUtils.get(RedisKey.DATA_DICTIONARY_CODE+type);
if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
return ResponseHelper.buildResponse(obj);
}else{
Collection<DataDictionary> list=iDataDictionaryService.list(queryWrapper);
List<MenuFrom> menus =TreeParser.getTreexin(null, list, DataDictionary.class.getName(),"getCode",0,
} else {
Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
List<MenuFrom> menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0,
"getName", "getParent", null);
MenuFrom Me= new MenuFrom( "-1", "-1", "-1", "危化品库", "危化品库", "危化品库", "-1", null);
MenuFrom Me = new MenuFrom("-1", "-1", "-1", "危化品库", "危化品库", "危化品库", "-1", null);
Me.setIsLeaf(false);
Me.setChildren(menus);
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE+type, JSON.toJSON(Me),time);
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(Me), time);
return ResponseHelper.buildResponse(Me);
}
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/form/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据表态类型多个code查询表单数据项", notes = "根据表态类型多个code查询表单数据项")
public ResponseModel<Object> selectFormdListItem(HttpServletRequest request, String types){
public ResponseModel<Object> selectFormdListItem(HttpServletRequest request, String types) {
HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
try {
String[] typest= types.split(",");
for (String type : typest) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type);
queryWrapper.orderByAsc("sort_num");
if(redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE_XIN+type)){
Object obj= redisUtils.get(RedisKey.DATA_DICTIONARY_CODE_XIN+type);
objectObjectHashMap.put(type,obj);
}else{
Collection<DataDictionary> list=iDataDictionaryService.list(queryWrapper);
List<MenuFrom> menus = null;
menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(),"getCode",0, "getName",
"getParent", null);
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE_XIN+type, JSON.toJSON(menus),time);
objectObjectHashMap.put(type,menus);
String[] typest = types.split(",");
for (String type : typest) {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type);
queryWrapper.orderByAsc("sort_num");
if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE_XIN + type)) {
Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE_XIN + type);
objectObjectHashMap.put(type, obj);
} else {
Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
List<MenuFrom> menus = null;
menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
"getParent", null);
redisUtils.set(RedisKey.DATA_DICTIONARY_CODE_XIN + type, JSON.toJSON(menus), time);
objectObjectHashMap.put(type, menus);
}
}
}
} catch (Exception e) {
e.printStackTrace();
e.printStackTrace();
throw new RuntimeException("系统异常！");
}
return ResponseHelper.buildResponse(objectObjectHashMap);
}
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/dataDictionaryTree", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典树", notes = "根据字典类型查询字典树")
public ResponseModel<Object> getDictionaryTree(@RequestParam String type, @RequestParam String rootName) throws Exception {
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type);
queryWrapper.orderByAsc("sort_num");
Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName"
, "getParent", null);
// 创建根节点
Menu menu = new Menu(-1L, rootName, -1L, menus, 0);
List<Menu> menuList = new ArrayList<>();
// 挂在主节点
menuList.add(menu);
return ResponseHelper.buildResponse(menuList);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/LinkageUnitController.java
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.biz.controller;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
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.Date;
import java.util.List;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.common.biz.service.impl.LinkageUnitServiceImpl;
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.common.api.dto.LinkageUnitDto;
......@@ -37,28 +46,29 @@ public class LinkageUnitController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增联动单位", notes = "新增联动单位")
public ResponseModel<LinkageUnitDto> save(@RequestBody LinkageUnitDto model) {
model = linkageUnitServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增联动单位", notes = "新增联动单位")
public ResponseModel<LinkageUnitDto> save(@RequestBody LinkageUnitDto model) {
model = linkageUnitServiceImpl.saveModel(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<LinkageUnitDto> updateBySequenceNbrLinkageUnit(@RequestBody LinkageUnitDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(linkageUnitServiceImpl.updateWithModel(model));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新联动单位", notes = "根据sequenceNbr更新联动单位")
public ResponseModel<LinkageUnitDto> updateBySequenceNbrLinkageUnit(@RequestBody LinkageUnitDto model,
@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(linkageUnitServiceImpl.updateById(model));
}
/**
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
......@@ -67,50 +77,60 @@ public class LinkageUnitController extends BaseController {
@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(linkageUnitServiceImpl.removeById(sequenceNbr));
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(linkageUnitServiceImpl.deleteById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个联动单位", notes = "根据sequenceNbr查询单个联动单位")
public ResponseModel<LinkageUnitDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryBySeq(sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个联动单位", notes = "根据sequenceNbr查询单个联动单位")
public ResponseModel<LinkageUnitDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryOne(sequenceNbr));
}
/**
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "联动单位分页查询", notes = "联动单位分页查询")
public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryForLinkageUnitPage(page));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size, String unitName, String linkageUnitType, String inAgreement) {
Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
page.setCurrent(current);
page.setSize(size);
Page<LinkageUnitDto> linkageUnitDtoPage = linkageUnitServiceImpl.queryForLinkageUnitPage(page, false,
unitName, linkageUnitType);
Date now = new Date();
List<LinkageUnitDto> linkageUnitDtoList = linkageUnitDtoPage.getRecords().stream().map(item -> {
boolean isInAgreement = DateUtils.belongCalendar(now, item.getAgreementStartDate(),
item.getAgreementEndDate());
item.setInAgreement(isInAgreement ? "是" : "否");
return item;
}).filter(item -> StringUtils.isEmpty(inAgreement) || inAgreement.equals(item.getInAgreement())).collect(Collectors.toList());
linkageUnitDtoPage.setRecords(linkageUnitDtoList);
return ResponseHelper.buildResponse(linkageUnitDtoPage);
}
/**
* 列表全部数据查询
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "联动单位列表全部数据查询", notes = "联动单位列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<LinkageUnitDto>> selectForList() {
return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryForLinkageUnitList());
}
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "联动单位列表全部数据查询", notes = "联动单位列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<LinkageUnitDto>> selectForList() {
return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryForLinkageUnitList(false));
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/SourceFileController.java 0 → 100644
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.SourceFileDto;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.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.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-07-16
*/
@RestController
@Api(tags = "公共附件Api")
@RequestMapping(value = "/common/source-file")
public class SourceFileController extends BaseController {
@Autowired
SourceFileServiceImpl sourceFileServiceImpl;
/**
* 新增公共附件
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增公共附件", notes = "新增公共附件")
public ResponseModel<SourceFileDto> save(@RequestBody SourceFileDto model) {
model = sourceFileServiceImpl.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<SourceFileDto> updateBySequenceNbrSourceFile(@RequestBody SourceFileDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(sourceFileServiceImpl.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(sourceFileServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个公共附件", notes = "根据sequenceNbr查询单个公共附件")
public ResponseModel<SourceFileDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(sourceFileServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "公共附件分页查询", notes = "公共附件分页查询")
public ResponseModel<Page<SourceFileDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) {
Page<SourceFileDto> page = new Page<SourceFileDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(sourceFileServiceImpl.queryForSourceFilePage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "公共附件列表全部数据查询", notes = "公共附件列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<SourceFileDto>> selectForList() {
return ResponseHelper.buildResponse(sourceFileServiceImpl.queryForSourceFileList());
}
/**
* 附件批量保存
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "附件批量保存", notes = "附件批量保存")
@PostMapping(value = "/saveBatch")
public ResponseModel<List<SourceFile>> saveSourceFile(@RequestBody List<SourceFile> sourceFiles,
@RequestParam Long sourceId) {
return ResponseHelper.buildResponse(sourceFileServiceImpl.saveSourceFile(sourceId, sourceFiles));
}
/**
* 根据sourceId查询
*
* @param sourceId 附件所属者id
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sourceId}/list")
@ApiOperation(httpMethod = "GET", value = "根据sourceId查询公共附件列表", notes = "根据sourceId查询公共附件列表")
public ResponseModel<List<SourceFile>> queryBySourceId(@PathVariable Long sourceId) {
return ResponseHelper.buildResponse(sourceFileServiceImpl.findBySourceId(sourceId));
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java
View file @ 4ca9028d
......@@ -321,4 +321,26 @@ public class WaterResourceController extends BaseController {
public ResponseModel<List<WaterResourceDto>> selectForList() {
return ResponseHelper.buildResponse(waterResourceServiceImpl.queryForWaterResourceList(true));
}
/**
* 列表查询消防水资源
*
* @param name 资源名称
* @param sequenceNbr 资源编号
* @param belongFightingSystemId 所属消防系统id
* @param belongBuildingId 所在建筑id
* @param belongBuilding 所在建筑
* @param resourceType 资源类型（消火栓、消防水鹤、天然水源、消防水池）
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "根据条件查询列表", notes = "根据条件查询列表")
@GetMapping(value = "/select_list")
public ResponseModel<List<WaterResourceDto>> selectList(String name, Long sequenceNbr,
Long belongFightingSystemId, Long belongBuildingId,
String belongBuilding, String resourceType) {
return ResponseHelper.buildResponse(waterResourceServiceImpl.queryWaterResourceList(false, name, sequenceNbr,
belongFightingSystemId, belongBuildingId,
belongBuilding, resourceType));
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
import com.yeejoin.amos.boot.module.common.api.mapper.LinkageUnitMapper;
import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
import com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
* 联动单位服务实现类
......@@ -17,17 +30,86 @@ import java.util.List;
*/
@Service
public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageUnit, LinkageUnitMapper> implements ILinkageUnitService {
@Autowired
DynamicFormInstanceServiceImpl dynamicFormInstanceService;
@Resource
LinkageUnitMapper linkageUnitMapper;
@Autowired
DynamicFormColumnServiceImpl dynamicFormColumnService;
public String getGroupCode() {
return "linkageUnit";
}
/**
* 分页查询
*/
public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page) {
return this.queryForPage(page, null, false);
public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page,
@Condition(Operator.eq) Boolean isDelete,
@Condition(Operator.like) String unitName,
@Condition(Operator.eq) String linkageUnitType) {
return this.queryForPage(page, null, false, isDelete, unitName, linkageUnitType);
}
/**
* 列表查询 示例
*/
public List<LinkageUnitDto> queryForLinkageUnitList() {
return this.queryForList("" , false);
public List<LinkageUnitDto> queryForLinkageUnitList(@Condition(Operator.eq) Boolean isDelete) {
return this.queryForList("", false, isDelete);
}
/**
* 保存联动单位
*
* @param linkageUnitDto 对象
* @return List<LinkageUnitDto>
*/
public LinkageUnitDto saveModel(LinkageUnitDto linkageUnitDto) {
//1.保存行数据
String groupCode = this.getGroupCode();
Map<String, Object> map = Bean.BeantoMap(linkageUnitDto);
Long instanceId = dynamicFormInstanceService.commonSave(groupCode, map);
linkageUnitDto.setInstanceId(instanceId);
//2.保存值班信息
LinkageUnitDto model = createWithModel(linkageUnitDto);
//3.返回保存后的数据
return model;
}
public LinkageUnitDto queryOne(Long sequenceNbr) {
boolean isDelete = false;
String groupCode = getGroupCode();
List<DynamicFormColumn> columns =
dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
LinkageUnitDto linkageUnitDto = linkageUnitMapper.selectOne(isDelete, fieldCodes, groupCode, sequenceNbr);
return linkageUnitDto;
}
public Boolean deleteById(Long sequenceNbr) {
LinkageUnit linkageUnit = getById(sequenceNbr);
linkageUnit.setIsDelete(true);
updateById(linkageUnit);
Long instanceId = linkageUnit.getInstanceId();
List<DynamicFormInstance> dynamicFormInstanceList =
dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
dynamicFormInstanceList.forEach(item -> item.setIsDelete(true));
boolean update = dynamicFormInstanceService.updateBatchById(dynamicFormInstanceList);
return update;
}
public LinkageUnitDto updateById(LinkageUnitDto linkageUnitDto) {
updateWithModel(linkageUnitDto);
Long instanceId = linkageUnitDto.getInstanceId();
List<DynamicFormInstance> dynamicFormInstanceList =
dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
Map<String, Object> objectMap = Bean.BeantoMap(linkageUnitDto);
dynamicFormInstanceList.forEach(item -> item.setFieldValue(objectMap.get(item.getFieldCode()) != null ?
objectMap.get(item.getFieldCode()).toString() : item.getFieldValue()));
dynamicFormInstanceService.updateBatchById(dynamicFormInstanceList);
return linkageUnitDto;
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/SourceFileServiceImpl.java 0 → 100644
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.SourceFileDto;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.api.mapper.SourceFileMapper;
import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
/**
* 公共附件服务实现类
*
* @author system_generator
* @date 2021-07-16
*/
@Service
public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile, SourceFileMapper> implements ISourceFileService {
@Autowired
private Sequence sequence;
/**
* 分页查询
*/
public Page<SourceFileDto> queryForSourceFilePage(Page<SourceFileDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<SourceFileDto> queryForSourceFileList() {
return this.queryForList("", false);
}
/**
* @param sourceId 所属者ID
* @Description 根据所属者ID查询所属文件
* @Return Map<String, List < SourceFile>>
* @Date 2020/12/18 14:12
*/
public List<SourceFile> findBySourceId(Long sourceId) {
List<SourceFile> sourceFiles = this.list(new LambdaQueryWrapper<SourceFile>().eq(SourceFile::getSourceId, sourceId));
Optional.ofNullable(sourceFiles).orElseThrow(() -> new BadRequest("所属文件为空"));
return sourceFiles;
}
/**
* @param sourceFiles
* @Description 批量保存文件
* @Return List<SourceFile>
* @Date 2020/12/18 14:27
*/
@Transactional(rollbackFor = Exception.class)
public List<SourceFile> saveSourceFile(Long sourceId, List<SourceFile> sourceFiles) {
if (CollectionUtils.isEmpty(sourceFiles)) {
return new ArrayList<>();
}
this.baseMapper.delete(new LambdaQueryWrapper<SourceFile>().eq(SourceFile::getSourceId, sourceId));
sourceFiles.forEach(s -> {
s.setSourceId(sourceId);
});
boolean flag = this.saveOrUpdateBatch(sourceFiles);
return flag ? sourceFiles : Collections.EMPTY_LIST;
}
}
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java
View file @ 4ca9028d
......@@ -6,6 +6,7 @@ import java.util.Optional;
import javax.annotation.Resource;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.module.common.api.dto.*;
import com.yeejoin.amos.boot.module.common.api.entity.*;
import org.apache.commons.lang3.StringUtils;
......@@ -62,6 +63,20 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
return this.queryForList("", false, isDelete);
}
/**
* 列表条件查询
*/
public List<WaterResourceDto> queryWaterResourceList(@Condition(Operator.eq) Boolean isDelete,
@Condition(Operator.like) String name,
@Condition(Operator.eq) Long sequenceNbr,
@Condition(Operator.eq) Long belongFightingSystemId,
@Condition(Operator.eq) Long belongBuildingId,
@Condition(Operator.like) String belongBuilding,
@Condition(Operator.eq) String resourceType) {
return this.queryForList("", false, isDelete, name, sequenceNbr, belongFightingSystemId, belongBuildingId,
belongBuilding, resourceType);
}
/**
* excel导入
......@@ -147,10 +162,10 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
if (null == pageNum || null == pageSize) {
pageNum = 1;
pageSize = Integer.MAX_VALUE;
}else{
pageNum=(pageNum - 1) * pageSize;
} else {
pageNum = (pageNum - 1) * pageSize;
}
return waterResourceMapper.getWaterResourceList( pageNum, pageSize, requestData);
return waterResourceMapper.getWaterResourceList(pageNum, pageSize, requestData);
}
@Override
......@@ -209,4 +224,8 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
}
return waterResourceDto;
}
public List<WaterResourceDto> getWaterResourceTypeList() {
return waterResourceMapper.getWaterResourceTypeList();
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java
View file @ 4ca9028d
package com.yeejoin.amos.boot.module.jcs.biz.aop;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.typroject.tyboot.core.foundation.utils.Bean;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
......@@ -30,6 +12,22 @@ 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 org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.typroject.tyboot.core.foundation.utils.Bean;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* controller层切面 用于用户数据缓存 供 sql自动填充使用
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/EquipmentController.java
View file @ 4ca9028d
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
import java.util.List;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -44,4 +45,11 @@ public class EquipmentController extends BaseController {
public ResponseModel<List<MenuFrom>> getBuildingList() {
return ResponseHelper.buildResponse(equipmentService.getBuildingList());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/fireSystem_waterResource/list")
@ApiOperation(value = "获取消防系统消防水源列表")
public ResponseModel<List<MenuFrom>> getFireSystemWaterResourceList() {
return ResponseHelper.buildResponse(equipmentService.getFireSystemWaterResourceList());
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/EquipmentServiceImpl.java
View file @ 4ca9028d
......@@ -4,14 +4,18 @@ import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.dto.FireSystemDto;
import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StopWatch;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Timer;
......@@ -24,6 +28,8 @@ public class EquipmentServiceImpl {
@Autowired
EquipFeignClient equipFeignClient;
@Autowired
WaterResourceServiceImpl waterResourceServiceImpl;
public List<MenuFrom> getFireSystemList() {
ResponseModel<Object> response = equipFeignClient.getFireSystemListAll();
......@@ -72,4 +78,35 @@ public class EquipmentServiceImpl {
}
return menuFromList;
}
public List<MenuFrom> getFireSystemWaterResourceList() {
// 获取消防系统列表
List<MenuFrom> fireSystemDtoList = getFireSystemList();
// 其他系统
MenuFrom fireSystem = new MenuFrom("-1", "其他系统", "0", "0");
fireSystemDtoList.add(fireSystem);
// 获取消防水源类型列表，包含消防系统和消防水源类型，去重
List<WaterResourceDto> waterResourceTypeList = waterResourceServiceImpl.getWaterResourceTypeList();
// 组装消防水资源树
fireSystemDtoList.forEach(item -> {
List<MenuFrom> children = Lists.newArrayList();
waterResourceTypeList.forEach(r -> {
if (r.getBelongFightingSystemId() != null && item.getKey().equals(r.getBelongFightingSystemId().toString())) {
MenuFrom menuFrom = new MenuFrom(r.getResourceType(), r.getResourceTypeName(), item.getKey(), "0");
children.add(menuFrom);
}
});
item.setChildren(children);
});
List<MenuFrom> children = Lists.newArrayList();
waterResourceTypeList.forEach(r -> {
if (r.getBelongFightingSystemId() == null) {
MenuFrom menuFrom = new MenuFrom(r.getResourceType(), r.getResourceTypeName(), "-1", "0");
children.add(menuFrom);
}
});
fireSystem.setChildren(children);
return fireSystemDtoList;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment