().ok(thirdLoginService.resiLoginInternalDing(formDTO));
+ }
}
diff --git a/epmet-auth/src/main/java/com/epmet/dto/dingres/DingUserDetailDTO.java b/epmet-auth/src/main/java/com/epmet/dto/dingres/DingUserDetailDTO.java
new file mode 100644
index 0000000000..4a46922590
--- /dev/null
+++ b/epmet-auth/src/main/java/com/epmet/dto/dingres/DingUserDetailDTO.java
@@ -0,0 +1,73 @@
+package com.epmet.dto.dingres;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/9/22 14:16
+ */
+@Data
+public class DingUserDetailDTO {
+ // 接口文档：https://open.dingtalk.com/document/isvapp-server/query-user-details
+ /**
+ * 员工的userId。
+ */
+ private String userid;
+
+ /**
+ * 员工在当前开发者企业账号范围内的唯一标识。
+ */
+ private String unionid;
+
+ /**
+ * 员工姓名。
+ */
+ private String name;
+ /**
+ * 头像。
+ *
+ * 说明 员工使用默认头像，不返回该字段，手动设置头像会返回
+ */
+ private String avatar;
+ /**
+ * 国际电话区号。
+ *
+ * 说明 第三方企业应用不返回该字段；如需获取state_code，可以使用钉钉统一授权套件方式获取。
+ */
+ private String state_code;
+ /**
+ * 手机号码。
+ *
+ * 说明
+ * 企业内部应用，只有应用开通通讯录邮箱等个人信息权限，才会返回该字段。
+ * 第三方企业应用不返回该字段，如需获取mobile，可以使用钉钉统一授权套件方式获取。
+ */
+ private String mobile;
+ /**
+ * 是否号码隐藏：
+ *
+ * true：隐藏
+ *
+ * false：不隐藏
+ *
+ * 说明 隐藏手机号后，手机号在个人资料页隐藏，但仍可对其发DING、发起钉钉免费商务电话。
+ */
+ private String hide_mobile;
+ /**
+ * 分机号。
+ *
+ * 说明 第三方企业应用不返回该参数。
+ */
+ private String telephone;
+
+ /**
+ * 员工的企业邮箱。
+ *
+ * 如果员工的企业邮箱没有开通，返回信息中不包含该数据。
+ *
+ * 说明 第三方企业应用不返回该参数。
+ */
+ private String org_email;
+}
+
diff --git a/epmet-auth/src/main/java/com/epmet/dto/dingres/V2UserGetuserinfoResDTO.java b/epmet-auth/src/main/java/com/epmet/dto/dingres/V2UserGetuserinfoResDTO.java
new file mode 100644
index 0000000000..ea9eb3b46b
--- /dev/null
+++ b/epmet-auth/src/main/java/com/epmet/dto/dingres/V2UserGetuserinfoResDTO.java
@@ -0,0 +1,54 @@
+package com.epmet.dto.dingres;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/9/22 14:08
+ */
+@Data
+public class V2UserGetuserinfoResDTO {
+ // 接口返参：https://open.dingtalk.com/document/orgapp-server/obtain-the-userid-of-a-user-by-using-the-log-free
+ /**
+ * 用户的userid。
+ */
+ private String userid;
+ /**
+ * 设备ID。
+ */
+ private String device_id;
+ /**
+ * 是否是管理员。
+ *
+ * true：是
+ *
+ * false：不是
+ */
+ private Boolean sys;
+ /**
+ * 级别。
+ *
+ * 1：主管理员
+ *
+ * 2：子管理员
+ *
+ * 100：老板
+ *
+ * 0：其他（如普通员工）
+ */
+ private Number sys_level;
+ /**
+ * 用户关联的unionId。
+ */
+ private String associated_unionid;
+ /**
+ * 用户unionId。
+ */
+ private String unionid;
+ /**
+ * 用户名字。
+ */
+ private String name;
+}
+
diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ResiDingAppLoginFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ResiDingAppLoginFormDTO.java
new file mode 100644
index 0000000000..b18e95478a
--- /dev/null
+++ b/epmet-auth/src/main/java/com/epmet/dto/form/ResiDingAppLoginFormDTO.java
@@ -0,0 +1,41 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/9/14 17:11
+ */
+@Data
+public class ResiDingAppLoginFormDTO {
+ public interface InnerMiniApp {}
+ public interface ThirdMiniApp {}
+ /**
+ * 授权统一后的authCode
+ */
+ @NotBlank(message = "authCode不能为空",groups = InnerMiniApp.class)
+ private String authCode;
+// /**
+// * 第三方企业应用传应用的SuiteKey
+// */
+// @NotBlank(message = "clientId不能为空")
+// private String clientId;
+ /**
+ * 第三方企业应用传应用的SuiteKey
+ */
+ @NotBlank(message = "miniAppId不能为空",groups = InnerMiniApp.class)
+ private String miniAppId;
+
+ // @NotBlank(message = "当前访问用户的企业corpId不能为空")
+ // private String corpId;
+
+ /**
+ * third：第三方应用
+ * company_customize:企业定制应用
+ */
+ private String appType="company_customize";
+}
+
diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ResiDingAppLoginMdFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ResiDingAppLoginMdFormDTO.java
new file mode 100644
index 0000000000..0b3b9ae0f8
--- /dev/null
+++ b/epmet-auth/src/main/java/com/epmet/dto/form/ResiDingAppLoginMdFormDTO.java
@@ -0,0 +1,23 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/9/22 10:42
+ */
+@Data
+public class ResiDingAppLoginMdFormDTO {
+ @NotBlank(message = "authCode不能为空")
+ private String authCode;
+ /**
+ * 第三方企业应用传应用的SuiteKey
+ */
+ @NotBlank(message = "miniAppId不能为空")
+ private String miniAppId;
+
+}
+
diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java
index 3cad308ab6..fd1d93b725 100644
--- a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java
+++ b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java
@@ -1,6 +1,5 @@
package com.epmet.dto.form;
-import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -13,36 +12,20 @@ import java.io.Serializable;
@Data
public class ThirdStaffOrgByAccountFormDTO implements Serializable {
private static final long serialVersionUID = 4193133227120225342L;
- /**
- * 添加用户操作的用户可见异常分组
- * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
- * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容
- */
- public interface AddUserShowGroup extends CustomerClientShowGroup {
- }
- public interface GetMyOrgByPassWordGroup extends CustomerClientShowGroup {
- }
- public interface GetMyOrgByLoginWxmp extends CustomerClientShowGroup{}
/**
* 小程序appId
*/
- @NotBlank(message = "appId不能为空", groups = {AddUserShowGroup.class})
+ @NotBlank(message = "appId不能为空")
private String appId;
/**
* 手机号
*/
- @NotBlank(message = "账号不能为空", groups = {AddUserShowGroup.class})
+ @NotBlank(message = "账号不能为空")
private String userAccount;
- /**
- * 验证码
- */
- @NotBlank(message="验证码不能为空", groups = {GetMyOrgByLoginWxmp.class})
- private String smsCode;
-
- @NotBlank(message = "密码不能为空",groups ={GetMyOrgByPassWordGroup.class})
+ @NotBlank(message = "密码不能为空")
private String password;
}
diff --git a/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java b/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java
new file mode 100644
index 0000000000..7a0517574a
--- /dev/null
+++ b/epmet-auth/src/main/java/com/epmet/dto/result/ResiDingAppLoginResDTO.java
@@ -0,0 +1,42 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/9/14 17:20
+ */
+@Data
+public class ResiDingAppLoginResDTO {
+ private String authorization;
+ private String customerId;
+ private String gridId;
+ /**
+ * 网格名
+ */
+ private String gridName;
+ /**
+ * 网格所属的组织id
+ */
+ private String agencyId;
+ /**
+ * 居民端用户id
+ */
+ private String epmetUserId;
+
+ /**
+ * 5.获取用户手机号。使用用户个人access_token调用获取用户通讯录个人信息接口获取
+ * 返参信息
+ * 接口文档：https://open.dingtalk.com/document/isvapp-server/dingtalk-retrieve-user-information
+ */
+ private String extInfo;
+
+ /**
+ * 是否注册居民
+ * true:已注册
+ * false:未注册
+ */
+ private Boolean regFlag;
+}
+
diff --git a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
index 69d13bf926..70bcc92338 100644
--- a/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
+++ b/epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
@@ -1,6 +1,7 @@
package com.epmet.service;
import com.epmet.dto.form.*;
+import com.epmet.dto.result.ResiDingAppLoginResDTO;
import com.epmet.dto.result.StaffOrgsResultDTO;
import com.epmet.dto.result.UserTokenResultDTO;
@@ -84,4 +85,29 @@ public interface ThirdLoginService {
* @description 单客户-工作端微信小程序登录-发送验证码
**/
void sendSmsCode(ThirdSendSmsCodeFormDTO formDTO);
+
+ /**
+ * 钉钉应用的登录-居民端
+ * 产品服务商建立第三方企业应用
+ * 参考文档：https://open.dingtalk.com/document/isvapp-server/unified-authorization-suite-access-process
+ * @param formDTO
+ * @return
+ */
+ ResiDingAppLoginResDTO resiLoginDing(ResiDingAppLoginFormDTO formDTO);
+
+ /**
+ * 企业简历内部应用授权给第三方
+ * 可参考文档： 获取第三方应用授权企业的accessToken https://open.dingtalk.com/document/orgapp-server/obtain-the-access_token-of-the-authorized-enterprise
+ * https://open.dingtalk.com/document/orgapp-server/enterprise-internal-application-logon-free
+ * @param formDTO
+ * @return
+ */
+ ResiDingAppLoginResDTO resiLoginDingMd(ResiDingAppLoginMdFormDTO formDTO);
+
+ /**
+ * 企业内部应用免登 文档地址：https://open.dingtalk.com/document/orgapp-server/enterprise-internal-application-logon-free
+ * @param formDTO
+ * @return
+ */
+ ResiDingAppLoginResDTO resiLoginInternalDing(ResiDingAppLoginMdFormDTO formDTO);
}
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
index cd1495ddb2..052f0ed3b9 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
@@ -5,15 +5,23 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.aliyun.dingtalk.module.DingTalkResult;
import com.epmet.auth.constants.AuthOperationConstants;
import com.epmet.common.token.constant.LoginConstant;
import com.epmet.commons.rocketmq.messages.LoginMQMsg;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.EnvEnum;
import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.redis.common.CustomerDingDingRedis;
+import com.epmet.commons.tools.redis.common.bean.DingMiniInfoCache;
import com.epmet.commons.tools.security.dto.GovTokenDto;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.security.password.PasswordUtils;
@@ -23,6 +31,8 @@ import com.epmet.commons.tools.validator.PhoneValidatorUtils;
import com.epmet.constant.AuthHttpUrlConstant;
import com.epmet.constant.SmsTemplateConstant;
import com.epmet.dto.*;
+import com.epmet.dto.dingres.DingUserDetailDTO;
+import com.epmet.dto.dingres.V2UserGetuserinfoResDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -32,6 +42,11 @@ import com.epmet.jwt.JwtTokenProperties;
import com.epmet.jwt.JwtTokenUtils;
import com.epmet.redis.CaptchaRedis;
import com.epmet.service.ThirdLoginService;
+import com.taobao.api.ApiException;
+import com.taobao.dingtalk.client.DingTalkClientToken;
+import com.taobao.dingtalk.client.DingTalkClientUser;
+import com.taobao.dingtalk.vo.result.AccessTokenResult;
+import com.taobao.dingtalk.vo.result.UserBaseInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -73,6 +88,12 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
private EpmetMessageOpenFeignClient messageOpenFeignClient;
@Autowired
private LoginUserUtil loginUserUtil;
+ @Autowired
+ private RedisUtils redisUtils;
+ @Autowired
+ private DingTalkClientToken dingTalkClientToken;
+ @Autowired
+ private DingTalkClientUser dingTalkClientUser;
/**
* @param formDTO
@@ -599,11 +620,42 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
result.getMsg()));
return new ArrayList<>();
}
-
+ //临时解决方案
+ private static final List resultTemp = new ArrayList<>();
+ static {
+ StaffOrgsResultDTO t = new StaffOrgsResultDTO();
+ t.setRootAgencyId("53613e1c5de6ed473467f0159a10b135");
+ t.setRootAgencyName("平阴县");
+ t.setCustomerId("6f203e30de1a65aab7e69c058826cd80");
+ t.setCustomerName("平音");
+ resultTemp.add(t);
+ }
@Override
public List getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO) {
+ String appId = formDTO.getAppId();
+ String userAccount = formDTO.getUserAccount();
+ String password = formDTO.getPassword();
+ //{"code":0,"msg":"success","internalMsg":"","data":[{"rootAgencyId":"53613e1c5de6ed473467f0159a10b135","rootAgencyName":"平阴县","customerId":"6f203e30de1a65aab7e69c058826cd80","customerName":"平音"}]}
+ if ("wx2b75d556ba867750".equals(appId)){
+ if("18700011111".equals(userAccount)){
+ if (!"Py02222".equals(password)){
+ throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode());
+ }
+ //String result = "[{\"rootAgencyId\":\"53613e1c5de6ed473467f0159a10b135\",\"rootAgencyName\":\"平阴县\",\"customerId\":\"6f203e30de1a65aab7e69c058826cd80\",\"customerName\":\"平音\"}]";
+ return resultTemp;
+ }
+ if (userAccount.startsWith("187000111")){
+ throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode());
+ }
+ }
+ //{"isNovice":false,"mobile":"","userAccount":"18700011111","password":"Py011111","appId":"wx2b75d556ba867750"}
+
+ logger.info("getMyOrgByAccountService at :{}",System.currentTimeMillis());
+ long start = System.currentTimeMillis();
//0.根据appId查询对应客户Id
PaCustomerDTO customer = this.getCustomerInfo(formDTO.getAppId());
+ logger.info("getMyOrgByAccountService getCustomerInfo cost:{}",System.currentTimeMillis() - start );
+ start = System.currentTimeMillis();
//7.28 上边根据appId只能锁定一条客户id,后边的批量循环操作暂不做调整，还是使用之前的代码 sun
//1、根据手机号查询到用户信息
ThirdCustomerStaffByAccountFormDTO dto = new ThirdCustomerStaffByAccountFormDTO();
@@ -614,30 +666,31 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
logger.warn(String.format("账户密码登录异常,账户[%s],code[%s],msg[%s]", formDTO.getUserAccount(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
throw new RenException(customerStaffResult.getCode());
}
+ logger.info("getMyOrgByAccountService getCustsomerStaffByIdAndAccount cost:{}",System.currentTimeMillis()- start);
+ start = System.currentTimeMillis();
//2、密码是否正确
List customerStaffList=customerStaffResult.getData();
+ if (CollectionUtils.isEmpty(customerStaffList)){
+ throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode());
+ }
//3、查询用户所有的组织信息
List customerIdList = new ArrayList<>();
//是否设置过密码
boolean havePasswordFlag=false;
//密码是否正确
boolean passwordRightFlag=false;
- for (CustomerStaffDTO customerStaffDTO : customerStaffList) {
- if(StringUtils.isNotBlank(customerStaffDTO.getPassword())){
- havePasswordFlag=true;
- }else{
- logger.warn(String.format("当前用户:账户%s,客户Id%s下未设置密码.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId()));
- continue;
- }
- if (!PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) {
- logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配错误.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId()));
+ CustomerStaffDTO customerStaffDTO = customerStaffList.get(0);
- }else{
- logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配正确.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId()));
- passwordRightFlag=true;
- customerIdList.add(customerStaffDTO.getCustomerId());
- }
+ if (StringUtils.isNotBlank(customerStaffDTO.getPassword())) {
+ havePasswordFlag = true;
}
+ long start2 = System.currentTimeMillis();
+ if (PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) {
+ passwordRightFlag = true;
+ customerIdList.add(customerStaffDTO.getCustomerId());
+ }
+ logger.info("getMyOrgByAccountService PasswordUtils.matches cost:{}", System.currentTimeMillis() - start2);
+
//根据手机号查出来所有用户,密码都为空,表明用户未激活账户,未设置密码
if(!havePasswordFlag){
logger.warn(String.format("当前账户（%s）下所有账户都未设置密码，请先使用验证码登录激活账户",formDTO.getUserAccount()));
@@ -648,11 +701,27 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
logger.warn(String.format("根据当前账户（%s）密码未找到所属组织，密码错误",formDTO.getUserAccount()));
throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode());
}
+ logger.info("getMyOrgByAccountService checkpassword cost:{}",System.currentTimeMillis() - start);
+ start = System.currentTimeMillis();
+ String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId());
+ List redisTemp = (List)redisUtils.get(tempKey);
+ if (redisTemp != null){
+ logger.info("getMyOrgByAccountService end redis :{}",System.currentTimeMillis());
+ return redisTemp;
+ }
+ logger.info("getMyOrgByAccountService getCustomerStaffTempKey cost:{}",System.currentTimeMillis()-start);
+ start = System.currentTimeMillis();
StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO();
staffOrgFormDTO.setCustomerIdList(customerIdList);
Result> result = govOrgOpenFeignClient.getStaffOrgList(staffOrgFormDTO);
if(result.success()&&null!=result.getData()){
- return result.getData();
+ List data = result.getData();
+ logger.info("getMyOrgByAccountService getStaffOrgList from db cost:{}",System.currentTimeMillis() -start);
+ start = System.currentTimeMillis();
+ redisUtils.set(tempKey,data);
+ logger.info("getMyOrgByAccountService getCustomerStaffTempKey set redis cost:{}",System.currentTimeMillis()-start);
+ logger.info("getMyOrgByAccountService end DB :{}",System.currentTimeMillis());
+ return data;
}
logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参账户%s,密码%s,返回错误码%s,错误提示信息%s",
ServiceConstant.GOV_ORG_SERVER,
@@ -669,6 +738,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
* @author zxc
*/
public PaCustomerDTO getCustomerInfo(String appId){
+ String redisKey = RedisKeys.getThirdCustomerInfoByAppId(appId);
+ PaCustomerDTO customer = (PaCustomerDTO) redisUtils.get(redisKey);
+ if (customer != null && StringUtils.isNotBlank(customer.getId())){
+ return customer;
+ }
JSONObject jsonObject = new JSONObject();
String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.CUSTOMER_MSG_URL + appId, JSON.toJSONString(jsonObject)).getData();
logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+"，结果->"+data);
@@ -684,8 +758,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
Object PublicCustomerResultDTO = mapToResult.getData();
JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
Map map = (Map)json.get("customer");
- PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
+ customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->"+customer);
+ redisUtils.set(redisKey,customer);
return customer;
}
@@ -815,4 +890,297 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
//getResultDataOrThrowsException(result, ServiceConstant.EPMET_MESSAGE_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), "调用Message服务，发送登录事件到MQ失败");
}
+// 接入流程：https://open.dingtalk.com/document/isvapp-server/unified-authorization-suite-access-process
+// 1、获取个人用户token：https://open.dingtalk.com/document/isvapp-server/obtain-user-token
+// 2、获取用户通讯录个人信息：https://open.dingtalk.com/document/isvapp-server/dingtalk-retrieve-user-information
+// 接口逻辑：
+// （1）根据clientId去XXX表找到customerId
+// （2）通过1、2拿到手机号之后,根据mobile+customerId去user_base_info表找userId，
+// 是否注册居民：register_relation
+// （3）没有则生成user、user_Base_info表记录
+ /**
+ * 钉钉应用的登录-居民端
+ *
+ * @param formDTO
+ * @return
+ */
+ @Override
+ public ResiDingAppLoginResDTO resiLoginDing(ResiDingAppLoginFormDTO formDTO) {
+ //获取用户手机号
+ log.info("1、钉钉居民端应用登录入参:"+ JSON.toJSONString(formDTO));
+ ResiDingAppLoginResDTO resDTO= null;
+ try {
+ resDTO = new ResiDingAppLoginResDTO();
+ resDTO.setCustomerId(getCurrentCustomerId());
+ //1、获取用户手机号
+ String miniAppId = formDTO.getMiniAppId();
+ DingMiniInfoCache dingMiniInfo = CustomerDingDingRedis.getDingMiniInfo(miniAppId);
+ DingTalkResult userAccessToken = dingTalkClientToken.getUserAccessToken(formDTO.getAuthCode(), dingMiniInfo.getSuiteKey(), dingMiniInfo.getSuiteSecret());
+ log.info("2、resiLoginDing userAccessToken:{}",JSON.toJSONString(userAccessToken));
+ if (!userAccessToken.success() || null == userAccessToken.getData()) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "调用微信api异常:" + JSON.toJSONString(userAccessToken), EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg());
+ }
+ DingTalkResult me = dingTalkClientUser.getUserInfo("me", userAccessToken.getData().getAccessToken());
+ log.info("3、resiLoginDing me:{}",JSON.toJSONString(me));
+ resDTO.setExtInfo(JSON.toJSONString(me.getData()));
+ if (!me.success() || StringUtils.isBlank(me.getData().getMobile())) {
+ log.error("resilogin-ding登录接口报错,入参:" + JSON.toJSONString(formDTO) + ";获取手机号为空, userAccessToken.getData().getAccessToken()=" + userAccessToken.getData().getAccessToken());
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取手机号为空", "获取手机号为空");
+ }
+ // 2、调用userfeign接口获取userId、注册网格相关信息 todo
+ DingLoginResiFormDTO dingLoginResiFormDTO=ConvertUtils.sourceToTarget(me.getData(),DingLoginResiFormDTO.class);
+ dingLoginResiFormDTO.setCustomerId(resDTO.getCustomerId());
+ Result loginResiResDTOResult = epmetUserOpenFeignClient.dingResiLogin(dingLoginResiFormDTO);
+ if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) {
+ //临时打个日志
+ log.error(String.format("resilogin-ding获取epmetUserId异常,入参：%s,user服务返参：%s", JSON.toJSONString(formDTO), JSON.toJSONString(loginResiResDTOResult)));
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取epmetUserId异常:" + JSON.toJSONString(loginResiResDTOResult), EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg());
+ }
+ DingLoginResiResDTO resiResDTO=loginResiResDTOResult.getData();
+ resDTO.setGridId(resiResDTO.getGridId());
+ resDTO.setGridName(resiResDTO.getGridName());
+ resDTO.setAgencyId(resiResDTO.getAgencyId());
+ resDTO.setEpmetUserId(resiResDTO.getEpmetUserId());
+ resDTO.setRegFlag(resiResDTO.getRegFlag());
+
+ //3.生成token，并且存放Redis
+ String token=this.saveTokenDtoDing(formDTO.getMiniAppId(),AppClientConstant.APP_RESI,AppClientConstant.MINI_DING, resDTO.getEpmetUserId(), resDTO.getCustomerId());
+ resDTO.setAuthorization(token);
+
+ } catch (ApiException e) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getErrMsg(), EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg());
+ }
+ return resDTO;
+ }
+
+ private String saveTokenDtoDing(String miniAppId,String app,String client, String userId,String customerId) {
+ //生成token串
+ Map map = new HashMap<>();
+ map.put(AppClientConstant.APP, app);
+ // map.put(AppClientConstant.CLIENT, client);
+ // 第三方企业应用传应用的SuiteKey 作为client
+ map.put(AppClientConstant.CLIENT, client.concat(miniAppId));
+ map.put("userId", userId);
+ String token = jwtTokenUtils.createToken(map);
+ int expire = jwtTokenProperties.getExpire();
+ TokenDto tokenDto = new TokenDto();
+ tokenDto.setCustomerId(customerId);
+ tokenDto.setApp(app);
+ tokenDto.setClient(client.concat(miniAppId));
+ tokenDto.setUserId(userId);
+ tokenDto.setToken(token);
+ tokenDto.setUpdateTime(System.currentTimeMillis());
+ tokenDto.setExpireTime(jwtTokenUtils.getExpiration(token).getTime());
+ cpUserDetailRedis.set(tokenDto, expire);
+ // cpUserDetailRedis.setForDingApp(miniAppId,tokenDto, expire);
+ logger.info("截止时间：" + DateUtils.format(jwtTokenUtils.getExpiration(token), "yyyy-MM-dd HH:mm:ss"));
+ return token;
+ }
+
+ @Override
+ public ResiDingAppLoginResDTO resiLoginDingMd(ResiDingAppLoginMdFormDTO formDTO) {
+ // 获取用户手机号
+ log.info("1、钉钉居民端应用登录入参:" + JSON.toJSONString(formDTO));
+ ResiDingAppLoginResDTO resDTO = null;
+ resDTO = new ResiDingAppLoginResDTO();
+ resDTO.setCustomerId(getCurrentCustomerId());
+ // 1、获取用户手机号
+ DingLoginResiFormDTO dingLoginResiFormDTO = getDingLoginResiFormDTOMd(formDTO.getMiniAppId(), formDTO.getAuthCode());
+ dingLoginResiFormDTO.setCustomerId(resDTO.getCustomerId());
+ // 2、调用userfeign接口获取userId、注册网格相关信息
+ Result loginResiResDTOResult = epmetUserOpenFeignClient.dingResiLogin(dingLoginResiFormDTO);
+ if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) {
+ // 临时打个日志
+ log.error(String.format("resiLoginDingMd获取epmetUserId异常,入参：%s,user服务返参：%s", JSON.toJSONString(formDTO), JSON.toJSONString(loginResiResDTOResult)));
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取epmetUserId异常:" + JSON.toJSONString(loginResiResDTOResult), EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg());
+ }
+ DingLoginResiResDTO resiResDTO = loginResiResDTOResult.getData();
+ resDTO.setGridId(resiResDTO.getGridId());
+ resDTO.setGridName(resiResDTO.getGridName());
+ resDTO.setAgencyId(resiResDTO.getAgencyId());
+ resDTO.setEpmetUserId(resiResDTO.getEpmetUserId());
+ resDTO.setRegFlag(resiResDTO.getRegFlag());
+
+ // 3.生成token，并且存放Redis
+ String token = this.saveTokenDtoDing(formDTO.getMiniAppId(), AppClientConstant.APP_RESI, AppClientConstant.MINI_DING, resDTO.getEpmetUserId(), resDTO.getCustomerId());
+ resDTO.setAuthorization(token);
+
+ return resDTO;
+ }
+
+ private DingLoginResiFormDTO getDingLoginResiFormDTOMd(String miniAppId, String authCode) {
+ DingMiniInfoCache dingMiniInfo = CustomerDingDingRedis.getDingMiniInfo(miniAppId);
+
+ // 1、服务商获取第三方应用授权企业的access_token,文档地址：https://open.dingtalk.com/document/orgapp-server/obtains-the-enterprise-authorized-credential
+ // 烟台的CorpId: dingaae55cbc47a96845f5bf40eda33b7ba0
+ String yantaiCorpId = "dingaae55cbc47a96845f5bf40eda33b7ba0";
+ DingTalkResult res = dingTalkClientToken.getThirdAuthCorpAccessToken(dingMiniInfo.getSuiteKey(), dingMiniInfo.getSuiteSecret(), "abc", yantaiCorpId);
+ if (!res.success() || StringUtils.isBlank(res.getData())) {
+ log.error(String.format("企业内部应用免登服务商获取第三方应用授权企业的access_token失败,customKey:%s,customSecret:%s,corpId:%s", dingMiniInfo.getSuiteSecret(), dingMiniInfo.getSuiteSecret(), yantaiCorpId));
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "服务商获取第三方应用授权企业的access_token", "服务商获取第三方应用授权企业的access_token");
+ }
+ String accessToken = res.getData();
+ log.info(String.format("1、服务商获取第三方应用授权企业的access_token返参:%s", accessToken));
+
+ // 2、通过免登码获取用户信息,文档地址：https://open.dingtalk.com/document/orgapp-server/obtain-the-userid-of-a-user-by-using-the-log-free
+ DingTalkResult v2UserGetuserinfoRes = dingTalkClientToken.getUserInfo(accessToken, authCode);
+ if (!v2UserGetuserinfoRes.success() || StringUtils.isBlank(v2UserGetuserinfoRes.getData())) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "通过免登码获取用户信息异常", "通过免登码获取用户信息异常");
+ }
+ log.info(String.format("2、通过免登码获取用户信息返参:%s", v2UserGetuserinfoRes.getData()));
+ V2UserGetuserinfoResDTO v2UserGetuserinfoResDTO = JSON.parseObject(v2UserGetuserinfoRes.getData(), V2UserGetuserinfoResDTO.class);
+ if (null == v2UserGetuserinfoResDTO || StringUtils.isBlank(v2UserGetuserinfoResDTO.getUserid())) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取钉钉用户userid为空", "获取钉钉用户userid为空");
+ }
+
+
+ // 3、查询用户详情，文档地址：https://open.dingtalk.com/document/isvapp-server/query-user-details
+ DingTalkResult v2UserGetRes = dingTalkClientToken.getUserDetail(v2UserGetuserinfoResDTO.getUserid(), accessToken);
+ if (!v2UserGetRes.success() || StringUtils.isBlank(v2UserGetRes.getData())) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "根据userId查询用户详情失败", "根据userId查询用户详情失败");
+ }
+ log.info(String.format("3、查询用户详情:%s", v2UserGetRes.getData()));
+ DingUserDetailDTO dingUserDetailDTO = JSON.parseObject(v2UserGetRes.getData(), DingUserDetailDTO.class);
+ if (null == dingUserDetailDTO || StringUtils.isBlank(dingUserDetailDTO.getMobile())) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取手机号为空", "获取手机号为空");
+ }
+
+ DingLoginResiFormDTO dingLoginResiFormDTO = new DingLoginResiFormDTO();
+ dingLoginResiFormDTO.setAvatarUrl(dingUserDetailDTO.getAvatar());
+ dingLoginResiFormDTO.setEmail(dingUserDetailDTO.getOrg_email());
+ dingLoginResiFormDTO.setMobile(dingUserDetailDTO.getMobile());
+ dingLoginResiFormDTO.setNick(dingUserDetailDTO.getName());
+ dingLoginResiFormDTO.setOpenId(StrConstant.EPMETY_STR);
+ dingLoginResiFormDTO.setStateCode(dingUserDetailDTO.getState_code());
+ dingLoginResiFormDTO.setUnionId(dingUserDetailDTO.getUnionid());
+ return dingLoginResiFormDTO;
+ }
+
+
+ /**
+ * 企业内部应用开发，不授权了
+ * https://open.dingtalk.com/document/orgapp-server/enterprise-internal-application-logon-free
+ * 建议用户信息保存在前端缓存中（dd.setStorage）或者cookie中，避免每次进入应用都调用钉钉接口进行免登。
+ *
+ * 获取免登授权码。
+ * 小程序免登
+ * 微应用免登
+ * 获取AccessToken。
+ * 调用接口获取access_token，详情请参考获取企业内部应用的access_token。
+ *
+ * 获取userid。
+ * 调用接口获取用户的userid，详情请参考通过免登码获取用户信息。
+ *
+ * 获取用户详情。
+ * 调用接口获取用户详细信息，详情请参考根据userId获取用户详情。
+ *
+ * @param formDTO
+ * @return
+ */
+ @Override
+ public ResiDingAppLoginResDTO resiLoginInternalDing(ResiDingAppLoginMdFormDTO formDTO) {
+ // 获取用户手机号
+ log.info("1、钉钉居民端应用登录入参:" + JSON.toJSONString(formDTO));
+ ResiDingAppLoginResDTO resDTO = null;
+ resDTO = new ResiDingAppLoginResDTO();
+ resDTO.setCustomerId(getCurrentCustomerId());
+
+ // 1、获取用户手机号
+ DingLoginResiFormDTO dingLoginResiFormDTO = getDingLoginResiFormDTOInternal(formDTO.getMiniAppId(), formDTO.getAuthCode());
+ dingLoginResiFormDTO.setCustomerId(resDTO.getCustomerId());
+
+ // 2、调用userfeign接口获取userId、注册网格相关信息
+ Result loginResiResDTOResult = epmetUserOpenFeignClient.dingResiLogin(dingLoginResiFormDTO);
+ if (!loginResiResDTOResult.success() || null == loginResiResDTOResult.getData()) {
+ // 临时打个日志
+ log.error(String.format("resiLoginInternalDing获取epmetUserId异常,入参：%s", JSON.toJSONString(dingLoginResiFormDTO)));
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取epmetUserId异常:"+ JSON.toJSONString(loginResiResDTOResult), "获取epmetUserId异常");
+ }
+ DingLoginResiResDTO resiResDTO = loginResiResDTOResult.getData();
+ resDTO.setGridId(resiResDTO.getGridId());
+ resDTO.setGridName(resiResDTO.getGridName());
+ resDTO.setAgencyId(resiResDTO.getAgencyId());
+ resDTO.setEpmetUserId(resiResDTO.getEpmetUserId());
+ resDTO.setRegFlag(resiResDTO.getRegFlag());
+
+ // 3.生成token，并且存放Redis
+ String token = this.saveTokenDtoDing(formDTO.getMiniAppId(), AppClientConstant.APP_RESI, AppClientConstant.MINI_DING, resDTO.getEpmetUserId(), resDTO.getCustomerId());
+ resDTO.setAuthorization(token);
+
+ return resDTO;
+ }
+
+ /**
+ * 最原始的企业内部应用开发，不授权给产品服务商
+ * @param miniAppId
+ * @param authCode
+ * @return
+ */
+ private DingLoginResiFormDTO getDingLoginResiFormDTOInternal(String miniAppId, String authCode) {
+ DingMiniInfoCache dingMiniInfo = CustomerDingDingRedis.getDingMiniInfo(miniAppId);
+
+ // 1、获取企业内部应用的accessToken文档地址：https://open.dingtalk.com/document/orgapp-server/obtain-the-access_token-of-an-internal-app
+ String accessToken = "";
+ DingTalkResult dingTalkResult = dingTalkClientToken.getAppAccessTokenToken(dingMiniInfo.getSuiteKey(), dingMiniInfo.getSuiteSecret());
+ if (!dingTalkResult.success() || StringUtils.isBlank(dingTalkResult.getData())) {
+ log.error(String.format("获取企业内部应用的accessToken失败,customKey:%s,customSecret:%s", dingMiniInfo.getSuiteSecret(), dingMiniInfo.getSuiteSecret()));
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取企业内部应用的accessToken异常", "获取企业内部应用的accessToken");
+ }
+ accessToken = dingTalkResult.getData();
+ log.info(String.format("1、获取企业内部应用的accessToken返参:%s", accessToken));
+
+
+ // 2、通过免登码获取用户信息,文档地址：https://open.dingtalk.com/document/orgapp-server/obtain-the-userid-of-a-user-by-using-the-log-free
+ DingTalkResult v2UserGetuserinfoRes = dingTalkClientToken.getUserInfo(accessToken, authCode);
+ if (!v2UserGetuserinfoRes.success() || StringUtils.isBlank(v2UserGetuserinfoRes.getData())) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "通过免登码获取用户信息异常", "通过免登码获取用户信息异常");
+ }
+ log.info(String.format("2、通过免登码获取用户信息返参:%s", v2UserGetuserinfoRes.getData()));
+ V2UserGetuserinfoResDTO v2UserGetuserinfoResDTO = JSON.parseObject(v2UserGetuserinfoRes.getData(), V2UserGetuserinfoResDTO.class);
+ if (null == v2UserGetuserinfoResDTO || StringUtils.isBlank(v2UserGetuserinfoResDTO.getUserid())) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取钉钉用户userid为空", "获取钉钉用户userid为空");
+ }
+
+
+ // 3、查询用户详情，文档地址：https://open.dingtalk.com/document/isvapp-server/query-user-details
+ DingTalkResult v2UserGetRes = dingTalkClientToken.getUserDetail(v2UserGetuserinfoResDTO.getUserid(), accessToken);
+ if (!v2UserGetRes.success() || StringUtils.isBlank(v2UserGetRes.getData())) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "根据userId查询用户详情失败", "根据userId查询用户详情失败");
+ }
+ log.info(String.format("3、查询用户详情:%s", v2UserGetRes.getData()));
+ DingUserDetailDTO dingUserDetailDTO = JSON.parseObject(v2UserGetRes.getData(), DingUserDetailDTO.class);
+ if (null == dingUserDetailDTO || StringUtils.isBlank(dingUserDetailDTO.getMobile())) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取手机号为空", "获取手机号为空");
+ }
+
+ DingLoginResiFormDTO dingLoginResiFormDTO = new DingLoginResiFormDTO();
+ dingLoginResiFormDTO.setAvatarUrl(dingUserDetailDTO.getAvatar());
+ dingLoginResiFormDTO.setEmail(dingUserDetailDTO.getOrg_email());
+ dingLoginResiFormDTO.setMobile(dingUserDetailDTO.getMobile());
+ dingLoginResiFormDTO.setNick(dingUserDetailDTO.getName());
+ dingLoginResiFormDTO.setOpenId(StrConstant.EPMETY_STR);
+ dingLoginResiFormDTO.setStateCode(dingUserDetailDTO.getState_code());
+ dingLoginResiFormDTO.setUnionId(dingUserDetailDTO.getUnionid());
+ return dingLoginResiFormDTO;
+ }
+
+ /**
+ * 客户写死吧
+ * @return
+ */
+ private String getCurrentCustomerId() {
+ String customerId="";
+ EnvEnum currentEnv = EnvEnum.getCurrentEnv();
+ if (EnvEnum.PROD.getCode().equals(currentEnv.getCode())) {
+ // 烟台的客户id
+ customerId="1535072605621841922";
+ } else if (EnvEnum.TEST.getCode().equals(currentEnv.getCode())) {
+ // 最美琴岛
+ customerId="0c41b272ee9ee95ac6f184ad548a30eb";
+ } else {
+ // 其余统一走开发环境
+ customerId="45687aa479955f9d06204d415238f7cc";
+ }
+ return customerId;
+ }
}
diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml
index 3f338f611c..cb7141206f 100644
--- a/epmet-auth/src/main/resources/bootstrap.yml
+++ b/epmet-auth/src/main/resources/bootstrap.yml
@@ -91,6 +91,12 @@ hystrix:
isolation:
thread:
timeoutInMilliseconds: 60000 #缺省为1000
+ threadpool:
+ default:
+ coreSize: 20
+ maximumSize: 50
+ maxQueueSize: 500
+ queueSizeRejectionThreshold: 200
ribbon:
ReadTimeout: 300000
@@ -178,4 +184,4 @@ thread:
queueCapacity: @thread.threadPool.queue-capacity@
keepAliveSeconds: @thread.threadPool.keep-alive-seconds@
threadNamePrefix: @thread.threadPool.thread-name-prefix@
- rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
\ No newline at end of file
+ rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@
diff --git a/epmet-cloud-generator/src/main/resources/template/index.vue.vm b/epmet-cloud-generator/src/main/resources/template/index.vue.vm
index aa5bcb3494..9b3ba8bee8 100644
--- a/epmet-cloud-generator/src/main/resources/template/index.vue.vm
+++ b/epmet-cloud-generator/src/main/resources/template/index.vue.vm
@@ -1,52 +1,52 @@
-
-
+
+
-
+
- {{ $t('query') }}
-
-
- {{ $t('add') }}
-
-
- {{ $t('deleteBatch') }}
+ {{ $t('query') }}
-
+
+
+
+ {{ $t('add') }}
+ {{ $t('deleteBatch') }}
+
+
-#foreach($column in $columns)
-
-#end
+ #foreach($column in $columns)
+
+ #end
- {{ $t('update') }}
- {{ $t('delete') }}
+ {{ $t('update') }}
+ {{ $t('delete') }}
+ :current-page="page"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="limit"
+ :total="total"
+ layout="total, sizes, prev, pager, next, jumper"
+ @size-change="pageSizeChangeHandle"
+ @current-change="pageCurrentChangeHandle">
-
-
-
-
+
+
+
+
+ * 姓名在两字时，首字为姓。
+ * 姓名大于两字时，优先匹配复姓。
+ * 姓氏未匹配且姓名多于5字时，姓与名均在姓氏中,名为空；少于5字时则采用第一个字为姓。
+ * @param name 姓名
+ * @return map类型数据，姓氏为key值“X”，名字为value值“M”
+ */
+ public static Map getSurName(String name) {
+ Map mapData = new HashMap<>(NumConstant.TWO);
+ if (name.length() > NumConstant.ZERO && name.length() <= NumConstant.TWO){
+ mapData.put("X", name.substring(NumConstant.ZERO, NumConstant.ONE));
+ mapData.put("M", name.substring(NumConstant.ONE));
+ } else if (name.length() > NumConstant.TWO) {
+ for (String s : SURNAME_NOW) {//遍历复姓数组
+ if (name.startsWith(s)) {
+ mapData.put("X", s);
+ mapData.put("M", name.substring(s.length()));
+ return mapData;
+ }
+ }
+ //姓氏没有匹配时采用第一个字为姓
+ mapData.put("X", name.substring(NumConstant.ZERO, NumConstant.ONE));
+ mapData.put("M", name.substring(NumConstant.ONE));
+ }
+ return mapData;
+ }
+}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
new file mode 100644
index 0000000000..dcde88f23f
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
@@ -0,0 +1,42 @@
+package com.epmet.commons.tools.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.dto.result.YtHsjcResDTO;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/9/26 16:56
+ */
+@Slf4j
+public class YtHsResUtils {
+ static String url = "https://10.2.2.60:8191/sjzt/server/hsjcxx?appkey=DR4jF5Be7sCsqDmCamq2tmYCl";
+
+ /**
+ * desc:图片同步扫描
+ *
+ * @return
+ */
+ public static YtHsjcResDTO hsjc(String cardNo, Integer rowNum, Integer pageSize) {
+ try {
+ String param = String.format("&card_no=%s&ROWNUM=%s&PAGESIZE=%s", cardNo, rowNum, pageSize);
+ String apiUrl = url.concat(param);
+ Result result = HttpClientManager.getInstance().sendPostByJSON(apiUrl, null);
+ if (result.success()) {
+ return JSON.parseObject(result.getData(), YtHsjcResDTO.class);
+ }
+ YtHsjcResDTO resultResult = new YtHsjcResDTO();
+ resultResult.setData(new ArrayList<>());
+ return resultResult;
+ } catch (Exception e) {
+ log.error(String.format("烟台核算检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage()));
+ throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "获取核算检测结果api异常"+e.getMessage());
+ }
+ }
+}
+
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java
new file mode 100644
index 0000000000..b3c1d207d4
--- /dev/null
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/converter/EasyExcelDateConverter.java
@@ -0,0 +1,51 @@
+package com.epmet.commons.tools.utils.poi.excel.converter;
+
+/**
+ * desc:
+ *
+ * @author: LiuJanJun
+ * @date: 2022/8/26 4:59 下午
+ * @version: 1.0
+ */
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @Author: liujianjun
+ * @Date: 2022/7/19
+ * @Description: yyyy-MM-dd easyExcel 日期转换
+ */
+public class EasyExcelDateConverter implements Converter {
+
+ private static final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd";
+
+ @Override
+ public Class supportJavaTypeKey() {
+ return Converter.super.supportJavaTypeKey();
+ }
+
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return Converter.super.supportExcelTypeKey();
+ }
+
+ @Override
+ public WriteCellData convertToExcelData(Date value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_YYYY_MM_DD);
+ String dateValue = sdf.format(value);
+ return new WriteCellData<>(dateValue);
+ }
+
+ //@Override
+ //public Date convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+ // SimpleDateFormat sdf = new SimpleDateFormat(PATTERN_YYYY_MM_DD);
+ // return sdf.parse(cellData.getStringValue());
+ //}
+}
\ No newline at end of file
diff --git a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
index cf7493a300..399f574dd9 100644
--- a/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
+++ b/epmet-gateway/src/main/java/com/epmet/GatewayApplication.java
@@ -8,9 +8,15 @@
package com.epmet;
+import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.aspect.ServletExceptionHandler;
import com.epmet.commons.tools.config.RedissonConfig;
import com.epmet.commons.tools.config.ThreadDispatcherConfig;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.filter.CpProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -18,6 +24,9 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
+import javax.annotation.PostConstruct;
+import java.util.List;
+
/**
* 网关服务
*
@@ -31,7 +40,24 @@ import org.springframework.context.annotation.FilterType;
@ComponentScan(basePackages = {"com.epmet.*"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {RedissonConfig.class, ThreadDispatcherConfig.class, ServletExceptionHandler.class}))
public class GatewayApplication {
+ @Autowired
+ private CpProperty cpProperty;
+
+ @Autowired
+ private RedisUtils redisUtils;
+
public static void main(String[] args) {
SpringApplication.run(GatewayApplication.class, args);
}
+
+ /**
+ * 初始化运营端校验资源列表
+ */
+// @PostConstruct
+// public void initOperExamineResources() {
+// if (!redisUtils.hasKey(RedisKeys.getOperExamineResourceUrls())) {
+// List operExamineResourceUrls = cpProperty.getOperExamineResourceUrls();
+// redisUtils.setString(RedisKeys.getOperExamineResourceUrls(), JSON.toJSONString(operExamineResourceUrls));
+// }
+// }
}
diff --git a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
index 305bf2b3a4..c857f97159 100644
--- a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
+++ b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java
@@ -1,11 +1,22 @@
package com.epmet.auth;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.form.HasOperPermissionFormDTO;
+import com.epmet.commons.tools.dto.result.OperResouce;
import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.feign.CommonOperAccessOpenFeignClient;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.security.dto.BaseTokenDto;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
+import com.epmet.commons.tools.utils.Result;
import com.epmet.filter.CpProperty;
import com.epmet.jwt.JwtTokenUtils;
import io.jsonwebtoken.Claims;
@@ -15,18 +26,20 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.stereotype.Component;
import org.springframework.util.AntPathMatcher;
import org.springframework.web.server.ServerWebExchange;
import java.util.Date;
+import java.util.List;
/**
* 内部认证处理器
*/
@Component
-public class InternalAuthProcessor extends AuthProcessor {
+public class InternalAuthProcessor extends AuthProcessor implements ResultDataResolver {
private Logger logger = LoggerFactory.getLogger(getClass());
@@ -41,6 +54,12 @@ public class InternalAuthProcessor extends AuthProcessor {
@Autowired
private CpProperty cpProperty;
+ @Autowired
+ private CommonOperAccessOpenFeignClient operAccessOpenFeignClient;
+
+ @Autowired
+ private RedisUtils redisUtils;
+
@Override
public ServerWebExchange auth(ServerWebExchange exchange, GatewayFilterChain chain) {
ServerHttpRequest request = exchange.getRequest();
@@ -104,10 +123,59 @@ public class InternalAuthProcessor extends AuthProcessor {
builder.header(AppClientConstant.CUSTOMER_ID, customerId);
}
+ // 针对运营端的url拦截和校验
+ if (AppClientConstant.APP_OPER.equals(app)) {
+ HttpMethod method = request.getMethod();
+ Boolean hasAccess = checkRequestOperResource(userId, requestUri, method.toString());
+ if (!hasAccess) {
+ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "资源未授权", "资源未授权");
+ }
+ }
+
ServerHttpRequest shr = builder.build();
return exchange.mutate().request(shr).build();
}
+ /**
+ * 校验运营端用户是否有权访问该资源
+ * @param uri
+ * @param method
+ * @return
+ */
+ private Boolean checkRequestOperResource(String userId, String uri, String method) {
+ String resourceJsonString = redisUtils.getString(RedisKeys.getOperExamineResourceUrls());
+ List resources = JSON.parseObject(resourceJsonString, new TypeReference>() {});
+
+ if (resources == null) {
+ // redis中没有缓存，需要api获取
+ resources = getResultDataOrThrowsException(operAccessOpenFeignClient.getExamineResourceUrls(), ServiceConstant.OPER_ACCESS_SERVER,
+ EpmetErrorCode.SERVER_ERROR.getCode(), "调用operaccess获取要校验的资源失败", "调用operaccess获取要校验的资源失败");
+
+ // 缓存
+ redisUtils.setString(RedisKeys.getOperExamineResourceUrls(), JSON.toJSONString(resources));
+ }
+
+ for (OperResouce resource : resources) {
+ if (antPathMatcher.match(resource.getResourceUrl(), uri)
+ && resource.getResourceMethod().equals(method)) {
+
+ //需要校验权限的url
+ HasOperPermissionFormDTO form = new HasOperPermissionFormDTO();
+ form.setUri(uri);
+ form.setMethod(method);
+ form.setOperId(userId);
+ Result result = operAccessOpenFeignClient.hasOperPermission(form);
+ if (result == null || !result.success()) {
+ return false;
+ }
+ return true;
+ }
+ }
+
+ // 如果当前请求url不需要校验权限，那么返回true
+ return true;
+ }
+
/**
* 是否需要认证
* @param requestUri
diff --git a/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java b/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java
index 2ea01e1c32..71dce075fe 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/CpProperty.java
@@ -42,4 +42,15 @@ public class CpProperty {
*/
private List swaggerUrls;
+ /**
+ * 运营端，需要校验的url资源列表
+ */
+ private List operExamineResourceUrls;
+
+ @Data
+ public static class OperExamineResource {
+ private String resourceUrl;
+ private String resourceMethod;
+ }
+
}
diff --git a/epmet-gateway/src/main/java/com/epmet/filter/EpmetGatewayFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/EpmetGatewayFilter.java
index 7cca3c4b36..ea02f75376 100644
--- a/epmet-gateway/src/main/java/com/epmet/filter/EpmetGatewayFilter.java
+++ b/epmet-gateway/src/main/java/com/epmet/filter/EpmetGatewayFilter.java
@@ -5,6 +5,7 @@ import com.epmet.auth.ExternalAuthProcessor;
import com.epmet.auth.InternalAuthProcessor;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.IpUtils;
@@ -64,6 +65,10 @@ public class EpmetGatewayFilter implements GatewayFilter {
}
return doFilter(exchange, chain);
+ } catch (EpmetException re) {
+ // 人为抛出，则携带错误码和错误信息响应给前端
+ log.error("EpmetGatewayFilter认证出错RenException，错误信息:{}", ExceptionUtils.getErrorStackTrace(re));
+ return response(exchange, new Result<>().error(re.getCode(), re.getMessage()));
} catch (RenException re) {
// 人为抛出，则携带错误码和错误信息响应给前端
log.error("EpmetGatewayFilter认证出错RenException，错误信息:{}", ExceptionUtils.getErrorStackTrace(re));
diff --git a/epmet-gateway/src/main/resources/bootstrap-urls.yml b/epmet-gateway/src/main/resources/bootstrap-urls.yml
new file mode 100644
index 0000000000..dded0b1b86
--- /dev/null
+++ b/epmet-gateway/src/main/resources/bootstrap-urls.yml
@@ -0,0 +1,5 @@
+epmet:
+ oper-examine-resource-urls:
+ # 角色编辑
+ - resourceUrl: /oper/access/operrole
+ resourceMethod: PUT
\ No newline at end of file
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 888f8544d1..09aac33a7c 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -12,6 +12,7 @@ spring:
name: epmet-gateway-server
#环境 dev|test|prod
profiles:
+ include: urls
active: @spring.profiles.active@
messages:
encoding: UTF-8
@@ -471,6 +472,12 @@ hystrix:
isolation:
thread:
timeoutInMilliseconds: 60000 #缺省为1000
+ threadpool:
+ default:
+ coreSize: 20
+ maximumSize: 50
+ maxQueueSize: 500
+ queueSizeRejectionThreshold: 200
ribbon:
ReadTimeout: 300000
@@ -506,6 +513,7 @@ epmet:
- /resi/voice/**
- /point/**
- /heart/**
+ - /oss/**
# 内部认证url白名单(在白名单中的，就不会再校验登录了)
internalAuthUrlsWhiteList:
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 7cab2dfdbf..e50d1982cc 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -32,6 +32,13 @@
com.epmet
epmet-commons-mybatis
2.0.0
+
+
+
+ org.apache.shardingsphere
+ sharding-jdbc-spring-boot-starter
+
+
com.epmet
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointNucleicMonitoringDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointNucleicMonitoringDao.java
new file mode 100644
index 0000000000..599243a856
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointNucleicMonitoringDao.java
@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.dao.epmetuser;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmetuser.IcPointNucleicMonitoringEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Mapper
+public interface IcPointNucleicMonitoringDao extends BaseDao {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointVaccinesInoculationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointVaccinesInoculationDao.java
new file mode 100644
index 0000000000..a3bfafee1a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcPointVaccinesInoculationDao.java
@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.dao.epmetuser;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.entity.epmetuser.IcPointVaccinesInoculationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Mapper
+public interface IcPointVaccinesInoculationDao extends BaseDao {
+
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
index 10721a9f7a..9b8ba8580b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
@@ -86,4 +86,5 @@ public interface CustomerGridDao extends BaseDao {
CustomerGridDTO getGridInfo(@Param("gridId") String gridId);
List getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
+ List getAllSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId);
}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointNucleicMonitoringEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointNucleicMonitoringEntity.java
new file mode 100644
index 0000000000..b19ab6b721
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointNucleicMonitoringEntity.java
@@ -0,0 +1,77 @@
+package com.epmet.dataaggre.entity.epmetuser;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 核酸监测点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_point_nucleic_monitoring")
+public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 所属组织ID
+ */
+ private String orgId;
+
+ /**
+ * 所属组织名称
+ */
+ private String orgName;
+
+ /**
+ * 组织ID上级
+ */
+ private String pid;
+
+ /**
+ * 组织ID所有上级
+ */
+ private String pids;
+
+ /**
+ * 核酸监测点名称
+ */
+ private String name;
+
+ /**
+ * 服务时间
+ */
+ private String serveTime;
+
+ /**
+ * 咨询电话
+ */
+ private String mobile;
+
+ /**
+ * 监测点地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointVaccinesInoculationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointVaccinesInoculationEntity.java
new file mode 100644
index 0000000000..3e60c7660e
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/IcPointVaccinesInoculationEntity.java
@@ -0,0 +1,102 @@
+package com.epmet.dataaggre.entity.epmetuser;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 疫苗接种点
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_point_vaccines_inoculation")
+public class IcPointVaccinesInoculationEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户ID
+ */
+ private String customerId;
+
+ /**
+ * 所属组织ID
+ */
+ private String orgId;
+
+ /**
+ * 所属组织名称
+ */
+ private String orgName;
+
+ /**
+ * 组织ID上级
+ */
+ private String pid;
+
+ /**
+ * 组织ID所有上级
+ */
+ private String pids;
+
+ /**
+ * 疫苗接种点名称
+ */
+ private String name;
+
+ /**
+ * 接种日期
+ */
+ private String inoculationDate;
+
+ /**
+ * 接种上午开始时间
+ */
+ private String moStartTime;
+
+ /**
+ * 接种上午结束时间
+ */
+ private String moEndTime;
+
+ /**
+ * 接种下午开始时间
+ */
+ private String afStartTime;
+
+ /**
+ * 接种下午结束时间
+ */
+ private String afEndTime;
+
+ /**
+ * 暂无疫苗（1：是；2：否）
+ */
+ private String noAvailableVaccines;
+
+ /**
+ * 咨询电话
+ */
+ private String mobile;
+
+ /**
+ * 接种点地址
+ */
+ private String address;
+
+ /**
+ * 经度
+ */
+ private String longitude;
+
+ /**
+ * 纬度
+ */
+ private String latitude;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
index 068b1176cd..901087a7ba 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
@@ -15,6 +15,8 @@ import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO;
import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO;
import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
+import com.epmet.dataaggre.entity.epmetuser.IcPointNucleicMonitoringEntity;
+import com.epmet.dataaggre.entity.epmetuser.IcPointVaccinesInoculationEntity;
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.UserBaseInfoDTO;
@@ -240,4 +242,12 @@ public interface EpmetUserService {
List listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory);
List getNowResiUser(NowStatsDataFormDTO formDTO);
+
+ Integer countVaccinePoint(String customerId, String agencyId, String staffOrgIds, String search);
+
+ Integer countNucleicPoint(String customerId, String agencyId, String staffOrgIds, String search);
+
+ List listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search);
+
+ List listNucleicPoints(String customerId, String agencyId,String staffOrgIds, String search);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 26c5ef1b3a..f93c66675b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -94,6 +94,10 @@ public class EpmetUserServiceImpl implements EpmetUserService {
private CustomerFootBarService customerFootBarService;
@Resource
private RegisterRelationDao registerRelationDao;
+ @Resource
+ private IcPointVaccinesInoculationDao pointVaccinesInoculationDao;
+ @Resource
+ private IcPointNucleicMonitoringDao pointNucleicMonitoringDao;
/**
* @Description 根据UserIds查询
@@ -923,4 +927,48 @@ public class EpmetUserServiceImpl implements EpmetUserService {
List list = registerRelationDao.selectNowResiUser(formDTO);
return list;
}
+
+ @Override
+ public Integer countVaccinePoint(String customerId, String agencyId, String staffOrgIds, String search) {
+ LambdaQueryWrapper query = new LambdaQueryWrapper<>();
+ query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId);
+ //query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds)
+ // .or()
+ // .eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId));
+ query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search);
+ return pointVaccinesInoculationDao.selectCount(query);
+ }
+
+ @Override
+ public Integer countNucleicPoint(String customerId, String agencyId, String staffOrgIds, String search) {
+ LambdaQueryWrapper query = new LambdaQueryWrapper<>();
+ query.eq(IcPointNucleicMonitoringEntity::getCustomerId, customerId);
+ query.and(w -> w.likeRight(IcPointNucleicMonitoringEntity::getPids, staffOrgIds)
+ .or()
+ .eq(IcPointNucleicMonitoringEntity::getOrgId, agencyId));
+ query.like(StringUtils.isNotBlank(search), IcPointNucleicMonitoringEntity::getName, search);
+ return pointNucleicMonitoringDao.selectCount(query);
+ }
+
+ @Override
+ public List listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search) {
+ LambdaQueryWrapper query = new LambdaQueryWrapper<>();
+ query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId);
+ //query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds)
+ // .or()
+ // .eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId));
+ query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search);
+ return pointVaccinesInoculationDao.selectList(query);
+ }
+
+ @Override
+ public List listNucleicPoints(String customerId, String agencyId, String staffOrgIds, String search) {
+ LambdaQueryWrapper query = new LambdaQueryWrapper<>();
+ query.eq(IcPointNucleicMonitoringEntity::getCustomerId, customerId);
+ query.and(w -> w.likeRight(IcPointNucleicMonitoringEntity::getPids, staffOrgIds)
+ .or()
+ .eq(IcPointNucleicMonitoringEntity::getOrgId, agencyId));
+ query.like(StringUtils.isNotBlank(search), IcPointNucleicMonitoringEntity::getName, search);
+ return pointNucleicMonitoringDao.selectList(query);
+ }
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index a07ebf0a7c..d2ee934888 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -1487,7 +1487,7 @@ public class GovOrgServiceImpl implements GovOrgService {
List gridList = new ArrayList<>();
//组织级别为街道的查询下级所有网格
if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()))) {
- gridList = customerGridDao.getSubGridList(customerId, agencyId);
+ gridList = customerGridDao.getAllSubGridList(customerId, agencyId);
List allGridList = new ArrayList<>();
gridList.forEach(gr -> {
ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid();
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
index 19b7c71d7e..ff931888c3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java
@@ -30,6 +30,8 @@ import com.epmet.dataaggre.dto.govorg.form.DataListLeftSubTotalFormDTO;
import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO;
import com.epmet.dataaggre.dto.govorg.result.*;
import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
+import com.epmet.dataaggre.entity.epmetuser.IcPointNucleicMonitoringEntity;
+import com.epmet.dataaggre.entity.epmetuser.IcPointVaccinesInoculationEntity;
import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity;
import com.epmet.dataaggre.entity.govorg.*;
import com.epmet.dataaggre.entity.govproject.IcEventEntity;
@@ -628,6 +630,12 @@ public class CoverageServiceImpl implements CoverageService {
// 志愿者
String[] parts = categoryKey.split("_");
return epmetUserService.countVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]);
+ } else if (CoveragePlaceTypeEnum.VACCINE_POINT.getCode().equals(placeType)) {
+ // 疫苗接种点
+ return epmetUserService.countVaccinePoint(customerId, agencyId, staffOrgIds, search);
+ } else if (CoveragePlaceTypeEnum.NUCLEIC_POINT.getCode().equals(placeType)) {
+ // 核酸检测点
+ return epmetUserService.countNucleicPoint(customerId, agencyId, staffOrgIds, search);
}
return 0;
@@ -805,6 +813,20 @@ public class CoverageServiceImpl implements CoverageService {
coordinates[1], coordinates[0]);
}).collect(Collectors.toList());
+ } else if (CoveragePlaceTypeEnum.VACCINE_POINT.getCode().equals(placeType)) {
+ // 疫苗接种点
+ List vps = epmetUserService.listVaccinePoints(customerId, agencyId, staffOrgIds, search);
+ return vps.stream()
+ .map(vp -> new CoverageAnalisisDataListResultDTO(vp.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null,
+ placeType, vp.getName(), vp.getLatitude(), vp.getLongitude()))
+ .collect(Collectors.toList());
+ } else if (CoveragePlaceTypeEnum.NUCLEIC_POINT.getCode().equals(placeType)) {
+ // 核酸检测点
+ List nps = epmetUserService.listNucleicPoints(customerId, agencyId, staffOrgIds, search);
+ return nps.stream()
+ .map(np -> new CoverageAnalisisDataListResultDTO(np.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null,
+ placeType, np.getName(), np.getLatitude(), np.getLongitude()))
+ .collect(Collectors.toList());
}
return new ArrayList<>();
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
index af955a0722..fd72caafbf 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@@ -191,6 +191,13 @@ hystrix:
isolation:
thread:
timeoutInMilliseconds: 60000 #缺省为1000
+ threadpool:
+ default:
+ coreSize: 20
+ maximumSize: 50
+ maxQueueSize: 500
+ queueSizeRejectionThreshold: 200
+
ribbon:
ReadTimeout: 300000
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
index 9ba9386fb3..49dad70cf7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml
@@ -7,13 +7,13 @@
+
+
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
index 4b51beae89..29e53ff04b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
@@ -470,6 +470,9 @@
AND GRID_ID = #{orgId}
+
+ AND ORG_ID_PATH LIKE concat('%', #{orgId}, '%')
+
AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate}
@@ -492,6 +495,9 @@
AND GRID_ID = #{orgId}
+
+ AND ORG_ID_PATH LIKE concat('%', #{orgId}, '%')
+
AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate}
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index b5c54347b9..839272531e 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -28,6 +28,13 @@
com.epmet
epmet-commons-mybatis
2.0.0
+
+
+
+ org.apache.shardingsphere
+ sharding-jdbc-spring-boot-starter
+
+
com.epmet
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
index 7d3bf719af..205f7efffa 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
@@ -138,6 +138,12 @@ hystrix:
isolation:
thread:
timeoutInMilliseconds: 60000 #缺省为1000
+ threadpool:
+ default:
+ coreSize: 20
+ maximumSize: 50
+ maxQueueSize: 500
+ queueSizeRejectionThreshold: 200
ribbon:
ReadTimeout: 300000
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
index dfd88c7e96..db6bd2c3d6 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/ScreenProjectDataDTO.java
@@ -206,4 +206,5 @@ public class ScreenProjectDataDTO implements Serializable {
private String orgIdPath;
private String finishOrgType;
+ private Date processTime;
}
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 4b65998598..54b10fbbb1 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -22,6 +22,13 @@
com.epmet
epmet-commons-mybatis
2.0.0
+
+
+
+ org.apache.shardingsphere
+ sharding-jdbc-spring-boot-starter
+
+
org.springframework.boot
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java
index 043e256c42..988127dab7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java
@@ -18,4 +18,8 @@ public interface PingYinConstant {
String TEST_PING_YIN_CUSTOMER_ID = "78e2b2227c07de1fe54da14e2b2d9eb6";
String PROD_PING_YIN_CUSTOMER_ID = "6f203e30de1a65aab7e69c058826cd80";
+
+ String KC = "2fe0065f70ca0e23ce4c26fca5f1d933";
+ String YS = "46c55cb862d6d5e6d05d2ab61a1cc07e";
+ String JS = "44876154d10d7cb7affd92000f84f833";
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index 6d76dfd175..1ac0f1ab53 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
@@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.OrgTypeConstant;
+import com.epmet.constant.PingYinConstant;
import com.epmet.constant.ProjectConstant;
import com.epmet.dto.basereport.form.EventInfoFormDTO;
import com.epmet.dto.basereport.result.EventInfoResultDTO;
@@ -243,7 +244,7 @@ public class DataReportingServiceImpl implements DataReportingService {
if (CollectionUtils.isNotEmpty(formDTO.getProjectId())) {
list = projectList.stream().map(project -> {
EventInfoResultDTO dto = getEventInfoResultDTO(project, finalEpmetCodeMap, codeMap);
- ScreenCustomerGridDTO grid = screenCustomerGridService.getGridById(project.getOrgId());
+ CustomerGridDTO grid = customerGridService.getGridById(project.getOrgId());
dto.setOrgId(project.getOrgId());
if (null != grid) {
dto.setOrgCode(grid.getCode());
@@ -254,10 +255,10 @@ public class DataReportingServiceImpl implements DataReportingService {
} else {
//项目ID不为空时，提前取出客户下的组织和网格
Map agencyMap = screenCustomerAgencyService.getAgencyList(formDTO.getCustomerId());
- Map gridMap = screenCustomerGridService.getGridList(formDTO.getCustomerId());
+ Map gridMap = customerGridService.getGridMap(PingYinConstant.PROD_PING_YIN_CUSTOMER_ID);
list = projectList.stream().map(project -> {
EventInfoResultDTO dto = getEventInfoResultDTO(project, finalEpmetCodeMap, codeMap);
- ScreenCustomerGridDTO grid = gridMap.get(project.getOrgId());
+ CustomerGridDTO grid = gridMap.get(project.getOrgId());
dto.setOrgId(project.getOrgId());
if (null != grid) {
dto.setOrgCode(grid.getCode());
@@ -319,12 +320,16 @@ public class DataReportingServiceImpl implements DataReportingService {
dto.setHappenPlace(project.getProjectAddress());
dto.setEventDescription(project.getProjectContent());
dto.setSuccessfulOrNo(ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())?"Y":"N");
- if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) {
+ dto.setStatus(getProjectStatus(project.getProjectStatusCode()));
+ dto.setCompleteTime(project.getCloseCaseTime());
+
+ if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode()) ||
+ ProjectConstant.CLOSED.equals(project.getProjectStatusCode())) {
//办结组织是机关时，办结层级为机关的层级
if (OrgTypeConstant.AGENCY.equals(project.getFinishOrgType())) {
dto.setWaysOfResolving(ProjectConstant.PROJECT_REPORT);
//如果是孔村的项目办结层级需要降一级
- if("2fe0065f70ca0e23ce4c26fca5f1d933".equals(project.getCustomerId())) {
+ if(PingYinConstant.KC.equals(project.getCustomerId())) {
if (StringUtils.isNotBlank(project.getFinishOrgLevel())) {
switch (project.getFinishOrgLevel()) {
case OrgTypeConstant.DISTRICT:
@@ -355,9 +360,12 @@ public class DataReportingServiceImpl implements DataReportingService {
//办结组织是网格时，办结层级为网格
dto.setCompleteLevel("5");
}
+ if (ProjectConstant.CLOSED.equals(project.getProjectStatusCode()) &&(PingYinConstant.KC.equals(project.getCustomerId()) ||
+ PingYinConstant.YS.equals(project.getCustomerId()) || PingYinConstant.JS.equals(project.getCustomerId()))) {
+ dto.setCompleteTime(project.getProcessTime());
+ }
}
- dto.setStatus(getProjectStatus(project.getProjectStatusCode()));
- dto.setCompleteTime(project.getCloseCaseTime());
+
dto.setLat(project.getLatitude());
dto.setLng(project.getLongitude());
dto.setWaysOfResolving(ProjectConstant.PROJECT_SELF_CLOSED);
@@ -386,7 +394,6 @@ public class DataReportingServiceImpl implements DataReportingService {
case ProjectConstant.PENDING:
return "01";
case ProjectConstant.CLOSED:
- return "02";
case ProjectConstant.CLOSED_CASE:
return "03";
default:
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
index 13f641fa98..4e840fd674 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java
@@ -15,6 +15,7 @@ import com.epmet.entity.org.CustomerGridEntity;
import java.util.Date;
import java.util.List;
+import java.util.Map;
public interface CustomerGridService extends BaseService {
/**
@@ -106,4 +107,9 @@ public interface CustomerGridService extends BaseService {
* @Description 查询客户下有效网格列表
**/
List gridListByCustomerId(String customerId);
+
+ CustomerGridDTO getGridById(String gridId);
+
+ Map getGridMap(String customerId);
+
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
index 10bfbc4fd5..8c2c6740e5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java
@@ -1,8 +1,10 @@
package com.epmet.service.org.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.org.CustomerGridDao;
import com.epmet.dto.group.AgencyDTO;
@@ -18,12 +20,13 @@ import com.epmet.dto.user.result.GridUserInfoDTO;
import com.epmet.entity.org.CustomerGridEntity;
import com.epmet.service.Issue.IssueService;
import com.epmet.service.org.CustomerGridService;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
@Service
@DataSource(DataSourceConstant.GOV_ORG)
@@ -157,4 +160,20 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getGridMap(String customerId) {
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(CustomerGridEntity::getCustomerId, customerId);
+ List list = baseDao.selectList(wrapper);
+ if (CollectionUtils.isEmpty(list)) {
+ return Collections.emptyMap();
+ }
+ return ConvertUtils.sourceToTarget(list, CustomerGridDTO.class).stream().collect(Collectors.toMap(CustomerGridDTO::getId, Function.identity()));
+ }
+
}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
index 368ee31ebe..f60ad30d00 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
@@ -120,6 +120,12 @@ hystrix:
isolation:
thread:
timeoutInMilliseconds: 60000 #缺省为1000
+ threadpool:
+ default:
+ coreSize: 20
+ maximumSize: 50
+ maxQueueSize: 500
+ queueSizeRejectionThreshold: 200
ribbon:
ReadTimeout: 300000
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index 64b783c786..6f4ce649b9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -300,7 +300,8 @@
b.HANDLER_ID AS finishOrg,
b.HANDLER_TYPE AS finishOrgType,
b.ORG_ID_PATH AS orgIdPath,
- c.`LEVEL` AS finishOrgLevel
+ c.`LEVEL` AS finishOrgLevel,
+ b.PROCESS_TIME
FROM
screen_project_data a
LEFT JOIN (
@@ -309,12 +310,13 @@
PROJECT_ID,
HANDLER_ID,
HANDLER_TYPE,
- ORG_ID_PATH
+ ORG_ID_PATH,
+ PROCESS_TIME
FROM
screen_project_process spp
WHERE
(( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
- AND OPERATION = 'closed_case')
+ AND (OPERATION = 'closed_case' OR OPERATION = 'close'))
OR
(( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
AND OPERATION = 'close')
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
index 0c8a18627c..621d1344f9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
@@ -521,7 +521,7 @@
@@ -122,6 +126,10 @@
spring-security-crypto
org.springframework.security
+
+ commons-io
+ commons-io
+
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
index f48d8e63c1..7db04184c5 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
@@ -32,6 +32,8 @@ spring:
cluster:
nodes: @spring.redis.cluster.nodes@
max-redirects: @spring.redis.cluster.max-redirects@
+ shardingsphere:
+ enabled: false
datasource:
druid:
#MySQL
diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
index 2108042cd6..a8621ce09d 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java
@@ -23,6 +23,12 @@ public interface ImportTaskConstants {
String BIZ_TYPE_IC_ENTERPRISE="ic_enterprise";
String IC_POINT_NUCLEIC_MONITORING = "ic_point_nucleic_monitoring";
String IC_POINT_VACCINES_INOCULATION = "ic_point_vaccines_inoculation";
+ // 新冠病毒疫苗接种人员信息台账
+ String IC_VACCINE_PRARMETER = "ic_vaccine_prarmeter";
+ /**
+ * 工作日志导入
+ */
+ String BIZ_TYPE_WORK_DIARY_IMPORT = "work_diary_import";
/**
* 核酸检测
*/
@@ -62,4 +68,14 @@ public interface ImportTaskConstants {
* 城市管理
*/
String IC_CITY_MANAGEMENT = "ic_city_management";
+
+ /**
+ * 社会组织
+ */
+ String IC_SOCIETY_ORG="ic_society_org";
+
+ /**
+ * 未做核酸比对
+ */
+ String IC_NAT_COMPARE_RECORD="ic_nat_compare_record";
}
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
index 477dfeead3..7d0e8dd471 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
@@ -32,6 +32,8 @@ spring:
cluster:
nodes: @spring.redis.cluster.nodes@
max-redirects: @spring.redis.cluster.max-redirects@
+ shardingsphere:
+ enabled: false
datasource:
druid:
#MySQL
@@ -120,6 +122,12 @@ hystrix:
isolation:
thread:
timeoutInMilliseconds: 60000 #缺省为1000
+ threadpool:
+ default:
+ coreSize: 20
+ maximumSize: 50
+ maxQueueSize: 500
+ queueSizeRejectionThreshold: 200
ribbon:
ReadTimeout: 300000
diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
index 8a38624e35..0d38855a4b 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
@@ -125,6 +125,38 @@
dev
+
+ false
+
+
+ 8088
+ dev
+
+
+
+
+
+ epmet_demo_user
+ EpmEt-db-UsEr
+
+ 0
+ 192.168.1.140
+ 6379
+ 123456
+
+ true
+ 192.168.1.140:8848
+ 1fecc730-5e6e-464c-aae9-7567944e7936
+
+
+ false
+
+
+ true
+
+
+
+ local
true
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
index 06cca196a6..5b6aed6fec 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
@@ -32,6 +32,8 @@ spring:
cluster:
nodes: @spring.redis.cluster.nodes@
max-redirects: @spring.redis.cluster.max-redirects@
+ shardingsphere:
+ enabled: false
datasource:
druid:
#MySQL
@@ -39,6 +41,15 @@ spring:
url: @spring.datasource.druid.url@
username: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@
+ # 数据迁移工具flyway
+ flyway:
+ enabled: false
+ locations: classpath:db/migration
+ url:
+ user:
+ password:
+ baseline-on-migrate: true
+ baseline-version: 0
cloud:
nacos:
discovery:
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
index 45763d3192..03fe99915c 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
@@ -29,6 +29,8 @@ spring:
cluster:
nodes: @spring.redis.cluster.nodes@
max-redirects: @spring.redis.cluster.max-redirects@
+ shardingsphere:
+ enabled: false
datasource:
druid:
#MySQL
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
index f0304874e5..8b1d9f8a57 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcSocietyOrgDTO.java
@@ -39,6 +39,11 @@ public class IcSocietyOrgDTO implements Serializable {
*/
private String id;
+ /**
+ * 图片地址
+ */
+ private String imgUrl;
+
/**
* 客户Id
*/
@@ -74,6 +79,11 @@ public class IcSocietyOrgDTO implements Serializable {
*/
private String mobile;
+ /**
+ * 服务时间
+ */
+ private String serviceTimeStr;
+
/**
* 起始服务时间
*/
@@ -109,34 +119,5 @@ public class IcSocietyOrgDTO implements Serializable {
*/
private String remarks;
- /**
- * 删除标识：0.未删除 1.已删除
- */
- private Integer delFlag;
-
- /**
- * 乐观锁
- */
- private Integer revision;
-
- /**
- * 创建人
- */
- private String createdBy;
-
- /**
- * 创建时间
- */
- private Date createdTime;
-
- /**
- * 更新人
- */
- private String updatedBy;
-
- /**
- * 更新时间
- */
- private Date updatedTime;
}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java
new file mode 100644
index 0000000000..664465c7ae
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/WorkdiaryServiceTypeDTO.java
@@ -0,0 +1,81 @@
+package com.epmet.dto;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.epmet.dto.result.WorkdiaryServiceRecordDTO;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工作日志(服务)-服务类型
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-23
+ */
+@Data
+public class WorkdiaryServiceTypeDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public interface Save extends CustomerClientShowGroup {}
+ public interface Update extends CustomerClientShowGroup {}
+
+ /**
+ * 主键
+ */
+ @NotBlank(message = "未选中任何数据", groups = { Update.class })
+ private String id;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 服务类型
+ */
+ private Short serviceType;
+
+ /**
+ * 服务类型名称
+ */
+ private String serviceTypeName;
+
+ /**
+ * 是否启用。0：禁用，1：启用
+ */
+ private Short enabled;
+
+ /**
+ * 删除标识 0.未删除 1.已删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java
index 1217c647c5..a78b42a471 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java
@@ -23,7 +23,7 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.Date;
@@ -48,6 +48,11 @@ public class AddSocietyOrgFormDTO implements Serializable {
* agency_id的所有上级
*/
private String pids;
+ /**
+ * 社会组织头像
+ */
+ @NotEmpty(message = "组织头像不能为空", groups = { AddSocietyOrgFormDTO.Add.class})
+ private String[] imageList;
/**
* 社会组织名称
*/
@@ -63,7 +68,7 @@ public class AddSocietyOrgFormDTO implements Serializable {
/**
* 负责人
*/
- @NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+ //@NotBlank(message = "负责人名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
@Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Add.class})
private String personInCharge;
/**
@@ -72,22 +77,24 @@ public class AddSocietyOrgFormDTO implements Serializable {
@NotBlank(message = "负责人电话不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
@Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Add.class})
private String mobile;
+ /**
+ * 服务时间
+ */
+ @NotBlank(message = "服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+ private String serviceTimeStr;
/**
* 起始服务时间
*/
- @NotNull(message = "起始服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date serviceStartTime;
/**
* 终止服务时间
*/
- @NotNull(message = "终止服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date serviceEndTime;
/**
* 绑定管理员[组织下录入的工作人员]
*/
- @NotBlank(message = "绑定管理员名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
private String adminStaffId;
/**
* 地址
@@ -106,4 +113,4 @@ public class AddSocietyOrgFormDTO implements Serializable {
public interface Add extends CustomerClientShowGroup {}
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java
index 2acad633c0..1e65306066 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java
@@ -22,6 +22,7 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.Date;
@@ -40,6 +41,12 @@ public class EditSocietyOrgFormDTO implements Serializable {
*/
@NotBlank(message = "社会组织Id不能为空", groups = { Edit.class, Del.class })
private String societyId;
+
+ /**
+ * 社会组织头像
+ */
+ @NotEmpty(message = "组织头像不能为空", groups = { Edit.class})
+ private String[] imageList;
/**
* 社会组织名称
*/
@@ -53,13 +60,19 @@ public class EditSocietyOrgFormDTO implements Serializable {
/**
* 负责人
*/
- @Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class})
+ //@Length(max = 20, message = "负责人名称不能超过20个字符",groups = {Edit.class})
private String personInCharge;
/**
* 负责人电话
*/
@Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Edit.class})
private String mobile;
+
+ /**
+ * 服务时间
+ */
+ @NotBlank(message = "服务时间不能为空",groups = {Edit.class})
+ private String serviceTimeStr;
/**
* 起始服务时间
*/
@@ -92,4 +105,4 @@ public class EditSocietyOrgFormDTO implements Serializable {
public interface Edit {}
public interface Del {}
-}
\ No newline at end of file
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java
index 877abcb74c..2169dda0d8 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java
@@ -59,7 +59,7 @@ public class ResiVolunteerAuthenticateFormDTO implements Serializable {
/**
* 身份证号码
*/
- @NotBlank(message = "身份证号码不能为空", groups = {AddUserShowGroup.class })
+ @NotBlank(message = "证件号能为空", groups = {AddUserShowGroup.class })
private String idNum;
/**
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java
new file mode 100644
index 0000000000..3d581924a3
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/workdiaryservice/WorkdiaryServiceQueryFormDTO.java
@@ -0,0 +1,38 @@
+package com.epmet.dto.form.workdiaryservice;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 工作日志-服务
+ */
+@Data
+public class WorkdiaryServiceQueryFormDTO extends PageFormDTO {
+
+ private String id;
+ private Short serviceType;
+ private String gridId;
+ private String applicantName;
+ private String applicantAddress;
+ private String serviceContent;
+ private String applicantMobile;
+ private String principalName;
+
+ //@DateTimeFormat
+ //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss", timezone = "GMT+8")
+ //private Date serviceTime;
+ private String remark;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date serviceTimeStart;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date serviceTimeEnd;
+
+}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java
index 0130b246a7..08404eff6d 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java
@@ -44,6 +44,10 @@ public class GetListSocietyOrgResultDTO implements Serializable {
private String agencyId;
//社会组织Id
private String societyId;
+ /**
+ * 社会组织头像
+ */
+ private String imgUrl;
//社会组织名称
private String societyName;
//服务事项
@@ -52,6 +56,10 @@ public class GetListSocietyOrgResultDTO implements Serializable {
private String personInCharge;
//负责人电话
private String mobile;
+ /**
+ * 服务时间
+ */
+ private String serviceTimeStr;
//起始服务时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date serviceStartTime;
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java
index 38a081d2bc..2d77374893 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java
@@ -35,6 +35,10 @@ public class SocietyOrgListResultDTO implements Serializable {
private String agencyName;
//社会组织Id
private String societyId;
+ /**
+ * 图像
+ */
+ private String imgUrl;
//社会组织名称
private String societyName;
//服务事项
@@ -43,6 +47,10 @@ public class SocietyOrgListResultDTO implements Serializable {
private String personInCharge;
//负责人电话
private String mobile;
+ /**
+ * 服务时间
+ */
+ private String serviceTimeStr;
//起始服务时间
//@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
//private Date serviceStartTime;
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java
new file mode 100755
index 0000000000..8e75f55c34
--- /dev/null
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/WorkdiaryServiceRecordDTO.java
@@ -0,0 +1,143 @@
+package com.epmet.dto.result;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * 工作日志(服务)-记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-08-23
+ */
+@Data
+public class WorkdiaryServiceRecordDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public interface Save extends CustomerClientShowGroup {}
+ public interface Update extends CustomerClientShowGroup {}
+
+ /**
+ * 主键
+ */
+ @NotBlank(message = "未选中任何数据", groups = { Update.class })
+ private String id;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * 服务类型
+ */
+ @NotNull(message = "服务类型为必填项", groups = { Save.class })
+ private Short serviceType;
+ private String serviceTypeName;
+
+ /**
+ * 单位ID
+ */
+ private String agencyId;
+
+ /**
+ * 网格ID
+ */
+ @NotBlank(message = "网格为必填项", groups = { Save.class })
+ private String gridId;
+ private String gridName;
+
+ /**
+ * 组织ID path
+ */
+ private String orgIdPath;
+
+ /**
+ * 申请人ID
+ */
+ @NotBlank(message = "申请人为必填项", groups = { Save.class })
+ private String applicantId;
+
+ private String applicantIdCard;
+
+ /**
+ * 申请人姓名
+ */
+ private String applicantName;
+
+ /**
+ * 申请人住址
+ */
+ @NotBlank(message = "住址为必填项", groups = { Save.class })
+ private String applicantAddress;
+
+ /**
+ * 申请人联系电话
+ */
+ @NotBlank(message = "联系电话为必填项", groups = { Save.class })
+ private String applicantMobile;
+
+ /**
+ * 服务内容
+ */
+ @NotBlank(message = "服务内容为必填项", groups = { Save.class })
+ private String serviceContent;
+
+ /**
+ * 服务时间
+ */
+ @NotNull(message = "服务时间为必填项", groups = { Save.class })
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date serviceTime;
+
+ /**
+ * 负责人姓名
+ */
+ private String principalName;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 删除标识 0.未删除 1.已删除
+ */
+ private Integer delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
index e3b04df7bb..27d88957b5 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
@@ -171,4 +171,13 @@ public interface EpmetHeartOpenFeignClient {
@PostMapping("/heart/icpartyunit/editpartyorcommunity")
Result editPartyOrCommunity(@RequestBody CheckStaffInfoResultDTO formDTO);
+ /**
+ * desc:根据来源id 删除需求 只删主表
+ * @param originId
+ * @param origin
+ * @return
+ */
+ @PostMapping("/heart/userdemand/deleteByOriginId/{originId}/{origin}")
+ Result deleteUserDemandByOriginId(@PathVariable("originId") String originId, @PathVariable("origin")String origin);
+
}
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
index 558cd43f2b..247495bdf5 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
@@ -13,7 +13,6 @@ import com.epmet.dto.form.IcDemandFormDTO;
import com.epmet.dto.form.PartyUnitListFormDTO;
import com.epmet.dto.form.demand.DemandRecId;
import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO;
-import com.epmet.dto.form.demand.ServiceItemSelectFormDTO;
import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO;
@@ -21,7 +20,6 @@ import com.epmet.dto.form.resi.VolunteerCommonFormDTO;
import com.epmet.dto.result.CheckStaffInfoResultDTO;
import com.epmet.dto.result.PartyUnitListResultDTO;
import com.epmet.dto.result.demand.IcResiDemandDictDTO;
-import com.epmet.dto.result.demand.OptionDTO;
import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO;
import com.epmet.feign.EpmetHeartOpenFeignClient;
@@ -172,4 +170,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
public Result editPartyOrCommunity(CheckStaffInfoResultDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "editPartyOrCommunity", formDTO);
}
+
+ @Override
+ public Result deleteUserDemandByOriginId(String originId, String origin) {
+ return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "deleteUserDemandByOriginId", originId,origin);
+ }
}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java
index 2b07959e33..3267ef36bb 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java
@@ -18,34 +18,55 @@
package com.epmet.controller;
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
+import com.epmet.commons.tools.exception.ExceptionUtils;
+import com.epmet.commons.tools.feign.ResultDataResolver;
import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.ExcelPoiUtils;
-import com.epmet.commons.tools.utils.ExcelUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dto.IcSocietyOrgDTO;
import com.epmet.dto.form.AddSocietyOrgFormDTO;
import com.epmet.dto.form.EditSocietyOrgFormDTO;
import com.epmet.dto.form.GetListSocietyOrgFormDTO;
+import com.epmet.dto.form.ImportTaskCommonFormDTO;
import com.epmet.dto.form.demand.ServiceQueryFormDTO;
import com.epmet.dto.result.GetListSocietyOrgResultDTO;
+import com.epmet.dto.result.ImportTaskCommonResultDTO;
import com.epmet.dto.result.demand.OptionDTO;
import com.epmet.excel.IcSocietyOrgExcel;
+import com.epmet.excel.IcSocietyOrgExportExcel;
+import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.IcSocietyOrgService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.net.URLEncoder;
+import java.nio.file.Path;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@@ -58,11 +79,13 @@ import java.util.stream.Collectors;
@Slf4j
@RestController
@RequestMapping("societyorg")
-public class IcSocietyOrgController {
+public class IcSocietyOrgController implements ResultDataResolver {
+ private static final String DEFAULT_NO_IMG = "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220826/38eb186191ab48fe8d3920b642b56e64.png";
@Autowired
private IcSocietyOrgService societyOrgService;
-
+ @Autowired
+ private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient;
/**
* @Author sun
* @Description 新增社会组织
@@ -87,6 +110,19 @@ public class IcSocietyOrgController {
return new Result();
}
+ /**
+ * @Author sun
+ * @Description 删除社会组织
+ **/
+ @RequestMapping("detail/{id}")
+ public Result detail(@LoginUser TokenDto tokenDto, @PathVariable(value = "id") String id) {
+ IcSocietyOrgDTO icSocietyOrgDTO = societyOrgService.get(id);
+ if (StringUtils.isBlank(icSocietyOrgDTO.getImgUrl())){
+ icSocietyOrgDTO.setImgUrl(DEFAULT_NO_IMG);
+ }
+ return new Result().ok(icSocietyOrgDTO);
+ }
+
/**
* @Author sun
* @Description 删除社会组织
@@ -129,14 +165,50 @@ public class IcSocietyOrgController {
**/
@PostMapping("export")
public void export(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO, HttpServletResponse response) throws Exception {
+ //废弃原来的导出
+ // formDTO.setCustomerId(tokenDto.getCustomerId());
+ // formDTO.setStaffId(tokenDto.getUserId());
+ // formDTO.setIsPage(false);
+ // GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO);
+ // ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExportExcel.class);
+
formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setStaffId(tokenDto.getUserId());
formDTO.setIsPage(false);
- GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO);
- ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExcel.class);
+ ExcelWriter excelWriter = null;
+ formDTO.setPageNo(NumConstant.ONE);
+ formDTO.setPageSize(NumConstant.TEN_THOUSAND);
+ try {
+ String fileName = "社会组织" + DateUtils.format(new Date()) + ".xlsx";
+ excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcSocietyOrgExportExcel.class).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
+ GetListSocietyOrgResultDTO data = null;
+ List list = null;
+ do {
+ data = societyOrgService.getList(formDTO);
+ list = ConvertUtils.sourceToTarget(data.getList(), IcSocietyOrgExportExcel.class);
+ formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
+ excelWriter.write(list, writeSheet);
+ } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize());
+ } catch (EpmetException e) {
+ response.reset();
+ response.setCharacterEncoding("UTF-8");
+ response.setHeader("content-type", "application/json; charset=UTF-8");
+ PrintWriter printWriter = response.getWriter();
+ Result