forked from rongchao/epmet-cloud-rizhao
wangxianzhang
4 years ago
341 changed files with 19995 additions and 266 deletions
@ -0,0 +1,6 @@ |
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526493468551626753', 'self_org_category', '社区自组织类别', '社区自组织类别：文化队伍、楼委会、老友俱乐部、治安巡逻队、其他', 1, 0, 0, '1', '2022-05-17 17:22:58', '1', '2022-05-17 17:22:58'); |
|||
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 ('1526495882432299010', 1526493468551626753, '楼委会', 'lwh', '0', '楼委会', 2, 0, 0, '1', '2022-05-17 17:32:34', '1', '2022-05-17 17:32:34'); |
|||
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 ('1526495969778679810', 1526493468551626753, '老友俱乐部', 'lyjlb', '0', '老友俱乐部', 3, 0, 0, '1', '2022-05-17 17:32:55', '1', '2022-05-17 17:32:55'); |
|||
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 ('1526496168622243842', 1526493468551626753, '其他', 'other', '0', '其他', 5, 0, 0, '1', '2022-05-17 17:33:42', '1', '2022-05-17 17:33:51'); |
|||
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 ('1526495766724034562', 1526493468551626753, '文化队伍', 'whdw', '0', '文化队伍', 1, 0, 0, '1', '2022-05-17 17:32:06', '1', '2022-05-17 17:32:40'); |
|||
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 ('1526496054369402882', 1526493468551626753, '治安巡逻队', 'zaxld', '0', '治安巡逻队', 4, 0, 0, '1', '2022-05-17 17:33:15', '1', '2022-05-17 17:33:24'); |
|||
@ -0,0 +1,9 @@ |
|||
|
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000013', 'ic_event', '事件管理', '', '13', '0', '0', '', '2022-05-17 18:23:27', '', '2022-05-17 18:23:27'); |
|||
|
|||
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 ('3000000000000000004', '1000000000000000013', '网格员手持终端', '4', '0', '', '4', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18: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 ('3000000000000000003', '1000000000000000013', '12345', '3', '0', '', '3', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18: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 ('3000000000000000002', '1000000000000000013', '社区电话', '2', '0', '', '2', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18: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 ('3000000000000000001', '1000000000000000013', '多媒体反映', '1', '0', '', '1', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18: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 ('3000000000000000000', '1000000000000000013', '随手拍/随时讲', '0', '0', '', '0', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18:39:18'); |
|||
|
|||
@ -0,0 +1 @@ |
|||
UPDATE `epmet_admin`.`sys_dict_type` SET `id`='1000000000000000013', `dict_type`='ic_event_source_type', `dict_name`='事件管理', `remark`='', `sort`='13', `DEL_FLAG`='0', `REVISION`='0', `CREATED_BY`='', `CREATED_TIME`='2022-05-17 18:23:27', `UPDATED_BY`='', `UPDATED_TIME`='2022-05-17 18:23:27' WHERE (`id`='1000000000000000013'); |
|||
@ -0,0 +1,38 @@ |
|||
/** |
|||
* 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.commons.tools.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* epmet-user端调用gov-org端的入参 |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class IcHouseFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
private String customerId; |
|||
private String houseId; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
package com.epmet.commons.tools.dto.form.mq; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* desc:rocketmq 基础参数 |
|||
* |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2021/6/7 16:23 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class MqBaseFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -6616119263736477518L; |
|||
|
|||
/** |
|||
* 客户Id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 对象id 没有则查询全部 |
|||
*/ |
|||
private String objectId; |
|||
|
|||
/** |
|||
* 对象id 没有则查询全部 |
|||
*/ |
|||
private List<String> objectIdList; |
|||
|
|||
public MqBaseFormDTO(String customerId, String objectId) { |
|||
this.customerId = customerId; |
|||
this.objectId = objectId; |
|||
} |
|||
|
|||
public MqBaseFormDTO(String customerId, List<String> objectIdList) { |
|||
this.customerId = customerId; |
|||
this.objectIdList = objectIdList; |
|||
} |
|||
} |
|||
@ -0,0 +1,37 @@ |
|||
package com.epmet.commons.tools.enums; |
|||
|
|||
public enum PartyOrgTypeEnum { |
|||
|
|||
PROVINCIAL("0", "省委"), |
|||
MUNICIPAL("1", "市委"), |
|||
DISTRICT("2", "区委"), |
|||
WORKING("3", "党工委"), |
|||
PARTY("4", "党委"), |
|||
BRANCH("5", "支部"); |
|||
|
|||
|
|||
private String code; |
|||
private String name; |
|||
|
|||
|
|||
PartyOrgTypeEnum(String code, String name) { |
|||
this.code = code; |
|||
this.name = name; |
|||
} |
|||
|
|||
public String getCode() { |
|||
return code; |
|||
} |
|||
|
|||
public void setCode(String code) { |
|||
this.code = code; |
|||
} |
|||
|
|||
public String getName() { |
|||
return name; |
|||
} |
|||
|
|||
public void setName(String name) { |
|||
this.name = name; |
|||
} |
|||
} |
|||
@ -0,0 +1,61 @@ |
|||
package com.epmet.commons.tools.enums; |
|||
|
|||
import java.util.Objects; |
|||
|
|||
/** |
|||
* @author Administrator |
|||
*/ |
|||
public enum PartyPostEnum { |
|||
//党员职务
|
|||
PTDY("0", "普通党员"), |
|||
ZBSJ("1", "支部书记"), |
|||
ZBWY("2", "支部委员"), |
|||
DWWY("3", "党委委员"), |
|||
|
|||
UN_KNOWN("8", "未知"); |
|||
|
|||
private String code; |
|||
private String name; |
|||
|
|||
|
|||
PartyPostEnum(String code, String name) { |
|||
this.code = code; |
|||
this.name = name; |
|||
} |
|||
|
|||
public static String getName(String code) { |
|||
PartyPostEnum[] partyPostEnums = values(); |
|||
for (PartyPostEnum partyPostEnum : partyPostEnums) { |
|||
if (Objects.equals(partyPostEnum.getCode(), code)) { |
|||
return partyPostEnum.getName(); |
|||
} |
|||
} |
|||
return null; |
|||
} |
|||
|
|||
public static String getCode(String name) { |
|||
PartyPostEnum[] partyPostEnums = values(); |
|||
for (PartyPostEnum partyPostEnum : partyPostEnums) { |
|||
if (partyPostEnum.getName().equals(name)) { |
|||
return partyPostEnum.getCode(); |
|||
} |
|||
} |
|||
return null; |
|||
} |
|||
|
|||
public String getCode() { |
|||
return code; |
|||
} |
|||
|
|||
public void setCode(String code) { |
|||
this.code = code; |
|||
} |
|||
|
|||
public String getName() { |
|||
return name; |
|||
} |
|||
|
|||
public void setName(String name) { |
|||
this.name = name; |
|||
} |
|||
} |
|||
@ -0,0 +1,64 @@ |
|||
package com.epmet.commons.tools.enums; |
|||
|
|||
/** |
|||
* 社区自组织增加分类：文化队伍、楼委会、老友俱乐部、治安巡逻队、其他 |
|||
*/ |
|||
public enum SelfOrgCategoryEnum { |
|||
// 文化队伍: #e70014
|
|||
// 楼委会: #f59701
|
|||
// 老友俱乐部: #8fc41e
|
|||
// 治安巡逻队: #00a1be
|
|||
// 其他: #0067b6
|
|||
|
|||
/** |
|||
* 环境变量枚举 |
|||
*/ |
|||
|
|||
WHDW("whdw", "文化队伍", "#e70014", 1), |
|||
LWH("lwh", "楼委会", "#f59701", 2), |
|||
LYJLB("lyjlb", "老友俱乐部", "#8fc41e", 3), |
|||
ZAXLD("zaxld", "治安巡逻队", "#00a1be", 4), |
|||
OTHER("other", "其他", "#0067b6", 5), |
|||
; |
|||
|
|||
private final String code; |
|||
private final String name; |
|||
private final String color; |
|||
private final Integer sort; |
|||
|
|||
|
|||
SelfOrgCategoryEnum(String code, String name, String color, Integer sort) { |
|||
this.code = code; |
|||
this.name = name; |
|||
this.color = color; |
|||
this.sort = sort; |
|||
} |
|||
|
|||
public static SelfOrgCategoryEnum getEnum(String code) { |
|||
SelfOrgCategoryEnum[] values = SelfOrgCategoryEnum.values(); |
|||
for (SelfOrgCategoryEnum value : values) { |
|||
if (value.getCode().equals(code)) { |
|||
return value; |
|||
} |
|||
} |
|||
return SelfOrgCategoryEnum.OTHER; |
|||
|
|||
} |
|||
|
|||
public String getCode() { |
|||
return code; |
|||
} |
|||
|
|||
public String getName() { |
|||
return name; |
|||
} |
|||
|
|||
public String getColor() { |
|||
return color; |
|||
} |
|||
|
|||
public Integer getSort() { |
|||
return sort; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,92 @@ |
|||
package com.epmet.commons.tools.redis.common.bean; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 房屋信息缓存 |
|||
* @author Administrator |
|||
*/ |
|||
@Data |
|||
public class HouseInfoCache implements Serializable { |
|||
/** |
|||
* 所属家庭Id |
|||
*/ |
|||
private String homeId; |
|||
|
|||
/** |
|||
* 小区详细地址 |
|||
*/ |
|||
private String neighborAddress; |
|||
/** |
|||
* 小区id |
|||
*/ |
|||
private String neighborHoodId; |
|||
/** |
|||
* 小区名称 |
|||
*/ |
|||
private String neighborHoodName; |
|||
|
|||
|
|||
/** |
|||
* 所属楼栋id |
|||
*/ |
|||
private String buildingId; |
|||
/** |
|||
* 楼栋名称 |
|||
*/ |
|||
private String buildingName; |
|||
|
|||
|
|||
/** |
|||
* 所属单元id |
|||
*/ |
|||
private String buildingUnitId; |
|||
/** |
|||
* 单元名 |
|||
*/ |
|||
private String unitName; |
|||
|
|||
|
|||
/** |
|||
* 门牌号 |
|||
*/ |
|||
private String doorName; |
|||
|
|||
/** |
|||
* 房屋类型，1楼房，2平房，3别墅 |
|||
*/ |
|||
private String houseType; |
|||
|
|||
private String houseName; |
|||
|
|||
/** |
|||
* 楼的经度 |
|||
*/ |
|||
private String buildingLongitude; |
|||
/** |
|||
* 楼的纬度 |
|||
*/ |
|||
private String buildingLatitude; |
|||
|
|||
/** |
|||
* 小区名+楼栋名+单元名+房屋名 |
|||
*/ |
|||
private String allName; |
|||
|
|||
private String customerId; |
|||
|
|||
/** |
|||
* 小区所在的组织id |
|||
*/ |
|||
private String agencyId; |
|||
/** |
|||
* eg：市北区-阜新路街道-南宁社区 |
|||
*/ |
|||
private String agencyPathName; |
|||
/** |
|||
* 组织的area_code |
|||
*/ |
|||
private String areaCode; |
|||
} |
|||
@ -0,0 +1,11 @@ |
|||
|
|||
ALTER TABLE `fact_agency_govern_daily` |
|||
ADD COLUMN `IC_EVENT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '19、当前组织内：来源于事件管理的项目：结案已解决数' AFTER `WORK_EVENT_UN_RESOLVED_COUNT`, |
|||
ADD COLUMN `IC_EVENT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '20、当前组织内：来源于事件管理的项目：结案无需解决数' AFTER `IC_EVENT_RESOLVED_COUNT`; |
|||
|
|||
|
|||
ALTER TABLE `epmet_data_statistical`.`fact_grid_govern_daily` |
|||
ADD COLUMN `IC_EVENT_RESOLVED_COUNT` int(11) NULL DEFAULT 0 COMMENT '19、当前组织内：来源于事件管理的项目：结案已解决数' AFTER `WORK_EVENT_UN_RESOLVED_COUNT`, |
|||
ADD COLUMN `IC_EVENT_UN_RESOLVED_COUNT` int(11) NULL DEFAULT 0 COMMENT '20、当前组织内：来源于事件管理的项目：结案无需解决数' AFTER `IC_EVENT_RESOLVED_COUNT`; |
|||
|
|||
|
|||
@ -0,0 +1,33 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
@Data |
|||
public class CategorySelfOrgFormDTO extends PageFormDTO implements Serializable { |
|||
/** |
|||
* 默认展示全部，此列可空 |
|||
*/ |
|||
private String categoryCode; |
|||
|
|||
/** |
|||
* token中获取 |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空",groups = PageFormDTO.AddUserInternalGroup.class) |
|||
private String customerId; |
|||
/** |
|||
* token中获取 |
|||
*/ |
|||
@NotBlank(message = "staffId不能为空",groups = PageFormDTO.AddUserInternalGroup.class) |
|||
private String staffId; |
|||
|
|||
/** |
|||
* 当前登录用户所属组织id |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
@Data |
|||
@AllArgsConstructor |
|||
@NoArgsConstructor |
|||
public class PartyTypepercentFormDTO { |
|||
|
|||
private static final long serialVersionUID = -3833404131164761022L; |
|||
|
|||
/** |
|||
* 组织id |
|||
*/ |
|||
@NotBlank(message = "组织id不能为空") |
|||
private String agencyId; |
|||
|
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/17 18:45 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PartyUnitListFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 8059924463686783668L; |
|||
|
|||
/** |
|||
* 联建单位IDs |
|||
*/ |
|||
private List<String> partyUnitIds; |
|||
|
|||
/** |
|||
* 社区自组织IDs |
|||
*/ |
|||
private List<String> communitySelfIds; |
|||
} |
|||
@ -0,0 +1,73 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import javax.validation.constraints.Min; |
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotEmpty; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
|
|||
@Data |
|||
@AllArgsConstructor |
|||
@NoArgsConstructor |
|||
public class PartyUnitListbriefFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -2776705671944626707L; |
|||
|
|||
/** |
|||
* 页码 |
|||
*/ |
|||
@NotNull |
|||
@Min(1) |
|||
private Integer pageNo; |
|||
|
|||
/** |
|||
* 每页记录数 |
|||
*/ |
|||
@NotNull |
|||
private Integer pageSize; |
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
// private String gridId;
|
|||
|
|||
/** |
|||
* 组织id |
|||
*/ |
|||
@NotBlank(message = "组织id不能为空") |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 单位名称 |
|||
*/ |
|||
private String unitName; |
|||
|
|||
/** |
|||
* 服务事项 |
|||
*/ |
|||
private String serviceMatter; |
|||
|
|||
/** |
|||
* 分类 |
|||
*/ |
|||
private String type; |
|||
|
|||
/** |
|||
* 联系人 |
|||
*/ |
|||
private String contact; |
|||
|
|||
/** |
|||
* 联系人电话 |
|||
*/ |
|||
private String contactMobile; |
|||
|
|||
private String customerId; |
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
@Data |
|||
public class IcEventCommentToDemandFromDTO implements Serializable { |
|||
private static final long serialVersionUID = 591380873862126679L; |
|||
|
|||
//客户Id
|
|||
private String customerId; |
|||
//需求Id
|
|||
private String demandRecId; |
|||
//评价满意度【 不满意:bad、基本满意:good、非常满意:perfect 】
|
|||
private String satisfaction; |
|||
//当前操作工作人员Id
|
|||
private String staffId; |
|||
|
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
@Data |
|||
public class ServiceListFormDTO extends PageFormDTO implements Serializable { |
|||
@NotBlank(message = "type不能为空:志愿者：volunteer；社区自组织：community_org", groups = PageFormDTO.AddUserInternalGroup.class) |
|||
private String type; |
|||
|
|||
/** |
|||
* 服务方id , |
|||
* 可能是来源于多元主题分析里的社区自组织，也可能是来源于志愿者 |
|||
*/ |
|||
@NotBlank(message = "serverId不能为空", groups = PageFormDTO.AddUserInternalGroup.class) |
|||
private String serverId; |
|||
|
|||
private String customerId; |
|||
/** |
|||
* volunteer时传入此参数 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
private List<String> serverIds; |
|||
} |
|||
|
|||
@ -0,0 +1,33 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
@Data |
|||
@NoArgsConstructor |
|||
@AllArgsConstructor |
|||
public class PartyTypepercentResultDTO { |
|||
|
|||
private static final long serialVersionUID = -5256798094892121661L; |
|||
|
|||
/** |
|||
* 联建单位类型 |
|||
*/ |
|||
private String label; |
|||
|
|||
/** |
|||
* 数量 |
|||
*/ |
|||
private Integer value; |
|||
|
|||
/** |
|||
* 联建单位编码 |
|||
*/ |
|||
private String code; |
|||
|
|||
/** |
|||
* 联建单位数量占比(%) |
|||
*/ |
|||
private String percent; |
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/17 18:45 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PartyUnitListResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 8059924463686783008L; |
|||
|
|||
/** |
|||
* 协办单位ID |
|||
*/ |
|||
private String assistanceUnitId; |
|||
|
|||
/** |
|||
* 协办单位名字 |
|||
*/ |
|||
private String assistanceUnitName; |
|||
|
|||
/** |
|||
* 协办单位类型，1社区自组织，2联建单位 |
|||
*/ |
|||
private String assistanceUnitType; |
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
@Data |
|||
@AllArgsConstructor |
|||
@NoArgsConstructor |
|||
public class PartyUnitListbrieResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -300315089751537091L; |
|||
|
|||
/** |
|||
* id |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 所属网格 |
|||
*/ |
|||
// private String gridName;
|
|||
|
|||
/** |
|||
* 所属网格id |
|||
*/ |
|||
// private String gridId;
|
|||
|
|||
/** |
|||
* 分类 |
|||
*/ |
|||
private String type; |
|||
|
|||
/** |
|||
* 服务事项 |
|||
*/ |
|||
private String serviceMatter; |
|||
|
|||
/** |
|||
* 单位名称 |
|||
*/ |
|||
private String unitName; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 多元主体分析-社区自组织饼图 |
|||
*/ |
|||
@Data |
|||
public class SelfOrgCategoryTotalResDTO implements Serializable { |
|||
|
|||
private String categoryCode; |
|||
private String categoryName; |
|||
/** |
|||
* 当前分类下的社区自组织数量 |
|||
*/ |
|||
private Integer total; |
|||
private String color; |
|||
} |
|||
@ -0,0 +1,8 @@ |
|||
alter table ic_community_self_organization |
|||
add COLUMN CATEGORY_CODE VARCHAR(32) DEFAULT NULL COMMENT '分类，来源于字典表dictType=self_org_category;'; |
|||
|
|||
|
|||
|
|||
ALTER TABLE `ic_user_demand_rec` |
|||
ADD COLUMN `ORIGIN` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'demand' COMMENT '来源[需求录入:demand 事件管理:ic_event]' AFTER `DEMAND_USER_HOUSE_ID`, |
|||
ADD COLUMN `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '来源Id[目前只有来源事件管理的有值]' AFTER `ORIGIN`; |
|||
@ -0,0 +1,4 @@ |
|||
update ic_community_self_organization set CATEGORY_CODE='other' |
|||
where DEL_FLAG='0' |
|||
and CATEGORY_CODE is not null |
|||
and CATEGORY_CODE !=''; |
|||
Binary file not shown.
@ -0,0 +1,31 @@ |
|||
package com.epmet.task; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.dto.form.AutoEvaluationFormDTO; |
|||
import com.epmet.feign.GovProjectOpenFeignClient; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/18 17:53 |
|||
* @DESC |
|||
*/ |
|||
@Slf4j |
|||
@Component("autoEvaluationTask") |
|||
public class AutoEvaluationTask implements ITask{ |
|||
|
|||
@Autowired |
|||
private GovProjectOpenFeignClient projectOpenFeignClient; |
|||
|
|||
@Override |
|||
public void run(String params) { |
|||
AutoEvaluationFormDTO formDTO = new AutoEvaluationFormDTO(); |
|||
if (StringUtils.isNotBlank(params)) { |
|||
formDTO = JSON.parseObject(params, AutoEvaluationFormDTO.class); |
|||
} |
|||
projectOpenFeignClient.autoEvaluation(formDTO); |
|||
} |
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
package com.epmet.task.ic; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.dto.extract.form.ExtractOriginFormDTO; |
|||
import com.epmet.feign.EpmetUserOpenFeignClient; |
|||
import com.epmet.task.ITask; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
import javax.annotation.Resource; |
|||
|
|||
/** |
|||
* @Description |
|||
* @Author zhaoqifeng |
|||
* @Date 2022/5/23 10:58 |
|||
*/ |
|||
@Slf4j |
|||
@Component("icVolunteerDataExtractionTask") |
|||
public class IcVolunteerDataExtractionTask implements ITask { |
|||
|
|||
@Resource |
|||
private EpmetUserOpenFeignClient epmetUserOpenFeignClient; |
|||
|
|||
/** |
|||
* 执行定时任务接口 |
|||
* |
|||
* @param params 参数，多参数使用JSON数据 |
|||
*/ |
|||
@Override |
|||
public void run(String params) { |
|||
log.info("icVolunteerDataExtractionTask定时任务正在执行，参数为：{}", params); |
|||
ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO(); |
|||
if (StringUtils.isNotBlank(params)) { |
|||
formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class); |
|||
} |
|||
Result result = epmetUserOpenFeignClient.volunteerDataExtraction(formDTO.getCustomerId()); |
|||
if (result.success()) { |
|||
log.info("icVolunteerDataExtractionTask定时任务正在执行定时任务执行成功"); |
|||
} else { |
|||
log.warn("icVolunteerDataExtractionTask定时任务正在执行定时任务执行失败:" + result.getMsg()); |
|||
} |
|||
} |
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue