Antiloveg 8 years ago
parent
commit
a4b6a209af

+ 2 - 0
schema/2017-06-14.sql

@@ -0,0 +1,2 @@
+alter table `admin`
+modify column `name` varchar(16) null comment '用户名';

+ 18 - 2
schema/permission.sql

@@ -453,7 +453,7 @@ insert into `permission`(`id`, `url`, `name`)
 values
 (UUID(), 'api/admin/audit/techBroders', '技术经纪人下拉'),
 (UUID(), 'api/admin/audit/demand', '科技需求管理--审核科技需求(审核员)'),
-(UUID(), 'api/admin/audit/demand', '科技成果管理--审核科技成果(审核员)');
+(UUID(), 'api/admin/audit/achievement', '科技成果管理--审核科技成果(审核员)');
 
 insert into `permission`(`id`, `url`, `name`) 
 values
@@ -483,5 +483,21 @@ values
 (UUID(), 'api/admin/achievement/uploadPicture', '科技成果管理--图片上传'),
 (UUID(), 'api/admin/achievement/delete', '科技成果管理--删除');
 
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/supervise/findUser', '审核员、客户经理、营销经理检索全部客户名称'),
+(UUID(), 'api/admin/supervise/adminOwnLocation', '管理员获取自己所在地区(地区管理员)'), 
+(UUID(), 'api/admin/supervise/adminDetailLocation', '管理员详情获取地区'), 
+(UUID(), 'api/admin/supervise/adminSelectList', '管理员下拉列表(地区管理员)');
 
-
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/portal/order/updateAchievementOrder', '科技成果管理--科技成果线索单/意向单修改'),
+(UUID(), 'api/admin/portal/order/achievementOrderLog', '科技成果管理--科技成果线索单/意向单Log'),
+(UUID(), 'api/admin/portal/order/userAchievementOrderList', '科技成果管理--科技成果线索单/意向单列表(个人用户)'),
+(UUID(), 'api/admin/portal/order/orgAchievementOrderList', '科技成果管理--科技成果线索单/意向单列表(组织用户)'),
+(UUID(), 'api/admin/portal/order/userDemandOrderList', '科技需求管理--科技需求线索单/意向单列表(个人用户)'),
+(UUID(), 'api/admin/portal/order/orgDemandOrderList', '科技需求管理--科技需求线索单/意向单列表(组织用户)'),
+(UUID(), 'api/admin/portal/order/demandOrderLog', '科技需求管理--科技需求线索单/意向单log'),
+(UUID(), 'api/admin/portal/order/updateDemandOrder', '科技需求管理--科技需求线索单/意向单修改'),
+(UUID(), 'api/admin/portal/order/downloadDemandOrder', '科技需求管理--下载科技需求线索单/意向单文件');

+ 0 - 1
src/main/java/com/goafanti/admin/controller/AdminAuditApiController.java

@@ -125,7 +125,6 @@ public class AdminAuditApiController extends CertifyApiController {
 				}
 			}
 		}
-
 		return res;
 	}
 }

+ 0 - 12
src/main/java/com/goafanti/admin/controller/AdminOrderApiController.java

@@ -1,6 +1,5 @@
 package com.goafanti.admin.controller;
 
-import java.util.Map.Entry;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.alibaba.fastjson.JSONObject;
 import com.goafanti.achievement.bo.InputAchievementOrder;
 import com.goafanti.achievement.service.AchievementOrderLogService;
 import com.goafanti.achievement.service.AchievementOrderService;
@@ -259,14 +257,4 @@ public class AdminOrderApiController extends CertifyApiController {
 		downloadUnPrivateFile(response, order.getEnclosureDownloadFileName(), order.getEnclosureUrl());
 		return res;
 	}
-
-	public static void main(String[] args) {
-		String jsonStr = "{\"id\":\"id\",\"JACKIE_ZHANG\":\"张学友\",\"ANDY_LAU\":\"刘德华\"}";
-		JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-		for (Entry<String, Object> entry : jsonObject.entrySet()) {
-			System.out.print(entry.getKey() + "-" + entry.getValue() + "\t");
-		}
-		System.out.println();
-	}
-
 }

+ 3 - 2
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -167,6 +167,7 @@ public class PublicController extends BaseController {
 			DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", "Sms", "sms.aliyuncs.com");
 		} catch (ClientException e1) {
 			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "获取手机验证码异常"));
+			return res;
 		}
 		IAcsClient client = new DefaultAcsClient(profile);
 		SingleSendSmsRequest request = new SingleSendSmsRequest();
@@ -177,13 +178,13 @@ public class PublicController extends BaseController {
 			request.setRecNum(mobile);
 			SingleSendSmsResponse httpResponse = client.getAcsResponse(request);
 		} catch (ServerException e) {
-			// e.printStackTrace();
 			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "获取手机验证码异常"));
 			LoggerUtils.fmtError(getClass(), e, "服务器端手机验证码异常:%s", e.getMessage());
+			return res;
 		} catch (ClientException e) {
-			// e.printStackTrace();
 			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "获取手机验证码异常"));
 			LoggerUtils.fmtError(getClass(), e, "客户端手机验证码异常:%s", e.getMessage());
+			return res;
 		}
 		return res;
 	}

+ 40 - 2
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -9,10 +9,20 @@ import javax.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.exceptions.ClientException;
+import com.aliyuncs.exceptions.ServerException;
+import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import com.aliyuncs.sms.model.v20160927.SingleSendSmsRequest;
+import com.aliyuncs.sms.model.v20160927.SingleSendSmsResponse;
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.patent.bo.PatentExpireBO;
@@ -22,6 +32,12 @@ import com.goafanti.patent.service.PatentInfoService;
 public class PatentTask {
 	@Resource
 	private PatentInfoService	patentInfoService;
+	
+	@Value(value = "${accessKey}")
+	private String					accessKey			= null;
+
+	@Value(value = "${accessSecret}")
+	private String					accessSecret		= null;
 
 	private static final String	LEAP_DAY		= "02-29";
 
@@ -37,11 +53,12 @@ public class PatentTask {
 		List<PatentExpireBO> peb = patentInfoService.selectExpireRecord();
 		if (null != peb && peb.size() > 0) {
 			for (PatentExpireBO p : peb) {
-				if (StringUtils.isNotBlank(p.getMobile()) && StringUtils.isNumeric(p.getMobile())
+				String mobile = p.getMobile();
+				if (StringUtils.isNotBlank(mobile) && StringUtils.isNumeric(mobile)
 						&& null != p.getPatentApplicationDate()) {
 					try {
 						if (disposeExprire(p)) {
-							// TODO 发送短信
+							sendMessage(mobile);
 						}
 					} catch (ParseException e) {
 					}
@@ -78,5 +95,26 @@ public class PatentTask {
 		return DateUtils.parseDate((Integer.parseInt(DateFormatUtils.format(s, AFTConstants.YYYY)) + 5) + "-"
 				+ DateFormatUtils.format(s, AFTConstants.MMDD), AFTConstants.YYYYMMDD);
 	}
+	
+	private void sendMessage(String mobile){
+		IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKey, accessSecret);
+		try {
+			DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", "Sms", "sms.aliyuncs.com");
+		} catch (ClientException e1) {
+		}
+		IAcsClient client = new DefaultAcsClient(profile);
+		SingleSendSmsRequest request = new SingleSendSmsRequest();
+		try {
+			request.setSignName("阿凡提信息科技");// {\"code\":\""+mobileVerifyCode+"\"}
+			request.setTemplateCode("SMS_37845022");
+			//request.setParamString("{\"code\":\"" + mobileVerifyCode + "\",\"product\":\"阿凡提信息科技\"}");
+			request.setRecNum(mobile);
+			SingleSendSmsResponse httpResponse = client.getAcsResponse(request);
+		} catch (ServerException e) {
+			LoggerUtils.fmtError(getClass(), e, "服务器端手机短信异常:%s", e.getMessage());
+		} catch (ClientException e) {
+			LoggerUtils.fmtError(getClass(), e, "客户端手机短信异常:%s", e.getMessage());
+		}
+	}
 
 }