Skip to content

D
data-center
Commit ee0df0de authored by shenxin's avatar shenxin
Browse files
Options

代码合并

parent f5a9fad4
Show whitespace changes
Inline Side-by-side
Showing with 1838 additions and 944 deletions
dataCenter-manager/src/main/java/com/mortals/xhx/common/code/NodeTypeEnum.java
View file @ ee0df0de
......@@ -8,6 +8,9 @@ package com.mortals.xhx.common.code;
*/
public enum NodeTypeEnum {
蓉易办受理("BusiType_21","21","蓉易办受理"),
蓉易办环节("BusiType_22","22","蓉易办环节"),
已提交("BusiType_23","23","已提交"),
受理("BusiType_1","11","受理"),
审查("BusiType_13","21","审查"),
决定("BusiType_8","91","决定"),
......
dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/RybApplyAndAcceptInformationTaskImpl.java 0 → 100644
View file @ ee0df0de
package com.mortals.xhx.modules.information.task;
import cn.hutool.core.date.DateTime;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.excel.util.CollectionUtils;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ITask;
import com.mortals.framework.service.ITaskExcuteService;
import com.mortals.xhx.common.code.NodeTypeEnum;
import com.mortals.xhx.common.utils.DateByAffairUtils;
import com.mortals.xhx.modules.implementlist.dao.RybMatterDao;
import com.mortals.xhx.modules.implementlist.dao.RybWorkDao;
import com.mortals.xhx.modules.implementlist.model.RybMatterListEntry;
import com.mortals.xhx.modules.implementlist.model.RybWorkEntry;
import com.mortals.xhx.modules.information.model.InformationEntity;
import com.mortals.xhx.modules.information.service.InformationService;
import com.mortals.xhx.modules.service.QueryInformationServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.stream.Collectors;
/**
* @author shenxin
* @Date: 2021/11/17-16:28
* @Description:办件数据推送蓉易办(申请并受理)
*/
@Slf4j
@Component("rybApplyAndAcceptInformationTaskImpl")
public class RybApplyAndAcceptInformationTaskImpl implements ITaskExcuteService {
@Value("${upload.AppKey}")
String AppKey;
@Autowired
private InformationService informationService;
@Autowired
private QueryInformationServiceImpl queryInformationService;
@Resource
private RybWorkDao rybWorkDao;
@Resource
private RybMatterDao rybMatterDao;
@Override
public void excuteTask(ITask task) throws AppException {
//1.查询上月的表是否存在未推送的数据
List<InformationEntity> informationEntities =
queryInformationService.queryDataThatHasNotBeenPushed(NodeTypeEnum.蓉易办受理.getCode(), "1", "0", task.getExcuteParam());
//组装申请并受理数据推送一体化平台
this.applyAndAccept(informationEntities);
}
private void applyAndAccept(List<InformationEntity> informationEntities) {
log.info("开始推送申请并受理理数据");
if(CollectionUtils.isEmpty(informationEntities)){
log.info("没有需要推送申请并受理理数据");
return;
}
List<InformationEntity> entities = informationEntities.parallelStream().map(e -> {
//组装参数
HashMap<String, Object> stringObjectHashMap = assemblyParameters(e);
if(stringObjectHashMap == null){
log.info("推送失败，没有该办件所对应的事项部门编码！");
e.setFailReason("推送失败，没有该办件所对应的事项部门编码！");
e.setIsReport("1");
e.setIsSuccess("0");
return e;
}
Map<String, String> map = (Map<String, String>) stringObjectHashMap.get("params");
e.setAcceptName(map.get("receiveusername"));
e.setAcceptId(map.get("receiveuseridcard"));
e.setAcceptPhone(map.get("receiveuserphone"));
Map<String, Object> params = new HashMap<>();
params.put("jsonData", JSONObject.toJSONString(stringObjectHashMap));
HttpRequest key = HttpUtil.createPost("https://10.1.235.51:4433/gateway/api/1/wllz/bjsqtjbsl/zs")//蓉易办
// HttpRequest key = HttpUtil.createPost("http://192.168.0.222:17011/m/supplement/test")//本地测试
.header("AppKey", AppKey)
.header("Content-Type", "application/x-www-form-urlencoded;charset=utf-8").form(params);
HttpResponse appKey = key.execute().charset("utf-8");
JSONObject jsonObject = JSONObject.parseObject(appKey.body());
log.info("响应：" + jsonObject);
JSONObject data = JSONObject.parseObject(jsonObject.getString("data"));
if ("200".equals(jsonObject.getString("code")) && "1".equals(data.getJSONObject("custom").getString("code"))) {
log.info("推送成功");
e.setIsReport("1");
e.setIsSuccess("1");
e.setBizStatus(NodeTypeEnum.蓉易办环节.getDesc());
e.setNodeType(NodeTypeEnum.蓉易办环节.getCode());
//默认区间3~20分钟
e.setCreateTime(DateByAffairUtils.getTimeByAddRandomDouble(DateTime.now(), null, null));
e.setOfficeCode(data.getJSONObject("custom").getJSONObject("content").getString("flowsn"));
} else {
log.info("推送失败:" + jsonObject);
e.setFailReason(jsonObject.toString());
e.setIsReport("1");
e.setIsSuccess("0");
}
e.setProcessStatusName(NodeTypeEnum.蓉易办受理.getValue());
return e;
}).collect(Collectors.toList());
log.info("申请受理推送完成");
informationService.update(entities, null);
}
private HashMap<String, Object> assemblyParameters(InformationEntity e) {
HashMap<String, Object> dataMap = new HashMap<>(16);
dataMap.put("token", "Epoint_WebSerivce_**##0601");
HashMap<String, Object> baseInfoMap = new HashMap<>(16);
baseInfoMap.put("projectname", e.getEventName());
baseInfoMap.put("applyway", "20");
if (e.getApplicantAttributes() == 2) {
baseInfoMap.put("applyertype", "20");
} else {
baseInfoMap.put("applyertype", "10");
baseInfoMap.put("legal", e.getLegalPerson());
baseInfoMap.put("legalpersoncardtype", "");
baseInfoMap.put("legalpersonidcard", "");
}
baseInfoMap.put("applyername", e.getApplicantName());
baseInfoMap.put("applyersex", e.getApplicantSex());
baseInfoMap.put("certtype", "22");
baseInfoMap.put("certnum", e.getApplicantCardNumbe());
baseInfoMap.put("address", "地址暂无");
baseInfoMap.put("contactmobile", e.getContactPhone());
baseInfoMap.put("contactperson", e.getContactName());
List<RybWorkEntry> workEntries = rybWorkDao.find(e.getDeptCode());
if(CollectionUtils.isEmpty(workEntries)){
return null;
}
baseInfoMap.putAll(randomlyExtractPersonnelInformation(workEntries));
baseInfoMap.put("receivedate", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(e.getCreateTime()));
RybMatterListEntry entry = rybMatterDao.find(e.getEventCode()).get(0);
if (null != entry) {
baseInfoMap.put("tasktype", entry.getMatterType());
baseInfoMap.put("task_id", entry.getTaskId());
} else {
baseInfoMap.put("tasktype", "1A");
baseInfoMap.put("task_id", "123");
}
baseInfoMap.put("eventcode", entry.getMatterCode());
baseInfoMap.put("areacode", e.getAreaCode());
baseInfoMap.put("source", "MTEwNDEyOTc0MDAw");
baseInfoMap.put("contactcertnum", e.getContactIdCard());
baseInfoMap.put("contactidcard", e.getContactIdCard());
dataMap.put("params", baseInfoMap);
return dataMap;
}
private HashMap<String, String> randomlyExtractPersonnelInformation(List<RybWorkEntry> workEntries) {
HashMap<String, String> dataMap = new HashMap<>(16);
Random random = new Random();
int i = random.nextInt(workEntries.size());
dataMap.put("receiveusername", workEntries.get(i).getReceiveUserName());
dataMap.put("receiveuseridcard", workEntries.get(i).getReceiveUserIdcard());
dataMap.put("receiveuserphone", workEntries.get(i).getReceiveUserPhone());
return dataMap;
}
@Override
public void stopTask(ITask task) throws AppException {
}
}
dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/RybSubmitLinkDataInformationTaskImpl.java 0 → 100644
View file @ ee0df0de
package com.mortals.xhx.modules.information.task;
import cn.hutool.http.HttpUtil;
import com.alibaba.excel.util.CollectionUtils;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ITask;
import com.mortals.framework.service.ITaskExcuteService;
import com.mortals.xhx.common.code.NodeTypeEnum;
import com.mortals.xhx.modules.information.model.InformationEntity;
import com.mortals.xhx.modules.information.service.InformationService;
import com.mortals.xhx.modules.service.QueryInformationServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author shenxin
* @Date: 2021/11/17-16:28
* @Description:办件数据推送蓉易办(办件环节)
*/
@Slf4j
@Component("rybSubmitLinkDataInformationTaskImpl")
public class RybSubmitLinkDataInformationTaskImpl implements ITaskExcuteService {
@Value("${upload.AppKey}")
String AppKey;
@Autowired
private InformationService informationService;
@Autowired
private QueryInformationServiceImpl queryInformationService;
@Override
public void excuteTask(ITask task) throws AppException {
//1.查询上月的表是否存在未推送的数据
List<InformationEntity> informationEntities =
queryInformationService.queryDataThatHasNotBeenPushed(NodeTypeEnum.蓉易办环节.getCode(), "1", "1", task.getExcuteParam());
//办件环节数据推送蓉易办
this.submitLinkData(informationEntities);
}
private void submitLinkData(List<InformationEntity> informationEntities) {
log.info("开始推送申请并受理理数据");
if(CollectionUtils.isEmpty(informationEntities)){
log.info("没有需要推送办件环节数据");
return;
}
List<InformationEntity> collect = informationEntities.parallelStream().map(e -> {
//组装参数
HashMap<String, Object> stringObjectHashMap = assemblyParametersLink(e);
Map<String, Object> params = new HashMap<>();
params.put("jsonData", JSONObject.toJSONString(stringObjectHashMap));
String appKey = HttpUtil
.createPost("https://10.1.235.51:4433/gateway/api/1/wllz/bjhjgcsjts/zs").form(params)//蓉易办
// .createPost("http://192.168.0.222:17011/m/supplement/test").form(params)//测试
.header("AppKey", AppKey)
.header("Content-Type", "application/x-www-form-urlencoded;charset=utf-8")
.execute()
.charset("utf-8")
.body();
JSONObject jsonObject = JSONObject.parseObject(appKey);
e.setBizStatus(NodeTypeEnum.已提交.getDesc());
e.setNodeType(NodeTypeEnum.已提交.getCode());
if ("200".equals(jsonObject.getString("code"))) {
log.info("提交成功:" + jsonObject);
} else {
log.info("提交失败:" + jsonObject);
}
e.setProcessStatusName(NodeTypeEnum.蓉易办环节.getValue());
return e;
}).collect(Collectors.toList());
log.info("办件环节推送完成");
informationService.update(collect, null);
}
private HashMap<String, Object> assemblyParametersLink(InformationEntity e) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
HashMap<String, Object> dataMap = new HashMap<>(16);
dataMap.put("token", "Epoint_WebSerivce_**##0601");
HashMap<String, Object> baseInfoMap = new HashMap<>(16);
baseInfoMap.put("flowsn", e.getOfficeCode());
baseInfoMap.put("operatetype", "80");
baseInfoMap.put("startdate", format.format(e.getGenTime()));
baseInfoMap.put("enddate", format.format(e.getCompleteTime()));
baseInfoMap.put("operateusername", e.getAcceptName());
baseInfoMap.put("operateuserphone", e.getAcceptPhone());
baseInfoMap.put("operateuseridcard", e.getAcceptId());
baseInfoMap.put("areacode", e.getAreaCode());
baseInfoMap.put("handleTime", format.format(e.getCreateTime()));
baseInfoMap.put("nodeStatus", "1");
dataMap.put("params", baseInfoMap);
return dataMap;
}
@Override
public void stopTask(ITask task) throws AppException {
}
}
dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/listener/InformationDataConversionListener.java
View file @ ee0df0de
......@@ -86,6 +86,7 @@ public class InformationDataConversionListener extends AnalysisEventListener<Sup
supplementEntity.setIsSuccess("0");
supplementEntity.setCreateDate(DateTime.now());
supplementEntity.setUpdateDate(supplementEntity.getCreateDate());
supplementEntity.setPushType(TYPE);
entityList.add(supplementEntity);
eventCodeList.add(supplementEntity.getImplCode());
if(PushTypeEnum.SYTH.getStyle().equals(TYPE)){
......
dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/model/SupplementEntity.java
View file @ ee0df0de
......@@ -145,6 +145,12 @@ public class SupplementEntity extends BaseEntityLong{
@ExcelIgnore
private String failReason;
/**
* 推送类型
*/
@ExcelIgnore
private String pushType;
/**
* 创建时间
*/
......@@ -454,6 +460,20 @@ public class SupplementEntity extends BaseEntityLong{
public void setFailReason(String failReason) {
this.failReason = failReason;
}
/**
* 获取 推送类型
* @return String
*/
public String getPushType(){
return pushType;
}
/**
* 设置 推送类型
* @param pushType
*/
public void setPushType(String pushType){
this.pushType = pushType;
}
/**
* 获取 创建时间
* @return createDate
......@@ -525,6 +545,7 @@ public class SupplementEntity extends BaseEntityLong{
.append(",isExecute:").append(getIsExecute())
.append(",isSuccess:").append(getIsSuccess())
.append(",failReason:").append(getFailReason())
.append(",pushType:").append(getPushType())
.append(",createDate:").append(getCreateDate())
.append(",updateDate:").append(getUpdateDate())
;
......@@ -553,6 +574,7 @@ public class SupplementEntity extends BaseEntityLong{
this.isExecute = null;
this.isSuccess = null;
this.failReason = null;
this.pushType = null;
this.createDate = null;
this.updateDate = null;
}
......
dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/model/SupplementQuery.java
View file @ ee0df0de
......@@ -8,8 +8,7 @@ import java.util.Date;
* Description:Supplement
* date: 2021-8-12 14:22:26
*/
public class SupplementQuery extends SupplementEntity{
private static final long serialVersionUID = 1628749346439L;
public class SupplementQuery extends SupplementEntity {
/** 开始 主键ID,主键,业务生成 */
private Long idStart;
......@@ -19,10 +18,9 @@ public class SupplementQuery extends SupplementEntity{
/** 增加 主键ID,主键,业务生成 */
private Long idIncrement;
/** 主键ID,主键,业务生成 */
/** 主键ID,主键,业务生成列表 */
private List <Long> idList;
/** 实施清单名称 */
private List<String> implNameList;
......@@ -85,11 +83,16 @@ public class SupplementQuery extends SupplementEntity{
/** 失败原因 */
private List<String> failReasonList;
/** 推送类型 */
private List<String> pushTypeList;
/** 开始 创建时间 */
private String createDateStart;
/** 结束 创建时间 */
private String createDateEnd;
/** 开始 更新时间 */
private String updateDateStart;
......@@ -102,9 +105,7 @@ public class SupplementQuery extends SupplementEntity{
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<SupplementQuery> andConditionList;
public SupplementQuery(){
}
public SupplementQuery(){}
/**
* 获取 开始 主键ID,主键,业务生成
......@@ -124,7 +125,7 @@ public class SupplementQuery extends SupplementEntity{
/**
* 获取 结束 主键ID,主键,业务生成
* @return idEnd
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
......@@ -169,6 +170,7 @@ public class SupplementQuery extends SupplementEntity{
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 实施清单名称
* @return implNameList
......@@ -484,6 +486,21 @@ public class SupplementQuery extends SupplementEntity{
public void setFailReasonList(List<String> failReasonList){
this.failReasonList = failReasonList;
}
/**
* 获取 推送类型
* @return pushTypeList
*/
public List<String> getPushTypeList(){
return this.pushTypeList;
}
/**
* 设置 推送类型
* @param pushTypeList
*/
public void setPushTypeList(List<String> pushTypeList){
this.pushTypeList = pushTypeList;
}
/**
* 获取 开始 创建时间
* @return createDateStart
......@@ -515,6 +532,7 @@ public class SupplementQuery extends SupplementEntity{
public void setCreateDateEnd(String createDateEnd){
this.createDateEnd = createDateEnd;
}
/**
* 获取 开始 更新时间
* @return updateDateStart
......@@ -547,6 +565,471 @@ public class SupplementQuery extends SupplementEntity{
this.updateDateEnd = updateDateEnd;
}
/**
* 设置 主键ID,主键,业务生成
* @param id
*/
public SupplementQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 主键ID,主键,业务生成
* @param idStart
*/
public SupplementQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 主键ID,主键,业务生成
* @param idEnd
*/
public SupplementQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 主键ID,主键,业务生成
* @param idIncrement
*/
public SupplementQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 主键ID,主键,业务生成
* @param idList
*/
public SupplementQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 实施清单名称
* @param implName
*/
public SupplementQuery implName(String implName){
setImplName(implName);
return this;
}
/**
* 设置 实施清单名称
* @param implNameList
*/
public SupplementQuery implNameList(List<String> implNameList){
this.implNameList = implNameList;
return this;
}
/**
* 设置 实施清单编码
* @param implCode
*/
public SupplementQuery implCode(String implCode){
setImplCode(implCode);
return this;
}
/**
* 设置 实施清单编码
* @param implCodeList
*/
public SupplementQuery implCodeList(List<String> implCodeList){
this.implCodeList = implCodeList;
return this;
}
/**
* 设置 申请人属性
* @param applicationType
*/
public SupplementQuery applicationType(String applicationType){
setApplicationType(applicationType);
return this;
}
/**
* 设置 申请人属性
* @param applicationTypeList
*/
public SupplementQuery applicationTypeList(List<String> applicationTypeList){
this.applicationTypeList = applicationTypeList;
return this;
}
/**
* 设置 申请人证件类型
* @param applicationCardType
*/
public SupplementQuery applicationCardType(String applicationCardType){
setApplicationCardType(applicationCardType);
return this;
}
/**
* 设置 申请人证件类型
* @param applicationCardTypeList
*/
public SupplementQuery applicationCardTypeList(List<String> applicationCardTypeList){
this.applicationCardTypeList = applicationCardTypeList;
return this;
}
/**
* 设置 申请人姓名
* @param applicationName
*/
public SupplementQuery applicationName(String applicationName){
setApplicationName(applicationName);
return this;
}
/**
* 设置 申请人姓名
* @param applicationNameList
*/
public SupplementQuery applicationNameList(List<String> applicationNameList){
this.applicationNameList = applicationNameList;
return this;
}
/**
* 设置 申请人证件号码
* @param applicationId
*/
public SupplementQuery applicationId(String applicationId){
setApplicationId(applicationId);
return this;
}
/**
* 设置 申请人证件号码
* @param applicationIdList
*/
public SupplementQuery applicationIdList(List<String> applicationIdList){
this.applicationIdList = applicationIdList;
return this;
}
/**
* 设置 申请人手机号码
* @param applicationPhone
*/
public SupplementQuery applicationPhone(String applicationPhone){
setApplicationPhone(applicationPhone);
return this;
}
/**
* 设置 申请人手机号码
* @param applicationPhoneList
*/
public SupplementQuery applicationPhoneList(List<String> applicationPhoneList){
this.applicationPhoneList = applicationPhoneList;
return this;
}
/**
* 设置 机构名称
* @param mechanismName
*/
public SupplementQuery mechanismName(String mechanismName){
setMechanismName(mechanismName);
return this;
}
/**
* 设置 机构名称
* @param mechanismNameList
*/
public SupplementQuery mechanismNameList(List<String> mechanismNameList){
this.mechanismNameList = mechanismNameList;
return this;
}
/**
* 设置 机构地址
* @param mechanismAddress
*/
public SupplementQuery mechanismAddress(String mechanismAddress){
setMechanismAddress(mechanismAddress);
return this;
}
/**
* 设置 机构地址
* @param mechanismAddressList
*/
public SupplementQuery mechanismAddressList(List<String> mechanismAddressList){
this.mechanismAddressList = mechanismAddressList;
return this;
}
/**
* 设置 机构性质
* @param mechanismType
*/
public SupplementQuery mechanismType(String mechanismType){
setMechanismType(mechanismType);
return this;
}
/**
* 设置 机构性质
* @param mechanismTypeList
*/
public SupplementQuery mechanismTypeList(List<String> mechanismTypeList){
this.mechanismTypeList = mechanismTypeList;
return this;
}
/**
* 设置 机构证件类型
* @param mechanismIdType
*/
public SupplementQuery mechanismIdType(String mechanismIdType){
setMechanismIdType(mechanismIdType);
return this;
}
/**
* 设置 机构证件类型
* @param mechanismIdTypeList
*/
public SupplementQuery mechanismIdTypeList(List<String> mechanismIdTypeList){
this.mechanismIdTypeList = mechanismIdTypeList;
return this;
}
/**
* 设置 机构编码
* @param mechanismId
*/
public SupplementQuery mechanismId(String mechanismId){
setMechanismId(mechanismId);
return this;
}
/**
* 设置 机构编码
* @param mechanismIdList
*/
public SupplementQuery mechanismIdList(List<String> mechanismIdList){
this.mechanismIdList = mechanismIdList;
return this;
}
/**
* 设置 法人姓名
* @param legalPerson
*/
public SupplementQuery legalPerson(String legalPerson){
setLegalPerson(legalPerson);
return this;
}
/**
* 设置 法人姓名
* @param legalPersonList
*/
public SupplementQuery legalPersonList(List<String> legalPersonList){
this.legalPersonList = legalPersonList;
return this;
}
/**
* 设置 办件申请日期
* @param applyTime
*/
public SupplementQuery applyTime(String applyTime){
setApplyTime(applyTime);
return this;
}
/**
* 设置 办件申请日期
* @param applyTimeList
*/
public SupplementQuery applyTimeList(List<String> applyTimeList){
this.applyTimeList = applyTimeList;
return this;
}
/**
* 设置 受理人姓名
* @param acceptName
*/
public SupplementQuery acceptName(String acceptName){
setAcceptName(acceptName);
return this;
}
/**
* 设置 受理人姓名
* @param acceptNameList
*/
public SupplementQuery acceptNameList(List<String> acceptNameList){
this.acceptNameList = acceptNameList;
return this;
}
/**
* 设置 受理人身份证号码
* @param acceptId
*/
public SupplementQuery acceptId(String acceptId){
setAcceptId(acceptId);
return this;
}
/**
* 设置 受理人身份证号码
* @param acceptIdList
*/
public SupplementQuery acceptIdList(List<String> acceptIdList){
this.acceptIdList = acceptIdList;
return this;
}
/**
* 设置 受理人手机号
* @param acceptPhone
*/
public SupplementQuery acceptPhone(String acceptPhone){
setAcceptPhone(acceptPhone);
return this;
}
/**
* 设置 受理人手机号
* @param acceptPhoneList
*/
public SupplementQuery acceptPhoneList(List<String> acceptPhoneList){
this.acceptPhoneList = acceptPhoneList;
return this;
}
/**
* 设置 系统编码
* @param sysCode
*/
public SupplementQuery sysCode(String sysCode){
setSysCode(sysCode);
return this;
}
/**
* 设置 系统编码
* @param sysCodeList
*/
public SupplementQuery sysCodeList(List<String> sysCodeList){
this.sysCodeList = sysCodeList;
return this;
}
/**
* 设置 是否执行转化（0.未执行 1.已执行）
* @param isExecute
*/
public SupplementQuery isExecute(String isExecute){
setIsExecute(isExecute);
return this;
}
/**
* 设置 是否执行转化（0.未执行 1.已执行）
* @param isExecuteList
*/
public SupplementQuery isExecuteList(List<String> isExecuteList){
this.isExecuteList = isExecuteList;
return this;
}
/**
* 设置 是否转化成功（0默认 1成功）
* @param isSuccess
*/
public SupplementQuery isSuccess(String isSuccess){
setIsSuccess(isSuccess);
return this;
}
/**
* 设置 是否转化成功（0默认 1成功）
* @param isSuccessList
*/
public SupplementQuery isSuccessList(List<String> isSuccessList){
this.isSuccessList = isSuccessList;
return this;
}
/**
* 设置 失败原因
* @param failReason
*/
public SupplementQuery failReason(String failReason){
setFailReason(failReason);
return this;
}
/**
* 设置 失败原因
* @param failReasonList
*/
public SupplementQuery failReasonList(List<String> failReasonList){
this.failReasonList = failReasonList;
return this;
}
/**
* 设置 推送类型
* @param pushType
*/
public SupplementQuery pushType(String pushType){
setPushType(pushType);
return this;
}
/**
* 设置 推送类型
* @param pushTypeList
*/
public SupplementQuery pushTypeList(List<String> pushTypeList){
this.pushTypeList = pushTypeList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
......
dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/task/SupplementTaskImpl.java
View file @ ee0df0de
package com.mortals.xhx.modules.supplement.task;
import cn.hutool.core.date.DateTime;
import com.alibaba.excel.util.CollectionUtils;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.ITask;
......@@ -8,11 +9,14 @@ import com.mortals.framework.service.ITaskExcuteService;
import com.mortals.framework.util.DateUtils;
import com.mortals.xhx.common.code.ApplicantTypeEnums;
import com.mortals.xhx.common.code.NodeTypeEnum;
import com.mortals.xhx.common.code.PushTypeEnum;
import com.mortals.xhx.common.utils.DateByAffairUtils;
import com.mortals.xhx.common.utils.FilterSuppDataUtils;
import com.mortals.xhx.common.utils.SnowFlakeUtil;
import com.mortals.xhx.modules.implementlist.model.ImplementlistEntity;
import com.mortals.xhx.modules.implementlist.model.RybMatterListEntry;
import com.mortals.xhx.modules.implementlist.service.ImplementlistService;
import com.mortals.xhx.modules.implementlist.service.RybMatterListService;
import com.mortals.xhx.modules.information.dao.InformationDao;
import com.mortals.xhx.modules.information.model.InformationEntity;
import com.mortals.xhx.modules.supplement.model.SupplementEntity;
......@@ -20,8 +24,10 @@ import com.mortals.xhx.modules.supplement.model.SupplementQuery;
import com.mortals.xhx.modules.supplement.service.SupplementService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
......@@ -37,21 +43,31 @@ import java.util.stream.Collectors;
@Component("supplementTaskImpl")
public class SupplementTaskImpl implements ITaskExcuteService {
@Value("${upload.area}")
String area;
@Autowired
private SupplementService supplementService;
@Autowired
private ImplementlistService implementlistService;
@Resource
private RybMatterListService rybMatterListService;
@Autowired
private InformationDao informationDao;
@Override
public void excuteTask(ITask task) throws AppException {
//1.查询上月的表是否存在未清洗的数据
List<SupplementEntity> supplementEntities = queryDataThatHasNotBeenPushed(task.getExcuteParam());
//1.查询上月的表是否存在未清洗的数据 //蓉易办
List<SupplementEntity> ryb = queryDataThatHasNotBeenPushed(task.getExcuteParam(), 1);
//开始进行数据清洗
this.dataCleaning(supplementEntities);
this.ryb(ryb);
//1.查询上月的表是否存在未清洗的数据 //省一体化
List<SupplementEntity> syth = queryDataThatHasNotBeenPushed(task.getExcuteParam(), 2);
//开始进行数据清洗
this.dataCleaning(syth);
}
......@@ -60,6 +76,62 @@ public class SupplementTaskImpl implements ITaskExcuteService {
}
private void ryb(List<SupplementEntity> supplementEntities) {
log.info("开始清洗");
if(CollectionUtils.isEmpty(supplementEntities)){
log.info("没有需要清洗数据");
return;
}
List<InformationEntity> informationQueries = new ArrayList<>();
if (!supplementEntities.isEmpty()) {
List<SupplementEntity> collect = supplementEntities.parallelStream().map(e -> {
//TODO：查询实施清单信息，通过事项编码查询有问题（但因数据库存储的事项数据是条件过滤后的，故暂时不改动查询），后期改动
RybMatterListEntry thImplement = rybMatterListService.getThImplement(e.getImplCode());
try {
InformationEntity informationQuery = new InformationEntity();
//组装第一次业务数据（清洗后的）
informationQuery = assemblyOfficeData(informationQuery, e);
if (null != thImplement) {
informationQuery.setDeptCode(thImplement.getDeptCode());
informationQuery.setEventCode(thImplement.getMatterCode());
informationQuery.setEventName(thImplement.getMatterName());
informationQuery.setAreaCode(area);
//是否转化成功：0默认 1成功
informationQuery.setIsSuccess("1");
//是否推送（0 否 1是）
informationQuery.setIsReport("0");
//设置 失败次数 默认为0
informationQuery.setFailTimes(0);
// 是否执行转化（0.未执行 1.已执行）
e.setIsExecute("1");
//是否转化成功（0默认 1成功）
e.setIsSuccess("1");
} else {
e.setFailReason(" Err:实施清单不存在");
informationQuery.setFailReason(" Err:实施清单不存在");
informationQuery.setIsSuccess("0");
// 是否执行转化（0.未执行 1.已执行）
e.setIsExecute("1");
//是否转化成功（0默认 1成功）
e.setIsSuccess("0");
}
e.setUpdateDate(DateTime.now());
informationQueries.add(informationQuery);
return e;
} catch (Exception ex) {
e.setIsExecute("1");
e.setFailReason("转换失败");
log.error("转换失败:SupplementID:" + e.getId());
log.error("转换失败：失败原因" + ex.getMessage());
return e;
}
}).collect(Collectors.toList());
supplementService.update(collect, null);
informationDao.insertBatch(informationQueries);
log.info("清洗完成，本次清洗数量："+ informationQueries.size());
}
}
private void dataCleaning(List<SupplementEntity> supplementEntities) {
if (!supplementEntities.isEmpty()) {
List<InformationEntity> informationQueries = new ArrayList<>();
......@@ -165,9 +237,13 @@ public class SupplementTaskImpl implements ITaskExcuteService {
informationQuery.setSystemCode(supplementEntity.getSysCode());
//测试暂时写死
if(PushTypeEnum.SYTH.getStyle().equals(supplementEntity.getPushType())){
informationQuery.setNodeType(NodeTypeEnum.受理.getCode());
informationQuery.setBizStatus(NodeTypeEnum.受理.getDesc());
}else if(PushTypeEnum.RYB.getStyle().equals(supplementEntity.getPushType())){
informationQuery.setNodeType(NodeTypeEnum.蓉易办受理.getCode());
informationQuery.setBizStatus(NodeTypeEnum.蓉易办受理.getDesc());
}
informationQuery.setProcessStatusName("申请并受理");
informationQuery.setDoThingProperty("0");
informationQuery.setApplyNum("1");
......@@ -178,11 +254,12 @@ public class SupplementTaskImpl implements ITaskExcuteService {
return informationQuery;
}
private List<SupplementEntity> queryDataThatHasNotBeenPushed(String excuteParam) {
private List<SupplementEntity> queryDataThatHasNotBeenPushed(String excuteParam, int type) {
List<SupplementEntity> supplementEntities;
SupplementQuery supplementQuery = new SupplementQuery();
supplementQuery.setIsExecute("0");
supplementQuery.setIsSuccess("0");
supplementQuery.setPushType(PushTypeEnum.getByValue(type).getStyle());
PageInfo pageInfo = new PageInfo();
pageInfo.setPrePageResult(Integer.parseInt(excuteParam));
//TODO： 条数限制
......
dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/web/SupplementController.java
View file @ ee0df0de
......@@ -44,17 +44,17 @@ public class SupplementController extends BaseCRUDJsonMappingController<Suppleme
* 导入办件信息，一阶段通过excel表格导入,放入磁盘中，在通过文件地址去获取文件内容进行数据清洗
*/
@PostMapping(value="importOfficeInformation")
public ApiRespPdu importOfficeInformation(@RequestPart("file") MultipartFile file, @RequestParam("sysCode") String sysCode ,@RequestParam("type") String type){
public ApiRespPdu importOfficeInformation(@RequestPart("file") MultipartFile file, @RequestParam("sysCode") String sysCode ,@RequestParam("type") int type){
ApiRespPdu respPdu=new ApiRespPdu();
String filePath = uploadService.saveFileUpload(file, null, null);
Map<String, String> objectObjectHashMap = new HashMap<>();
if(PushTypeEnum.SYTH.getStyle().equals(type) && StringUtils.isEmpty(sysCode)){
if(PushTypeEnum.SYTH.getValue() == type && StringUtils.isEmpty(sysCode)){
respPdu.setCode(-1);
respPdu.setMsg("缺少系统编码");
return respPdu;
}
objectObjectHashMap.put("sysCode",sysCode);
objectObjectHashMap.put("type",type);
objectObjectHashMap.put("type",PushTypeEnum.getByValue(type).getStyle());
objectObjectHashMap.put("status",ExcelUploadEnum.未处理的文件路径.getCode());
iCacheService.hset(ExcelUploadEnum.UPLOAD_PATH.getCode(),filePath,objectObjectHashMap);
respPdu.setCode(200);
......
dataCenter-manager/src/main/resources/bootstrap.yml
View file @ ee0df0de
......@@ -57,4 +57,9 @@ cookie:
domain: base.testnew.com
port: 111
upload:
path: @profiles.filepath@
path: /data-center-send/pic #新津
# path: D:/pic #金堂
area: 510132 #新津
# area: 510121 #金堂
AppKey: 834815625598599168 #新津
# AppKey: 743109085582327808 #金堂
\ No newline at end of file
dataCenter-manager/src/main/resources/sqlmap/module/supplement/supplement.xml
View file @ ee0df0de
......@@ -2,10 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.modules.supplement.dao.ibatis.SupplementDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="SupplementEntity" id="SupplementEntity-Map">
<result property="id" column="id" />
<id property="id" column="id" />
<result property="implName" column="impl_name" />
<result property="implCode" column="impl_code" />
<result property="applicationType" column="application_type" />
......@@ -27,9 +26,12 @@
<result property="isExecute" column="is_execute" />
<result property="isSuccess" column="is_success" />
<result property="failReason" column="fail_reason" />
<result property="pushType" column="push_type" />
<result property="createDate" column="createDate" />
<result property="updateDate" column="updateDate" />
</resultMap>
<update id="createTable" parameterType="paramDto">
CREATE TABLE `${tableName}`(
`id` bigint(20) NOT NULL COMMENT '主键ID,主键,业务生成',
......@@ -54,6 +56,7 @@
`is_execute` varchar(1) DEFAULT NULL COMMENT '是否执行转化（0.未执行 1.已执行）',
`is_success` varchar(1) DEFAULT NULL COMMENT '是否转化成功（0默认 1成功）',
`fail_reason` varchar(255) DEFAULT NULL COMMENT '失败原因',
`push_type` varchar(10) DEFAULT NULL COMMENT '推送类型',
`createDate` datetime DEFAULT NULL COMMENT '创建时间',
`updateDate` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`)
......@@ -68,67 +71,70 @@
a.id as id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('implName') or colPickMode == 1 and data.containsKey('implName')))">
a.impl_name as impl_name,
a.impl_name as implName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('implCode') or colPickMode == 1 and data.containsKey('implCode')))">
a.impl_code as impl_code,
a.impl_code as implCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applicationType') or colPickMode == 1 and data.containsKey('applicationType')))">
a.application_type as application_type,
a.application_type as applicationType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applicationCardType') or colPickMode == 1 and data.containsKey('applicationCardType')))">
a.application_card_type as application_card_type,
a.application_card_type as applicationCardType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applicationName') or colPickMode == 1 and data.containsKey('applicationName')))">
a.application_name as application_name,
a.application_name as applicationName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applicationId') or colPickMode == 1 and data.containsKey('applicationId')))">
a.application_id as application_id,
a.application_id as applicationId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applicationPhone') or colPickMode == 1 and data.containsKey('applicationPhone')))">
a.application_phone as application_phone,
a.application_phone as applicationPhone,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mechanismName') or colPickMode == 1 and data.containsKey('mechanismName')))">
a.mechanism_name as mechanism_name,
a.mechanism_name as mechanismName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mechanismAddress') or colPickMode == 1 and data.containsKey('mechanismAddress')))">
a.mechanism_address as mechanism_address,
a.mechanism_address as mechanismAddress,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mechanismType') or colPickMode == 1 and data.containsKey('mechanismType')))">
a.mechanism_type as mechanism_type,
a.mechanism_type as mechanismType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mechanismIdType') or colPickMode == 1 and data.containsKey('mechanismIdType')))">
a.mechanism_id_type as mechanism_id_type,
a.mechanism_id_type as mechanismIdType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('mechanismId') or colPickMode == 1 and data.containsKey('mechanismId')))">
a.mechanism_id as mechanism_id,
a.mechanism_id as mechanismId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('legalPerson') or colPickMode == 1 and data.containsKey('legalPerson')))">
a.legal_person as legal_person,
a.legal_person as legalPerson,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applyTime') or colPickMode == 1 and data.containsKey('applyTime')))">
a.apply_time as apply_time,
a.apply_time as applyTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('acceptName') or colPickMode == 1 and data.containsKey('acceptName')))">
a.accept_name as accept_name,
a.accept_name as acceptName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('acceptId') or colPickMode == 1 and data.containsKey('acceptId')))">
a.accept_id as accept_id,
a.accept_id as acceptId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('acceptPhone') or colPickMode == 1 and data.containsKey('acceptPhone')))">
a.accept_phone as accept_phone,
a.accept_phone as acceptPhone,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sysCode') or colPickMode == 1 and data.containsKey('sysCode')))">
a.sys_code as sys_code,
a.sys_code as sysCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isExecute') or colPickMode == 1 and data.containsKey('isExecute')))">
a.is_execute as is_execute,
a.is_execute as isExecute,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isSuccess') or colPickMode == 1 and data.containsKey('isSuccess')))">
a.is_success as is_success,
a.is_success as isSuccess,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('failReason') or colPickMode == 1 and data.containsKey('failReason')))">
a.fail_reason as fail_reason,
a.fail_reason as failReason,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pushType') or colPickMode == 1 and data.containsKey('pushType')))">
a.push_type as pushType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createDate') or colPickMode == 1 and data.containsKey('createDate')))">
a.createDate as createDate,
......@@ -138,26 +144,28 @@
</if>
</trim>
</sql>
<!-- 新增 -->
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SupplementEntity" >
insert into ${tableName}
(id,impl_name,impl_code,application_type,application_card_type,application_name,application_id,application_phone,mechanism_name,mechanism_address,mechanism_type,mechanism_id_type,mechanism_id,legal_person,apply_time,accept_name,accept_id,accept_phone,sys_code,is_execute,is_success,fail_reason,createDate,updateDate)
insert into supplement
(id,impl_name,impl_code,application_type,application_card_type,application_name,application_id,application_phone,mechanism_name,mechanism_address,mechanism_type,mechanism_id_type,mechanism_id,legal_person,apply_time,accept_name,accept_id,accept_phone,sys_code,is_execute,is_success,fail_reason,push_type,createDate,updateDate)
VALUES
(#{id},#{implName},#{implCode},#{applicationType},#{applicationCardType},#{applicationName},#{applicationId},#{applicationPhone},#{mechanismName},#{mechanismAddress},#{mechanismType},#{mechanismIdType},#{mechanismId},#{legalPerson},#{applyTime},#{acceptName},#{acceptId},#{acceptPhone},#{sysCode},#{isExecute},#{isSuccess},#{failReason},#{createDate},#{updateDate})
(#{id},#{implName},#{implCode},#{applicationType},#{applicationCardType},#{applicationName},#{applicationId},#{applicationPhone},#{mechanismName},#{mechanismAddress},#{mechanismType},#{mechanismIdType},#{mechanismId},#{legalPerson},#{applyTime},#{acceptName},#{acceptId},#{acceptPhone},#{sysCode},#{isExecute},#{isSuccess},#{failReason},#{pushType},#{createDate},#{updateDate})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into ${tableName}
(id,impl_name,impl_code,application_type,application_card_type,application_name,application_id,application_phone,mechanism_name,mechanism_address,mechanism_type,mechanism_id_type,mechanism_id,legal_person,apply_time,accept_name,accept_id,accept_phone,sys_code,is_execute,is_success,fail_reason,createDate,updateDate)
insert into supplement
(id,impl_name,impl_code,application_type,application_card_type,application_name,application_id,application_phone,mechanism_name,mechanism_address,mechanism_type,mechanism_id_type,mechanism_id,legal_person,apply_time,accept_name,accept_id,accept_phone,sys_code,is_execute,is_success,fail_reason,push_type,createDate,updateDate)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.id},#{item.implName},#{item.implCode},#{item.applicationType},#{item.applicationCardType},#{item.applicationName},#{item.applicationId},#{item.applicationPhone},#{item.mechanismName},#{item.mechanismAddress},#{item.mechanismType},#{item.mechanismIdType},#{item.mechanismId},#{item.legalPerson},#{item.applyTime},#{item.acceptName},#{item.acceptId},#{item.acceptPhone},#{item.sysCode},#{item.isExecute},#{item.isSuccess},#{item.failReason},#{item.createDate},#{item.updateDate})
(#{item.id},#{item.implName},#{item.implCode},#{item.applicationType},#{item.applicationCardType},#{item.applicationName},#{item.applicationId},#{item.applicationPhone},#{item.mechanismName},#{item.mechanismAddress},#{item.mechanismType},#{item.mechanismIdType},#{item.mechanismId},#{item.legalPerson},#{item.applyTime},#{item.acceptName},#{item.acceptId},#{item.acceptPhone},#{item.sysCode},#{item.isExecute},#{item.isSuccess},#{item.failReason},#{item.pushType},#{item.createDate},#{item.updateDate})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update ${tableName} as a
update supplement as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('implName')) or (colPickMode==1 and !data.containsKey('implName'))">
......@@ -223,6 +231,9 @@
<if test="(colPickMode==0 and data.containsKey('failReason')) or (colPickMode==1 and !data.containsKey('failReason'))">
a.fail_reason=#{data.failReason},
</if>
<if test="(colPickMode==0 and data.containsKey('pushType')) or (colPickMode==1 and !data.containsKey('pushType'))">
a.push_type=#{data.pushType},
</if>
<if test="(colPickMode==0 and data.containsKey('createDate')) or (colPickMode==1 and !data.containsKey('createDate'))">
a.createDate=#{data.createDate},
</if>
......@@ -239,10 +250,8 @@
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update ${tableName} as a
update supplement as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="impl_name=(case" suffix="ELSE impl_name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('implName')) or (colPickMode==1 and !item.containsKey('implName'))">
......@@ -250,7 +259,6 @@
</if>
</foreach>
</trim>
<trim prefix="impl_code=(case" suffix="ELSE impl_code end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('implCode')) or (colPickMode==1 and !item.containsKey('implCode'))">
......@@ -258,7 +266,6 @@
</if>
</foreach>
</trim>
<trim prefix="application_type=(case" suffix="ELSE application_type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applicationType')) or (colPickMode==1 and !item.containsKey('applicationType'))">
......@@ -266,7 +273,6 @@
</if>
</foreach>
</trim>
<trim prefix="application_card_type=(case" suffix="ELSE application_card_type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applicationCardType')) or (colPickMode==1 and !item.containsKey('applicationCardType'))">
......@@ -274,7 +280,6 @@
</if>
</foreach>
</trim>
<trim prefix="application_name=(case" suffix="ELSE application_name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applicationName')) or (colPickMode==1 and !item.containsKey('applicationName'))">
......@@ -282,7 +287,6 @@
</if>
</foreach>
</trim>
<trim prefix="application_id=(case" suffix="ELSE application_id end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applicationId')) or (colPickMode==1 and !item.containsKey('applicationId'))">
......@@ -290,7 +294,6 @@
</if>
</foreach>
</trim>
<trim prefix="application_phone=(case" suffix="ELSE application_phone end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applicationPhone')) or (colPickMode==1 and !item.containsKey('applicationPhone'))">
......@@ -298,7 +301,6 @@
</if>
</foreach>
</trim>
<trim prefix="mechanism_name=(case" suffix="ELSE mechanism_name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mechanismName')) or (colPickMode==1 and !item.containsKey('mechanismName'))">
......@@ -306,7 +308,6 @@
</if>
</foreach>
</trim>
<trim prefix="mechanism_address=(case" suffix="ELSE mechanism_address end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mechanismAddress')) or (colPickMode==1 and !item.containsKey('mechanismAddress'))">
......@@ -314,7 +315,6 @@
</if>
</foreach>
</trim>
<trim prefix="mechanism_type=(case" suffix="ELSE mechanism_type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mechanismType')) or (colPickMode==1 and !item.containsKey('mechanismType'))">
......@@ -322,7 +322,6 @@
</if>
</foreach>
</trim>
<trim prefix="mechanism_id_type=(case" suffix="ELSE mechanism_id_type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mechanismIdType')) or (colPickMode==1 and !item.containsKey('mechanismIdType'))">
......@@ -330,7 +329,6 @@
</if>
</foreach>
</trim>
<trim prefix="mechanism_id=(case" suffix="ELSE mechanism_id end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('mechanismId')) or (colPickMode==1 and !item.containsKey('mechanismId'))">
......@@ -338,7 +336,6 @@
</if>
</foreach>
</trim>
<trim prefix="legal_person=(case" suffix="ELSE legal_person end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('legalPerson')) or (colPickMode==1 and !item.containsKey('legalPerson'))">
......@@ -346,7 +343,6 @@
</if>
</foreach>
</trim>
<trim prefix="apply_time=(case" suffix="ELSE apply_time end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applyTime')) or (colPickMode==1 and !item.containsKey('applyTime'))">
......@@ -354,7 +350,6 @@
</if>
</foreach>
</trim>
<trim prefix="accept_name=(case" suffix="ELSE accept_name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('acceptName')) or (colPickMode==1 and !item.containsKey('acceptName'))">
......@@ -362,7 +357,6 @@
</if>
</foreach>
</trim>
<trim prefix="accept_id=(case" suffix="ELSE accept_id end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('acceptId')) or (colPickMode==1 and !item.containsKey('acceptId'))">
......@@ -370,7 +364,6 @@
</if>
</foreach>
</trim>
<trim prefix="accept_phone=(case" suffix="ELSE accept_phone end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('acceptPhone')) or (colPickMode==1 and !item.containsKey('acceptPhone'))">
......@@ -378,7 +371,6 @@
</if>
</foreach>
</trim>
<trim prefix="sys_code=(case" suffix="ELSE sys_code end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('sysCode')) or (colPickMode==1 and !item.containsKey('sysCode'))">
......@@ -386,7 +378,6 @@
</if>
</foreach>
</trim>
<trim prefix="is_execute=(case" suffix="ELSE is_execute end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('isExecute')) or (colPickMode==1 and !item.containsKey('isExecute'))">
......@@ -394,7 +385,6 @@
</if>
</foreach>
</trim>
<trim prefix="is_success=(case" suffix="ELSE is_success end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('isSuccess')) or (colPickMode==1 and !item.containsKey('isSuccess'))">
......@@ -402,7 +392,6 @@
</if>
</foreach>
</trim>
<trim prefix="fail_reason=(case" suffix="ELSE fail_reason end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('failReason')) or (colPickMode==1 and !item.containsKey('failReason'))">
......@@ -410,7 +399,13 @@
</if>
</foreach>
</trim>
<trim prefix="push_type=(case" suffix="ELSE push_type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('pushType')) or (colPickMode==1 and !item.containsKey('pushType'))">
when a.id=#{item.id} then #{item.pushType}
</if>
</foreach>
</trim>
<trim prefix="createDate=(case" suffix="ELSE createDate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createDate')) or (colPickMode==1 and !item.containsKey('createDate'))">
......@@ -418,7 +413,6 @@
</if>
</foreach>
</trim>
<trim prefix="updateDate=(case" suffix="ELSE updateDate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateDate')) or (colPickMode==1 and !item.containsKey('updateDate'))">
......@@ -435,23 +429,23 @@
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="SupplementEntity-Map">
select <include refid="_columns"/>
from ${tableName} as a
from supplement as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from ${tableName} as a where a.id=#{condition.id}
delete a.* from supplement as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from ${tableName} where id in
delete from supplement where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from ${tableName} as a
delete a.* from supplement as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
......@@ -462,7 +456,7 @@
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="SupplementEntity-Map">
select <include refid="_columns"/>
from ${tableName} as a
from supplement as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
......@@ -471,10 +465,11 @@
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from ${tableName} as a
from supplement as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
......@@ -519,7 +514,6 @@
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
......@@ -862,6 +856,21 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('pushType')">
<if test="conditionParamRef.pushType != null and conditionParamRef.pushType != ''">
${_conditionType_} a.push_type like #{${_conditionParam_}.pushType}
</if>
<if test="conditionParamRef.pushType == null">
${_conditionType_} a.push_type is null
</if>
</if>
<if test="conditionParamRef.containsKey('pushTypeList')">
${_conditionType_} a.push_type in
<foreach collection="conditionParamRef.pushTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createDate')">
<if test="conditionParamRef.createDate != null ">
${_conditionType_} a.createDate = #{${_conditionParam_}.createDate}
......@@ -1014,6 +1023,11 @@
<if test='orderCol.failReason != null and "DESC".equalsIgnoreCase(orderCol.failReason)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('pushType')">
a.push_type
<if test='orderCol.pushType != null and "DESC".equalsIgnoreCase(orderCol.pushType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createDate')">
a.createDate
<if test='orderCol.createDate != null and "DESC".equalsIgnoreCase(orderCol.createDate)'>DESC</if>
......
pom.xml
View file @ ee0df0de
......@@ -52,7 +52,7 @@
<properties>
<profiles.active>test</profiles.active>
<profiles.datasource.uri>
<![CDATA[jdbc:mysql://192.168.0.252:3306/datacenter-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<![CDATA[jdbc:mysql://192.168.0.251:3306/xhx-base?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>nacos@2020</profiles.datasource.password>
<profiles.redis.uri>192.168.0.252</profiles.redis.uri>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment