加密接口参数修改

ibps-basic-root/modules/basic-response/src/main/resources/config/application-dev-fileserver.yml

@@ -1,3 +1,3 @@
 fastdfs:
   common:
-    tracker-servers: ${FILE_TRACKER_SERVER:172.16.40.184:22122}
+    tracker-servers: ${FILE_TRACKER_SERVER:119.23.210.103:22122}

ibps-basis-root/modules/basis-zuul/src/main/java/com/lc/ibps/cloud/gateway/filter/AccessTokenFilter.java

@@ -53,9 +53,9 @@ public class AccessTokenFilter extends ZuulFilter {
 
 		//如果是润乾服务器签章报表调用则直接返回true
 		if (
-				"172.16.40.184".equals(RequestUtil.getIpAddr(request))||
+				"172.18.157.44".equals(RequestUtil.getIpAddr(request))||
 						"localhost".equals(RequestUtil.getIpAddr(request))||
-						"127.0.0.1".equals(RequestUtil.getIpAddr(request))
+						"120.77.249.241".equals(RequestUtil.getIpAddr(request))
 						//||
 						//"120.77.249.241".equals(RequestUtil.getIpAddr(request))
 		){
@@ -89,9 +89,9 @@ public class AccessTokenFilter extends ZuulFilter {
 		if(!authorizationConfig.isEnable()
 				|| !authorizationConfig.isAccessTokenFilterEnable() 
 				|| authorizationConfig.isIgnoreUrl(uri)
-				||"172.16.40.184".equals(RequestUtil.getIpAddr(request))||
+				||"120.77.249.241".equals(RequestUtil.getIpAddr(request))||
 		"localhost".equals(RequestUtil.getIpAddr(request))||
-				"127.0.0.1".equals(RequestUtil.getIpAddr(request))
+				"172.18.157.44".equals(RequestUtil.getIpAddr(request))
 //				||
 //				"120.77.249.241".equals(RequestUtil.getIpAddr(request))
 				) {

ibps-oauth-root/modules/oauth-client2/src/main/java/com/lc/ibps/cloud/oauth/client/filter/AccessTokenValidatorFilter.java

@@ -58,9 +58,9 @@ public class AccessTokenValidatorFilter extends AbstractFilter implements Ordere
 		httpResponse.setCharacterEncoding(StringPool.UTF_8);
 		String uri = httpRequest.getRequestURI();
 		if (
-				"172.16.40.184".equals(RequestUtil.getIpAddr(httpRequest))||
+				"172.18.157.44".equals(RequestUtil.getIpAddr(httpRequest))||
 		"localhost".equals(RequestUtil.getIpAddr(httpRequest))||
-				"127.0.0.1".equals(RequestUtil.getIpAddr(httpRequest))
+				"172.18.157.46".equals(RequestUtil.getIpAddr(httpRequest))
 //						||
 //		"120.77.249.241".equals(RequestUtil.getIpAddr(httpRequest))
 		){

ibps-oauth-root/modules/oauth-server2/src/main/resources/conf/dataSource-dev.xml

@@ -10,9 +10,9 @@
 <!--    <driverUrl>jdbc:mysql://39.108.0.125:3306/klims-ibps?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->
 <!--    <user>root</user>-->
 <!--    <password>!$%^QWER</password>-->
-    <driverUrl>jdbc:mysql://172.16.40.184:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
+    <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
     <user>root</user>
-    <password>Lh789456123</password>
+    <password>!$%^QWER</password>
 	<!-- 	
 	<dbType>oracle</dbType>
     <driver>oracle.jdbc.OracleDriver</driver>

ibps-oauth-root/modules/oauth-server2/src/main/resources/conf/dataSource-platform-dev.xml

@@ -7,9 +7,9 @@
     <!-- dev下使用该链接 -->
  	<dbType>mysql</dbType>
   	<driver>com.mysql.jdbc.Driver</driver>
-    <driverUrl>jdbc:mysql://172.16.40.184:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
+    <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
     <user>root</user>
-    <password>Lh789456123</password>
+    <password>!$%^QWER</password>
     <!-- 	
 	<dbType>oracle</dbType>
     <driver>oracle.jdbc.OracleDriver</driver>

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/quartz/job/BaseJob.java

@@ -45,30 +45,30 @@ public abstract class BaseJob {
 
 	public abstract void executeJob()
 			throws Exception;
-	public Integer getDay(List<Map<String, Object>> paramList){
-		if(paramList.size()>1 || paramList.size()<=0)
-			return 0;
-		Integer day=0;
-		Map param = paramList.get(0);
-		String leiXing = (String)param.get("TI_XING_LEI_XING_");
-		//提前提醒
-		if("tqtx".equalsIgnoreCase(leiXing)){
-			java.math.BigDecimal tqtxTianShu=(java.math.BigDecimal)param.get("TI_QIAN_TIAN_SHU_");
-			day = tqtxTianShu.intValue();
-		}
-		//超期提醒
-		if("cqtx".equalsIgnoreCase(leiXing)){
-			java.math.BigDecimal cqtxTianShu=(java.math.BigDecimal)param.get("CHAO_QI_TIAN_SHU_");
-			day = cqtxTianShu.intValue();
-		}
-		return day;
-	}
-	public String getTiXingFangShi(List<Map<String, Object>> paramList){
-		if(paramList.size()>1 || paramList.size()<=0)
-			return "";
-		Map param = paramList.get(0);
-		return (String)param.get("TI_XING_FANG_SHI_");
-	}
+//	public Integer getDay(List<Map<String, Object>> paramList){
+//		if(paramList.size()>1 || paramList.size()<=0)
+//			return 0;
+//		Integer day=0;
+//		Map param = paramList.get(0);
+//		String leiXing = (String)param.get("TI_XING_LEI_XING_");
+//		//提前提醒
+//		if("tqtx".equalsIgnoreCase(leiXing)){
+//			java.math.BigDecimal tqtxTianShu=(java.math.BigDecimal)param.get("TI_QIAN_TIAN_SHU_");
+//			day = tqtxTianShu.intValue();
+//		}
+//		//超期提醒
+//		if("cqtx".equalsIgnoreCase(leiXing)){
+//			java.math.BigDecimal cqtxTianShu=(java.math.BigDecimal)param.get("CHAO_QI_TIAN_SHU_");
+//			day = cqtxTianShu.intValue();
+//		}
+//		return day;
+//	}
+//	public String getTiXingFangShi(List<Map<String, Object>> paramList){
+//		if(paramList.size()>1 || paramList.size()<=0)
+//			return "";
+//		Map param = paramList.get(0);
+//		return (String)param.get("TI_XING_FANG_SHI_");
+//	}
 	public void sendDxMsg(DSRWEntity entity) throws Exception {
 //		DefaultProfile profile = DefaultProfile.getProfile("cn-shenzhen", "LTAI5tJAD8SEZmu1qfgW92qf", "6HUH05rYbDGbAEFC8ZJlltPr2zzeC3");
 //		DefaultProfile.addEndpoint("cn-shenzhen", "cn-shenzhen", "Dysmsapi", "dysmsapi.aliyuncs.com");
@@ -81,31 +81,31 @@ public abstract class BaseJob {
 //		SendSmsResponse response = client.getAcsResponse(request);
 //		System.out.println(JSON.toJSONString(response));
 	}
-	public String calSql(String dataSql, List<Map<String, Object>> paramList){
-		if(paramList.size()>1 || paramList.size()<=0)
-			return "";
-		Map param = paramList.get(0);
-		String startDate = (String)param.get("TI_XING_QI_SHI_SH");
-		String endDate = (String)param.get("TI_XING_JIE_ZHI_S");
-		String leiXing = (String)param.get("TI_XING_LEI_XING_");
-		String tqtxExp = ">=";
-		String cqtxExp = "<=";
-		//提前提醒
-		if("tqtx".equalsIgnoreCase(leiXing)){
-			java.math.BigDecimal  tqtxTianShu=(java.math.BigDecimal)param.get("TI_QIAN_TIAN_SHU_");
-			dataSql=dataSql.replaceAll("#DAYS#",tqtxTianShu.intValue()+"");
-			dataSql=dataSql.replaceAll("#EXP#",tqtxExp);
-		}
-		//超期提醒
-		if("cqtx".equalsIgnoreCase(leiXing)){
-			java.math.BigDecimal  cqtxTianShu=(java.math.BigDecimal)param.get("CHAO_QI_TIAN_SHU_");
-			dataSql=dataSql.replaceAll("#DAYS#",cqtxTianShu.intValue()+"");
-			dataSql=dataSql.replaceAll("#EXP#",cqtxExp);
-		}
-		dataSql=dataSql.replaceAll("#STARTDATE#",startDate);
-		dataSql=dataSql.replaceAll("#ENDDATE#",endDate);
-		return dataSql;
-	}
+//	public String calSql(String dataSql, List<Map<String, Object>> paramList){
+//		if(paramList.size()>1 || paramList.size()<=0)
+//			return "";
+//		Map param = paramList.get(0);
+//		String startDate = (String)param.get("TI_XING_QI_SHI_SH");
+//		String endDate = (String)param.get("TI_XING_JIE_ZHI_S");
+//		String leiXing = (String)param.get("TI_XING_LEI_XING_");
+//		String tqtxExp = ">=";
+//		String cqtxExp = "<=";
+//		//提前提醒
+//		if("tqtx".equalsIgnoreCase(leiXing)){
+//			java.math.BigDecimal  tqtxTianShu=(java.math.BigDecimal)param.get("TI_QIAN_TIAN_SHU_");
+//			dataSql=dataSql.replaceAll("#DAYS#",tqtxTianShu.intValue()+"");
+//			dataSql=dataSql.replaceAll("#EXP#",tqtxExp);
+//		}
+//		//超期提醒
+//		if("cqtx".equalsIgnoreCase(leiXing)){
+//			java.math.BigDecimal  cqtxTianShu=(java.math.BigDecimal)param.get("CHAO_QI_TIAN_SHU_");
+//			dataSql=dataSql.replaceAll("#DAYS#",cqtxTianShu.intValue()+"");
+//			dataSql=dataSql.replaceAll("#EXP#",cqtxExp);
+//		}
+//		dataSql=dataSql.replaceAll("#STARTDATE#",startDate);
+//		dataSql=dataSql.replaceAll("#ENDDATE#",endDate);
+//		return dataSql;
+//	}
 	/**
 	 * 执行日志
 	 * 

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/quartz/job/CustomerContactJob.java

@@ -12,75 +12,75 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-@Transactional
-@Component
-@Async
-
-public class CustomerContactJob extends BaseJob{
-
-	private String columns = "ti_xing_zhou_qi_,ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
-	private String dataSql = "SELECT SHI_XIANG_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_REN_,JIAO_WANG_RI_QI_,ID_,LIAN_XI_REN_ from t_jwjl " +
-			"WHERE (ti_xing_biao_zhi_ is null or ti_xing_biao_zhi_<>'1') and shi_fou_ti_xing_='1' AND DATE_ADD(jiao_wang_ri_qi_,INTERVAL #DAYS# DAY) #EXP# NOW() and jiao_wang_ri_qi_ between '#STARTDATE#' and '#ENDDATE#'";
-
-
-	@Scheduled(cron="0 */59 * * * ? ")
-	@Override
-	public void executeJob() throws Exception {
-		try{
-			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
-			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","khjwjltx"));//客户交往记录
-			String tiXingFangShi = getTiXingFangShi(paramList);
-			int day = getDay(paramList);
-			dataSql = calSql(dataSql,paramList);
-			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
-			for(Map<String, Object> map: list){
-				DSRWEntity entity = new DSRWEntity();
-				String id= UUID.randomUUID().toString();
-				entity.setId(id);
-				entity.setDingShiRenWuNeiRo((String)map.get("SHI_XIANG_"));
-				entity.setBianZhiBuMen((String)map.get("BIAN_ZHI_BU_MEN_"));
-				String shouLiRenYuan = "";
-				if(!StringUtils.isEmpty((String)map.get("BIAN_ZHI_REN_")))
-					shouLiRenYuan = (String)map.get("BIAN_ZHI_REN_");
-				if(!StringUtils.isEmpty((String)map.get("TI_XING_DUI_XIANG"))){
-					if(!StringUtils.isEmpty(shouLiRenYuan)){
-						shouLiRenYuan = shouLiRenYuan+","+(String)map.get("TI_XING_DUI_XIANG");
-					}else{
-						shouLiRenYuan = (String)map.get("TI_XING_DUI_XIANG");
-					}
-				}
-				entity.setShouLiRenYuan(shouLiRenYuan);
-
-				Calendar cal = Calendar.getInstance();
-				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("JIAO_WANG_RI_QI_")));
-				cal.add(Calendar.DATE,day);
-				Date now = cal.getTime();
-				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
-				entity.setRenWuShiJian(renWuShiJian);
-
-				entity.setRenWuBiaoTi((String)map.get("LIAN_XI_REN_")+"的交往记录提醒");
-				entity.setShouLiDuiXiang("中心");
-				entity.setFaQiDuiXiang("中心");
-				entity.setDingShiRenWuLeiXi("提醒");
-				entity.setRenWuZhuangTai("未结束");
-				entity.setGuanLianFuBiao((String)map.get("ID_"));
-				entity.setGuanLianZiDuan("wai_jian_");
-				if("dx".equalsIgnoreCase(tiXingFangShi)){
-					sendDxMsg(entity);
-					continue;
-				}
-				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
-						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
-						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
-						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
-				jdbcTemplate.execute(sql);
-				String sqlUpdate = "update t_jwjl set ti_xing_biao_zhi_='1',ti_xing_id_='"+id+"' where id_='"+entity.getGuanLianFuBiao()+"'";
-				jdbcTemplate.execute(sqlUpdate);
-			}
-
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-
-	}
-}
+//@Transactional
+//@Component
+//@Async
+//
+//public class CustomerContactJob extends BaseJob{
+//
+//	private String columns = "ti_xing_zhou_qi_,ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
+//	private String dataSql = "SELECT SHI_XIANG_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_REN_,JIAO_WANG_RI_QI_,ID_,LIAN_XI_REN_ from t_jwjl " +
+//			"WHERE (ti_xing_biao_zhi_ is null or ti_xing_biao_zhi_<>'1') and shi_fou_ti_xing_='1' AND DATE_ADD(jiao_wang_ri_qi_,INTERVAL #DAYS# DAY) #EXP# NOW() and jiao_wang_ri_qi_ between '#STARTDATE#' and '#ENDDATE#'";
+//
+//
+//	@Scheduled(cron="0 */59 * * * ? ")
+//	@Override
+//	public void executeJob() throws Exception {
+//		try{
+//			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
+//			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","khjwjltx"));//客户交往记录
+//			String tiXingFangShi = getTiXingFangShi(paramList);
+//			int day = getDay(paramList);
+//			dataSql = calSql(dataSql,paramList);
+//			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
+//			for(Map<String, Object> map: list){
+//				DSRWEntity entity = new DSRWEntity();
+//				String id= UUID.randomUUID().toString();
+//				entity.setId(id);
+//				entity.setDingShiRenWuNeiRo((String)map.get("SHI_XIANG_"));
+//				entity.setBianZhiBuMen((String)map.get("BIAN_ZHI_BU_MEN_"));
+//				String shouLiRenYuan = "";
+//				if(!StringUtils.isEmpty((String)map.get("BIAN_ZHI_REN_")))
+//					shouLiRenYuan = (String)map.get("BIAN_ZHI_REN_");
+//				if(!StringUtils.isEmpty((String)map.get("TI_XING_DUI_XIANG"))){
+//					if(!StringUtils.isEmpty(shouLiRenYuan)){
+//						shouLiRenYuan = shouLiRenYuan+","+(String)map.get("TI_XING_DUI_XIANG");
+//					}else{
+//						shouLiRenYuan = (String)map.get("TI_XING_DUI_XIANG");
+//					}
+//				}
+//				entity.setShouLiRenYuan(shouLiRenYuan);
+//
+//				Calendar cal = Calendar.getInstance();
+//				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("JIAO_WANG_RI_QI_")));
+//				cal.add(Calendar.DATE,day);
+//				Date now = cal.getTime();
+//				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
+//				entity.setRenWuShiJian(renWuShiJian);
+//
+//				entity.setRenWuBiaoTi((String)map.get("LIAN_XI_REN_")+"的交往记录提醒");
+//				entity.setShouLiDuiXiang("中心");
+//				entity.setFaQiDuiXiang("中心");
+//				entity.setDingShiRenWuLeiXi("提醒");
+//				entity.setRenWuZhuangTai("未结束");
+//				entity.setGuanLianFuBiao((String)map.get("ID_"));
+//				entity.setGuanLianZiDuan("wai_jian_");
+//				if("dx".equalsIgnoreCase(tiXingFangShi)){
+//					sendDxMsg(entity);
+//					continue;
+//				}
+//				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
+//						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
+//						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
+//						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
+//				jdbcTemplate.execute(sql);
+//				String sqlUpdate = "update t_jwjl set ti_xing_biao_zhi_='1',ti_xing_id_='"+id+"' where id_='"+entity.getGuanLianFuBiao()+"'";
+//				jdbcTemplate.execute(sqlUpdate);
+//			}
+//
+//		}catch(Exception e){
+//			e.printStackTrace();
+//		}
+//
+//	}
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/quartz/job/CustomerOrderJob.java

@@ -11,67 +11,67 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-@Transactional
-@Component
-@Async
-public class CustomerOrderJob extends BaseJob{
-	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
-	private String dataSql = "SELECT SHOU_LI_BU_MEN_,BIAN_ZHI_REN_,DING_DAN_CHENG_JI,ID_,LIAN_XI_REN_ from t_gdyrqcwt " +
-			" where (ti_xing_biao_zhi2 is null or ti_xing_biao_zhi2<>'1') AND DATE_ADD(DING_DAN_CHENG_JI,INTERVAL #DAYS# DAY) #EXP# NOW() " +
-			" and wei_tuo_dan_wei_ not in(select wei_tuo_dan_wei_ from t_gdyrqcwt where DATE_ADD(DING_DAN_CHENG_JI,INTERVAL #DAYS# DAY)>NOW()) and DING_DAN_CHENG_JI between '#STARTDATE#' and '#ENDDATE#'";
-
-	@Scheduled(cron="0 */59 * * * ? ")
-	@Override
-	public void executeJob() throws Exception {
-		try{
-			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
-			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","qntqkddkhtx"));//去年同期开单
-			String tiXingFangShi = getTiXingFangShi(paramList);
-			dataSql = calSql(dataSql,paramList);
-			int day = getDay(paramList);
-			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
-			for(Map<String, Object> map: list){
-				DSRWEntity entity = new DSRWEntity();
-				String id= UUID.randomUUID().toString();
-				entity.setId(id);
-				entity.setDingShiRenWuNeiRo("去年同期开单的客户提醒");
-				entity.setBianZhiBuMen((String)map.get("SHOU_LI_BU_MEN_"));
-				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
-
-				Calendar cal = Calendar.getInstance();
-				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("DING_DAN_CHENG_JI")));
-				cal.add(Calendar.DATE,day);
-				Date now = cal.getTime();
-				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
-				entity.setRenWuShiJian(renWuShiJian);
-
-				entity.setRenWuBiaoTi((String)map.get("SHOU_LI_BU_MEN_")+"的去年同期开单的客户提醒");
-				entity.setShouLiDuiXiang("中心");
-				entity.setFaQiDuiXiang("中心");
-				entity.setDingShiRenWuLeiXi("订单提醒");
-				entity.setRenWuZhuangTai("未结束");
-				entity.setGuanLianFuBiao((String)map.get("ID_"));
-				entity.setGuanLianZiDuan("wai_jian_");
-				if("dx".equalsIgnoreCase(tiXingFangShi)){
-					sendDxMsg(entity);
-					continue;
-				}
-				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
-						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
-						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
-						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
-				jdbcTemplate.execute(sql);
-
-				String sqlUpdate = "update t_gdyrqcwt set ti_xing_biao_zhi2='1',ti_xing_id_='"+id+"' where id_='"+entity.getGuanLianFuBiao()+"'";
-				jdbcTemplate.execute(sqlUpdate);
-
-			}
-
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-
-
-	}
-
-}
+//@Transactional
+//@Component
+//@Async
+//public class CustomerOrderJob extends BaseJob{
+//	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
+//	private String dataSql = "SELECT SHOU_LI_BU_MEN_,BIAN_ZHI_REN_,DING_DAN_CHENG_JI,ID_,LIAN_XI_REN_ from t_gdyrqcwt " +
+//			" where (ti_xing_biao_zhi2 is null or ti_xing_biao_zhi2<>'1') AND DATE_ADD(DING_DAN_CHENG_JI,INTERVAL #DAYS# DAY) #EXP# NOW() " +
+//			" and wei_tuo_dan_wei_ not in(select wei_tuo_dan_wei_ from t_gdyrqcwt where DATE_ADD(DING_DAN_CHENG_JI,INTERVAL #DAYS# DAY)>NOW()) and DING_DAN_CHENG_JI between '#STARTDATE#' and '#ENDDATE#'";
+//
+//	@Scheduled(cron="0 */59 * * * ? ")
+//	@Override
+//	public void executeJob() throws Exception {
+//		try{
+//			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
+//			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","qntqkddkhtx"));//去年同期开单
+//			String tiXingFangShi = getTiXingFangShi(paramList);
+//			dataSql = calSql(dataSql,paramList);
+//			int day = getDay(paramList);
+//			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
+//			for(Map<String, Object> map: list){
+//				DSRWEntity entity = new DSRWEntity();
+//				String id= UUID.randomUUID().toString();
+//				entity.setId(id);
+//				entity.setDingShiRenWuNeiRo("去年同期开单的客户提醒");
+//				entity.setBianZhiBuMen((String)map.get("SHOU_LI_BU_MEN_"));
+//				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
+//
+//				Calendar cal = Calendar.getInstance();
+//				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("DING_DAN_CHENG_JI")));
+//				cal.add(Calendar.DATE,day);
+//				Date now = cal.getTime();
+//				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
+//				entity.setRenWuShiJian(renWuShiJian);
+//
+//				entity.setRenWuBiaoTi((String)map.get("SHOU_LI_BU_MEN_")+"的去年同期开单的客户提醒");
+//				entity.setShouLiDuiXiang("中心");
+//				entity.setFaQiDuiXiang("中心");
+//				entity.setDingShiRenWuLeiXi("订单提醒");
+//				entity.setRenWuZhuangTai("未结束");
+//				entity.setGuanLianFuBiao((String)map.get("ID_"));
+//				entity.setGuanLianZiDuan("wai_jian_");
+//				if("dx".equalsIgnoreCase(tiXingFangShi)){
+//					sendDxMsg(entity);
+//					continue;
+//				}
+//				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
+//						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
+//						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
+//						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
+//				jdbcTemplate.execute(sql);
+//
+//				String sqlUpdate = "update t_gdyrqcwt set ti_xing_biao_zhi2='1',ti_xing_id_='"+id+"' where id_='"+entity.getGuanLianFuBiao()+"'";
+//				jdbcTemplate.execute(sqlUpdate);
+//
+//			}
+//
+//		}catch(Exception e){
+//			e.printStackTrace();
+//		}
+//
+//
+//	}
+//
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/quartz/job/NoteBookJob.java

@@ -11,71 +11,71 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-@Transactional
-@Component
-@Async
-public class NoteBookJob extends BaseJob{
-
-	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
-	private String dataSql = "SELECT SHI_XIANG_MING_CH,TIAN_SHU_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_REN_,TI_XING_SHI_JIAN_,ID_ from t_jsb " +
-			" where (ti_xing_biao_zhi_ is null or ti_xing_biao_zhi_<>'1') AND DATE_ADD(ti_xing_shi_jian_,INTERVAL #DAYS# DAY) #EXP# NOW() and ti_xing_shi_jian_ between '#STARTDATE#' and '#ENDDATE#'";
-
-	@Scheduled(cron="0 */59 * * * ? ")
-	@Override
-	public void executeJob() throws Exception {
-		try{
-			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
-			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","khzygljsb"));//客户资源管理记事本
-			String tiXingFangShi = getTiXingFangShi(paramList);
-			dataSql = calSql(dataSql,paramList);
-			int day = getDay(paramList);
-			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
-			for(Map<String, Object> map: list){
-				Integer tianShu = (Integer)map.get("TIAN_SHU_");
-				if(tianShu!=null){
-					day=tianShu;
-				}
-				DSRWEntity entity = new DSRWEntity();
-				String id= UUID.randomUUID().toString();
-				entity.setId(id);
-				entity.setDingShiRenWuNeiRo((String)map.get("SHI_XIANG_MING_CH"));
-				entity.setBianZhiBuMen((String)map.get("BIAN_ZHI_BU_MEN_"));
-				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
-
-				Calendar cal = Calendar.getInstance();
-				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("TI_XING_SHI_JIAN_")));
-				cal.add(Calendar.DATE,day);
-				Date now = cal.getTime();
-				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
-				entity.setRenWuShiJian(renWuShiJian);
-
-				entity.setRenWuBiaoTi((String)map.get("BIAN_ZHI_REN_")+"的记事提醒");
-				entity.setShouLiDuiXiang("中心");
-				entity.setFaQiDuiXiang("中心");
-				entity.setDingShiRenWuLeiXi("提醒");
-				entity.setRenWuZhuangTai("未结束");
-				entity.setGuanLianFuBiao((String)map.get("ID_"));
-				entity.setGuanLianZiDuan("wai_jian_");
-				if("dx".equalsIgnoreCase(tiXingFangShi)){
-					sendDxMsg(entity);
-					continue;
-				}
-				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
-						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
-						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
-						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
-				jdbcTemplate.execute(sql);
-
-				String sqlUpdate = "update t_jsb set ti_xing_biao_zhi_='1',ti_xing_id_='"+id+"' where id_='"+entity.getGuanLianFuBiao()+"'";
-				jdbcTemplate.execute(sqlUpdate);
-
-			}
-
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-
-
-	}
-
-}
+//@Transactional
+//@Component
+//@Async
+//public class NoteBookJob extends BaseJob{
+//
+//	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
+//	private String dataSql = "SELECT SHI_XIANG_MING_CH,TIAN_SHU_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_REN_,TI_XING_SHI_JIAN_,ID_ from t_jsb " +
+//			" where (ti_xing_biao_zhi_ is null or ti_xing_biao_zhi_<>'1') AND DATE_ADD(ti_xing_shi_jian_,INTERVAL #DAYS# DAY) #EXP# NOW() and ti_xing_shi_jian_ between '#STARTDATE#' and '#ENDDATE#'";
+//
+//	@Scheduled(cron="0 */59 * * * ? ")
+//	@Override
+//	public void executeJob() throws Exception {
+//		try{
+//			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
+//			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","khzygljsb"));//客户资源管理记事本
+//			String tiXingFangShi = getTiXingFangShi(paramList);
+//			dataSql = calSql(dataSql,paramList);
+//			int day = getDay(paramList);
+//			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
+//			for(Map<String, Object> map: list){
+//				Integer tianShu = (Integer)map.get("TIAN_SHU_");
+//				if(tianShu!=null){
+//					day=tianShu;
+//				}
+//				DSRWEntity entity = new DSRWEntity();
+//				String id= UUID.randomUUID().toString();
+//				entity.setId(id);
+//				entity.setDingShiRenWuNeiRo((String)map.get("SHI_XIANG_MING_CH"));
+//				entity.setBianZhiBuMen((String)map.get("BIAN_ZHI_BU_MEN_"));
+//				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
+//
+//				Calendar cal = Calendar.getInstance();
+//				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("TI_XING_SHI_JIAN_")));
+//				cal.add(Calendar.DATE,day);
+//				Date now = cal.getTime();
+//				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
+//				entity.setRenWuShiJian(renWuShiJian);
+//
+//				entity.setRenWuBiaoTi((String)map.get("BIAN_ZHI_REN_")+"的记事提醒");
+//				entity.setShouLiDuiXiang("中心");
+//				entity.setFaQiDuiXiang("中心");
+//				entity.setDingShiRenWuLeiXi("提醒");
+//				entity.setRenWuZhuangTai("未结束");
+//				entity.setGuanLianFuBiao((String)map.get("ID_"));
+//				entity.setGuanLianZiDuan("wai_jian_");
+//				if("dx".equalsIgnoreCase(tiXingFangShi)){
+//					sendDxMsg(entity);
+//					continue;
+//				}
+//				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
+//						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
+//						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
+//						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
+//				jdbcTemplate.execute(sql);
+//
+//				String sqlUpdate = "update t_jsb set ti_xing_biao_zhi_='1',ti_xing_id_='"+id+"' where id_='"+entity.getGuanLianFuBiao()+"'";
+//				jdbcTemplate.execute(sqlUpdate);
+//
+//			}
+//
+//		}catch(Exception e){
+//			e.printStackTrace();
+//		}
+//
+//
+//	}
+//
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/quartz/job/PaymentJob.java

@@ -11,67 +11,67 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-@Transactional
-@Component
-@Async
-public class PaymentJob extends BaseJob{
-
-	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
-	private String dataSql = "SELECT SHOU_LI_BU_MEN_,BIAN_ZHI_REN_,DING_DAN_CHENG_JI,ID_,LIAN_XI_REN_ from t_gdyrqcwt " +
-			" where crm_zhuang_tai_ not in('yfkdkp','yfkykp') and (ti_xing_biao_zhi_ is null or ti_xing_biao_zhi_<>'1') AND DATE_ADD(DING_DAN_CHENG_JI,INTERVAL #DAYS# DAY) #EXP# NOW() and DING_DAN_CHENG_JI between '#STARTDATE#' and '#ENDDATE#'";
-
-	@Scheduled(cron="0 */59 * * * ? ")
-	@Override
-	public void executeJob() throws Exception {
-		try{
-			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
-			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","yszkxx"));//应收账款
-			String tiXingFangShi = getTiXingFangShi(paramList);
-			dataSql = calSql(dataSql,paramList);
-			int day = getDay(paramList);
-			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
-			for(Map<String, Object> map: list){
-				DSRWEntity entity = new DSRWEntity();
-				String id= UUID.randomUUID().toString();
-				entity.setId(id);
-				entity.setDingShiRenWuNeiRo("应收款提醒");
-				entity.setBianZhiBuMen((String)map.get("SHOU_LI_BU_MEN_"));
-				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
-
-				Calendar cal = Calendar.getInstance();
-				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("DING_DAN_CHENG_JI")));
-				cal.add(Calendar.DATE,day);
-				Date now = cal.getTime();
-				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
-				entity.setRenWuShiJian(renWuShiJian);
-
-				entity.setRenWuBiaoTi((String)map.get("BIAN_ZHI_REN_")+"的应收款提醒");
-				entity.setShouLiDuiXiang("中心");
-				entity.setFaQiDuiXiang("中心");
-				entity.setDingShiRenWuLeiXi("付款提醒");
-				entity.setRenWuZhuangTai("未结束");
-				entity.setGuanLianFuBiao((String)map.get("ID_"));
-				entity.setGuanLianZiDuan("wai_jian_");
-				if("dx".equalsIgnoreCase(tiXingFangShi)){
-					sendDxMsg(entity);
-					continue;
-				}
-				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
-						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
-						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
-						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
-				jdbcTemplate.execute(sql);
-
-				String sqlUpdate = "update t_gdyrqcwt set ti_xing_biao_zhi_='1',ti_xing_id_='"+id+"'  where id_='"+entity.getGuanLianFuBiao()+"'";
-				jdbcTemplate.execute(sqlUpdate);
-
-			}
-
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-
-
-	}
-
-}
+//@Transactional
+//@Component
+//@Async
+//public class PaymentJob extends BaseJob{
+//
+//	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
+//	private String dataSql = "SELECT SHOU_LI_BU_MEN_,BIAN_ZHI_REN_,DING_DAN_CHENG_JI,ID_,LIAN_XI_REN_ from t_gdyrqcwt " +
+//			" where crm_zhuang_tai_ not in('yfkdkp','yfkykp') and (ti_xing_biao_zhi_ is null or ti_xing_biao_zhi_<>'1') AND DATE_ADD(DING_DAN_CHENG_JI,INTERVAL #DAYS# DAY) #EXP# NOW() and DING_DAN_CHENG_JI between '#STARTDATE#' and '#ENDDATE#'";
+//
+//	@Scheduled(cron="0 */59 * * * ? ")
+//	@Override
+//	public void executeJob() throws Exception {
+//		try{
+//			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
+//			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","yszkxx"));//应收账款
+//			String tiXingFangShi = getTiXingFangShi(paramList);
+//			dataSql = calSql(dataSql,paramList);
+//			int day = getDay(paramList);
+//			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
+//			for(Map<String, Object> map: list){
+//				DSRWEntity entity = new DSRWEntity();
+//				String id= UUID.randomUUID().toString();
+//				entity.setId(id);
+//				entity.setDingShiRenWuNeiRo("应收款提醒");
+//				entity.setBianZhiBuMen((String)map.get("SHOU_LI_BU_MEN_"));
+//				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
+//
+//				Calendar cal = Calendar.getInstance();
+//				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("DING_DAN_CHENG_JI")));
+//				cal.add(Calendar.DATE,day);
+//				Date now = cal.getTime();
+//				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
+//				entity.setRenWuShiJian(renWuShiJian);
+//
+//				entity.setRenWuBiaoTi((String)map.get("BIAN_ZHI_REN_")+"的应收款提醒");
+//				entity.setShouLiDuiXiang("中心");
+//				entity.setFaQiDuiXiang("中心");
+//				entity.setDingShiRenWuLeiXi("付款提醒");
+//				entity.setRenWuZhuangTai("未结束");
+//				entity.setGuanLianFuBiao((String)map.get("ID_"));
+//				entity.setGuanLianZiDuan("wai_jian_");
+//				if("dx".equalsIgnoreCase(tiXingFangShi)){
+//					sendDxMsg(entity);
+//					continue;
+//				}
+//				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
+//						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
+//						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
+//						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
+//				jdbcTemplate.execute(sql);
+//
+//				String sqlUpdate = "update t_gdyrqcwt set ti_xing_biao_zhi_='1',ti_xing_id_='"+id+"'  where id_='"+entity.getGuanLianFuBiao()+"'";
+//				jdbcTemplate.execute(sqlUpdate);
+//
+//			}
+//
+//		}catch(Exception e){
+//			e.printStackTrace();
+//		}
+//
+//
+//	}
+//
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/quartz/job/ReportDueJob.java

@@ -11,68 +11,68 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-@Transactional
-@Component
-@Async
-public class ReportDueJob extends BaseJob{
+//@Transactional
+//@Component
+//@Async
+//public class ReportDueJob extends BaseJob{
 
-	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
-	private String dataSql = "SELECT SHOU_LI_BU_MEN_,BIAN_ZHI_REN_,BAO_GAO_FA_FANG_S,ID_,LIAN_XI_REN_ from t_gdyrqcwt " +
-			" where (ti_xing_biao_zhi3 is null or ti_xing_biao_zhi3<>'1') AND DATE_ADD(bao_gao_fa_fang_s,INTERVAL #DAYS# DAY) #EXP# NOW() and bao_gao_fa_fang_s between '#STARTDATE#' and '#ENDDATE#'";
+//	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
+//	private String dataSql = "SELECT SHOU_LI_BU_MEN_,BIAN_ZHI_REN_,BAO_GAO_FA_FANG_S,ID_,LIAN_XI_REN_ from t_gdyrqcwt " +
+//			" where (ti_xing_biao_zhi3 is null or ti_xing_biao_zhi3<>'1') AND DATE_ADD(bao_gao_fa_fang_s,INTERVAL #DAYS# DAY) #EXP# NOW() and bao_gao_fa_fang_s between '#STARTDATE#' and '#ENDDATE#'";
 
 
-	@Scheduled(cron="0 */59 * * * ? ")
-	@Override
-	public void executeJob() throws Exception {
-		try{
-			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
-			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","bgwcrqtx"));//报告完成日期
-			String tiXingFangShi = getTiXingFangShi(paramList);
-			dataSql = calSql(dataSql,paramList);
-			int day = getDay(paramList);
-			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
-			for(Map<String, Object> map: list){
-				DSRWEntity entity = new DSRWEntity();
-				String id= UUID.randomUUID().toString();
-				entity.setId(id);
-				entity.setDingShiRenWuNeiRo("报告逾期提醒");
-				entity.setBianZhiBuMen((String)map.get("SHOU_LI_BU_MEN_"));
-				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
+//	@Scheduled(cron="0 */59 * * * ? ")
+//	@Override
+//	public void executeJob() throws Exception {
+//		try{
+//			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
+//			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","bgwcrqtx"));//报告完成日期
+//			String tiXingFangShi = getTiXingFangShi(paramList);
+//			dataSql = calSql(dataSql,paramList);
+//			int day = getDay(paramList);
+//			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
+//			for(Map<String, Object> map: list){
+//				DSRWEntity entity = new DSRWEntity();
+//				String id= UUID.randomUUID().toString();
+//				entity.setId(id);
+//				entity.setDingShiRenWuNeiRo("报告逾期提醒");
+//				entity.setBianZhiBuMen((String)map.get("SHOU_LI_BU_MEN_"));
+//				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
+//
+//				Calendar cal = Calendar.getInstance();
+//				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("BAO_GAO_FA_FANG_S")));
+//				cal.add(Calendar.DATE,day);
+//				Date now = cal.getTime();
+//				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
+//				entity.setRenWuShiJian(renWuShiJian);
+//
+//				entity.setRenWuBiaoTi((String)map.get("LIAN_XI_REN_")+"的报告逾期提醒");
+//				entity.setShouLiDuiXiang("中心");
+//				entity.setFaQiDuiXiang("中心");
+//				entity.setDingShiRenWuLeiXi("逾期提醒");
+//				entity.setRenWuZhuangTai("未结束");
+//				entity.setGuanLianFuBiao((String)map.get("ID_"));
+//				entity.setGuanLianZiDuan("wai_jian_");
+//				if("dx".equalsIgnoreCase(tiXingFangShi)){
+//					sendDxMsg(entity);
+//					continue;
+//				}
+//				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
+//						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
+//						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
+//						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
+//				jdbcTemplate.execute(sql);
+//
+//				String sqlUpdate = "update t_gdyrqcwt set ti_xing_biao_zhi3='1',ti_xing_id_='"+id+"'  where id_='"+entity.getGuanLianFuBiao()+"'";
+//				jdbcTemplate.execute(sqlUpdate);
+//
+//			}
+//
+//		}catch(Exception e){
+//			e.printStackTrace();
+//		}
+//
+//
+//	}
 
-				Calendar cal = Calendar.getInstance();
-				cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse( (String)map.get("BAO_GAO_FA_FANG_S")));
-				cal.add(Calendar.DATE,day);
-				Date now = cal.getTime();
-				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
-				entity.setRenWuShiJian(renWuShiJian);
-
-				entity.setRenWuBiaoTi((String)map.get("LIAN_XI_REN_")+"的报告逾期提醒");
-				entity.setShouLiDuiXiang("中心");
-				entity.setFaQiDuiXiang("中心");
-				entity.setDingShiRenWuLeiXi("逾期提醒");
-				entity.setRenWuZhuangTai("未结束");
-				entity.setGuanLianFuBiao((String)map.get("ID_"));
-				entity.setGuanLianZiDuan("wai_jian_");
-				if("dx".equalsIgnoreCase(tiXingFangShi)){
-					sendDxMsg(entity);
-					continue;
-				}
-				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
-						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
-						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
-						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
-				jdbcTemplate.execute(sql);
-
-				String sqlUpdate = "update t_gdyrqcwt set ti_xing_biao_zhi3='1',ti_xing_id_='"+id+"'  where id_='"+entity.getGuanLianFuBiao()+"'";
-				jdbcTemplate.execute(sqlUpdate);
-
-			}
-
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-
-
-	}
-
-}
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/quartz/job/ReportSendJob.java

@@ -11,63 +11,63 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-@Transactional
-@Component
-@Async
-public class ReportSendJob extends BaseJob{
-
-	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
-	private String dataSql = "SELECT SHOU_LI_BU_MEN_,BIAN_ZHI_REN_,JIAN_CE_WAN_CHENG,ID_,LIAN_XI_REN_ from t_gdyrqcwt " +
-			" where (ti_xing_biao_zhi4 is null or ti_xing_biao_zhi4<>'1') AND (jian_ce_wan_cheng='' or jian_ce_wan_cheng is null) and jian_ce_wan_cheng between '#STARTDATE#' and '#ENDDATE#'";
-
-	@Scheduled(cron="0 */59 * * * ? ")
-	@Override
-	public void executeJob() throws Exception {
-		try{
-			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
-			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","bgyq"));//报告逾期
-			String tiXingFangShi = getTiXingFangShi(paramList);
-			dataSql = calSql(dataSql,paramList);
-			int day = getDay(paramList);
-			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
-			for(Map<String, Object> map: list){
-				DSRWEntity entity = new DSRWEntity();
-				String id= UUID.randomUUID().toString();
-				entity.setId(id);
-				entity.setDingShiRenWuNeiRo("报告完成提醒");
-				entity.setBianZhiBuMen((String)map.get("SHOU_LI_BU_MEN_"));
-				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
-
-				Calendar cal = Calendar.getInstance();
-				Date now = cal.getTime();
-				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
-				entity.setRenWuShiJian(renWuShiJian);
-
-				entity.setRenWuBiaoTi((String)map.get("LIAN_XI_REN_")+"的报告完成提醒");
-				entity.setShouLiDuiXiang("中心");
-				entity.setFaQiDuiXiang("中心");
-				entity.setDingShiRenWuLeiXi("报告提醒");
-				entity.setRenWuZhuangTai("未结束");
-				entity.setGuanLianFuBiao((String)map.get("ID_"));
-				entity.setGuanLianZiDuan("wai_jian_");
-				if("dx".equalsIgnoreCase(tiXingFangShi)){
-					sendDxMsg(entity);
-					continue;
-				}
-				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
-						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
-						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
-						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
-				jdbcTemplate.execute(sql);
-
-				String sqlUpdate = "update t_gdyrqcwt set ti_xing_biao_zhi4='1',ti_xing_id_='"+id+"'  where id_='"+entity.getGuanLianFuBiao()+"'";
-				jdbcTemplate.execute(sqlUpdate);
-
-			}
-
-		}catch(Exception e){
-			e.printStackTrace();
-		}
-
-	}
-}
+//@Transactional
+//@Component
+//@Async
+//public class ReportSendJob extends BaseJob{
+//
+//	private String columns = "ID_,guan_lian_zi_duan,wai_jian_,guan_lian_fu_biao,ding_shi_ren_wu_n,ren_wu_shi_jian_,ren_wu_zhuang_tai,shou_li_ren_yuan_,bian_zhi_bu_men_,ren_wu_biao_ti_,fa_qi_dui_xiang_,shou_li_dui_xiang,ding_shi_ren_wu_l";
+//	private String dataSql = "SELECT SHOU_LI_BU_MEN_,BIAN_ZHI_REN_,JIAN_CE_WAN_CHENG,ID_,LIAN_XI_REN_ from t_gdyrqcwt " +
+//			" where (ti_xing_biao_zhi4 is null or ti_xing_biao_zhi4<>'1') AND (jian_ce_wan_cheng='' or jian_ce_wan_cheng is null) and jian_ce_wan_cheng between '#STARTDATE#' and '#ENDDATE#'";
+//
+//	@Scheduled(cron="0 */59 * * * ? ")
+//	@Override
+//	public void executeJob() throws Exception {
+//		try{
+//			JdbcTemplate jdbcTemplate = TableMetaUtil.getJdbcTemplateByDsAlias("dataSource_default");
+//			List<Map<String, Object>> paramList = jdbcTemplate.queryForList(paraSetSql.replace("#TYPE#","bgyq"));//报告逾期
+//			String tiXingFangShi = getTiXingFangShi(paramList);
+//			dataSql = calSql(dataSql,paramList);
+//			int day = getDay(paramList);
+//			List<Map<String, Object>> list = jdbcTemplate.queryForList(dataSql);
+//			for(Map<String, Object> map: list){
+//				DSRWEntity entity = new DSRWEntity();
+//				String id= UUID.randomUUID().toString();
+//				entity.setId(id);
+//				entity.setDingShiRenWuNeiRo("报告完成提醒");
+//				entity.setBianZhiBuMen((String)map.get("SHOU_LI_BU_MEN_"));
+//				entity.setShouLiRenYuan((String)map.get("BIAN_ZHI_REN_"));
+//
+//				Calendar cal = Calendar.getInstance();
+//				Date now = cal.getTime();
+//				String renWuShiJian = new SimpleDateFormat("yyyy-MM-dd").format(now);
+//				entity.setRenWuShiJian(renWuShiJian);
+//
+//				entity.setRenWuBiaoTi((String)map.get("LIAN_XI_REN_")+"的报告完成提醒");
+//				entity.setShouLiDuiXiang("中心");
+//				entity.setFaQiDuiXiang("中心");
+//				entity.setDingShiRenWuLeiXi("报告提醒");
+//				entity.setRenWuZhuangTai("未结束");
+//				entity.setGuanLianFuBiao((String)map.get("ID_"));
+//				entity.setGuanLianZiDuan("wai_jian_");
+//				if("dx".equalsIgnoreCase(tiXingFangShi)){
+//					sendDxMsg(entity);
+//					continue;
+//				}
+//				String sql = "insert into t_dsrw("+columns+") values('','"+entity.getId()+"','"+entity.getGuanLianZiDuan()+"','"+entity.getGuanLianFuBiao()+
+//						"','"+entity.getGuanLianFuBiao()+"','"+entity.getDingShiRenWuNeiRo()+"','"+entity.getRenWuShiJian()+"','"+entity.getRenWuZhuangTai()+
+//						"','"+entity.getShouLiRenYuan() +"','"+entity.getBianZhiBuMen() +"','"+entity.getRenWuBiaoTi()+"'"+",'"+entity.getFaQiDuiXiang()+
+//						"','"+entity.getShouLiDuiXiang()+"','"+entity.getDingShiRenWuLeiXi()+"')";
+//				jdbcTemplate.execute(sql);
+//
+//				String sqlUpdate = "update t_gdyrqcwt set ti_xing_biao_zhi4='1',ti_xing_id_='"+id+"'  where id_='"+entity.getGuanLianFuBiao()+"'";
+//				jdbcTemplate.execute(sqlUpdate);
+//
+//			}
+//
+//		}catch(Exception e){
+//			e.printStackTrace();
+//		}
+//
+//	}
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/config/JcjdConfig.java

@@ -7,7 +7,7 @@ package com.lc.ibps.config;
 
 public class JcjdConfig {
 
-    public static final String ENCIPHER_KEY="4qjmkW2f2OWWaT24cuqrkZGhwa6i5WypKsxnukI2Mqn+C4X+qMPn4ex0V8czvFvFrQn87YhVg0ch2kdVcORLDQ=="; //接口加密key
+    //public static final String ENCIPHER_KEY="4qjmkW2f2OWWaT24cuqrkZGhwa6i5WypKsxnukI2Mqn+C4X+qMPn4ex0V8czvFvFrQn87YhVg0ch2kdVcORLDQ=="; //接口加密key
 
     public static final String WT_STATE="待环境检测"; //委托
 

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/config/JsonUtilConfig.java

@@ -5,10 +5,11 @@ import com.google.gson.GsonBuilder;
 import net.sf.json.JSONArray;
 import org.apache.commons.lang.StringUtils;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 
 /**
  * @author wy
@@ -16,6 +17,9 @@ import java.util.Map;
  */
 
 public class JsonUtilConfig {
+
+    private static final String KEY = "dmngJmmO+9GMw+tu";
+    private static final String IV = "sanXyqhk8+U7LPP4";
     private final static Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
     public static Gson getInstance(){
         return gson;
@@ -54,4 +58,17 @@ public class JsonUtilConfig {
              return map;
     }
 
+    public static String decrypt(String encryptedText) throws Exception {
+        byte[] encryptedData = Base64.getDecoder().decode(encryptedText);
+
+        SecretKeySpec secretKeySpec = new SecretKeySpec(KEY.getBytes(StandardCharsets.UTF_8), "AES");
+        IvParameterSpec ivParameterSpec = new IvParameterSpec(IV.getBytes(StandardCharsets.UTF_8));
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); // 使用CBC模式和PKCS5Padding填充
+        cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec);
+
+        byte[] decryptedBytes = cipher.doFinal(encryptedData);
+        return new String(decryptedBytes, StandardCharsets.UTF_8).trim(); // 去除末尾空格
+    }
+
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/sysdata/controller/TestController.java

@@ -1,62 +1,62 @@
-package com.lc.ibps.sysdata.controller;
-
-import com.lc.ibps.cloud.entity.APIResult;
-import com.lc.ibps.cloud.provider.GenericProvider;
-import com.lc.ibps.task.entity.Tzqxdsrwb;
-import com.lc.ibps.task.services.CycleTaskService;
-import com.lc.ibps.vo.TaskVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/task")
-@Api(tags = "用于周期任务接口的调试", value = "用于接口的调试管理")
-public class TestController extends GenericProvider {
-
-    @Resource
-    private CycleTaskService cycleTaskService;
-    @GetMapping("/testTask")
-    @ApiOperation(value = "用于接口的调试", notes = "每日执行一次")
-    public APIResult<Void> testTask(String id) {
-        APIResult<Void> apiResult = new APIResult<>();
-        try {
-            String sign="每日";
-            cycleTaskService.testTask(id);
-            apiResult.setState(200);
-            apiResult.addVariable("data","成功");
-        } catch (Exception e){
-            apiResult.setState(100);
-            apiResult.addVariable("data"," 失败");
-        }
-        return apiResult;
-    }
-    @GetMapping("/dayTask")
-    @ApiOperation(value = "用于接口的调试", notes = "每日执行一次")
-    public APIResult<Void> countCaseNumData(){
-        APIResult<Void> apiResult = new APIResult<>();
-        try {
+//package com.lc.ibps.sysdata.controller;
+//
+//import com.lc.ibps.cloud.entity.APIResult;
+//import com.lc.ibps.cloud.provider.GenericProvider;
+//import com.lc.ibps.task.entity.Tzqxdsrwb;
+////import com.lc.ibps.task.services.CycleTaskService;
+//import com.lc.ibps.vo.TaskVo;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.BeanUtils;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.annotation.Resource;
+//
+//@RestController
+//@RequestMapping("/task")
+//@Api(tags = "用于周期任务接口的调试", value = "用于接口的调试管理")
+//public class TestController extends GenericProvider {
+//
+//    @Resource
+//    private CycleTaskService cycleTaskService;
+//    @GetMapping("/testTask")
+//    @ApiOperation(value = "用于接口的调试", notes = "每日执行一次")
+//    public APIResult<Void> testTask(String id) {
+//        APIResult<Void> apiResult = new APIResult<>();
+//        try {
 //            String sign="每日";
-//            String sign="每日下午2点";
-//            String sign="工作日上午8点";
-//            String sign="工作日下午2点";
-
-            String sign="工作日3点";
-            cycleTaskService.startProcess(sign);
-            apiResult.setState(200);
-            apiResult.addVariable("data","成功");
-        } catch (Exception e){
-            apiResult.setState(100);
-            apiResult.addVariable("data"," 失败");
-        }
-        return apiResult;
-    }
-
-
-}
+//            cycleTaskService.testTask(id);
+//            apiResult.setState(200);
+//            apiResult.addVariable("data","成功");
+//        } catch (Exception e){
+//            apiResult.setState(100);
+//            apiResult.addVariable("data"," 失败");
+//        }
+//        return apiResult;
+//    }
+//    @GetMapping("/dayTask")
+//    @ApiOperation(value = "用于接口的调试", notes = "每日执行一次")
+//    public APIResult<Void> countCaseNumData(){
+//        APIResult<Void> apiResult = new APIResult<>();
+//        try {
+////            String sign="每日";
+////            String sign="每日下午2点";
+////            String sign="工作日上午8点";
+////            String sign="工作日下午2点";
+//
+//            String sign="工作日3点";
+//            cycleTaskService.startProcess(sign);
+//            apiResult.setState(200);
+//            apiResult.addVariable("data","成功");
+//        } catch (Exception e){
+//            apiResult.setState(100);
+//            apiResult.addVariable("data"," 失败");
+//        }
+//        return apiResult;
+//    }
+//
+//
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/sysdata/controller/UpdateDataTableController.java

@@ -39,6 +39,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.json.JsonArray;
 import java.util.*;
 
+import static com.lc.ibps.config.JsonUtilConfig.decrypt;
 import static org.activiti.engine.impl.util.CollectionUtil.map;
 
 /**
@@ -61,20 +62,7 @@ public class UpdateDataTableController {
     @ApiImplicitParams({@ApiImplicitParam("传入加密的sql字符串")})
     @PostMapping("/encipher")
     APIResult<Void> encipher(@RequestBody String data)throws Exception {
-        APIResult<Void> apiResult = new APIResult<>();
-        //sql解密后在进行查询
-        //data
-        APIResult<Void> encipher = updateDataTableService.encipher(data);
-        Map mapData = JSONObject.parseObject(data); /*转换成map*/
-        String sql = (String) mapData.get("sql");
-        if (null != sql && !"".equals(sql) && "select".equals(sql.substring(0, 6))) {
-            apiResult.addVariable("data", updateDataTableService.inputSqlSelectData(sql));
-            apiResult.setState(StateEnum.SUCCESS.getCode());
-            return apiResult;
-        }
-        apiResult.setState(StateEnum.ERROR.getCode());
-        apiResult.setMessage("参数错误！ 必须为select!!!");
-        return apiResult;
+        return updateDataTableService.encipher(data);
     }
 
 
@@ -102,17 +90,21 @@ public class UpdateDataTableController {
     APIResult<Void> batchDelete(@RequestBody String data){
         APIResult<Void> apiResult = new APIResult<>();
         /*鉴权，当前接口只允许pc端发送请求 */
-        if(data.isEmpty() || !updateDataTableService.sigVerify(data)){
-            apiResult.setState(StateEnum.ERROR.getCode());
-            apiResult.setMessage("非法的签名,接口请求失败！");
-            return apiResult;
-        }
-        Map map = JSONObject.parseObject(data);
+//        if(data.isEmpty() || !updateDataTableService.sigVerify(data)){
+//            apiResult.setState(StateEnum.ERROR.getCode());
+//            apiResult.setMessage("非法的签名,接口请求失败！");
+//            return apiResult;
+//        }
         String tableName = "";
         String paramWhere = "";
+        Map map = JSONObject.parseObject(data);
+        String ciphertext = (String)map.get("ciphertext");
         try{
-        tableName = (String) map.get("tableName");
-        paramWhere = (String) map.get("paramWhere");
+            String decrypt = decrypt(ciphertext);
+            JSONObject sqlMap = JSONObject.parseObject(decrypt);
+
+        tableName = sqlMap.getString("tableName");
+        paramWhere =  sqlMap.getString("paramWhere");
         } catch (Exception e) {
             apiResult.setState(StateEnum.ERROR.getCode());
             apiResult.setMessage("参数类型错误");
@@ -219,19 +211,21 @@ public class UpdateDataTableController {
         APIResult<Void> apiResult = new APIResult<>();
 
         /*鉴权，当前接口只允许pc端发送请求 */
-        if(data.isEmpty() || !updateDataTableService.sigVerify(data)){
-            apiResult.setState(StateEnum.ERROR.getCode());
-            apiResult.setMessage("调用接口时，签名不合法！");
-            return apiResult;
-        }
+//        if(data.isEmpty() || !updateDataTableService.sigVerify(data)){
+//            apiResult.setState(StateEnum.ERROR.getCode());
+//            apiResult.setMessage("调用接口时，签名不合法！");
+//            return apiResult;
+//        }
 
         Map mapData = JSONObject.parseObject(data); /*转换成map*/
+        String ciphertext =(String) mapData.get("ciphertext");
         String tableName = null;
         List<Map<String,String>> updList = new ArrayList<>();
-
         try {
-            tableName = (String) mapData.get("tableName");
-            updList = (List<Map<String, String>>) mapData.get("updList");
+            String decrypt = decrypt(ciphertext);
+            Map jsonMap = JSONObject.parseObject(decrypt);
+            tableName = (String) jsonMap.get("tableName");
+            updList = (List<Map<String, String>>) jsonMap.get("updList");
         } catch (Exception e) {
             e.printStackTrace();
             apiResult.setState(StateEnum.ERROR.getCode());
@@ -404,24 +398,27 @@ public class UpdateDataTableController {
         APIResult<Void> apiResult = new APIResult<>();
 
         /*鉴权，当前接口只允许pc端发送请求 */
-        if(data.isEmpty() || !updateDataTableService.sigVerify(data)){
-            apiResult.setState(StateEnum.ERROR.getCode());
-            apiResult.setMessage("非法的签名,接口请求失败！");
-            return apiResult;
-        }
-        JSONObject jsonObject = JSONObject.parseObject(data);/*转换成map*/
+//        if(data.isEmpty() || !updateDataTableService.sigVerify(data)){
+//            apiResult.setState(StateEnum.ERROR.getCode());
+//            apiResult.setMessage("非法的签名,接口请求失败！");
+//            return apiResult;
+//        }
+        Map jsonMap = JSONObject.parseObject(data);/*转换成map*/
+        String sql =(String) jsonMap.get("ciphertext");
         String tableName = null;
         String defKey = null;
         String formKey = null; /*表名*/
         String type = null; /*类型*/
         List<LinkedHashMap> paramWhere = null; /*条件 ： 值*/
         try {
-            tableName = jsonObject.getString("tableName");/*获取表名*/
-            type = StringUtils.isEmpty(jsonObject.getString("type")) ? null:jsonObject.getString("type");/*获取类型*/
-            String paramWhere1 = jsonObject.getString("paramWhere");/*获取参数数组*/
+            String decrypt = decrypt(sql);
+            JSONObject map = JSONObject.parseObject(decrypt);/*转换成map*/
+            tableName =(String) map.get("tableName");/*获取表名*/
+            type = StringUtils.isEmpty(map.getString("type")) ? null:map.getString("type");/*获取类型*/
+            String paramWhere1 = map.getString("paramWhere");/*获取参数数组*/
             paramWhere = JSONObject.parseArray(paramWhere1, LinkedHashMap.class);
-            defKey = jsonObject.getString("defKey");
-            formKey = jsonObject.getString("formKey");
+            defKey = map.getString("defKey");
+            formKey = map.getString("formKey");
         } catch (Exception e) {
             apiResult.setState(StateEnum.ERROR.getCode());
             apiResult.setMessage("参数类型错误");

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/sysdata/services/impl/UpdateDataTableImpl.java

@@ -27,12 +27,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 import static com.lc.ibps.api.base.constants.StateEnum.ERROR;
 import static com.lc.ibps.api.base.constants.StateEnum.SUCCESS;
+import static com.lc.ibps.config.JsonUtilConfig.decrypt;
 
 /**
  * @title: liaoby
@@ -424,26 +426,13 @@ public class UpdateDataTableImpl extends GenericProvider implements UpdateDataTa
     @Override
     public APIResult<Void> encipher(String data) throws Exception {
         APIResult<Void> apiResult = new APIResult<>();
-        //sql解密后在进行查询
-        // 前端传递的加密数据为 data，密钥为 key
-        //String encryptedData = "encrypted-data-from-frontend";
-       // String key = "4qjmkW2f2OWWaT24cuqrkZGhwa6i5WypKsxnukI2Mqn+C4X+qMPn4ex0V8czvFvFrQn87YhVg0ch2kdVcORLDQ==";
-        // 将密钥转换为 SecretKeySpec
-        byte[] keyBytes = JcjdConfig.ENCIPHER_KEY.getBytes(StandardCharsets.UTF_8);
-        SecretKeySpec secretKey = new SecretKeySpec(keyBytes, "AES");
-
-        // 创建 AES 解密器
+        Map mapData = JSONObject.parseObject(data);
+        String ciphertext =(String) mapData.get("ciphertext");
         try{
-            Cipher cipher = Cipher.getInstance("AES");
-            cipher.init(Cipher.DECRYPT_MODE, secretKey);
-            // Base64 解码并解密数据
-            byte[] encryptedBytes = Base64.getDecoder().decode(data);
-            byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
-            //解密后的数据
-            String decryptedData = new String(decryptedBytes, StandardCharsets.UTF_8);
+            String decryptedText = decrypt(ciphertext);
             //转map
-            Map mapData = JSONObject.parseObject(decryptedData); /*转换成map*/
-            String sql = (String) mapData.get("sql");
+            Map mapSql = JSONObject.parseObject(decryptedText); /*转换成map*/
+            String sql = (String) mapSql.get("sql");
             if (null != sql && !"".equals(sql) && "select".equals(sql.substring(0, 6))) {
                 apiResult.addVariable("data", updateDataTableDao.inputSqlSelectData(sql));
                 apiResult.setState(StateEnum.SUCCESS.getCode());
@@ -456,7 +445,6 @@ public class UpdateDataTableImpl extends GenericProvider implements UpdateDataTa
             apiResult.setMessage(JcjdConfig.ERROR_MASSAGE);
             apiResult.setState(JcjdConfig.error);
             throw new Exception(JcjdConfig.EXCEPTION);
-           // return apiResult;
         }
     }
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/dao/TzqxdsrwbMapper.java

@@ -1,29 +1,29 @@
 package com.lc.ibps.task.dao;
 
-import com.lc.ibps.task.entity.Tzqxdsrwb;
+//import com.lc.ibps.task.entity.Tzqxdsrwb;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
+//import org.apache.ibatis.annotations.Param;
+//
+//import java.util.List;
+//
 @Mapper
 public interface TzqxdsrwbMapper {
-    int deleteByPrimaryKey(String id);
-
-    int insert(Tzqxdsrwb record);
-
-    int insertSelective(Tzqxdsrwb record);
-
-    Tzqxdsrwb selectByPrimaryKey(String id);
-
-    int updateByPrimaryKeySelective(Tzqxdsrwb record);
-
-    int updateByPrimaryKey(Tzqxdsrwb record);
-
-    List<Tzqxdsrwb> getTzqxdsrwb(String startSign);
-
-    List<Tzqxdsrwb> getTimingTaskTzqxdsrwb(@Param("dateSign") String dateSign);
-
-    int updateTimingTaskSign(@Param("id") String id);
-
+//    int deleteByPrimaryKey(String id);
+//
+//    int insert(Tzqxdsrwb record);
+//
+//    int insertSelective(Tzqxdsrwb record);
+//
+//    Tzqxdsrwb selectByPrimaryKey(String id);
+//
+//    int updateByPrimaryKeySelective(Tzqxdsrwb record);
+//
+//    int updateByPrimaryKey(Tzqxdsrwb record);
+//
+//    List<Tzqxdsrwb> getTzqxdsrwb(String startSign);
+//
+//    List<Tzqxdsrwb> getTimingTaskTzqxdsrwb(@Param("dateSign") String dateSign);
+//
+//    int updateTimingTaskSign(@Param("id") String id);
+//
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/server/CycleTaskServer.java

@@ -1,169 +1,169 @@
-package com.lc.ibps.task.server;
-
-import com.lc.ibps.base.service.ServiceConfiguration;
-import com.lc.ibps.cloud.config.AuthorizationConfig;
-import com.lc.ibps.cloud.redis.utils.RedisUtil;
-import com.lc.ibps.mobile.controller.MobileSystemController;
-import com.lc.ibps.task.services.CycleTaskService;
-import com.lc.ibps.untils.DateUntil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/***
- *   周期性任务服务
- *
- *  * @author  ht
- */
-
-
+//package com.lc.ibps.task.server;
+//
+//import com.lc.ibps.base.service.ServiceConfiguration;
+//import com.lc.ibps.cloud.config.AuthorizationConfig;
+//import com.lc.ibps.cloud.redis.utils.RedisUtil;
+//import com.lc.ibps.mobile.controller.MobileSystemController;
+//import com.lc.ibps.task.services.CycleTaskService;
+//import com.lc.ibps.untils.DateUntil;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.scheduling.annotation.Async;
+//import org.springframework.scheduling.annotation.Scheduled;
+//import org.springframework.stereotype.Component;
+//import org.springframework.stereotype.Service;
+//
+//import javax.annotation.Resource;
+//
+///***
+// *   周期性任务服务
+// *
+// *  * @author  ht
+// */
+//
+//
+////@Component
+//
 //@Component
-
-@Component
-@Slf4j
-public class CycleTaskServer {
-
-    private static ServiceConfiguration SpringContextUtils;
-    private static MobileSystemController JwtUtil;
-
-    private AuthorizationConfig   authorizationConfig;
-    @Resource
-    private CycleTaskService cycleTaskService;
-
-    //  日期定时 执行一次
-    //@Scheduled(cron="0 10 5 1/1 * ? ")
-    @Scheduled(cron="0/30 * * * * ?")
-    public void timingTask(){
-      //  UserTokenContext.setToken(getTemporaryToken());
-
-     //   authorizationConfig.getToken();
-
-        log.info("每日--日期定时:"+DateUntil.getNow().toString() );
-        String sign="日期定时";
-        cycleTaskService.timingTaskProcess();
-
-    //  2.使用完删除Token，避免性能
-   //     UserTokenContext.remove();
-
-        log.info("每日--日期定时:"+DateUntil.getNow().toString() );
-    };
-
-     @Scheduled(cron="0 10 2 1/1 * ? ")
-  // @Scheduled(cron="0/30 * * * * ? ")
-    public void dayTask(){
-        log.info("每日--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="每日";
-        cycleTaskService.startProcess(sign);
-        log.info("每日--周期任务结束:"+DateUntil.getNow().toString() );
-     };
-
-    //   每周执行一次
-    @Scheduled(cron="0 15 2 ? * MON")
-    public void weekTask(){
-        log.info("每周--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="每周";
-        cycleTaskService.startProcess(sign);
-        log.info("每周--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-
-    //   两周执行一次
-    @Scheduled(cron="0 15 2 ? * MON")
-    public void twoWeekTask(){
-        log.info("每二周--周期任务开始:"+DateUntil.getNow().toString() );
-        Integer week= DateUntil.getWeek();
-        if(week%2==0) {
-            //  2周处理
-            String sign = "每二周";
-            cycleTaskService.startProcess(sign);
-        }
-        log.info("每二周--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-    //   每月执行一次
-    @Scheduled(cron="0 0 2 1 * ?")
-    public void monthTask(){
-        log.info("每月--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="每月";
-        cycleTaskService.startProcess(sign);
-        log.info("每月--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-    //   每季执行一次
-    @Scheduled(cron="0 0 3 1 * ?")
-    public void seasonTask(){
-        log.info("季度--周期任务开始:"+DateUntil.getNow().toString() );
-        Integer month=DateUntil.getMonth();
-        if(month%3==0) {
-            //  季度处理
-            String sign = "季度";
-            cycleTaskService.startProcess(sign);
-        }
-        log.info("季度--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-    //   每半年执一次
-    @Scheduled(cron="0 0 3 1 * ?")
-    public void halfYearTask(){
-        log.info("每半年--周期任务开始:"+DateUntil.getNow().toString() );
-        Integer month=DateUntil.getMonth();
-        if(month%6==0) {
-            //  半年处理
-            String sign = "每半年";
-            cycleTaskService.startProcess(sign);
-        }
-        log.info("每半年--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-
-//    //   每年执一次
-    @Scheduled(cron="0 15 4 1 1 * ")
-    public void yearTask(){
-        log.info("每年--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="每年";
-        cycleTaskService.startProcess(sign);
-        log.info("每年--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-
-    //   每日上午8点
-    @Scheduled(cron="0 0 8 * * ?")
-    public void dailyAt8Am(){
-        log.info("每日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="每日上午8点";
-        cycleTaskService.startProcess(sign);
-        log.info("每日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-//  每日下午2点
-    @Scheduled(cron="0 0 14 * * ?")
-    public void dailyAt2Pm(){
-        log.info("每日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="每日下午2点";
-        cycleTaskService.startProcess(sign);
-        log.info("每日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-//  工作日上午8点
-    @Scheduled(cron="0 0 8 ? * MON-FRI")
-    public void weekdaysAt8am(){
-        log.info("工作日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="工作日上午8点";
-        cycleTaskService.startProcess(sign);
-        log.info("工作日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-//工作日下午2点
-    @Scheduled(cron="0 0 14 ? * MON-FRI")
-    public void weekdaysAt2Pm(){
-        log.info("工作日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="工作日下午2点";
-        cycleTaskService.startProcess(sign);
-        log.info("工作日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-// 工作日3点
-    @Scheduled(cron="0 0 3 ? * MON-FRI")
-    public void workingDay(){
-        log.info("工作日3点--周期任务开始:"+DateUntil.getNow().toString() );
-        String sign="工作日3点";
-        cycleTaskService.startProcess(sign);
-        log.info("工作日3点--周期任务开始:"+DateUntil.getNow().toString() );
-    };
-
-
-}
+//@Slf4j
+//public class CycleTaskServer {
+//
+//    private static ServiceConfiguration SpringContextUtils;
+//    private static MobileSystemController JwtUtil;
+//
+//    private AuthorizationConfig   authorizationConfig;
+//    @Resource
+//    private CycleTaskService cycleTaskService;
+//
+//    //  日期定时 执行一次
+//    //@Scheduled(cron="0 10 5 1/1 * ? ")
+//    @Scheduled(cron="0/30 * * * * ?")
+//    public void timingTask(){
+//      //  UserTokenContext.setToken(getTemporaryToken());
+//
+//     //   authorizationConfig.getToken();
+//
+//        log.info("每日--日期定时:"+DateUntil.getNow().toString() );
+//        String sign="日期定时";
+//        cycleTaskService.timingTaskProcess();
+//
+//    //  2.使用完删除Token，避免性能
+//   //     UserTokenContext.remove();
+//
+//        log.info("每日--日期定时:"+DateUntil.getNow().toString() );
+//    };
+//
+//     @Scheduled(cron="0 10 2 1/1 * ? ")
+//  // @Scheduled(cron="0/30 * * * * ? ")
+//    public void dayTask(){
+//        log.info("每日--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="每日";
+//        cycleTaskService.startProcess(sign);
+//        log.info("每日--周期任务结束:"+DateUntil.getNow().toString() );
+//     };
+//
+//    //   每周执行一次
+//    @Scheduled(cron="0 15 2 ? * MON")
+//    public void weekTask(){
+//        log.info("每周--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="每周";
+//        cycleTaskService.startProcess(sign);
+//        log.info("每周--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+//
+//    //   两周执行一次
+//    @Scheduled(cron="0 15 2 ? * MON")
+//    public void twoWeekTask(){
+//        log.info("每二周--周期任务开始:"+DateUntil.getNow().toString() );
+//        Integer week= DateUntil.getWeek();
+//        if(week%2==0) {
+//            //  2周处理
+//            String sign = "每二周";
+//            cycleTaskService.startProcess(sign);
+//        }
+//        log.info("每二周--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+//    //   每月执行一次
+//    @Scheduled(cron="0 0 2 1 * ?")
+//    public void monthTask(){
+//        log.info("每月--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="每月";
+//        cycleTaskService.startProcess(sign);
+//        log.info("每月--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+//    //   每季执行一次
+//    @Scheduled(cron="0 0 3 1 * ?")
+//    public void seasonTask(){
+//        log.info("季度--周期任务开始:"+DateUntil.getNow().toString() );
+//        Integer month=DateUntil.getMonth();
+//        if(month%3==0) {
+//            //  季度处理
+//            String sign = "季度";
+//            cycleTaskService.startProcess(sign);
+//        }
+//        log.info("季度--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+//    //   每半年执一次
+//    @Scheduled(cron="0 0 3 1 * ?")
+//    public void halfYearTask(){
+//        log.info("每半年--周期任务开始:"+DateUntil.getNow().toString() );
+//        Integer month=DateUntil.getMonth();
+//        if(month%6==0) {
+//            //  半年处理
+//            String sign = "每半年";
+//            cycleTaskService.startProcess(sign);
+//        }
+//        log.info("每半年--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+//
+////    //   每年执一次
+//    @Scheduled(cron="0 15 4 1 1 * ")
+//    public void yearTask(){
+//        log.info("每年--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="每年";
+//        cycleTaskService.startProcess(sign);
+//        log.info("每年--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+//
+//    //   每日上午8点
+//    @Scheduled(cron="0 0 8 * * ?")
+//    public void dailyAt8Am(){
+//        log.info("每日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="每日上午8点";
+//        cycleTaskService.startProcess(sign);
+//        log.info("每日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+////  每日下午2点
+//    @Scheduled(cron="0 0 14 * * ?")
+//    public void dailyAt2Pm(){
+//        log.info("每日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="每日下午2点";
+//        cycleTaskService.startProcess(sign);
+//        log.info("每日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+////  工作日上午8点
+//    @Scheduled(cron="0 0 8 ? * MON-FRI")
+//    public void weekdaysAt8am(){
+//        log.info("工作日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="工作日上午8点";
+//        cycleTaskService.startProcess(sign);
+//        log.info("工作日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+////工作日下午2点
+//    @Scheduled(cron="0 0 14 ? * MON-FRI")
+//    public void weekdaysAt2Pm(){
+//        log.info("工作日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="工作日下午2点";
+//        cycleTaskService.startProcess(sign);
+//        log.info("工作日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+//// 工作日3点
+//    @Scheduled(cron="0 0 3 ? * MON-FRI")
+//    public void workingDay(){
+//        log.info("工作日3点--周期任务开始:"+DateUntil.getNow().toString() );
+//        String sign="工作日3点";
+//        cycleTaskService.startProcess(sign);
+//        log.info("工作日3点--周期任务开始:"+DateUntil.getNow().toString() );
+//    };
+//
+//
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/services/CycleTaskService.java

@@ -1,26 +1,26 @@
-package com.lc.ibps.task.services;
-
-import com.lc.ibps.task.entity.Tzqxdsrwb;
-
-/***
- *  周期性任务服务接口
- */
-public interface CycleTaskService {
-
-    //  每日执行一次
-    //   每周执行一次
-    //   两周执行一次
-    //   每月执行一次
-    //   每季执行一次
-    //   每半年执一次
-    //   每年执一次
-    //  根据 id 起动流程
-    void testTask(String id);
-
-    void startProcess(String startSign);
-     //   定时任务执行
-    void timingTaskProcess();
-     //   起动任务
-    void startProcessTask(Tzqxdsrwb varTzqxdsrwb);
-
-}
+//package com.lc.ibps.task.services;
+//
+//import com.lc.ibps.task.entity.Tzqxdsrwb;
+//
+///***
+// *  周期性任务服务接口
+// */
+//public interface CycleTaskService {
+//
+//    //  每日执行一次
+//    //   每周执行一次
+//    //   两周执行一次
+//    //   每月执行一次
+//    //   每季执行一次
+//    //   每半年执一次
+//    //   每年执一次
+//    //  根据 id 起动流程
+//    void testTask(String id);
+//
+//    void startProcess(String startSign);
+//     //   定时任务执行
+//    void timingTaskProcess();
+//     //   起动任务
+//    void startProcessTask(Tzqxdsrwb varTzqxdsrwb);
+//
+//}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/services/impl/CycleTaskServiceImpl.java

@@ -1,96 +1,96 @@
-package com.lc.ibps.task.services.impl;
-
-import com.lc.ibps.bpmn.api.model.inst.IBpmProcInst;
-import com.lc.ibps.bpmn.api.service.BpmProcInstService;
-import com.lc.ibps.bpmn.cmd.IbpsProcInstCmd;
-import com.lc.ibps.bpmn.provider.BpmInstProvider;
-import com.lc.ibps.cloud.entity.APIRequest;
-import com.lc.ibps.cloud.entity.APIResult;
-import com.lc.ibps.task.dao.TzqxdsrwbMapper;
-import com.lc.ibps.task.entity.Tzqxdsrwb;
-import com.lc.ibps.task.services.CycleTaskService;
-import com.lc.ibps.untils.DateUntil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static jodd.util.ThreadUtil.sleep;
-
-@Service
-@Slf4j
-public class CycleTaskServiceImpl implements CycleTaskService {
-    @Resource
-    private BpmProcInstService bpmProcInstService;
-
-    @Autowired
-    private TzqxdsrwbMapper tzqxdsrwbMapper;
-
-    @Autowired
-    private BpmInstProvider pmInstProvider;
-    //  起动周期性任务流程
-    @Override
-    public void testTask(String id){
-        Tzqxdsrwb tzqxdsrwb= tzqxdsrwbMapper.selectByPrimaryKey(id);
-        startProcessTask(tzqxdsrwb);
-    }
-
-    //  起动周期性任务流程
-    @Override
-    public void startProcess(String startSign) {
-       List<Tzqxdsrwb> dataList= tzqxdsrwbMapper.getTzqxdsrwb(startSign);
-       if(dataList!=null&&dataList.size()>0){
-           for(Tzqxdsrwb tzqxdsrwbTemp:dataList){
-               startProcessTask(tzqxdsrwbTemp);
-           }
-       }
-    }
-    //  日期定时任务
-    @Override
-    public void timingTaskProcess() {
-        String dateSign=DateUntil.getFormatNow();
-        List<Tzqxdsrwb> dataList= tzqxdsrwbMapper.getTimingTaskTzqxdsrwb(dateSign);
-        if(dataList!=null&&dataList.size()>0){
-            for(Tzqxdsrwb tzqxdsrwbTemp:dataList){
-                startProcessTask(tzqxdsrwbTemp);
-                updateTimingTask(tzqxdsrwbTemp);
-            }
-        }
-    }
-
-    //   日期定时任务业务处理
-    private void updateTimingTask(Tzqxdsrwb varTzqxdsrwb){
-        if(varTzqxdsrwb==null||varTzqxdsrwb.getId().equals("")){
-            return;
-        }
-        tzqxdsrwbMapper.updateTimingTaskSign(varTzqxdsrwb.getId());
-    }
-
-    //   开始任务
-    @Override
-    public void startProcessTask(Tzqxdsrwb varTzqxdsrwb){
-       try {
-           //  线程等 10000
-           Thread.sleep(20000);
-           if (varTzqxdsrwb != null) {
-               IbpsProcInstCmd cmd = null;
-               APIRequest request = new APIRequest();
-               request.addParameters("defId", varTzqxdsrwb.getLiuChengId());
-               request.addParameters("version", "0");
-               request.addParameters("data", varTzqxdsrwb.getChuShiShuJu());
-               cmd = pmInstProvider.getStartCmd(request);
-               cmd.setSubject(varTzqxdsrwb.getRenWuMingCheng());
-               cmd.setCurUser("jinyuan");
-               cmd.setCurUserName("张维敏");
-               IBpmProcInst inst = bpmProcInstService.startProcInst(cmd);
-               log.info(inst.toString());
-               cmd.setCurUserName("张维敏");
-           }
-       } catch (Exception e){
-           log.error("执行任务发生了错误："+e);
-       }
-    }
-
-}
+//package com.lc.ibps.task.services.impl;
+//
+//import com.lc.ibps.bpmn.api.model.inst.IBpmProcInst;
+//import com.lc.ibps.bpmn.api.service.BpmProcInstService;
+//import com.lc.ibps.bpmn.cmd.IbpsProcInstCmd;
+//import com.lc.ibps.bpmn.provider.BpmInstProvider;
+//import com.lc.ibps.cloud.entity.APIRequest;
+//import com.lc.ibps.cloud.entity.APIResult;
+//import com.lc.ibps.task.dao.TzqxdsrwbMapper;
+//import com.lc.ibps.task.entity.Tzqxdsrwb;
+//import com.lc.ibps.task.services.CycleTaskService;
+//import com.lc.ibps.untils.DateUntil;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//import javax.annotation.Resource;
+//import java.util.List;
+//
+//import static jodd.util.ThreadUtil.sleep;
+//
+//@Service
+//@Slf4j
+//public class CycleTaskServiceImpl implements CycleTaskService {
+//    @Resource
+//    private BpmProcInstService bpmProcInstService;
+//
+//    @Autowired
+//    private TzqxdsrwbMapper tzqxdsrwbMapper;
+//
+//    @Autowired
+//    private BpmInstProvider pmInstProvider;
+//    //  起动周期性任务流程
+//    @Override
+//    public void testTask(String id){
+//        Tzqxdsrwb tzqxdsrwb= tzqxdsrwbMapper.selectByPrimaryKey(id);
+//        startProcessTask(tzqxdsrwb);
+//    }
+//
+//    //  起动周期性任务流程
+//    @Override
+//    public void startProcess(String startSign) {
+//       List<Tzqxdsrwb> dataList= tzqxdsrwbMapper.getTzqxdsrwb(startSign);
+//       if(dataList!=null&&dataList.size()>0){
+//           for(Tzqxdsrwb tzqxdsrwbTemp:dataList){
+//               startProcessTask(tzqxdsrwbTemp);
+//           }
+//       }
+//    }
+//    //  日期定时任务
+//    @Override
+//    public void timingTaskProcess() {
+//        String dateSign=DateUntil.getFormatNow();
+//        List<Tzqxdsrwb> dataList= tzqxdsrwbMapper.getTimingTaskTzqxdsrwb(dateSign);
+//        if(dataList!=null&&dataList.size()>0){
+//            for(Tzqxdsrwb tzqxdsrwbTemp:dataList){
+//                startProcessTask(tzqxdsrwbTemp);
+//                updateTimingTask(tzqxdsrwbTemp);
+//            }
+//        }
+//    }
+//
+//    //   日期定时任务业务处理
+//    private void updateTimingTask(Tzqxdsrwb varTzqxdsrwb){
+//        if(varTzqxdsrwb==null||varTzqxdsrwb.getId().equals("")){
+//            return;
+//        }
+//        tzqxdsrwbMapper.updateTimingTaskSign(varTzqxdsrwb.getId());
+//    }
+//
+//    //   开始任务
+//    @Override
+//    public void startProcessTask(Tzqxdsrwb varTzqxdsrwb){
+//       try {
+//           //  线程等 10000
+//           Thread.sleep(20000);
+//           if (varTzqxdsrwb != null) {
+//               IbpsProcInstCmd cmd = null;
+//               APIRequest request = new APIRequest();
+//               request.addParameters("defId", varTzqxdsrwb.getLiuChengId());
+//               request.addParameters("version", "0");
+//               request.addParameters("data", varTzqxdsrwb.getChuShiShuJu());
+//               cmd = pmInstProvider.getStartCmd(request);
+//               cmd.setSubject(varTzqxdsrwb.getRenWuMingCheng());
+//               cmd.setCurUser("jinyuan");
+//               cmd.setCurUserName("张维敏");
+//               IBpmProcInst inst = bpmProcInstService.startProcInst(cmd);
+//               log.info(inst.toString());
+//               cmd.setCurUserName("张维敏");
+//           }
+//       } catch (Exception e){
+//           log.error("执行任务发生了错误："+e);
+//       }
+//    }
+//
+//}

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/TzqxdsrwbMapper.xml

@@ -1,262 +1,262 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lc.ibps.task.dao.TzqxdsrwbMapper" >
-  <resultMap id="BaseResultMap" type="com.lc.ibps.task.entity.Tzqxdsrwb" >
-    <id column="id_" property="id" jdbcType="VARCHAR" />
-    <result column="tenant_id_" property="tenantId" jdbcType="VARCHAR" />
-    <result column="ip_" property="ip" jdbcType="VARCHAR" />
-    <result column="create_by_" property="createBy" jdbcType="VARCHAR" />
-    <result column="create_time_" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="update_by_" property="updateBy" jdbcType="VARCHAR" />
-    <result column="update_time_" property="updateTime" jdbcType="TIMESTAMP" />
-    <result column="shi_fou_guo_shen_" property="shiFouGuoShen" jdbcType="VARCHAR" />
-    <result column="bian_zhi_ren_" property="bianZhiRen" jdbcType="VARCHAR" />
-    <result column="bian_zhi_bu_men_" property="bianZhiBuMen" jdbcType="VARCHAR" />
-    <result column="bian_zhi_shi_jian" property="bianZhiShiJian" jdbcType="VARCHAR" />
-    <result column="ren_wu_ming_cheng" property="renWuMingCheng" jdbcType="VARCHAR" />
-    <result column="ren_wu_lei_bie_" property="renWuLeiBie" jdbcType="VARCHAR" />
-    <result column="ren_wu_zhuang_tai" property="renWuZhuangTai" jdbcType="VARCHAR" />
-    <result column="liu_cheng_id_" property="liuChengId" jdbcType="VARCHAR" />
-    <result column="liu_cheng_ming_ch" property="liuChengMingCh" jdbcType="VARCHAR" />
-    <result column="liu_cheng_ding_yi" property="liuChengDingYi" jdbcType="VARCHAR" />
-    <result column="chu_shi_shu_ju_" property="chuShiShuJu" jdbcType="VARCHAR" />
-    <result column="ren_wu_ri_qi_" property="renWuRiQi" jdbcType="VARCHAR" />
-    <result column="zhi_xing_" property="zhiXing" jdbcType="VARCHAR" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    id_, tenant_id_, ip_, create_by_, create_time_, update_by_, update_time_, shi_fou_guo_shen_, 
-    bian_zhi_ren_, bian_zhi_bu_men_, bian_zhi_shi_jian, ren_wu_ming_cheng, ren_wu_lei_bie_, 
-    ren_wu_zhuang_tai, liu_cheng_id_, liu_cheng_ming_ch, liu_cheng_ding_yi,chu_shi_shu_ju_,
-    ren_wu_ri_qi_,zhi_xing_
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
-    <include refid="Base_Column_List" />
-    from t_zqxdsrwb
-    where id_ = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from t_zqxdsrwb
-    where id_ = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >
-    insert into t_zqxdsrwb (id_, tenant_id_, ip_, 
-      create_by_, create_time_, update_by_, 
-      update_time_, shi_fou_guo_shen_, bian_zhi_ren_, 
-      bian_zhi_bu_men_, bian_zhi_shi_jian, ren_wu_ming_cheng, 
-      ren_wu_lei_bie_, ren_wu_zhuang_tai, liu_cheng_id_, 
-      liu_cheng_ming_ch, liu_cheng_ding_yi)
-    values (#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, 
-      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, 
-      #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{renWuMingCheng,jdbcType=VARCHAR}, 
-      #{renWuLeiBie,jdbcType=VARCHAR}, #{renWuZhuangTai,jdbcType=VARCHAR}, #{liuChengId,jdbcType=VARCHAR}, 
-      #{liuChengMingCh,jdbcType=VARCHAR}, #{liuChengDingYi,jdbcType=VARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >
-    insert into t_zqxdsrwb
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id_,
-      </if>
-      <if test="tenantId != null" >
-        tenant_id_,
-      </if>
-      <if test="ip != null" >
-        ip_,
-      </if>
-      <if test="createBy != null" >
-        create_by_,
-      </if>
-      <if test="createTime != null" >
-        create_time_,
-      </if>
-      <if test="updateBy != null" >
-        update_by_,
-      </if>
-      <if test="updateTime != null" >
-        update_time_,
-      </if>
-      <if test="shiFouGuoShen != null" >
-        shi_fou_guo_shen_,
-      </if>
-      <if test="bianZhiRen != null" >
-        bian_zhi_ren_,
-      </if>
-      <if test="bianZhiBuMen != null" >
-        bian_zhi_bu_men_,
-      </if>
-      <if test="bianZhiShiJian != null" >
-        bian_zhi_shi_jian,
-      </if>
-      <if test="renWuMingCheng != null" >
-        ren_wu_ming_cheng,
-      </if>
-      <if test="renWuLeiBie != null" >
-        ren_wu_lei_bie_,
-      </if>
-      <if test="renWuZhuangTai != null" >
-        ren_wu_zhuang_tai,
-      </if>
-      <if test="liuChengId != null" >
-        liu_cheng_id_,
-      </if>
-      <if test="liuChengMingCh != null" >
-        liu_cheng_ming_ch,
-      </if>
-      <if test="liuChengDingYi != null" >
-        liu_cheng_ding_yi,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null" >
-        #{tenantId,jdbcType=VARCHAR},
-      </if>
-      <if test="ip != null" >
-        #{ip,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null" >
-        #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null" >
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null" >
-        #{updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null" >
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="shiFouGuoShen != null" >
-        #{shiFouGuoShen,jdbcType=VARCHAR},
-      </if>
-      <if test="bianZhiRen != null" >
-        #{bianZhiRen,jdbcType=VARCHAR},
-      </if>
-      <if test="bianZhiBuMen != null" >
-        #{bianZhiBuMen,jdbcType=VARCHAR},
-      </if>
-      <if test="bianZhiShiJian != null" >
-        #{bianZhiShiJian,jdbcType=VARCHAR},
-      </if>
-      <if test="renWuMingCheng != null" >
-        #{renWuMingCheng,jdbcType=VARCHAR},
-      </if>
-      <if test="renWuLeiBie != null" >
-        #{renWuLeiBie,jdbcType=VARCHAR},
-      </if>
-      <if test="renWuZhuangTai != null" >
-        #{renWuZhuangTai,jdbcType=VARCHAR},
-      </if>
-      <if test="liuChengId != null" >
-        #{liuChengId,jdbcType=VARCHAR},
-      </if>
-      <if test="liuChengMingCh != null" >
-        #{liuChengMingCh,jdbcType=VARCHAR},
-      </if>
-      <if test="liuChengDingYi != null" >
-        #{liuChengDingYi,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >
-    update t_zqxdsrwb
-    <set >
-      <if test="tenantId != null" >
-        tenant_id_ = #{tenantId,jdbcType=VARCHAR},
-      </if>
-      <if test="ip != null" >
-        ip_ = #{ip,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null" >
-        create_by_ = #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null" >
-        create_time_ = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null" >
-        update_by_ = #{updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null" >
-        update_time_ = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="shiFouGuoShen != null" >
-        shi_fou_guo_shen_ = #{shiFouGuoShen,jdbcType=VARCHAR},
-      </if>
-      <if test="bianZhiRen != null" >
-        bian_zhi_ren_ = #{bianZhiRen,jdbcType=VARCHAR},
-      </if>
-      <if test="bianZhiBuMen != null" >
-        bian_zhi_bu_men_ = #{bianZhiBuMen,jdbcType=VARCHAR},
-      </if>
-      <if test="bianZhiShiJian != null" >
-        bian_zhi_shi_jian = #{bianZhiShiJian,jdbcType=VARCHAR},
-      </if>
-      <if test="renWuMingCheng != null" >
-        ren_wu_ming_cheng = #{renWuMingCheng,jdbcType=VARCHAR},
-      </if>
-      <if test="renWuLeiBie != null" >
-        ren_wu_lei_bie_ = #{renWuLeiBie,jdbcType=VARCHAR},
-      </if>
-      <if test="renWuZhuangTai != null" >
-        ren_wu_zhuang_tai = #{renWuZhuangTai,jdbcType=VARCHAR},
-      </if>
-      <if test="liuChengId != null" >
-        liu_cheng_id_ = #{liuChengId,jdbcType=VARCHAR},
-      </if>
-      <if test="liuChengMingCh != null" >
-        liu_cheng_ming_ch = #{liuChengMingCh,jdbcType=VARCHAR},
-      </if>
-      <if test="liuChengDingYi != null" >
-        liu_cheng_ding_yi = #{liuChengDingYi,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id_ = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >
-    update t_zqxdsrwb
-    set tenant_id_ = #{tenantId,jdbcType=VARCHAR},
-      ip_ = #{ip,jdbcType=VARCHAR},
-      create_by_ = #{createBy,jdbcType=VARCHAR},
-      create_time_ = #{createTime,jdbcType=TIMESTAMP},
-      update_by_ = #{updateBy,jdbcType=VARCHAR},
-      update_time_ = #{updateTime,jdbcType=TIMESTAMP},
-      shi_fou_guo_shen_ = #{shiFouGuoShen,jdbcType=VARCHAR},
-      bian_zhi_ren_ = #{bianZhiRen,jdbcType=VARCHAR},
-      bian_zhi_bu_men_ = #{bianZhiBuMen,jdbcType=VARCHAR},
-      bian_zhi_shi_jian = #{bianZhiShiJian,jdbcType=VARCHAR},
-      ren_wu_ming_cheng = #{renWuMingCheng,jdbcType=VARCHAR},
-      ren_wu_lei_bie_ = #{renWuLeiBie,jdbcType=VARCHAR},
-      ren_wu_zhuang_tai = #{renWuZhuangTai,jdbcType=VARCHAR},
-      liu_cheng_id_ = #{liuChengId,jdbcType=VARCHAR},
-      liu_cheng_ming_ch = #{liuChengMingCh,jdbcType=VARCHAR},
-      liu_cheng_ding_yi = #{liuChengDingYi,jdbcType=VARCHAR}
-    where id_ = #{id,jdbcType=VARCHAR}
-  </update>
+<!--  <resultMap id="BaseResultMap" type="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
+<!--    <id column="id_" property="id" jdbcType="VARCHAR" />-->
+<!--    <result column="tenant_id_" property="tenantId" jdbcType="VARCHAR" />-->
+<!--    <result column="ip_" property="ip" jdbcType="VARCHAR" />-->
+<!--    <result column="create_by_" property="createBy" jdbcType="VARCHAR" />-->
+<!--    <result column="create_time_" property="createTime" jdbcType="TIMESTAMP" />-->
+<!--    <result column="update_by_" property="updateBy" jdbcType="VARCHAR" />-->
+<!--    <result column="update_time_" property="updateTime" jdbcType="TIMESTAMP" />-->
+<!--    <result column="shi_fou_guo_shen_" property="shiFouGuoShen" jdbcType="VARCHAR" />-->
+<!--    <result column="bian_zhi_ren_" property="bianZhiRen" jdbcType="VARCHAR" />-->
+<!--    <result column="bian_zhi_bu_men_" property="bianZhiBuMen" jdbcType="VARCHAR" />-->
+<!--    <result column="bian_zhi_shi_jian" property="bianZhiShiJian" jdbcType="VARCHAR" />-->
+<!--    <result column="ren_wu_ming_cheng" property="renWuMingCheng" jdbcType="VARCHAR" />-->
+<!--    <result column="ren_wu_lei_bie_" property="renWuLeiBie" jdbcType="VARCHAR" />-->
+<!--    <result column="ren_wu_zhuang_tai" property="renWuZhuangTai" jdbcType="VARCHAR" />-->
+<!--    <result column="liu_cheng_id_" property="liuChengId" jdbcType="VARCHAR" />-->
+<!--    <result column="liu_cheng_ming_ch" property="liuChengMingCh" jdbcType="VARCHAR" />-->
+<!--    <result column="liu_cheng_ding_yi" property="liuChengDingYi" jdbcType="VARCHAR" />-->
+<!--    <result column="chu_shi_shu_ju_" property="chuShiShuJu" jdbcType="VARCHAR" />-->
+<!--    <result column="ren_wu_ri_qi_" property="renWuRiQi" jdbcType="VARCHAR" />-->
+<!--    <result column="zhi_xing_" property="zhiXing" jdbcType="VARCHAR" />-->
+<!--  </resultMap>-->
+<!--  <sql id="Base_Column_List" >-->
+<!--    id_, tenant_id_, ip_, create_by_, create_time_, update_by_, update_time_, shi_fou_guo_shen_, -->
+<!--    bian_zhi_ren_, bian_zhi_bu_men_, bian_zhi_shi_jian, ren_wu_ming_cheng, ren_wu_lei_bie_, -->
+<!--    ren_wu_zhuang_tai, liu_cheng_id_, liu_cheng_ming_ch, liu_cheng_ding_yi,chu_shi_shu_ju_,-->
+<!--    ren_wu_ri_qi_,zhi_xing_-->
+<!--  </sql>-->
+<!--  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >-->
+<!--    select -->
+<!--    <include refid="Base_Column_List" />-->
+<!--    from t_zqxdsrwb-->
+<!--    where id_ = #{id,jdbcType=VARCHAR}-->
+<!--  </select>-->
+<!--  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >-->
+<!--    delete from t_zqxdsrwb-->
+<!--    where id_ = #{id,jdbcType=VARCHAR}-->
+<!--  </delete>-->
+<!--  <insert id="insert" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
+<!--    insert into t_zqxdsrwb (id_, tenant_id_, ip_, -->
+<!--      create_by_, create_time_, update_by_, -->
+<!--      update_time_, shi_fou_guo_shen_, bian_zhi_ren_, -->
+<!--      bian_zhi_bu_men_, bian_zhi_shi_jian, ren_wu_ming_cheng, -->
+<!--      ren_wu_lei_bie_, ren_wu_zhuang_tai, liu_cheng_id_, -->
+<!--      liu_cheng_ming_ch, liu_cheng_ding_yi)-->
+<!--    values (#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, -->
+<!--      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, -->
+<!--      #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, -->
+<!--      #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{renWuMingCheng,jdbcType=VARCHAR}, -->
+<!--      #{renWuLeiBie,jdbcType=VARCHAR}, #{renWuZhuangTai,jdbcType=VARCHAR}, #{liuChengId,jdbcType=VARCHAR}, -->
+<!--      #{liuChengMingCh,jdbcType=VARCHAR}, #{liuChengDingYi,jdbcType=VARCHAR})-->
+<!--  </insert>-->
+<!--  <insert id="insertSelective" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
+<!--    insert into t_zqxdsrwb-->
+<!--    <trim prefix="(" suffix=")" suffixOverrides="," >-->
+<!--      <if test="id != null" >-->
+<!--        id_,-->
+<!--      </if>-->
+<!--      <if test="tenantId != null" >-->
+<!--        tenant_id_,-->
+<!--      </if>-->
+<!--      <if test="ip != null" >-->
+<!--        ip_,-->
+<!--      </if>-->
+<!--      <if test="createBy != null" >-->
+<!--        create_by_,-->
+<!--      </if>-->
+<!--      <if test="createTime != null" >-->
+<!--        create_time_,-->
+<!--      </if>-->
+<!--      <if test="updateBy != null" >-->
+<!--        update_by_,-->
+<!--      </if>-->
+<!--      <if test="updateTime != null" >-->
+<!--        update_time_,-->
+<!--      </if>-->
+<!--      <if test="shiFouGuoShen != null" >-->
+<!--        shi_fou_guo_shen_,-->
+<!--      </if>-->
+<!--      <if test="bianZhiRen != null" >-->
+<!--        bian_zhi_ren_,-->
+<!--      </if>-->
+<!--      <if test="bianZhiBuMen != null" >-->
+<!--        bian_zhi_bu_men_,-->
+<!--      </if>-->
+<!--      <if test="bianZhiShiJian != null" >-->
+<!--        bian_zhi_shi_jian,-->
+<!--      </if>-->
+<!--      <if test="renWuMingCheng != null" >-->
+<!--        ren_wu_ming_cheng,-->
+<!--      </if>-->
+<!--      <if test="renWuLeiBie != null" >-->
+<!--        ren_wu_lei_bie_,-->
+<!--      </if>-->
+<!--      <if test="renWuZhuangTai != null" >-->
+<!--        ren_wu_zhuang_tai,-->
+<!--      </if>-->
+<!--      <if test="liuChengId != null" >-->
+<!--        liu_cheng_id_,-->
+<!--      </if>-->
+<!--      <if test="liuChengMingCh != null" >-->
+<!--        liu_cheng_ming_ch,-->
+<!--      </if>-->
+<!--      <if test="liuChengDingYi != null" >-->
+<!--        liu_cheng_ding_yi,-->
+<!--      </if>-->
+<!--    </trim>-->
+<!--    <trim prefix="values (" suffix=")" suffixOverrides="," >-->
+<!--      <if test="id != null" >-->
+<!--        #{id,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="tenantId != null" >-->
+<!--        #{tenantId,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="ip != null" >-->
+<!--        #{ip,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="createBy != null" >-->
+<!--        #{createBy,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="createTime != null" >-->
+<!--        #{createTime,jdbcType=TIMESTAMP},-->
+<!--      </if>-->
+<!--      <if test="updateBy != null" >-->
+<!--        #{updateBy,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="updateTime != null" >-->
+<!--        #{updateTime,jdbcType=TIMESTAMP},-->
+<!--      </if>-->
+<!--      <if test="shiFouGuoShen != null" >-->
+<!--        #{shiFouGuoShen,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="bianZhiRen != null" >-->
+<!--        #{bianZhiRen,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="bianZhiBuMen != null" >-->
+<!--        #{bianZhiBuMen,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="bianZhiShiJian != null" >-->
+<!--        #{bianZhiShiJian,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="renWuMingCheng != null" >-->
+<!--        #{renWuMingCheng,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="renWuLeiBie != null" >-->
+<!--        #{renWuLeiBie,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="renWuZhuangTai != null" >-->
+<!--        #{renWuZhuangTai,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="liuChengId != null" >-->
+<!--        #{liuChengId,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="liuChengMingCh != null" >-->
+<!--        #{liuChengMingCh,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="liuChengDingYi != null" >-->
+<!--        #{liuChengDingYi,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--    </trim>-->
+<!--  </insert>-->
+<!--  <update id="updateByPrimaryKeySelective" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
+<!--    update t_zqxdsrwb-->
+<!--    <set >-->
+<!--      <if test="tenantId != null" >-->
+<!--        tenant_id_ = #{tenantId,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="ip != null" >-->
+<!--        ip_ = #{ip,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="createBy != null" >-->
+<!--        create_by_ = #{createBy,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="createTime != null" >-->
+<!--        create_time_ = #{createTime,jdbcType=TIMESTAMP},-->
+<!--      </if>-->
+<!--      <if test="updateBy != null" >-->
+<!--        update_by_ = #{updateBy,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="updateTime != null" >-->
+<!--        update_time_ = #{updateTime,jdbcType=TIMESTAMP},-->
+<!--      </if>-->
+<!--      <if test="shiFouGuoShen != null" >-->
+<!--        shi_fou_guo_shen_ = #{shiFouGuoShen,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="bianZhiRen != null" >-->
+<!--        bian_zhi_ren_ = #{bianZhiRen,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="bianZhiBuMen != null" >-->
+<!--        bian_zhi_bu_men_ = #{bianZhiBuMen,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="bianZhiShiJian != null" >-->
+<!--        bian_zhi_shi_jian = #{bianZhiShiJian,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="renWuMingCheng != null" >-->
+<!--        ren_wu_ming_cheng = #{renWuMingCheng,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="renWuLeiBie != null" >-->
+<!--        ren_wu_lei_bie_ = #{renWuLeiBie,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="renWuZhuangTai != null" >-->
+<!--        ren_wu_zhuang_tai = #{renWuZhuangTai,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="liuChengId != null" >-->
+<!--        liu_cheng_id_ = #{liuChengId,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="liuChengMingCh != null" >-->
+<!--        liu_cheng_ming_ch = #{liuChengMingCh,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--      <if test="liuChengDingYi != null" >-->
+<!--        liu_cheng_ding_yi = #{liuChengDingYi,jdbcType=VARCHAR},-->
+<!--      </if>-->
+<!--    </set>-->
+<!--    where id_ = #{id,jdbcType=VARCHAR}-->
+<!--  </update>-->
+<!--  <update id="updateByPrimaryKey" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
+<!--    update t_zqxdsrwb-->
+<!--    set tenant_id_ = #{tenantId,jdbcType=VARCHAR},-->
+<!--      ip_ = #{ip,jdbcType=VARCHAR},-->
+<!--      create_by_ = #{createBy,jdbcType=VARCHAR},-->
+<!--      create_time_ = #{createTime,jdbcType=TIMESTAMP},-->
+<!--      update_by_ = #{updateBy,jdbcType=VARCHAR},-->
+<!--      update_time_ = #{updateTime,jdbcType=TIMESTAMP},-->
+<!--      shi_fou_guo_shen_ = #{shiFouGuoShen,jdbcType=VARCHAR},-->
+<!--      bian_zhi_ren_ = #{bianZhiRen,jdbcType=VARCHAR},-->
+<!--      bian_zhi_bu_men_ = #{bianZhiBuMen,jdbcType=VARCHAR},-->
+<!--      bian_zhi_shi_jian = #{bianZhiShiJian,jdbcType=VARCHAR},-->
+<!--      ren_wu_ming_cheng = #{renWuMingCheng,jdbcType=VARCHAR},-->
+<!--      ren_wu_lei_bie_ = #{renWuLeiBie,jdbcType=VARCHAR},-->
+<!--      ren_wu_zhuang_tai = #{renWuZhuangTai,jdbcType=VARCHAR},-->
+<!--      liu_cheng_id_ = #{liuChengId,jdbcType=VARCHAR},-->
+<!--      liu_cheng_ming_ch = #{liuChengMingCh,jdbcType=VARCHAR},-->
+<!--      liu_cheng_ding_yi = #{liuChengDingYi,jdbcType=VARCHAR}-->
+<!--    where id_ = #{id,jdbcType=VARCHAR}-->
+<!--  </update>-->
 
 
-  <select id="getTzqxdsrwb" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select
-    <include refid="Base_Column_List" />
-    from t_zqxdsrwb
-    where ren_wu_zhuang_tai <![CDATA[ = ]]> 1 and ren_wu_lei_bie_ = #{startSign,jdbcType=VARCHAR}
+<!--  <select id="getTzqxdsrwb" resultMap="BaseResultMap" parameterType="java.lang.String" >-->
+<!--    select-->
+<!--    <include refid="Base_Column_List" />-->
+<!--    from t_zqxdsrwb-->
+<!--    where ren_wu_zhuang_tai <![CDATA[ = ]]> 1 and ren_wu_lei_bie_ = #{startSign,jdbcType=VARCHAR}-->
 
-  </select>
+<!--  </select>-->
 
-  <select id="getTimingTaskTzqxdsrwb" resultMap="BaseResultMap"  >
-    select
-    <include refid="Base_Column_List" />
-    from t_zqxdsrwb
-    where ren_wu_zhuang_tai <![CDATA[ = ]]> 1 and ren_wu_lei_bie_ <![CDATA[ = ]]> '日期定时' and zhi_xing_ <![CDATA[ <> ]]> '已执行'
-          and ren_wu_ri_qi_ <![CDATA[ = ]]> #{dateSign}
-  </select>
+<!--  <select id="getTimingTaskTzqxdsrwb" resultMap="BaseResultMap"  >-->
+<!--    select-->
+<!--    <include refid="Base_Column_List" />-->
+<!--    from t_zqxdsrwb-->
+<!--    where ren_wu_zhuang_tai <![CDATA[ = ]]> 1 and ren_wu_lei_bie_ <![CDATA[ = ]]> '日期定时' and zhi_xing_ <![CDATA[ <> ]]> '已执行'-->
+<!--          and ren_wu_ri_qi_ <![CDATA[ = ]]> #{dateSign}-->
+<!--  </select>-->
 
- <update id="updateTimingTaskSign" >
-    update t_zqxdsrwb set zhi_xing_='已执行' where  id_=#{id}
- </update>
+<!-- <update id="updateTimingTaskSign" >-->
+<!--    update t_zqxdsrwb set zhi_xing_='已执行' where  id_=#{id}-->
+<!-- </update>-->
 
 
 </mapper>

ibps-provider-root/modules/provider-business/src/main/resources/conf/dataSource-dev.xml

@@ -7,9 +7,9 @@
     <!-- dev下使用该链接 -->
  	<dbType>mysql</dbType>
   	<driver>com.mysql.jdbc.Driver</driver>
-    <driverUrl>jdbc:mysql://172.16.40.184:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
+    <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
     <user>root</user>
-    <password>Lh789456123</password>
+    <password>!$%^QWER</password>
 
     <!-- 本机VM 192.168.22.3 -->
 <!--    <driverUrl>jdbc:mysql://192.168.22.3:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->

ibps-provider-root/modules/provider-business/src/main/resources/conf/dataSource-platform-dev.xml

@@ -7,9 +7,9 @@
     <!-- dev下使用该链接 -->
  	<dbType>mysql</dbType>
   	<driver>com.mysql.jdbc.Driver</driver>
-    <driverUrl>jdbc:mysql://172.16.40.184:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
+    <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
     <user>root</user>
-    <password>Lh789456123</password>
+    <password>!$%^QWER</password>
 
     <!-- 本机VM 192.168.22.3 -->
 <!--    <driverUrl>jdbc:mysql://192.168.22.3:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->

ibps-provider-root/modules/provider-platform/src/main/resources/conf/dataSource-dev.xml

@@ -7,9 +7,9 @@
     <!-- dev下使用该链接 -->
  	<dbType>mysql</dbType>
   	<driver>com.mysql.jdbc.Driver</driver>
-    <driverUrl>jdbc:mysql://172.16.40.184:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
+    <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
     <user>root</user>
-    <password>Lh789456123</password>
+    <password>!$%^QWER</password>
 
     <!-- 吴懿 -->
 <!--    <driverUrl>jdbc:mysql://192.168.2.134:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->

ibps-provider-root/modules/provider-platform/src/main/resources/conf/dataSource-platform-dev.xml

@@ -5,9 +5,9 @@
     <alias>dataSource_default</alias>
     <dbType>mysql</dbType>
     <driver>com.mysql.jdbc.Driver</driver>
-    <driverUrl>jdbc:mysql://172.16.40.184:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
+    <driverUrl>jdbc:mysql://119.23.210.103:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>
     <user>root</user>
-    <password>Lh789456123</password>
+    <password>!$%^QWER</password>
 
     <!-- 吴懿 -->
 <!--    <driverUrl>jdbc:mysql://192.168.2.134:3306/klims-ibps3?useUnicode=true&amp;characterEncoding=utf-8</driverUrl>-->