187 changed files with 6947 additions and 313 deletions
@ -0,0 +1,32 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/1/18 下午4:43 |
|||
*/ |
|||
@Data |
|||
public class SsoLoginOperFormDTO extends LoginCommonFormDTO { |
|||
|
|||
private static final long serialVersionUID = -4215746830030486659L; |
|||
|
|||
public interface ThirdPlatformLoginForm { |
|||
} |
|||
|
|||
/** |
|||
* 上游系统token |
|||
*/ |
|||
@NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class}) |
|||
private String thirdToken; |
|||
|
|||
/** |
|||
* 上游系统标识 |
|||
* |
|||
* @see com.epmet.enums.ThirdPlatformEnum |
|||
*/ |
|||
@NotBlank(message = "平台标识不能为空", groups = {ThirdPlatformLoginForm.class}) |
|||
private String platform; |
|||
} |
@ -0,0 +1,57 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/1/18 下午4:43 |
|||
*/ |
|||
@Data |
|||
public class ThirdPlatFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -6543952487970013031L; |
|||
|
|||
public interface SsoLoginForm { |
|||
} |
|||
|
|||
public interface ThirdPlatformLoginForm { |
|||
} |
|||
|
|||
/** |
|||
* sso票据,有效期为300秒 |
|||
*/ |
|||
@NotBlank(message = "sso票据不能为空", groups = {SsoLoginForm.class, ThirdPlatformLoginForm.class}) |
|||
private String ticket; |
|||
|
|||
/** |
|||
* 三方平台应用AppId |
|||
*/ |
|||
@NotBlank(message = "三方平台应用AppId不能为空", groups = SsoLoginForm.class) |
|||
private String appId; |
|||
|
|||
/** |
|||
* app类型 resi;居民段,work:工作端 |
|||
*/ |
|||
@NotBlank(message = "app不能为空", groups = SsoLoginForm.class) |
|||
private String app; |
|||
|
|||
@NotBlank(message = "client不能为空", groups = SsoLoginForm.class) |
|||
private String client; |
|||
|
|||
/** |
|||
* 上游系统token |
|||
*/ |
|||
@NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class}) |
|||
private String thirdToken; |
|||
|
|||
/** |
|||
* 上游系统token |
|||
* |
|||
* @see com.epmet.enums.ThirdPlatformEnum |
|||
*/ |
|||
@NotBlank(message = "token不能为空", groups = {ThirdPlatformLoginForm.class}) |
|||
private String platform; |
|||
} |
@ -0,0 +1,50 @@ |
|||
package com.epmet.enums; |
|||
|
|||
/** |
|||
* 系统环境变量枚举类 |
|||
* dev|test|prod |
|||
* |
|||
* @author jianjun liu |
|||
* @date 2020-07-03 11:14 |
|||
**/ |
|||
public enum ThirdPlatformEnum { |
|||
/** |
|||
* 平阴联动指挥平台 |
|||
*/ |
|||
PINGYIN_LIANDONG("pyld", "平阴联动指挥平台", "pyldApiService"), |
|||
; |
|||
|
|||
private String code; |
|||
private String name; |
|||
private String apiService; |
|||
|
|||
|
|||
ThirdPlatformEnum(String code, String name, String apiService) { |
|||
this.code = code; |
|||
this.name = name; |
|||
this.apiService = apiService; |
|||
} |
|||
|
|||
public static ThirdPlatformEnum getEnum(String code) { |
|||
ThirdPlatformEnum[] values = ThirdPlatformEnum.values(); |
|||
for (ThirdPlatformEnum value : values) { |
|||
if (value.getCode().equals(code)) { |
|||
return value; |
|||
} |
|||
} |
|||
return null; |
|||
} |
|||
|
|||
|
|||
public String getCode() { |
|||
return code; |
|||
} |
|||
|
|||
public String getName() { |
|||
return name; |
|||
} |
|||
|
|||
public String getApiService() { |
|||
return apiService; |
|||
} |
|||
} |
@ -0,0 +1,123 @@ |
|||
package com.epmet.commons.thirdplat.apiservice.pyld; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.alibaba.fastjson.JSONObject; |
|||
import com.epmet.commons.thirdplat.apiservice.AbstractApiService; |
|||
import com.epmet.commons.thirdplat.bean.ThirdPlatUserInfo; |
|||
import com.epmet.commons.thirdplat.constants.PyldConstants; |
|||
import com.epmet.commons.thirdplat.dto.result.jcet.PyldUserInfoResultDTO; |
|||
import com.epmet.commons.thirdplat.properties.PyldThirdplatProps; |
|||
import com.epmet.commons.thirdplat.properties.ThirdplatProps; |
|||
import com.epmet.commons.tools.exception.EpmetErrorCode; |
|||
import com.epmet.commons.tools.exception.RenException; |
|||
import com.epmet.commons.tools.utils.HttpClientManager; |
|||
import com.epmet.commons.tools.utils.Result; |
|||
import org.apache.commons.codec.digest.DigestUtils; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.slf4j.Logger; |
|||
import org.slf4j.LoggerFactory; |
|||
import org.springframework.stereotype.Service; |
|||
|
|||
import java.nio.charset.StandardCharsets; |
|||
import java.util.HashMap; |
|||
import java.util.Map; |
|||
|
|||
/** |
|||
* desc: 平阴联动指挥平台sso登陆服务类 接入文档:http://note.youdao.com/noteshare?id=167ad65365f9eccf7925e8c2629d2021&sub=555AE50510344CB5AACD5C06B9AA3B3B
|
|||
* |
|||
* @author LiuJanJun |
|||
* @date 2021/2/25 1:43 下午 |
|||
*/ |
|||
@Service |
|||
public class PyldApiService extends AbstractApiService { |
|||
|
|||
Logger logger = LoggerFactory.getLogger(getClass()); |
|||
|
|||
private PyldThirdplatProps pyldThirdplatProps; |
|||
|
|||
public PyldApiService(ThirdplatProps props) { |
|||
this.thirdplatProps = props; |
|||
pyldThirdplatProps = props.getPyld(); |
|||
} |
|||
|
|||
/** |
|||
* @return |
|||
* @Description 通过第三方平台ticket获取用户信息 |
|||
* @author wxz |
|||
* @date 2021.01.19 10:26 |
|||
*/ |
|||
@Override |
|||
public ThirdPlatUserInfo getUserInfoByTicket(String platformToken) { |
|||
|
|||
logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口开始>>>>>>>>>>>>"); |
|||
logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口入参 platformToken:{}", platformToken); |
|||
|
|||
|
|||
JSONObject jsonParam = new JSONObject(); |
|||
jsonParam.put(PyldConstants.PLAT_PARAM_TOKEN, platformToken); |
|||
jsonParam.put(PyldConstants.PLAT_PARAM_MANAGEMENTKEY, PyldConstants.PLAT_PARAM_MANAGEMENTKEY_VALUE); |
|||
|
|||
String domain = pyldThirdplatProps.getDomain(); |
|||
Result<String> result = HttpClientManager.getInstance().sendPost( |
|||
domain.concat(PyldConstants.METHOD_CHECK_LOGIN), |
|||
domain.startsWith("https://"), |
|||
jsonParam.toJSONString(), |
|||
buildHeaders()); |
|||
|
|||
logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口返回:{}", result.getData()); |
|||
logger.info("【请求平阴联动指挥平台第三方平台】getUserInfoByTicket()接口结束<<<<<<<<<<<<"); |
|||
PyldUserInfoResultDTO resultDTO = this.parseResult(result); |
|||
|
|||
ThirdPlatUserInfo userInfo = new ThirdPlatUserInfo(); |
|||
userInfo.setMobile(resultDTO.getMobile()); |
|||
userInfo.setCustomerId(resultDTO.getReserved()); |
|||
return userInfo; |
|||
|
|||
} |
|||
|
|||
/** |
|||
* 构建请求头信息 |
|||
* |
|||
* @return |
|||
*/ |
|||
private Map<String, Object> buildHeaders() { |
|||
Map<String, Object> headers = new HashMap(); |
|||
long timestamp = System.currentTimeMillis(); |
|||
headers.put(PyldConstants.PLAT_HEADER_TIMESTAMP, timestamp); |
|||
headers.put(PyldConstants.PLAT_HEADER_APP_KEY, pyldThirdplatProps.getAppkey()); |
|||
String encryptContent = pyldThirdplatProps.getAppId() + pyldThirdplatProps.getAppkey() + pyldThirdplatProps.getAppSecret() + timestamp; |
|||
headers.put(PyldConstants.PLAT_HEADER_ACCESS_TOKEN, DigestUtils.md5Hex(encryptContent.getBytes(StandardCharsets.UTF_8))); |
|||
return headers; |
|||
} |
|||
|
|||
/** |
|||
* desc: 解析结果 |
|||
* |
|||
* @param thResult |
|||
* @return com.epmet.commons.thirdplat.dto.result.jcet.JcetUserInfoResultDTO |
|||
* @author LiuJanJun |
|||
* @date 2021/2/24 10:11 上午 |
|||
*/ |
|||
private PyldUserInfoResultDTO parseResult(Result<String> thResult) { |
|||
if (!thResult.success()) { |
|||
throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(), |
|||
EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getMsg().concat(":").concat(thResult.getInternalMsg())); |
|||
} |
|||
JSONObject jcetResult = JSON.parseObject(thResult.getData()); |
|||
Integer code = jcetResult.getInteger("code"); |
|||
String msg = jcetResult.getString("msg"); |
|||
if (code == null || code != 0) { |
|||
throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(), msg.concat(",错误码:") + code); |
|||
} |
|||
JSONObject data = jcetResult.getJSONObject("data"); |
|||
if (data == null) { |
|||
throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(), |
|||
EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getMsg().concat(":").concat(PyldConstants.REPONSE_USER_NOT_LOGIN)); |
|||
} |
|||
PyldUserInfoResultDTO userInfo = data.getObject("userInfo", PyldUserInfoResultDTO.class); |
|||
if (userInfo == null || StringUtils.isBlank(userInfo.getMobile()) || StringUtils.isBlank(userInfo.getReserved())) { |
|||
throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(), PyldConstants.REPONSE_USER_NOT_LOGIN); |
|||
} |
|||
return userInfo; |
|||
} |
|||
} |
@ -0,0 +1,18 @@ |
|||
package com.epmet.commons.thirdplat.constants; |
|||
|
|||
public interface PyldConstants { |
|||
|
|||
String METHOD_CHECK_LOGIN = "/unifiedAuth/loginCheck"; |
|||
|
|||
|
|||
String PLAT_HEADER_TIMESTAMP = "timestamp"; |
|||
String PLAT_HEADER_APP_KEY = "appkey"; |
|||
String PLAT_HEADER_ACCESS_TOKEN = "accessToken"; |
|||
|
|||
|
|||
String PLAT_PARAM_TOKEN = "platformToken"; |
|||
String PLAT_PARAM_MANAGEMENTKEY = "managementKey"; |
|||
String PLAT_PARAM_MANAGEMENTKEY_VALUE = "epmet_work"; |
|||
|
|||
String REPONSE_USER_NOT_LOGIN = "token失效,请重新登陆"; |
|||
} |
@ -0,0 +1,18 @@ |
|||
package com.epmet.commons.thirdplat.dto.result.jcet; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
@Data |
|||
public class PyldUserInfoResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 6176427074670949388L; |
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 客户Id |
|||
*/ |
|||
private String reserved; |
|||
} |
@ -0,0 +1,14 @@ |
|||
package com.epmet.commons.thirdplat.properties; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* 酒城e通三方平台配置 |
|||
*/ |
|||
@Data |
|||
public class PyldThirdplatProps { |
|||
private String domain; |
|||
private String appId; |
|||
private String appkey; |
|||
private String appSecret; |
|||
} |
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 描述一下 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/2/27 17:52 |
|||
*/ |
|||
@Data |
|||
public class AgencyInfoDTO implements Serializable { |
|||
private String agencyId; |
|||
private String areaCode; |
|||
private List<String> subAgencyIds; |
|||
private List<String> subGridIds; |
|||
} |
@ -0,0 +1,142 @@ |
|||
/** |
|||
* 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; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
import java.math.BigDecimal; |
|||
|
|||
/** |
|||
* 项目(事件)分类按网格_按天统计 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-02-23 |
|||
*/ |
|||
@Data |
|||
public class ScreenProjectCategoryGridDailyDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 日期yyyyMMdd |
|||
*/ |
|||
private String dateId; |
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 网格所属的组织id |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* 网格所有的父级id,以英文:或者英文,隔开 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* e世通中的项目类别编码 |
|||
*/ |
|||
private String epmetCategoryCode; |
|||
|
|||
/** |
|||
* 该分类下所有项目总数 |
|||
*/ |
|||
private Integer projectTotal; |
|||
|
|||
/** |
|||
* 该分类下,正在处理中的项目总数 |
|||
*/ |
|||
private Integer pendingTotal; |
|||
|
|||
/** |
|||
* 该分类下已结案的项目总数 |
|||
*/ |
|||
private Integer closedTotal; |
|||
|
|||
/** |
|||
* 该分类下已结案无需解决的项目总数 |
|||
*/ |
|||
private Integer unResolvedTotal; |
|||
|
|||
/** |
|||
* 该分类下已结案已解决的项目总数 |
|||
*/ |
|||
private Integer resolvedTotal; |
|||
|
|||
/** |
|||
* 该分类下项目结案率 |
|||
*/ |
|||
private BigDecimal closedRatio; |
|||
|
|||
/** |
|||
* 该分类下已结案项目解决率 |
|||
*/ |
|||
private BigDecimal resolvedRatio; |
|||
|
|||
/** |
|||
* 该分类下已结案项目未解决率 |
|||
*/ |
|||
private BigDecimal unResolvedRatio; |
|||
|
|||
/** |
|||
* 删除标识 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
@ -0,0 +1,147 @@ |
|||
/** |
|||
* 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; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
import java.math.BigDecimal; |
|||
|
|||
/** |
|||
* 项目(事件)分类按组织_按天统计 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-02-23 |
|||
*/ |
|||
@Data |
|||
public class ScreenProjectCategoryOrgDailyDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 日期yyyyMMdd |
|||
*/ |
|||
private String dateId; |
|||
|
|||
/** |
|||
* 组织id |
|||
*/ |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 社区级:community,乡(镇、街道)级:street,区县级: district,市级: city省级:province |
|||
*/ |
|||
private String orgType; |
|||
|
|||
/** |
|||
* 当前orgId所属的上级id |
|||
*/ |
|||
private String pid; |
|||
|
|||
/** |
|||
* orgId所有的父级id,以英文:或者英文,隔开 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* e世通中的项目类别编码 |
|||
*/ |
|||
private String epmetCategoryCode; |
|||
|
|||
/** |
|||
* 该分类下所有项目总数 |
|||
*/ |
|||
private Integer projectTotal; |
|||
|
|||
/** |
|||
* 该分类下,正在处理中的项目总数 |
|||
*/ |
|||
private Integer pendingTotal; |
|||
|
|||
/** |
|||
* 该分类下已结案的项目总数 |
|||
*/ |
|||
private Integer closedTotal; |
|||
|
|||
/** |
|||
* 该分类下已结案无需解决的项目总数 |
|||
*/ |
|||
private Integer unResolvedTotal; |
|||
|
|||
/** |
|||
* 该分类下已结案已解决的项目总数 |
|||
*/ |
|||
private Integer resolvedTotal; |
|||
|
|||
/** |
|||
* 该分类下项目结案率 |
|||
*/ |
|||
private BigDecimal closedRatio; |
|||
|
|||
/** |
|||
* 该分类下已结案项目解决率 |
|||
*/ |
|||
private BigDecimal resolvedRatio; |
|||
|
|||
/** |
|||
* 该分类下已结案项目未解决率 |
|||
*/ |
|||
private BigDecimal unResolvedRatio; |
|||
|
|||
/** |
|||
* 删除标识 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.form.screen; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2021/2/23 15:26 |
|||
*/ |
|||
@Data |
|||
public class CategoryAnalysisFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -3088762710988337423L; |
|||
|
|||
public interface CategoryAnalysis{} |
|||
|
|||
@NotBlank(message = "组织ID不能为空",groups = {CategoryAnalysis.class}) |
|||
private String agencyId; |
|||
} |
@ -0,0 +1,26 @@ |
|||
package com.epmet.dto.result.screen; |
|||
|
|||
import lombok.Data; |
|||
import lombok.NoArgsConstructor; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @author zhaoqifeng |
|||
* @dscription |
|||
* @date 2021/2/23 15:28 |
|||
*/ |
|||
@NoArgsConstructor |
|||
@Data |
|||
public class CategoryAnalysisResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 4500337306142206855L; |
|||
/** |
|||
* 类别名称 |
|||
*/ |
|||
private String categoryName; |
|||
/** |
|||
* 项目总数 |
|||
*/ |
|||
private Integer projectTotal; |
|||
} |
@ -0,0 +1,19 @@ |
|||
package com.epmet.evaluationindex.screen.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: liushaowen |
|||
* @date: 2021/2/24 16:12 |
|||
*/ |
|||
@Data |
|||
public class ScreenProjectDetailFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
@NotBlank(message = "projectId不能为空") |
|||
private String projectId; |
|||
} |
@ -0,0 +1,21 @@ |
|||
package com.epmet.evaluationindex.screen.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: liushaowen |
|||
* @date: 2021/2/24 15:22 |
|||
*/ |
|||
@Data |
|||
public class ScreenProjectDistributionFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
private String areaCode; |
|||
|
|||
private String level; |
|||
|
|||
private String agencyId; |
|||
} |
@ -0,0 +1,42 @@ |
|||
package com.epmet.evaluationindex.screen.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 描述一下 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/2/28 14:29 |
|||
*/ |
|||
@Data |
|||
public class SubAgencyIndexRankPyFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 8930332375421099186L; |
|||
/** |
|||
* 当前组织,平阴大屏,默认传跟组织 |
|||
* */ |
|||
@NotBlank(message = "agencyId不能为空") |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 目前只有平阴在传,默认赋值:370124 |
|||
* */ |
|||
@NotBlank(message = "areaCode不能为空;平阴默认传:370124") |
|||
private String areaCode; |
|||
|
|||
/** |
|||
* 默认查询前10条 |
|||
* */ |
|||
@NotNull(message = "topNum不能为空") |
|||
private Integer topNum; |
|||
|
|||
@NotBlank(message = "type不能为空,街道:street;网格:grid") |
|||
private String type; |
|||
|
|||
@NotBlank(message = "customerId不能为空") |
|||
private String customerId; |
|||
} |
@ -0,0 +1,124 @@ |
|||
package com.epmet.evaluationindex.screen.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import com.fasterxml.jackson.annotation.JsonInclude; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: liushaowen |
|||
* @date: 2021/2/24 16:15 |
|||
*/ |
|||
@Data |
|||
public class ScreenProjectDetailResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
/** |
|||
* 项目id |
|||
*/ |
|||
private String projectId; |
|||
/** |
|||
* 议题内容,其实就是项目内容 |
|||
*/ |
|||
private String projectContent; |
|||
/** |
|||
* 上报时间,对应的是立项时间;格式:yyyy-MM-dd HH:mm |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") |
|||
private String reportTime; |
|||
/** |
|||
* 所属类别名称 |
|||
*/ |
|||
private String categoryName; |
|||
/** |
|||
* 上报人名 |
|||
*/ |
|||
private String reportUserName; |
|||
/** |
|||
* 上报人电话 |
|||
*/ |
|||
private String mobile; |
|||
/** |
|||
* 上报位置 |
|||
*/ |
|||
private String reportAddress; |
|||
/** |
|||
* 图片列表 |
|||
*/ |
|||
private List<String> imgList; |
|||
/** |
|||
* 处理进展列表(返回的是按时间升序的集合) |
|||
*/ |
|||
private List<processDTO> processList; |
|||
|
|||
@Data |
|||
public static class processDTO{ |
|||
@JsonIgnore |
|||
private String processId; |
|||
/** |
|||
* 处理部门名称 |
|||
*/ |
|||
private String handleDeptName; |
|||
/** |
|||
* 公开处理意见 |
|||
*/ |
|||
private String suggestion; |
|||
/** |
|||
* 处理时间:yyyy-MM-dd HH:mm:ss |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date reponseTime; |
|||
/** |
|||
* 关闭:close; 回应 response,结案closed_case,退回return,部门流转transfer,创建项目created |
|||
*/ |
|||
private String operation; |
|||
/** |
|||
* 被吹哨部门;如果是多个以逗号隔开返给前端。 |
|||
*/ |
|||
private String whistleDeptName; |
|||
|
|||
private List<AttachmentDTO> attachments; |
|||
|
|||
@Data |
|||
public static class AttachmentDTO{ |
|||
@JsonInclude(JsonInclude.Include.NON_NULL) |
|||
/** |
|||
* 文件名 |
|||
*/ |
|||
private String fileName; |
|||
@JsonInclude(JsonInclude.Include.NON_NULL) |
|||
/** |
|||
* 附件名(uuid随机生成) |
|||
*/ |
|||
private String attachmentName; |
|||
@JsonInclude(JsonInclude.Include.NON_NULL) |
|||
/** |
|||
* 附件大小 字节为单位 |
|||
*/ |
|||
private String attachmentSize; |
|||
@JsonInclude(JsonInclude.Include.NON_NULL) |
|||
/** |
|||
* 文件格式(JPG、PNG、JPEG、BMP、GIF、PDF、PPT、PPTX、DOC、DOCX、XLS、XLSX、MP3、WMA、M4A、MP4、AVI、MOV、RMVB、RM、WMV) |
|||
*/ |
|||
private String attachmentFormat; |
|||
@JsonInclude(JsonInclude.Include.NON_NULL) |
|||
/** |
|||
* 文件类型((图片 - image、 视频 - video、 语音 - voice、 文档 - doc)) |
|||
*/ |
|||
private String attachmentType; |
|||
/** |
|||
* url地址 |
|||
*/ |
|||
private String attachmentUrl; |
|||
@JsonInclude(JsonInclude.Include.NON_NULL) |
|||
/** |
|||
* 语音或视频时长,秒 |
|||
*/ |
|||
private String duration; |
|||
} |
|||
} |
|||
} |
@ -0,0 +1,32 @@ |
|||
package com.epmet.evaluationindex.screen.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: liushaowen |
|||
* @date: 2021/2/24 15:26 |
|||
*/ |
|||
@Data |
|||
public class ScreenProjectDistributionResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
/** |
|||
* 主键id |
|||
*/ |
|||
private String id; |
|||
/** |
|||
* 项目标题 |
|||
*/ |
|||
private String projectTitle; |
|||
/** |
|||
* 项目等级 1:红色事件;2:黄色事件;3:绿色事件 |
|||
*/ |
|||
private String level; |
|||
/** |
|||
* 经纬度 |
|||
*/ |
|||
private String longitude; |
|||
private String latitude; |
|||
} |
@ -0,0 +1,31 @@ |
|||
package com.epmet.plugins.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
/** |
|||
* 7、【工作日志】党员志愿者服务近12月趋势图 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/2/27 19:53 |
|||
*/ |
|||
@Data |
|||
public class VoluntaryServiceTrendFormDTO { |
|||
/** |
|||
* 当前组织id |
|||
*/ |
|||
@NotBlank(message = "agencyId不能为空") |
|||
private String agencyId; |
|||
|
|||
@NotBlank(message = "目前只有平阴在传,默认赋值:370124") |
|||
private String areaCode; |
|||
|
|||
@NotBlank(message = "customerId不能为空") |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 截止到某月格式:yyyyMM;目前没有让大屏前端赋值,代码默认为为上个月 |
|||
*/ |
|||
private String endMonthId; |
|||
} |
@ -0,0 +1,46 @@ |
|||
package com.epmet.plugins.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 6、【工作日志】近12月趋势图 |
|||
* |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class WorkRecordTrendFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -2934835714413031036L; |
|||
/** |
|||
* party:支部建设; union:联建共建;党员志愿服务:voluntaryservice |
|||
*/ |
|||
@NotBlank(message = "dataType不能为空;可选值:party:支部建设; union:联建共建") |
|||
private String dataType; |
|||
|
|||
/** |
|||
* 当前组织id |
|||
*/ |
|||
@NotBlank(message = "agencyId不能为空") |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 组织次数:organize;参与人数:joinuser;平均参与人数:avguser |
|||
*/ |
|||
@NotBlank(message = "type不能为空") |
|||
private String type; |
|||
|
|||
@NotBlank(message = "customerId不能为空") |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 查询数据起始月份Id |
|||
*/ |
|||
private String startMonth; |
|||
|
|||
/** |
|||
* 查询数据结束月份Id |
|||
*/ |
|||
private String endMonth; |
|||
} |
@ -0,0 +1,30 @@ |
|||
package com.epmet.plugins.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 7、【工作日志】党员志愿者服务近12月趋势图 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/2/28 13:41 |
|||
*/ |
|||
@Data |
|||
public class VoluntaryServiceTrendDTO implements Serializable { |
|||
private String monthId; |
|||
/** |
|||
* 组织次数 |
|||
*/ |
|||
private Integer organizeTotal; |
|||
|
|||
/** |
|||
* 参与人数 |
|||
*/ |
|||
private Integer participateUserTotal; |
|||
|
|||
/** |
|||
* 平均参与人数 |
|||
*/ |
|||
private Integer avgParticipateUserTotal; |
|||
} |
@ -0,0 +1,23 @@ |
|||
package com.epmet.plugins.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 7、【工作日志】党员志愿者服务近12月趋势图 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/2/27 19:55 |
|||
*/ |
|||
@Data |
|||
public class VoluntaryServiceTrendResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -560895826884970305L; |
|||
private List<String> xAxis=new ArrayList<>(); |
|||
//组织次数:organize;参与人数:joinuser;平均参与人数:avguser
|
|||
private List<Integer> organizeList=new ArrayList<>(); |
|||
private List<Integer> joinUserList=new ArrayList<>(); |
|||
private List<Integer> avgUserList=new ArrayList<>(); |
|||
} |
@ -0,0 +1,56 @@ |
|||
package com.epmet.plugins.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 6、【工作日志】近12月趋势图 |
|||
* |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class WorkRecordTrendResultDTO implements Serializable { |
|||
/** |
|||
* 横轴 过去十二个月份 |
|||
* ['1月', '2月', '3月', '4月', '5月','6月','7月','8月','9月','10月','11月','12月'] |
|||
*/ |
|||
private List<String> xAxis = new ArrayList<>(); |
|||
/** |
|||
* 资源标签名 |
|||
* ['三会一课', '主题党日', '三述专题', '志愿服务', '党内关怀'] |
|||
*/ |
|||
private List<String> legend = new ArrayList<>(); |
|||
|
|||
/** |
|||
*各项资源对应数据对象 |
|||
*/ |
|||
private List<WorkRecordTrendResultDTO.SeriesResultDTO> series = new ArrayList<>(); |
|||
|
|||
@Data |
|||
public static class SeriesResultDTO { |
|||
/** |
|||
* 资源标签名 |
|||
* ['三会一课', '主题党日', '三述专题', '志愿服务', '党内关怀'] |
|||
*/ |
|||
private String name; |
|||
/** |
|||
* 各项资源对应12月份数据 |
|||
*/ |
|||
private List<Integer> data = new ArrayList<>(); |
|||
/** |
|||
* 数据对应的月份Id |
|||
*/ |
|||
@JsonIgnore |
|||
private String monthId; |
|||
/** |
|||
* 各项资源对应某一月份数据 |
|||
*/ |
|||
@JsonIgnore |
|||
private Integer value; |
|||
} |
|||
|
|||
} |
@ -0,0 +1,42 @@ |
|||
/** |
|||
* 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.datareport.dao.evaluationindex.screen; |
|||
|
|||
import com.epmet.dto.result.screen.CategoryAnalysisResultDTO; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 项目(事件)分类按组织_按天统计 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-02-23 |
|||
*/ |
|||
@Mapper |
|||
public interface ScreenProjectCategoryOrgDailyDao { |
|||
/** |
|||
* 类型分析 |
|||
* @author zhaoqifeng |
|||
* @date 2021/2/23 16:47 |
|||
* @param agencyId |
|||
* @return java.util.List<com.epmet.dto.result.screen.CategoryAnalysisResultDTO> |
|||
*/ |
|||
List<CategoryAnalysisResultDTO> selectCategoryAnalysis(@Param("agencyId") String agencyId); |
|||
} |
@ -0,0 +1,24 @@ |
|||
package com.epmet.datareport.dao.evaluationindex.screen; |
|||
|
|||
import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO; |
|||
import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
|
|||
@Mapper |
|||
public interface ScreenProjectDataDao { |
|||
|
|||
List<ScreenProjectDistributionResultDTO> projectDistribution(@Param("agencyId") String agencyId, @Param("ids") List<String> ids, @Param("level") String level); |
|||
|
|||
List<String> selectIdsByAreaCode(@Param("areaCode") String areaCode); |
|||
|
|||
List<ScreenProjectDetailResultDTO> projectDistributionDetail(@Param("projectId") String projectId); |
|||
|
|||
List<String> selectProjectImgs(@Param("projectId") String projectId); |
|||
|
|||
List<ScreenProjectDetailResultDTO.processDTO> selectProjectProcess(@Param("projectId") String projectId); |
|||
|
|||
List<ScreenProjectDetailResultDTO.processDTO.AttachmentDTO> selectProjectProcessAttachments(@Param("processId") String processId); |
|||
} |
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue