|
|
@@ -14,6 +14,9 @@ import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
+import com.goafanti.common.model.JtNews;
|
|
|
+import com.goafanti.news.bo.InputJtNews;
|
|
|
+import com.goafanti.news.service.EventPlanningService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
@@ -83,7 +86,7 @@ public class PublicController extends BaseController {
|
|
|
|
|
|
@Resource
|
|
|
private FieldGlossoryService fieldGlossoryService;
|
|
|
-
|
|
|
+
|
|
|
@Resource
|
|
|
private CommentService commentService;
|
|
|
|
|
|
@@ -92,35 +95,35 @@ public class PublicController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private DistrictGlossoryService districtGlossoryService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private UserIdentityService userIdentityService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private AchievementService achievementService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private DemandService demandService;
|
|
|
-
|
|
|
+
|
|
|
@Autowired
|
|
|
private JtBusinessService jtBusinessService;
|
|
|
-
|
|
|
+
|
|
|
@Value(value = "${patentTemplate}")
|
|
|
private String patentTemplate = null;
|
|
|
|
|
|
@Resource(name = "passwordUtil")
|
|
|
private PasswordUtil passwordUtil;
|
|
|
-
|
|
|
+
|
|
|
@Resource
|
|
|
private VoucherDetailService voucherDetailService;
|
|
|
@Resource
|
|
|
private VoucherService voucherService;
|
|
|
@Resource
|
|
|
- private JDBCIdGenerator jDBCIdGenerator;
|
|
|
+ private EventPlanningService eventPlanningService;
|
|
|
|
|
|
/**
|
|
|
* 获取验证码
|
|
|
- *
|
|
|
+ *
|
|
|
* @param response
|
|
|
*/
|
|
|
@RequestMapping(value = "/getVCode", method = RequestMethod.GET)
|
|
|
@@ -145,11 +148,10 @@ public class PublicController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 手机验证码
|
|
|
- *
|
|
|
+ *
|
|
|
* @param mobile
|
|
|
* @param sign
|
|
|
* 是否用与找回密码
|
|
|
- * @param type
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/getMCode", method = RequestMethod.GET)
|
|
|
@@ -189,7 +191,7 @@ public class PublicController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param mobile
|
|
|
* @param res
|
|
|
* @return
|
|
|
@@ -213,7 +215,7 @@ public class PublicController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 下载图片
|
|
|
- *
|
|
|
+ *
|
|
|
* @param response
|
|
|
* @param path
|
|
|
* @param request
|
|
|
@@ -268,7 +270,7 @@ public class PublicController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 删除图片文件(public图片)
|
|
|
- *
|
|
|
+ *
|
|
|
* @param path
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -300,12 +302,10 @@ public class PublicController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 下载文件
|
|
|
- *
|
|
|
- * @param res
|
|
|
+ *
|
|
|
* @param fileName
|
|
|
* @param response
|
|
|
* @param path
|
|
|
- * @param request
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
|
|
|
@@ -386,7 +386,7 @@ public class PublicController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param mobileCode
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -422,7 +422,7 @@ public class PublicController extends BaseController {
|
|
|
|
|
|
/**
|
|
|
* 重置密码
|
|
|
- *
|
|
|
+ *
|
|
|
* @param resetCode
|
|
|
* @param mobile
|
|
|
* @param type
|
|
|
@@ -474,7 +474,7 @@ public class PublicController extends BaseController {
|
|
|
VerifyCodeUtils.clearResetCodeTime();
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
public Result resetPassword(String mobile,Integer type,String newPwd,String resetCode) {
|
|
|
@@ -493,7 +493,7 @@ public class PublicController extends BaseController {
|
|
|
cleanCodeSession();
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (StringUtils.isBlank(newPwd)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "新密码"));
|
|
|
return res;
|
|
|
@@ -512,11 +512,11 @@ public class PublicController extends BaseController {
|
|
|
user.setPassword(passwordUtil.getEncryptPwd(user));
|
|
|
userService.updateByPrimaryKeySelective(user);
|
|
|
return res;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param mobileCode
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -565,7 +565,7 @@ public class PublicController extends BaseController {
|
|
|
VerifyCodeUtils.clearMobileCode();
|
|
|
VerifyCodeUtils.clearMobileCodeTime();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/getRegisterMCode", method = RequestMethod.GET )
|
|
|
@ResponseBody
|
|
|
public Result getRegisterMCode(String mobile){
|
|
|
@@ -582,7 +582,7 @@ public class PublicController extends BaseController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value = "/getResetMCode", method = RequestMethod.GET )
|
|
|
@ResponseBody
|
|
|
public Result getResetMCode(String mobile) {
|
|
|
@@ -603,7 +603,7 @@ public class PublicController extends BaseController {
|
|
|
}
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/** 省市区查询 **/
|
|
|
@RequestMapping(value = "/listAllProvince" , method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
|
@@ -612,33 +612,33 @@ public class PublicController extends BaseController {
|
|
|
res.setData(districtGlossoryService.getProvince());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value="/industryList", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public Result getIndustryList() {
|
|
|
Result result=new Result();
|
|
|
result.setData(userIdentityService.selectIndustryReletively());
|
|
|
return result;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value="/achievementList", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public Result getAchievements(AchievementObject achievementObject,Integer pageNo,Integer pageSize) {
|
|
|
Result result=new Result();
|
|
|
result.setData(achievementService.getAchievementObjects(achievementObject, pageNo, pageSize));
|
|
|
- return result;
|
|
|
+ return result;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@RequestMapping(value="/demandList", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public Result getDemands(DemandListBo demandListBo,Integer pageNo,Integer pageSize) {
|
|
|
- Result result=new Result();
|
|
|
+ Result result=new Result();
|
|
|
result.setData(demandService.getDemandObjects(demandListBo, pageNo, pageSize));
|
|
|
return result;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
@RequestMapping(value = "/comment/list", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
public Result listComment(String commodityId,Integer pageNo,Integer pageSize) {
|
|
|
@@ -653,7 +653,7 @@ public class PublicController extends BaseController {
|
|
|
commentResult.setComments(commentService.searchComment(commodityId, pageNo, pageSize));
|
|
|
result.setData(commentResult);
|
|
|
return result;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -706,7 +706,7 @@ public class PublicController extends BaseController {
|
|
|
VerifyCodeUtils.clearResetCodeTime();
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增评价
|
|
|
*/
|
|
|
@@ -727,7 +727,7 @@ public class PublicController extends BaseController {
|
|
|
if(null == commentInput.getCommodityType() || commentInput.getCommodityType()<0 || commentInput.getCommodityType() > 5) {
|
|
|
result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","产品类型"));return result;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
int res=commentService.addNewComment(commentInput,ip);
|
|
|
if(res ==-1) {
|
|
|
result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","提交失败"));return result;
|
|
|
@@ -735,9 +735,9 @@ public class PublicController extends BaseController {
|
|
|
result.setData(res);
|
|
|
return result;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param commodityId
|
|
|
* @param pageNo
|
|
|
* @param pageSize
|
|
|
@@ -757,7 +757,7 @@ public class PublicController extends BaseController {
|
|
|
commentResult.setComments(commentService.searchUnlandedCommentList(commodityId, pageNo, pageSize));
|
|
|
result.setData(commentResult);
|
|
|
return result;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
/**
|
|
|
* 服务商项目列表
|
|
|
@@ -779,7 +779,7 @@ public class PublicController extends BaseController {
|
|
|
res.setData(pagination);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value = "/getUserVoucher", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@@ -794,7 +794,7 @@ public class PublicController extends BaseController {
|
|
|
if (s.equals(jt.getId())) {
|
|
|
jt.setIsGet(1);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
return res.data(p);
|
|
|
@@ -813,7 +813,7 @@ public class PublicController extends BaseController {
|
|
|
res.data(voucherDetailService.saveUserGetVoucher(uid,vid));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 服务商列表
|
|
|
* @param user
|
|
|
@@ -828,7 +828,7 @@ public class PublicController extends BaseController {
|
|
|
res.setData(userService.selectOrganizationList(user, pageNo, pageSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@RequestMapping(value="/invRegister",method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
|
@@ -886,5 +886,15 @@ public class PublicController extends BaseController {
|
|
|
map.put( "zffc",zfList);
|
|
|
return res.data(map);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+ @RequestMapping(value = "/getEventPlanningList",method = RequestMethod.GET)
|
|
|
+ @ResponseBody
|
|
|
+ public Result getEventPlanningList(InputJtNews inputJtNews){
|
|
|
+ Result res = new Result();
|
|
|
+ inputJtNews.setReleaseStatus(1);
|
|
|
+ res.setData(eventPlanningService.listnewsDetails(inputJtNews));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
}
|