wangxianzhang
3 years ago
150 changed files with 1954 additions and 791 deletions
@ -0,0 +1,17 @@ |
|||
|
|||
|
|||
UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000220', `dict_label` = '区域化党建单位--楼宇党建' |
|||
WHERE (`id` = '1000000000000000200'); |
|||
UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000221', `dict_label` = '区域化党建单位--两新组织' |
|||
WHERE (`id` = '1000000000000000201'); |
|||
UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000222', `dict_label` = '区域化党建单位--区域单位党建' |
|||
WHERE (`id` = '1000000000000000202'); |
|||
UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000223', `dict_label` = '区域化党建单位--机关直属部门' |
|||
WHERE (`id` = '1000000000000000203'); |
|||
UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000224', `dict_label` = '区域化党建单位--其他' |
|||
WHERE (`id` = '1000000000000000204'); |
|||
|
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000225', '1000000000000000007', '社会组织--社会团体', '5', '0', '', '5', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000226', '1000000000000000007', '社会组织--民办非企业单位', '6', '0', '', '6', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000227', '1000000000000000007', '社会组织--基金会', '7', '0', '', '7', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000228', '1000000000000000007', '社会组织--其他', '8', '0', '', '8', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); |
|||
@ -0,0 +1,6 @@ |
|||
update sys_dict_data set dict_label='联建单位' |
|||
where dict_value='party_unit' |
|||
and DEL_FLAG='0' |
|||
and dict_type_id=( |
|||
select st.id from sys_dict_type st where st.dict_type='user_demand_service_type' and st.DEL_FLAG='0' |
|||
); |
|||
@ -0,0 +1,25 @@ |
|||
package com.epmet.auth.dto.result; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
/** |
|||
* @ClassName BlockChainStaffAuthResultDTO |
|||
* @Description 区块链用户认证结果 |
|||
* @Author wangxianzhang |
|||
* @Date 2022/1/20 10:41 上午 |
|||
*/ |
|||
@Data |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
public class BlockChainStaffAuthResultDTO { |
|||
|
|||
private String userId; |
|||
private String realName; |
|||
private String phone; |
|||
private String headUrl; |
|||
private String agencyId; |
|||
private String agencyName; |
|||
|
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @ClassName BcAdminLoginFormDTO |
|||
* @Description 区块链管理系统staff身份认证 |
|||
* @Author wangxianzhang |
|||
* @Date 2022/1/17 10:11 下午 |
|||
*/ |
|||
@Data |
|||
public class BcStaffAuthenticationFormDTO { |
|||
|
|||
@NotBlank(message = "客户ID必填") |
|||
private String customerId; |
|||
|
|||
@NotBlank(message = "手机号必填") |
|||
private String mobile; |
|||
|
|||
@NotBlank(message = "密码必填") |
|||
private String password; |
|||
} |
|||
@ -0,0 +1 @@ |
|||
alter table ic_community_self_organization add COLUMN REMARK VARCHAR(500) comment '备注' AFTER ORGANIZATION_CREATED_TIME; |
|||
@ -0,0 +1,4 @@ |
|||
ALTER TABLE `epmet_heart`.`ic_party_activity` |
|||
ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `AGENCY_ID`; |
|||
ALTER TABLE `epmet_heart`.`latest_act_info` |
|||
ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `CUSTOMER_ID`; |
|||
Binary file not shown.
@ -0,0 +1,29 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* desc: 楼宇列表查询条件 |
|||
* |
|||
* @return |
|||
* @author LiuJanJun |
|||
* @date 2022/4/13 2:45 下午 |
|||
*/ |
|||
@Data |
|||
public class IcBuildingListFormDTO extends PageFormDTO { |
|||
|
|||
private static final long serialVersionUID = -7536532648656861790L; |
|||
/** |
|||
* 小区ID |
|||
*/ |
|||
private String neighborHoodId; |
|||
/** |
|||
* 房主姓名 |
|||
*/ |
|||
private String ownerName; |
|||
/** |
|||
* 房主电话 |
|||
*/ |
|||
private String ownerPhone; |
|||
} |
|||
@ -0,0 +1,69 @@ |
|||
package com.epmet.dto.form;/** |
|||
* Created by 11 on 2020/3/19. |
|||
*/ |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Description 小区房屋列表查询条件 |
|||
* @ClassName ListCustomerGridFormDTO |
|||
* @Author wangc |
|||
* @date 2020.03.19 15:00 |
|||
*/ |
|||
@Data |
|||
public class IcHouseListFormDTO extends PageFormDTO { |
|||
|
|||
private static final long serialVersionUID = -1L; |
|||
|
|||
/** |
|||
* 组织类别 |
|||
*/ |
|||
private String level; |
|||
|
|||
private String id; |
|||
|
|||
|
|||
/** |
|||
* 组织ID |
|||
*/ |
|||
private String agencyId; |
|||
private String pids; |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 小区名字 |
|||
*/ |
|||
private String neighborHoodName; |
|||
/** |
|||
* 楼栋名字 |
|||
*/ |
|||
private String buildingName; |
|||
/** |
|||
* 房主姓名 |
|||
*/ |
|||
private String ownerName; |
|||
/** |
|||
* 房主电话 |
|||
*/ |
|||
private String ownerPhone; |
|||
/** |
|||
* 房屋状态 【1：出租 0：自住 2：闲置】 |
|||
*/ |
|||
private String rentFlag; |
|||
/** |
|||
* 楼栋ID |
|||
*/ |
|||
private String buildingId; |
|||
/** |
|||
* 小区ID |
|||
*/ |
|||
private String neighborHoodId; |
|||
|
|||
/** |
|||
* 搜索关键词，社区查询，搜索输入的关键词 |
|||
*/ |
|||
private String keyword; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,63 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
|
|||
@Data |
|||
public class IcNeighborHoodListFormDTO extends PageFormDTO { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 组织类别 |
|||
*/ |
|||
@NotBlank(message = "组织类别不能为空") |
|||
private String level; |
|||
|
|||
/** |
|||
* orgId 跟level配套使用 |
|||
*/ |
|||
@NotBlank(message = "组织Id不能为空") |
|||
private String id; |
|||
|
|||
|
|||
/** |
|||
* 组织ID |
|||
*/ |
|||
private String agencyId; |
|||
private String pids; |
|||
private String gridId; |
|||
|
|||
|
|||
/** |
|||
* 房主姓名 |
|||
*/ |
|||
private String ownerName; |
|||
/** |
|||
* 房主电话 |
|||
*/ |
|||
private String ownerPhone; |
|||
|
|||
|
|||
|
|||
} |
|||
@ -1,85 +0,0 @@ |
|||
package com.epmet.dto.form;/** |
|||
* Created by 11 on 2020/3/19. |
|||
*/ |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.Min; |
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.Pattern; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 陌生人导览查询附近网格传参定义 |
|||
* @ClassName ListCustomerGridFormDTO |
|||
* @Author wangc |
|||
* @date 2020.03.19 15:00 |
|||
*/ |
|||
@Data |
|||
public class ListIcNeighborHoodFormDTO implements Serializable{ |
|||
|
|||
private static final long serialVersionUID = -1L; |
|||
|
|||
|
|||
/** |
|||
* 当前页 |
|||
* */ |
|||
private Integer pageNo = 1; |
|||
|
|||
/** |
|||
* 每页显示数量 |
|||
* */ |
|||
private Integer pageSize = 20; |
|||
|
|||
/** |
|||
* 组织类别 |
|||
*/ |
|||
private String level ; |
|||
|
|||
private String id; |
|||
|
|||
/** |
|||
* 组织ID |
|||
*/ |
|||
// private String agencyId;
|
|||
/** |
|||
* 网格ID |
|||
*/ |
|||
// private String gridId;
|
|||
/** |
|||
* 小区名字 |
|||
*/ |
|||
// private String neighborHoodName;
|
|||
/** |
|||
* 楼栋名字 |
|||
*/ |
|||
// private String buildingName;
|
|||
/** |
|||
* 房主姓名 |
|||
*/ |
|||
private String ownerName; |
|||
/** |
|||
* 房主电话 |
|||
*/ |
|||
private String ownerPhone; |
|||
/** |
|||
* 数据类型【小区：neighbourHood，楼栋：building，房屋：house】 |
|||
*/ |
|||
// @Pattern(regexp = "^(neighbourHood|building|house)?$",message = "数据类型选择错误")
|
|||
// private String dataType;
|
|||
/** |
|||
* 楼栋ID |
|||
*/ |
|||
private String buildingId; |
|||
/** |
|||
* 小区ID |
|||
*/ |
|||
private String neighborHoodId; |
|||
|
|||
/** |
|||
* 搜索关键词，社区查询，搜索输入的关键词 |
|||
*/ |
|||
private String keyword; |
|||
|
|||
|
|||
} |
|||
@ -1,17 +0,0 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2021/10/25 16:58 |
|||
*/ |
|||
@Data |
|||
public class HouseResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 8054109017922254586L; |
|||
private String houseId; |
|||
private String houseName; |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/4/12 16:40 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class HousesNameResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -8643628706377635279L; |
|||
|
|||
private String idCard; |
|||
|
|||
private String houseName; |
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
/** |
|||
* desc:楼宇列表结果类 |
|||
* |
|||
* @author: LiuJanJun |
|||
* @date: 2022/4/13 2:28 下午 |
|||
* @version: 1.0 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class IcBuildingListResultDTO extends PageFormDTO { |
|||
|
|||
private static final long serialVersionUID = -8277921228438123299L; |
|||
private String gridName; |
|||
private Integer totalHouseNum; |
|||
private String latitude; |
|||
private String agencyId; |
|||
private Integer sort; |
|||
private String agencyName; |
|||
private String buildingId; |
|||
private String buildingName; |
|||
private String buildingTypeKey; |
|||
private String neighborHoodId; |
|||
private String neighborHoodName; |
|||
private Integer totalFloorNum; |
|||
private String gridId; |
|||
private Integer totalUnitNum; |
|||
private String longitude; |
|||
private String buildingType; |
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
|
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* desc:房屋列表结果类 |
|||
* @author liujianjun |
|||
*/ |
|||
@Data |
|||
public class IcHouseListResultDTO implements Serializable { |
|||
|
|||
|
|||
private static final long serialVersionUID = 4963952996288796744L; |
|||
|
|||
private String houseId; |
|||
private String ownerPhone; |
|||
private String purpose; |
|||
private String doorName; |
|||
private String houseType; |
|||
private String unitNum; |
|||
private String agencyId; |
|||
private String buildingId; |
|||
private String houseName; |
|||
private String buildingName; |
|||
private String rentFlag; |
|||
private String ownerName; |
|||
private String neighborHoodId; |
|||
private String purposeKey; |
|||
private String neighborHoodName; |
|||
private String unitNumKey; |
|||
private String ownerIdCard; |
|||
private String gridId; |
|||
private String houseTypeKey; |
|||
private Integer rentFlagKey; |
|||
} |
|||
@ -0,0 +1,2 @@ |
|||
ALTER TABLE `ic_house` |
|||
MODIFY COLUMN `RENT_FLAG` tinyint(1) NOT NULL COMMENT '1：出租 0：自住 2：闲置' AFTER `PURPOSE`; |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue