Skip to content

A
amos-boot-biz
Commit 062025b1 authored by 曹盼盼's avatar 曹盼盼
Browse files
Options

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

parents 403645c8 63b0448e
Hide whitespace changes
Inline Side-by-side
Showing with 548 additions and 349 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/EXPersonUser.java
View file @ 062025b1
package com.yeejoin.amos.boot.module.jxiop.api.dto;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.yeejoin.amos.boot.biz.common.excel.CommonExplicitConstraint;
import com.yeejoin.amos.boot.biz.common.excel.ExplicitConstraint;
import com.alibaba.excel.annotation.ExcelProperty;
......@@ -26,182 +27,182 @@ public class EXPersonUser {
@ExcelProperty(value = "所属场站", index = 2)
@ApiModelProperty(value = "所属场站")
private String projectName;
@ExcelProperty(value = "部门", index = 3)
@ExcelIgnore
@ApiModelProperty(value = "部门")
private String departmentName;
@ExcelProperty(value = "证件类型", index = 4)
@ExcelProperty(value = "证件类型", index = 3)
@ApiModelProperty(value = "证件类型(0-身份证)")
private String idType;
@ExcelProperty(value = "证件编号", index = 5)
@ExcelProperty(value = "证件编号", index = 4)
@ApiModelProperty(value = "证件编号")
private String idNumber;
@ExcelProperty(value = "平台账号名称", index = 6)
@ExcelProperty(value = "平台账号名称", index = 5)
@ApiModelProperty(value = "平台账号名称")
private String accountName;
@ExplicitConstraint(indexNum = 7, source = {"男","女"}) //固定下拉内容
@ExcelProperty(value = "性别", index = 7)
@ExplicitConstraint(indexNum = 6, source = {"男","女"}) //固定下拉内容
@ExcelProperty(value = "性别", index = 6)
@ApiModelProperty(value = "性别( 0-男 1-女 )")
private String sex;
@ExcelProperty(value = "生日", index = 8)
@ExcelProperty(value = "生日", index = 7)
@ApiModelProperty(value = "生日")
private Date birthday;
@ExcelProperty(value = "年龄", index = 9)
@ExcelProperty(value = "年龄", index = 8)
@ApiModelProperty(value = "年龄")
private Integer age;
@ExcelProperty(value = "籍贯", index = 10)
@ExcelIgnore
@ApiModelProperty(value = "籍贯")
private String nativePlace;
@ExcelProperty(value = "民族", index = 11)
@ExplicitConstraint(indexNum = 11, sourceClass = CommonExplicitConstraint.class,type="MZ") //固定下拉内容
@ExcelProperty(value = "民族", index = 9)
@ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class,type="MZ") //固定下拉内容
@ApiModelProperty(value = "民族")
private String folkKey;
@ExcelProperty(value = "政治面貌", index =12)
@ExplicitConstraint(indexNum = 12, source = {"群众","共青团员","预备党员","中共党员"}) //固定下拉内容
@ExcelProperty(value = "政治面貌", index =10)
@ExplicitConstraint(indexNum = 10, source = {"群众","共青团员","预备党员","中共党员"}) //固定下拉内容
@ApiModelProperty(value = "政治面貌")
private String politicCountenance;
@ExcelProperty(value = "户籍地址", index = 13)
@ExcelProperty(value = "户籍地址", index = 11)
@ApiModelProperty(value = "户籍地址")
private String registeredResidenceAddress;
@ExcelProperty(value = "现住址", index = 14)
@ExcelProperty(value = "现住址", index = 12)
@ApiModelProperty(value = "现住址")
private String presentAddress;
@ExcelProperty(value = "应急电话", index = 15)
@ExcelProperty(value = "应急电话", index = 13)
@ApiModelProperty(value = "应急电话")
private String emergencyPhone;
@ExcelProperty(value = "电话", index = 16)
@ExcelProperty(value = "电话", index = 14)
@ApiModelProperty(value = "电话")
private String phone;
@ExcelProperty(value = "身高（厘米）", index = 17)
@ExcelProperty(value = "身高（厘米）", index = 15)
@ApiModelProperty(value = "身高（厘米）")
private Integer height;
@ExcelProperty(value = "体重（千克）", index = 18)
@ExcelProperty(value = "体重（千克）", index = 16)
@ApiModelProperty(value = "体重（千克）")
private Integer weight;
@ExcelProperty(value = "参加工作时间", index = 19)
@ExcelProperty(value = "参加工作时间", index = 17)
@ApiModelProperty(value = "参加工作时间")
private Date workTime;
@ExcelProperty(value = "进入本单位工作时间", index = 20)
@ExcelProperty(value = "进入本单位工作时间", index = 18)
@ApiModelProperty(value = "进入本单位工作时间")
private Date stationWorkTime;
@ExcelProperty(value = "工作所在地", index = 21)
@ExplicitConstraint(indexNum = 21, source = {"国内","国外"}) //固定下拉内容
@ExcelProperty(value = "工作所在地", index = 19)
@ExplicitConstraint(indexNum = 19, source = {"国内","国外"}) //固定下拉内容
@ApiModelProperty(value = "工作所在地key")
private String workPlaceKey;
@ExcelProperty(value = "岗位", index = 22)
@ExplicitConstraint(indexNum = 22,sourceClass = CommonExplicitConstraint.class,type="YGZYJNJDZS") //固定下拉内容
@ExcelProperty(value = "岗位", index = 20)
@ExplicitConstraint(indexNum = 20,sourceClass = CommonExplicitConstraint.class,type="YGZYJNJDZS") //固定下拉内容
@ApiModelProperty(value = "岗位")
private String postName;
@ExcelProperty(value = "是否特殊工种", index = 23)
@ExplicitConstraint(indexNum = 23, source = {"是","否"}) //固定下拉内容
@ExcelProperty(value = "是否特殊工种", index = 21)
@ExplicitConstraint(indexNum = 21, source = {"是","否"}) //固定下拉内容
@ApiModelProperty(value = "是否特殊工种")
private Integer isSpecialWork;
@ExcelProperty(value = "技能鉴定工种", index = 24)
@ExplicitConstraint(indexNum = 24, sourceClass = CommonExplicitConstraint.class,type="JNDDGZ") //固定下拉内容
@ExcelProperty(value = "技能鉴定工种", index = 22)
@ExplicitConstraint(indexNum = 22, sourceClass = CommonExplicitConstraint.class,type="JNDDGZ") //固定下拉内容
@ApiModelProperty(value = "技能鉴定工种key")
private String workTypeKey;
@ExcelProperty(value = "工种名称", index = 25)
@ExplicitConstraint(indexNum = 25, sourceClass = CommonExplicitConstraint.class,type="JNJDGZ") //固定下拉内容
@ExcelProperty(value = "工种名称", index = 23)
@ExplicitConstraint(indexNum = 23, sourceClass = CommonExplicitConstraint.class,type="JNJDGZ") //固定下拉内容
@ApiModelProperty(value = "工种名称")
private String workName;
@ExcelProperty(value = "专业技术资格名称", index = 26)
@ExplicitConstraint(indexNum = 26, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
@ExcelProperty(value = "专业技术资格名称", index = 24)
@ExplicitConstraint(indexNum = 24, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
@ApiModelProperty(value = "专业技术资格名称")
private String professionalTechnologyName;
@ExcelProperty(value = "技能等级", index = 27)
@ExplicitConstraint(indexNum = 27, source = {"无","初级工","中级工","高级工","技师","高级技师","其他"}) //固定下拉内容
@ExcelProperty(value = "技能等级", index = 25)
@ExplicitConstraint(indexNum = 25, source = {"无","初级工","中级工","高级工","技师","高级技师","其他"}) //固定下拉内容
@ApiModelProperty(value = "技能等级key")
private String skillLevelKey;
@ExcelProperty(value = "专业技术资格等级", index = 28)
@ExplicitConstraint(indexNum = 28, source = {"初级","中级","副高级","正高级","教授级"}) //固定下拉内容
@ExcelProperty(value = "专业技术资格等级", index = 26)
@ExplicitConstraint(indexNum = 26, source = {"初级","中级","副高级","正高级","教授级"}) //固定下拉内容
@ApiModelProperty(value = "专业技术资格等级")
private String professionalTechnologyLevelKey;
@ExcelProperty(value = "岗位执业鉴定证书", index = 29)
@ExcelProperty(value = "岗位执业鉴定证书", index = 27)
@ApiModelProperty(value = "岗位执业鉴定证书")
@ExplicitConstraint(indexNum = 29, sourceClass = CommonExplicitConstraint.class,type="POST_PRACTICE_CERTIFICATE") //固定下拉内容
@ExplicitConstraint(indexNum = 27, sourceClass = CommonExplicitConstraint.class,type="POST_PRACTICE_CERTIFICATE") //固定下拉内容
private String professionalQualificationCertificate;
@ExcelProperty(value = "岗位职业鉴定证书", index = 30)
@ExcelProperty(value = "岗位职业鉴定证书", index = 28)
@ApiModelProperty(value = " 岗位职业鉴定证书")
@ExplicitConstraint(indexNum = 30, sourceClass = CommonExplicitConstraint.class,type="POST_OCCUPATION_CERTIFICATE") //固定下拉内容
@ExplicitConstraint(indexNum = 28, sourceClass = CommonExplicitConstraint.class,type="POST_OCCUPATION_CERTIFICATE") //固定下拉内容
private String professionalCareerCertificate;
@ExcelProperty(value = "初始学历", index = 31)
@ExcelProperty(value = "初始学历", index = 29)
@ApiModelProperty(value = "初始学历key")
@ExplicitConstraint(indexNum = 31, sourceClass = CommonExplicitConstraint.class,type="CSXL") //固定下拉内容
@ExplicitConstraint(indexNum = 29, sourceClass = CommonExplicitConstraint.class,type="CSXL") //固定下拉内容
private String initialEducationKey;
@ExcelProperty(value = "现学历", index = 32)
@ExplicitConstraint(indexNum = 32, sourceClass = CommonExplicitConstraint.class,type="XXL") //固定下拉内容
@ExcelProperty(value = "现学历", index = 30)
@ExplicitConstraint(indexNum = 30, sourceClass = CommonExplicitConstraint.class,type="XXL") //固定下拉内容
@ApiModelProperty(value = "现学历key")
private String currentEducationKey;
@ExcelProperty(value = "现学历学校名称", index = 33)
@ExcelProperty(value = "现学历学校名称", index = 31)
@ApiModelProperty(value = "现学历学校名称")
private String currentSchool;
@ExcelProperty(value = "现学历所学专业", index = 34)
@ExcelProperty(value = "现学历所学专业", index = 32)
@ApiModelProperty(value = "现学历所学专业")
private String currentMajor;
@ExcelProperty(value = "证件类型", index = 35)
@ExcelProperty(value = "证件类型", index = 33)
@ApiModelProperty(value = "证件类型")
@ExplicitConstraint(indexNum = 35, sourceClass = CommonExplicitConstraint.class,type="ZDLX") //固定下拉内容
@ExplicitConstraint(indexNum = 33, sourceClass = CommonExplicitConstraint.class,type="ZDLX") //固定下拉内容
private String documentType;
@ExcelProperty(value = "证书名称", index = 36)
@ExcelProperty(value = "证书名称", index = 34)
@ApiModelProperty(value = "证书名称")
@ExplicitConstraint(indexNum = 36, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
@ExplicitConstraint(indexNum = 34, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
private String certificateName;
@ExcelProperty(value = "取证时间", index = 37)
@ExcelProperty(value = "取证时间", index = 35)
@ApiModelProperty(value = "取证时间")
private Date certificateTime;
@ExcelProperty(value = "发证机关", index = 38)
@ExcelProperty(value = "发证机关", index = 36)
@ApiModelProperty(value = "发证机关")
private String issuingAuthority;
@ExcelProperty(value = "证书编号", index = 39)
@ExcelProperty(value = "证书编号", index = 37)
@ApiModelProperty(value = "证书编号")
private String certificateNum;
@ExcelProperty(value = "取证项目", index = 40)
@ExcelProperty(value = "取证项目", index = 38)
@ApiModelProperty(value = "取证项目")
private String certificateProject;
@ExcelProperty(value = "有效期限", index = 41)
@ExcelProperty(value = "有效期限", index = 39)
@ApiModelProperty(value = "有效期限")
private String validPeriod;
@ExcelProperty(value = "证书等级", index = 42)
@ExcelProperty(value = "证书等级", index = 40)
@ApiModelProperty(value = "证书等级")
@ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
@ExplicitConstraint(indexNum = 40, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
private String certificateGrade;
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/ExStationBasicDto.java
View file @ 062025b1
......@@ -21,7 +21,7 @@ public class ExStationBasicDto {
@ExcelProperty(value = "场站编号", index = 1)
@ApiModelProperty(value = "场站编号")
private String stationCode;
@ExplicitConstraint(indexNum = 2, source = {"建设方","总承包方","分包方"}) //固定下拉内容
@ExplicitConstraint(indexNum = 2, sourceClass = CommonExplicitConstraint.class, method = "getstationType") //固定下拉内容
@ExcelProperty(value = "场站类型", index = 2)
@ApiModelProperty(value = "场站类型")
private String stationType;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/HouseholdPvImport.java
View file @ 062025b1
......@@ -7,43 +7,43 @@ import lombok.Data;
@Data
public class HouseholdPvImport {
@ColumnWidth(15)
@ExcelProperty(value = "所属场站", index = 1)
@ExcelProperty(value = "所属场站", index = 0)
private String platformCompanyId;
@ColumnWidth(15)
@ExcelProperty(value = "乡镇", index = 2)
@ExcelProperty(value = "乡镇", index = 1)
private String districtId;
@ColumnWidth(15)
@ExcelProperty(value = "户号", index = 3)
@ExcelProperty(value = "户号", index = 2)
private String number;
@ColumnWidth(15)
@ExcelProperty(value = "户主姓名", index = 4)
@ExcelProperty(value = "户主姓名", index = 3)
private String name;
@ColumnWidth(15)
@ExcelProperty(value = "性别", index = 5)
@ExcelProperty(value = "性别", index = 4)
private String sex;
@ColumnWidth(15)
@ExcelProperty(value = "身份证号", index = 6)
@ExcelProperty(value = "身份证号", index = 5)
private String idNumber;
@ColumnWidth(20)
@ExcelProperty(value = "证件过期时间", index = 7)
@ExcelProperty(value = "证件过期时间", index = 6)
private String expiryTime;
@ColumnWidth(15)
@ExcelProperty(value = "签发机关", index = 8)
@ExcelProperty(value = "签发机关", index = 7)
private String issuingAuthority;
@ColumnWidth(15)
@ExcelProperty(value = "户籍地址", index = 9)
@ExcelProperty(value = "户籍地址", index = 8)
private String residenceAddress;
@ColumnWidth(15)
@ExcelProperty(value = "手机号码", index = 10)
@ExcelProperty(value = "手机号码", index = 9)
private String phone;
@ColumnWidth(15)
@ExcelProperty(value = "居住地", index = 11)
@ExcelProperty(value = "居住地", index = 10)
private String address;
@ColumnWidth(15)
@ExcelProperty(value = "居住地邮编", index = 12)
@ExcelProperty(value = "居住地邮编", index = 11)
private String postcode;
@ColumnWidth(15)
@ExcelProperty(value = "送达地址", index = 13)
@ExcelProperty(value = "送达地址", index = 12)
private String serviceAddress;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonBasicDto.java
View file @ 062025b1
......@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.module.jxiop.api.entity.CommonFile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -80,6 +81,7 @@ public class PersonBasicDto extends BaseDto {
private List<CommonFile> backCertificatePhoto;
@ApiModelProperty(value = "进入本单位工作时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date stationWorkTime;
@ApiModelProperty(value = "工作所在地key")
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonUser.java
View file @ 062025b1
......@@ -32,7 +32,7 @@ public class PersonUser {
private Integer age;
@ApiModelProperty(value = "籍贯")
private String nativePlace;
private List<Integer> nativePlace;
@ApiModelProperty(value = "民族")
private String folkKey;
......@@ -77,6 +77,18 @@ public class PersonUser {
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<CommonFile> backCertificatePhoto;
@ApiModelProperty(value = "进入本单位工作时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date stationWorkTime;
@ApiModelProperty(value = "工作所在地key")
private String workPlaceKey;
@ApiModelProperty(value = "岗位")
private String postName;
/**
* 技能学历
* */
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationBasicDto.java
View file @ 062025b1
......@@ -33,6 +33,9 @@ public class StationBasicDto extends BaseDto {
@ApiModelProperty(value = "场站类型")
private String stationType;
@ApiModelProperty(value = "场站类型名称")
private String stationTypeName;
@ApiModelProperty(value = "项目状态")
private String stationFlag;
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationInfoDto.java
View file @ 062025b1
......@@ -44,6 +44,6 @@ public class StationInfoDto {
@ApiModelProperty(value = "纬度")
private String laitude;
@ApiModelProperty(value = "所属片区code")
private String areaCode;
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/UserMapperDto.java
View file @ 062025b1
......@@ -39,17 +39,19 @@ public class UserMapperDto {
}
public void setHeadPhoto(String headPhoto) {
this.headPhoto = headPhoto;
this.photo= headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
this.photo= headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
if(!this.photo.isEmpty()){
this.headPhoto = this.photo.get(0).getUrl();
}
}
public List<CommonFile> getPhoto() {
return headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
return photo;
}
public void setPhoto(List<CommonFile> photo) {
this.photo =headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
this.photo =photo;
}
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonBasic.java
View file @ 062025b1
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -133,6 +134,7 @@ public class PersonBasic extends BaseEntity {
* 进入本单位工作时间
*/
@TableField("station_work_time")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date stationWorkTime;
/**
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonSkillEducation.java
View file @ 062025b1
......@@ -34,7 +34,7 @@ public class PersonSkillEducation extends BaseEntity {
* 是否特殊工种
*/
@TableField("is_special_work")
private Integer isSpecialWork;
private String isSpecialWork;
/**
* 工种名称
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/StationBasic.java
View file @ 062025b1
......@@ -43,6 +43,9 @@ public class StationBasic extends BaseEntity {
*/
@TableField("station_type")
private String stationType;
@TableField("station_type_name")
private String stationTypeName;
/**
* 项目状态
*/
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/StationBasicMapper.java
View file @ 062025b1
......@@ -30,7 +30,7 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
@Param("stationType")String stationType,
@Param("orgCode")String orgCode);
//删除
int deleteList(String[] ids);
int deleteList(String ids);
//导出
List<ExStationBasicDto> getExStationBasicDto( @Param("stationMasterName") String stationMasterName,
@Param("stationName")String stationName,
......@@ -39,6 +39,8 @@ public interface StationBasicMapper extends BaseMapper<StationBasic> {
//获取场站列表信息
List<StationInfoDto> getStationList(@Param("areaCode")String areaCode);
int deleteStationCoordinateByStationid (@Param("sequence_nbr") Long sequence_nbr );
int getStationPersonByStationID (@Param("sequence_nbr") String sequence_nbr );
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml
View file @ 062025b1
......@@ -24,7 +24,7 @@
AND person_basic.project_org_code like concat('%',#{orgCode},'%')
</if>
<if test="name != null and name != ''">
AND person_basic.name like concat('%',#{name},'%')
AND person_account.name like concat('%',#{name},'%')
</if>
<if test="accountName != null and accountName != ''">
AND person_account.account_name like concat('%',#{accountName},'%')
......@@ -50,7 +50,7 @@
AND person_basic.project_org_code like concat('%',#{orgCode},'%')
</if>
<if test="name != null and name != ''">
AND person_basic.name like concat('%',#{name},'%')
AND person_account.name like concat('%',#{name},'%')
</if>
<if test="accountName != null and accountName != ''">
AND person_account.account_name like concat('%',#{accountName},'%')
......@@ -96,7 +96,7 @@
<where>
person_basic.is_delete=0
<if test="name != null and name != ''">
AND person_basic.name like concat('%',#{name},'%')
AND person_account.name like concat('%',#{name},'%')
</if>
<if test="accountName != null and accountName != ''">
AND person_account.account_name like concat('%',#{accountName},'%')
......@@ -169,7 +169,7 @@
<where>
person_basic.is_delete=0
<if test="name != null and name != ''">
AND person_basic.name like concat('%',#{name},'%')
AND person_account.name like concat('%',#{name},'%')
</if>
<if test="accountName != null and accountName != ''">
AND person_account.account_name like concat('%',#{accountName},'%')
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml
View file @ 062025b1
......@@ -11,6 +11,7 @@
station_basic.station_master_name stationMasterName ,
station_basic.mobile_phone mobilePhone ,
station_basic.station_type stationType ,
station_basic.station_type_name stationTypeName ,
station_basic.address address ,
station_basic.owner_unit ownerUnit
from station_basic
......@@ -56,23 +57,19 @@
</select>
<delete id="deleteList" parameterType="int">
delete from station_basic where sequence_nbr in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>;
delete from station_coordinate where station_id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
delete from station_basic where sequence_nbr = #{id};
delete from station_coordinate where station_id = #{id}
</delete>
<delete id = "deleteStationCoordinateByStationid">
delete from station_coordinate where station_id = #{sequence_nbr}
</delete>
<select id="getExStationBasicDto" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.ExStationBasicDto">
select
station_basic.station_name stationName ,
station_basic.station_code stationCode,
station_basic.station_type stationType,
station_basic.station_type_name stationType,
station_basic.station_flag stationFlag,
station_basic.address address,
station_basic.station_master_name stationMasterName ,
......@@ -106,6 +103,7 @@
station_basic.station_name stationName ,
station_basic.station_type stationType,
station_basic.station_flag stationFlag,
station_basic.area_code areaCode,
station_coordinate.longitude,
station_coordinate.laitude ,
station_coordinate.is_main_coordinate
......@@ -125,6 +123,14 @@
AND station_basic.area_code like concat('%',#{areaCode},'%')
</if>
</select>
<select id="getStationPersonByStationID" resultType="int">
SELECT
COUNT( 1 )
FROM
person_account
LEFT JOIN station_basic ON person_account.project_id = station_basic.platform_station_id
WHERE
station_basic.sequence_nbr = #{sequence_nbr}
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java
View file @ 062025b1
package com.yeejoin.amos.boot.module.jxiop.biz.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jxiop.api.dto.CompanyTreeDto;
import com.yeejoin.amos.boot.module.jxiop.api.dto.ListCompanyModel;
import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
......@@ -24,9 +26,8 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
* @description:
......@@ -84,7 +85,53 @@ public class PrivilegeController extends BaseController{
return ResponseHelper.buildResponse(date);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/stationTree")
@ApiOperation(httpMethod = "GET",value = "查询所属场站", notes = "查询所属场站")
public ResponseModel< Collection<CompanyModel>> stationTree(String orgCode ) {
Long companyId =null;
if(orgCode!=null){
LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient
.queryByOrgcode(orgCode).getResult();
for (Map.Entry<Object, Object> it : l.entrySet()) {
CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()),
CompanyModel.class);
if (companyModel != null) {
companyId = companyModel.getSequenceNbr();
}
break;
}
}else{
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
companyId = reginParams.getCompany().getSequenceNbr();
}
List<ListCompanyModel> data = new ArrayList();
FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId);
FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId);
CompanyModel companyModel=dat.getResult();
companyModel.setChildren(de.getResult());
List<CompanyModel> list =new ArrayList<>();
list.add(companyModel);
return ResponseHelper.buildResponse(list);
}
// public List<ListCompanyModel> getdata(Collection<CompanyModel> datas){
// List<ListCompanyModel> list =new ArrayList<>();
// for (CompanyModel companyModel : datas) {
// ListCompanyModel companyModeld = new ListCompanyModel();
// companyModeld.setSequenceNbr(companyModel.getSequenceNbr());
// companyModeld.setCompanyName(companyModel.getCompanyName());
// companyModeld.setChildren(getdata(companyModel.getChildren()));
// list.add(companyModeld);
// }
// return list;
// }
}
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/StationBasicController.java
View file @ 062025b1
......@@ -10,12 +10,16 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.StationBasicServiceImpl;
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.jxiop.api.dto.StationBasicDto;
......@@ -35,23 +39,25 @@ public class StationBasicController extends BaseController {
@Autowired
StationBasicServiceImpl stationBasicServiceImpl;
/**
* 新增场站基础信息表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增场站基础信息表", notes = "新增场站基础信息表")
public ResponseModel<Object> save(@RequestBody StationBasic model) {
try {
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增场站基础信息表", notes = "新增场站基础信息表")
public ResponseModel<Object> save(@RequestBody StationBasic model) {
try {
stationBasicServiceImpl.add(model);
return ResponseHelper.buildResponse(null);
}catch (InnerInvokException e){
return this.buildResponseFalse(e.getMessage());
} catch (InnerInvokException e) {
return this.buildResponseFalse(e.getMessage());
}
}
public ResponseModel buildResponseFalse(String message) {
}
public ResponseModel buildResponseFalse(String message) {
ResponseModel response = new ResponseModel();
response.setResult(null);
response.setDevMessage("FAILURE");
......@@ -60,26 +66,29 @@ public class StationBasicController extends BaseController {
response.setDevMessage(message);
return response;
}
/**
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/update")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新场站基础信息表", notes = "根据sequenceNbr更新场站基础信息表")
public ResponseModel<StationBasicDto> updateBySequenceNbrStationBasic(@RequestBody StationBasic model,@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
try {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/update")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新场站基础信息表", notes = "根据sequenceNbr更新场站基础信息表")
public ResponseModel<StationBasicDto> updateBySequenceNbrStationBasic(@RequestBody StationBasic model, @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
try {
model.setSequenceNbr(sequenceNbr);
stationBasicServiceImpl.update(model);
return ResponseHelper.buildResponse(null);
}catch (InnerInvokException e){
return this.buildResponseFalse(e.getMessage());
} catch (InnerInvokException e) {
return this.buildResponseFalse(e.getMessage());
}
}
}
/**
/**
* 根据sequenceNbr删除
*
* @param ids 主键
......@@ -88,80 +97,77 @@ public class StationBasicController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/delete")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除场站基础信息表", notes = "根据sequenceNbr删除场站基础信息表")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "ids") String ids){
try { String[] idss=ids.split(",");
int num= stationBasicServiceImpl.deleteList(idss);
return ResponseHelper.buildResponse(num>0?true:false);
}catch (InnerInvokException e){
return this.buildResponseFalse(e.getMessage());
}
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "ids") String ids) {
if (stationBasicServiceImpl.getStationPersonByStationID(ids) > 0) {
return this.buildResponseFalse("请删除场站下的人员后再删除场站！");
}
int num = stationBasicServiceImpl.deleteList(ids);
return ResponseHelper.buildResponse(num > 0 ? true : false);
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getById")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个场站基础信息表", notes = "根据sequenceNbr查询单个场站基础信息表")
public ResponseModel<StationBasic> selectOne(@RequestParam Long sequenceNbr) {
StationBasic stationBasic= stationBasicServiceImpl.getById(sequenceNbr);
return ResponseHelper.buildResponse(stationBasic);
}
/**
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getById")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个场站基础信息表", notes = "根据sequenceNbr查询单个场站基础信息表")
public ResponseModel<StationBasic> selectOne(@RequestParam Long sequenceNbr) {
StationBasic stationBasic = stationBasicServiceImpl.getById(sequenceNbr);
return ResponseHelper.buildResponse(stationBasic);
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "场站基础信息表分页查询", notes = "场站基础信息表分页查询")
public ResponseModel<Page<StationBasicDto>> queryForPage(@RequestParam(value = "current") int current,
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "场站基础信息表分页查询", notes = "场站基础信息表分页查询")
public ResponseModel<Page<StationBasicDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "stationMasterName",required = false) String stationMasterName,
@RequestParam(value = "stationName",required = false)String stationName,
@RequestParam(value = "stationType",required = false)String stationType,
@RequestParam(value = "orgCode",required = false)String orgCode
@RequestParam(value = "stationMasterName", required = false) String stationMasterName,
@RequestParam(value = "stationName", required = false) String stationName,
@RequestParam(value = "stationType", required = false) String stationType,
@RequestParam(value = "orgCode", required = false) String orgCode
) {
Page<StationBasicDto> page = new Page<StationBasicDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(stationBasicServiceImpl.queryPage(page, stationMasterName,
Page<StationBasicDto> page = new Page<StationBasicDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(stationBasicServiceImpl.queryPage(page, stationMasterName,
stationName,
stationType,
orgCode
));
}
orgCode
));
}
/**
* 场站地图接口
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "场站基础信息表列表全部数据查询", notes = "场站基础信息表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<StationBasicDto>> selectForList() {
return ResponseHelper.buildResponse(stationBasicServiceImpl.queryForStationBasicList());
}
/**
* 场站地图接口
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "场站基础信息表列表全部数据查询", notes = "场站基础信息表列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<StationBasicDto>> selectForList() {
return ResponseHelper.buildResponse(stationBasicServiceImpl.queryForStationBasicList());
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "场站地图数据", notes = "场站地图数据")
@GetMapping(value = "/listforMap")
public ResponseModel<List<StationInfoDto>> getStationList( @RequestParam(value = "areaCode",required = false)String areaCode) {
return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(areaCode));
}
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "场站地图数据", notes = "场站地图数据")
@GetMapping(value = "/listforMap")
public ResponseModel<List<StationInfoDto>> getStationList(@RequestParam(value = "areaCode", required = false) String areaCode) {
return ResponseHelper.buildResponse(stationBasicServiceImpl.getStationList(areaCode));
}
}
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/ExDataSourcesImpl.java
View file @ 062025b1
......@@ -35,7 +35,7 @@ public class ExDataSourcesImpl implements DataSources {
@Autowired
private RedisUtils redisUtils;
private final String CZLX="CZLX";
@Override
public String[] selectList(String type, String method) throws Exception {
String[] str = {};
......@@ -46,6 +46,10 @@ public class ExDataSourcesImpl implements DataSources {
case "getArea":
str = getArea();
break;
case "getstationType":
str = getstationType(CZLX);
break;
}
}
return str;
......@@ -111,17 +115,43 @@ public class ExDataSourcesImpl implements DataSources {
if (!data.isEmpty()) {
for (ListCompanyModel datum : data) {
datas.add(datum.getCompanyName() + "@" + datum.getSequenceNbr());
// if (datum.getChildren() != null) {
// this.getCompanyModel(datum.getChildren(),datas);
// }
}
}
return datas;
}
private String[] getstationType(String dictCode) {
FeignClientResult<List<DictionarieValueModel>> Model =Systemctl.dictionarieClient.dictValues(dictCode);
List<DictionarieValueModel> user=new ArrayList<>();
if (!ObjectUtils.isEmpty(Model)) {
if(Model.getStatus()==200){
user = Model.getResult();
}else{
throw new RuntimeException(Model.getMessage());
}
}
String[] str = null;
List<String> collect=new ArrayList<>();
this.getstationTypeList(user,collect);
str = collect.toArray(new String[collect.size()]);
return str;
}
public List<String> getstationTypeList( List<DictionarieValueModel> data,List<String> datas) {
if (!data.isEmpty()) {
for (DictionarieValueModel datum : data) {
datas.add(datum.getDictDataValue() + "@" + datum.getDictDataKey());
}
}
return datas;
}
private String[] getDataDictionary(String type) {
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/ExcelServiceImpl.java
View file @ 062025b1
......@@ -132,6 +132,13 @@ public class ExcelServiceImpl {
CompanyModel companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(type[1]));
fireChemical.setAreaCode(companyModel.getCompanyCode());
}
if (fireChemical.getStationType() != null) {
String[] type = fireChemical.getStationType().split("@");
fireChemical.setStationTypeName(type[0]);
fireChemical.setStationType(type[1]);
}
//平台增加场站
CompanyModel companyModeldata=new CompanyModel();
......@@ -141,6 +148,7 @@ public class ExcelServiceImpl {
companyModeldata.setParentId(Long.valueOf(fireChemical.getArea()));
companyModeldata.setCompanyCode(fireChemical.getStationCode());
companyModeldata= this.addCompanyModel(companyModeldata);
fireChemical.setProjectOrgCode(companyModeldata.getOrgCode());
fireChemical.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
excelEntityList.add(fireChemical);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java
View file @ 062025b1
package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jxiop.api.dto.*;
import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
......@@ -33,7 +34,7 @@ import java.util.stream.Collectors;
* @date 2023-04-20
*/
@Service
public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBasic,PersonBasicMapper> implements IPersonBasicService {
public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBasic, PersonBasicMapper> implements IPersonBasicService {
@Autowired
PersonBasicMapper personBasicMapper;
......@@ -55,45 +56,62 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
/**
* 分页查询
*/
public Page<PersonBasicDto> queryForPersonBasicPage(Page<PersonBasicDto> page) {
public Page<PersonBasicDto> queryForPersonBasicPage(Page<PersonBasicDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<PersonBasicDto> queryForPersonBasicList() {
return this.queryForList("" , false);
public List<PersonBasicDto> queryForPersonBasicList() {
return this.queryForList("", false);
}
/**
* 新增
* */
*/
@Transactional
public void addPerson(PersonDto model, HttpServletRequest httpServletRequest){
public void addPerson(PersonDto model, HttpServletRequest httpServletRequest) {
//获取人员基本信息数据
PersonUser personUser =model.getPersonUser();
PersonUser personUser = model.getPersonUser();
//获取人员资质信息
PersonCertificate personCertificate =model.getPersonCertificate();
PersonCertificate personCertificate = model.getPersonCertificate();
//获取人员账号信息
PersonAccount personAccount =model.getPersonAccount();
PersonAccount personAccount = model.getPersonAccount();
//人员基础信息
PersonBasic personBasic = new PersonBasic();
BeanUtils.copyProperties(personUser, personBasic);
this.baseMapper.insert(personBasic);
//人员技能学历信息
PersonSkillEducation personSkillEducation = new PersonSkillEducation();
BeanUtils.copyProperties(personUser, personSkillEducation);
personSkillEducation.setPersonId(personBasic.getSequenceNbr());
personSkillEducationService.save(personSkillEducation);
//人员资质信息
personCertificate.setPersonId(personBasic.getSequenceNbr());
personCertificateService.save(personCertificate);
//人员账号信息
personAccount.setPersonId(personBasic.getSequenceNbr());
personAccountService.save(personAccount);
//新增平台账号
//组装数据
AgencyUserModel usd=new AgencyUserModel();
AgencyUserModel usd = new AgencyUserModel();
//应用
usd.setAppCodes(personAccount.getApplication());
//手机号
usd.setMobile(personUser.getPhone());
//角色
Map<Long,List<Long>> map=new HashMap<>();
Map<Long, List<Long>> map = new HashMap<>();
List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
if(personAccount.getDepartmentId()!=null){
if (personAccount.getDepartmentId() != null) {
map.put(personAccount.getDepartmentId(),cdids);
}else{
map.put(personAccount.getProjectId(),cdids);
map.put(personAccount.getDepartmentId(), cdids);
} else {
map.put(personAccount.getProjectId(), cdids);
}
usd.setOrgRoleSeqs(map);
//密码
......@@ -106,43 +124,34 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
usd.setUserName(personAccount.getAccountName());
usd.setLockStatus("UNLOCK");
//新增平台用户
AgencyUserModel agencyUserModel=this.setcreateUser(usd);
AgencyUserModel agencyUserModel = this.setcreateUser(usd);
//查询部门
DepartmentModel departmentModel=null;
if(personAccount.getDepartmentId()!=null){
departmentModel= this.getdepartmentModel(personAccount.getDepartmentId());
DepartmentModel departmentModel = null;
if (personAccount.getDepartmentId() != null) {
departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
}
CompanyModel companyModel=new CompanyModel();
CompanyModel companyModel = new CompanyModel();
//单位
companyModel=this.getCompanyModel(personAccount.getProjectId());
//人员基础信息
PersonBasic personBasic = new PersonBasic();
BeanUtils.copyProperties(personUser,personBasic);
if(departmentModel!=null){
companyModel = this.getCompanyModel(personAccount.getProjectId());
if (departmentModel != null) {
personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
}else{
} else {
personBasic.setProjectOrgCode(companyModel.getOrgCode());
}
this.baseMapper.insert(personBasic);
//人员技能学历信息
PersonSkillEducation personSkillEducation = new PersonSkillEducation();
BeanUtils.copyProperties(personUser,personSkillEducation);
personSkillEducation.setPersonId(personBasic.getSequenceNbr());
personSkillEducationService.save(personSkillEducation);
//人员资质信息
personCertificate.setPersonId(personBasic.getSequenceNbr());
personCertificateService.save(personCertificate);
//人员账号信息
personAccount.setPersonId(personBasic.getSequenceNbr());
if (!personUser.getNativePlace().isEmpty()) {
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
}
personAccount.setPuserId(agencyUserModel.getUserId());
personAccount.setProjectName(companyModel.getCompanyName());
personAccountService.save(personAccount);
this.personBasicMapper.updateById(personBasic);
this.personAccountService.updateById(personAccount);
}
@Transactional
public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest,Long sequenceNbr) {
public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest, Long sequenceNbr) {
//获取人员基本信息数据
......@@ -151,22 +160,37 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
PersonCertificate personCertificate = model.getPersonCertificate();
//获取人员账号信息
PersonAccount personAccount = model.getPersonAccount();
//人员基础信息
PersonBasic personBasic = new PersonBasic();
personBasic.setSequenceNbr(sequenceNbr);
this.personBasicMapper.updateById(personBasic);
//人员归属信息
PersonSkillEducation personSkillEducation = new PersonSkillEducation();
BeanUtils.copyProperties(personUser, personSkillEducation);
personSkillEducation.setPersonId(personBasic.getSequenceNbr());
PersonSkillEducation personSkillEducationd = personSkillEducationService.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr()));
personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
personSkillEducationService.updateById(personSkillEducation);
//人员资质信息
personCertificateService.updateById(personCertificate);
//人员账号信息
personAccount.setPersonId(sequenceNbr);
personAccountService.updateById(personAccount);
//新增平台账号
//组装数据
AgencyUserModel usd=new AgencyUserModel();
AgencyUserModel usd = new AgencyUserModel();
//应用
usd.setAppCodes(personAccount.getApplication());
//手机号
usd.setMobile(personUser.getPhone());
//角色
Map<Long,List<Long>> map=new HashMap<>();
Map<Long, List<Long>> map = new HashMap<>();
List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
if(personAccount.getDepartmentId()!=null){
if (personAccount.getDepartmentId() != null) {
map.put(personAccount.getDepartmentId(),cdids);
}else{
map.put(personAccount.getProjectId(),cdids);
map.put(personAccount.getDepartmentId(), cdids);
} else {
map.put(personAccount.getProjectId(), cdids);
}
usd.setOrgRoleSeqs(map);
//密码
......@@ -180,39 +204,28 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
usd.setLockStatus("UNLOCK");
usd.setUserId(personAccount.getPuserId());
//新增平台用户
AgencyUserModel agencyUserModel=this.updateuser(personAccount.getPuserId(),usd);
AgencyUserModel agencyUserModel = this.updateuser(personAccount.getPuserId(), usd);
//查询部门
DepartmentModel departmentModel=null;
if(personAccount.getDepartmentId()!=null){
departmentModel= this.getdepartmentModel(personAccount.getDepartmentId());
DepartmentModel departmentModel = null;
if (personAccount.getDepartmentId() != null) {
departmentModel = this.getdepartmentModel(personAccount.getDepartmentId());
}
CompanyModel companyModel=new CompanyModel();
CompanyModel companyModel = new CompanyModel();
//单位
companyModel=this.getCompanyModel(personAccount.getProjectId());
companyModel = this.getCompanyModel(personAccount.getProjectId());
//人员基础信息
PersonBasic personBasic = new PersonBasic();
personBasic.setSequenceNbr(sequenceNbr);
BeanUtils.copyProperties(personUser, personBasic);
if(departmentModel!=null){
if (departmentModel != null) {
personBasic.setProjectOrgCode(departmentModel.getOrgCode());
personAccount.setProjectDepartmentName(departmentModel.getDepartmentName());
}else{
} else {
personBasic.setProjectOrgCode(companyModel.getOrgCode());
}
this.personBasicMapper.updateById(personBasic);
//人员归属信息
PersonSkillEducation personSkillEducation = new PersonSkillEducation();
BeanUtils.copyProperties(personUser, personSkillEducation);
personSkillEducation.setPersonId(personBasic.getSequenceNbr());
personSkillEducationService.updateById(personSkillEducation);
//人员资质信息
personCertificateService.updateById(personCertificate);
//人员账号信息
personAccount.setPersonId(sequenceNbr);
if (personUser.getNativePlace() != null) {
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
}
personAccount.setProjectName(companyModel.getCompanyName());
this.personBasicMapper.updateById(personBasic);
personAccountService.updateById(personAccount);
return model;
}
......@@ -226,14 +239,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
wrapper1.eq("is_delete", 0);
//人员基础信息
PersonBasic personBasic = this.getOne(wrapper1);
BeanUtils.copyProperties(personBasic,personUser);
BeanUtils.copyProperties(personBasic, personUser);
//人员技能学历信息
QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper();
wrapper2.eq("person_id", sequenceNbr);
PersonSkillEducation personSkillEducation =personSkillEducationService.getOne(wrapper2);
BeanUtils.copyProperties(personSkillEducation,personUser);
PersonSkillEducation personSkillEducation = personSkillEducationService.getOne(wrapper2);
BeanUtils.copyProperties(personSkillEducation, personUser);
QueryWrapper<PersonCertificate> wrapper3 = new QueryWrapper();
......@@ -245,7 +256,11 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
QueryWrapper<PersonAccount> wrapper4 = new QueryWrapper();
wrapper4.eq("person_id", sequenceNbr);
//人员账号信息
PersonAccount personAccount= personAccountService.getOne(wrapper4);
PersonAccount personAccount = personAccountService.getOne(wrapper4);
if (personBasic.getNativePlace() != null) {
personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
}
personDto.setPersonUser(personUser);
personDto.setPersonCertificate(personCertificate);
personDto.setPersonAccount(personAccount);
......@@ -253,31 +268,32 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
}
@Transactional
public int deletePerson(String [] ids) {
public int deletePerson(String[] ids) {
//查询所有平台用户
QueryWrapper<PersonAccount> wrapper = new QueryWrapper();
wrapper.in("person_id",ids);
List<PersonAccount> list=personAccountService.list(wrapper);
List<String> userid=new ArrayList<>();
wrapper.in("person_id", ids);
List<PersonAccount> list = personAccountService.list(wrapper);
List<String> userid = new ArrayList<>();
for (PersonAccount personAccount : list) {
userid.add(personAccount.getPuserId());
}
//删除平台
this.deleuser(String.join(",",userid));
return personBasicMapper.deleteList(ids);
//删除平台
int deleteResult = personBasicMapper.deleteList(ids);
this.deleuser(String.join(",", userid));
return deleteResult;
}
//新增平台用户
private AgencyUserModel setcreateUser(AgencyUserModel userDto) {
FeignClientResult<AgencyUserModel> amosUser=Privilege.agencyUserClient.create(userDto);
private AgencyUserModel setcreateUser(AgencyUserModel userDto) {
FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.create(userDto);
AgencyUserModel user=new AgencyUserModel();
AgencyUserModel user = new AgencyUserModel();
if (!ObjectUtils.isEmpty(amosUser)) {
if(amosUser.getStatus()==200){
user = amosUser.getResult();
}else{
if (amosUser.getStatus() == 200) {
user = amosUser.getResult();
} else {
throw new RuntimeException(amosUser.getMessage());
}
}
......@@ -286,13 +302,13 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
//修改平台用户
private AgencyUserModel updateuser(String userId, AgencyUserModel userDto) {
FeignClientResult<AgencyUserModel> amosUser=Privilege.agencyUserClient.update(userDto,userId);
AgencyUserModel user=new AgencyUserModel();
FeignClientResult<AgencyUserModel> amosUser = Privilege.agencyUserClient.update(userDto, userId);
AgencyUserModel user = new AgencyUserModel();
if (!ObjectUtils.isEmpty(amosUser)) {
if(amosUser.getStatus()==200){
if (amosUser.getStatus() == 200) {
user = amosUser.getResult();
}else{
} else {
throw new RuntimeException(amosUser.getMessage());
}
}
......@@ -300,37 +316,39 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
}
private DepartmentModel getdepartmentModel(Long departmentId) {
FeignClientResult<DepartmentModel> de=Privilege.departmentClient.seleteOne(departmentId);
FeignClientResult<DepartmentModel> de = Privilege.departmentClient.seleteOne(departmentId);
DepartmentModel departmentModel=new DepartmentModel();
DepartmentModel departmentModel = new DepartmentModel();
if (!ObjectUtils.isEmpty(de)) {
if(de.getStatus()==200){
if (de.getStatus() == 200) {
departmentModel = de.getResult();
}else{
} else {
throw new RuntimeException(de.getMessage());
}
}
return departmentModel;
}
public CompanyModel getCompanyModel(Long projectId) {
FeignClientResult<CompanyModel> cResult = Privilege.companyClient.seleteOne(projectId);
CompanyModel companyModel=new CompanyModel();
CompanyModel companyModel = new CompanyModel();
if (!ObjectUtils.isEmpty(cResult)) {
if(cResult.getStatus()==200){
if (cResult.getStatus() == 200) {
companyModel = cResult.getResult();
}else{
} else {
throw new RuntimeException(cResult.getMessage());
}
}
return companyModel;
}
private void deleuser(String userid) {
FeignClientResult<List<String>> cResult = Privilege.agencyUserClient.multDeleteUser(userid);
if (!ObjectUtils.isEmpty(cResult)) {
if(cResult.getStatus()!=200){
if (cResult.getStatus() != 200) {
throw new RuntimeException(cResult.getMessage());
}
}
......@@ -340,25 +358,20 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
* 分页查询
*/
public Page<UserMapperDto> queryPage(Page<UserMapperDto> page,
String name,
String accountName,
String projectName,String orgCode) {
String name,
String accountName,
String projectName, String orgCode) {
List<UserMapperDto> list=personBasicMapper.queryPage((page.getCurrent()-1) * page.getSize(),page.getSize(), name,
List<UserMapperDto> list = personBasicMapper.queryPage((page.getCurrent() - 1) * page.getSize(), page.getSize(), name,
accountName,
projectName,orgCode);
List<UserMapperDto> listcount=personBasicMapper.queryPagecount( name,
projectName, orgCode);
List<UserMapperDto> listcount = personBasicMapper.queryPagecount(name,
accountName,
projectName,orgCode);
projectName, orgCode);
page.setTotal(listcount.size());
page.setRecords(list);
return page;
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java
View file @ 062025b1
......@@ -15,15 +15,20 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import java.util.ArrayList;
import java.util.List;
......@@ -45,6 +50,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
PersonBasicServiceImpl personBasicServiceImpl;
@Autowired
StationBasicMapper stationBasicMapper;
private final String CZLX="CZLX";
/**
* 分页查询
*/
......@@ -88,15 +95,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
@Transactional
public void add(StationBasic stationBasic) {
//平台增加场站
CompanyModel companyModeldata=new CompanyModel();
companyModeldata.setCompanyName(stationBasic.getStationName());
companyModeldata.setCompanyType("company");
companyModeldata.setLevel("station");
companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
companyModeldata.setCompanyCode(stationBasic.getStationCode());
companyModeldata= this.addCompanyModel(companyModeldata);
//场站坐标信息
List<StationCoordinate> list= stationBasic.getStationCoordinate();
List<StationCoordinate> listdate=new ArrayList<>();
......@@ -108,19 +106,33 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
stationBasic.setAreaName(companyModel.getCompanyName());
stationBasic.setAreaCode(companyModel.getCompanyCode());
stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
//获取类型名称
String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
stationBasic.setStationTypeName(typeName);
//场站基本信息
this.save(stationBasic);
for (StationCoordinate stationCoordinate : list) {
if(CollectionUtils.isEmpty(list)){
StationCoordinate stationCoordinate = new StationCoordinate();
stationCoordinate.setStationId(stationBasic.getSequenceNbr());
listdate.add(stationCoordinate);
}else{
for (StationCoordinate stationCoordinate : list) {
stationCoordinate.setStationId(stationBasic.getSequenceNbr());
listdate.add(stationCoordinate);
}
}
stationCoordinateServiceImpl.saveBatch(listdate);
//平台增加场站
CompanyModel companyModeldata=new CompanyModel();
companyModeldata.setCompanyName(stationBasic.getStationName());
companyModeldata.setCompanyType("company");
companyModeldata.setLevel("station");
companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
companyModeldata.setCompanyCode(stationBasic.getStationCode());
companyModeldata= this.addCompanyModel(companyModeldata);
stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
this.update(stationBasic);
}
......@@ -153,7 +165,19 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
}
private String queryByCode(String dictCode,String dictDataKey) {
FeignClientResult<DictionarieValueModel> Model =Systemctl.dictionarieClient.value(dictCode,dictDataKey);
DictionarieValueModel user=new DictionarieValueModel();
if (!ObjectUtils.isEmpty(Model)) {
if(Model.getStatus()==200){
user = Model.getResult();
}else{
throw new RuntimeException(Model.getMessage());
}
}
return user.getDictDataValue();
}
......@@ -176,17 +200,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
public void update(StationBasic stationBasic) {
//平台增加场站
CompanyModel companyModeldata=new CompanyModel();
companyModeldata.setCompanyName(stationBasic.getStationName());
companyModeldata.setCompanyType("company");
companyModeldata.setLevel("station");
companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
companyModeldata.setCompanyCode(stationBasic.getStationCode());
companyModeldata= this.updateCompanyModel(companyModeldata,Long.valueOf(stationBasic.getPlatformStationId()));
//场站坐标信息
List<StationCoordinate> list= stationBasic.getStationCoordinate();
List<StationCoordinate> listdate=new ArrayList<>();
......@@ -198,24 +211,35 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
stationBasic.setAreaName(companyModel.getCompanyName());
stationBasic.setAreaCode(companyModel.getCompanyCode());
stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
//场站基本信息
stationBasicMapper.updateById(stationBasic);
//获取类型名称
String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
stationBasic.setStationTypeName(typeName);
//场站基本信息
stationBasicMapper.updateById(stationBasic);
stationBasicMapper.deleteStationCoordinateByStationid(stationBasic.getSequenceNbr());
for (StationCoordinate stationCoordinate : list) {
stationCoordinate.setStationId(stationBasic.getSequenceNbr());
listdate.add(stationCoordinate);
}
stationCoordinateServiceImpl.saveOrUpdateBatch(listdate);
//平台增加场站
CompanyModel companyModeldata=new CompanyModel();
companyModeldata.setCompanyName(stationBasic.getStationName());
companyModeldata.setCompanyType("company");
companyModeldata.setLevel("station");
companyModeldata.setParentId(Long.valueOf(stationBasic.getArea()));
companyModeldata.setCompanyCode(stationBasic.getStationCode());
companyModeldata= this.updateCompanyModel(companyModeldata,Long.valueOf(stationBasic.getPlatformStationId()));
stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
stationBasicMapper.updateById(stationBasic);
}
public int deleteList(String[] ids){
public int deleteList(String ids){
QueryWrapper<StationBasic> wrapper = new QueryWrapper();
wrapper.in("sequence_nbr",ids);
List<StationBasic> list=this.list(wrapper);
......@@ -224,10 +248,10 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
idscom.add(personAccount.getPlatformStationId());
}
//删除平台
int deleteResult = stationBasicMapper.deleteList(ids);
this.deleteCompany(String.join(",",idscom));
return stationBasicMapper.deleteList(ids);
}
return deleteResult;
}
public StationBasic getById(Long sequenceNbr){
......@@ -251,5 +275,6 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
public List<StationInfoDto> getStationList(String areaCode){
return stationBasicMapper.getStationList(areaCode);
}
public int getStationPersonByStationID(String id) {return stationBasicMapper.getStationPersonByStationID(id);};
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/resources/application.properties
View file @ 062025b1
......@@ -30,8 +30,8 @@ spring.liquibase.enabled=true
## eureka properties:
eureka.instance.prefer-ip-address=true
eureka.instance.ip-address=172.16.3.41
#eureka.instance.prefer-ip-address=true
#eureka.instance.ip-address=172.16.3.41
eureka.client.registry-fetch-interval-seconds=5
eureka.instance.health-check-url-path=/actuator/health
eureka.instance.lease-expiration-duration-in-seconds=10
......
amos-boot-system-jxiop/pom.xml
View file @ 062025b1
......@@ -25,7 +25,27 @@
<artifactId>poi-ooxml</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
</exclusions>
<exclusion>
<artifactId>easypoi-base</artifactId>
<groupId>cn.afterturn</groupId>
</exclusion>
<exclusion>
<artifactId>easypoi-annotation</artifactId>
<groupId>cn.afterturn</groupId>
</exclusion>
<exclusion>
<artifactId>easypoi-web</artifactId>
<groupId>cn.afterturn</groupId>
</exclusion>
<exclusion>
<artifactId>poi-ooxml-schemas</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
<exclusion>
<artifactId>poi</artifactId>
<groupId>org.apache.poi</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/EquipmentCategoryEnum.java
View file @ 062025b1
......@@ -11,30 +11,47 @@ import java.util.Map;
public enum EquipmentCategoryEnum {
/**
**行政区划分及对应初始监管码
* *行政区划分及对应初始监管码
*/
XZQHDT("行政区划电梯","XZQHDT"),
XZQH("行政区划","XZQH"),
BLW("补零位","0"),
JGM("监管码初始码","0000001"),
CSM("96333初始码","00001"),
YJL("已拒领","6037"),
YRL("已认领","6035"),
DRL("待认领","6036"),
CSZT("初始状态","0"),
YSY("已使用","1"),
WSY("未使用","2"),
BF("报废","6");
XZQHDT("行政区划电梯", "XZQHDT", "行政区划电梯"),
XZQH("行政区划", "XZQH", "行政区划"),
BLW("补零位", "0", "补零位"),
JGM("监管码初始码", "0000001", "监管码初始码"),
XXCSM("西咸96333初始码", "85000", "31"),
BJCSM("宝鸡96333初始码", "13000", "32"),
XYCSM("咸阳96333初始码", "75000", "33"),
TCCSM("铜川96333初始码", "05000", "34"),
WNCSM("渭南96333初始码", "13000", "35"),
YACSM("延安96333初始码", "11000", "36"),
YUCSM("榆林96333初始码", "10000", "37"),
HZCSM("汉中96333初始码", "09000", "38"),
AKCSM("安康96333初始码", "11000", "39"),
SLCSM("商洛96333初始码", "06000", "40"),
YLCSM("杨凌96333初始码", "70000", "41"),
HCCSM("韩城96333初始码", "08000", "42"),
SMCSM("神木96333初始码", "06000", "43"),
FGCSM("府谷96333初始码", "02000", "44"),
YJL("已拒领", "6037", "已拒领"),
YRL("已认领", "6035", "已认领"),
DRL("待认领", "6036", "待认领"),
CSZT("初始状态", "0", "初始状态"),
YSY("已使用", "1", "已使用"),
WSY("未使用", "2", "未使用"),
BF("报废", "6", "报废");
private String name;
private String code;
public static Map<String,String> getName=new HashMap<>();
public static Map<String,String> getCode=new HashMap<>();
private String value;
public static Map<String, String> getName = new HashMap<>();
public static Map<String, String> getCode = new HashMap<>();
public static Map<String, String> getValue = new HashMap<>();
static {
for (EquipmentCategoryEnum e : EquipmentCategoryEnum.values()){
for (EquipmentCategoryEnum e : EquipmentCategoryEnum.values()) {
getName.put(e.code, e.name);
getCode.put(e.name, e.code);
getValue.put(e.value, e.code);
}
}
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @ 062025b1
......@@ -455,7 +455,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
zero.append(num);
elevatorCode.append(zero);
} else {
elevatorCode.append(EquipmentCategoryEnum.CSM.getCode());
elevatorCode.append(EquipmentCategoryEnum.getValue.get(elevator));
}
return elevatorCode.toString();
}
......
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