Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw 8 years ago
parent
commit
5e69d0f76c
21 changed files with 132 additions and 68 deletions
  1. 9 12
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  2. 21 11
      src/main/java/com/goafanti/admin/controller/AdminTechProjectController.java
  3. 1 1
      src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java
  4. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java
  5. 1 1
      src/main/java/com/goafanti/cognizance/service/OrgTechCenterDetailService.java
  6. 0 2
      src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java
  7. 3 3
      src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java
  8. 1 1
      src/main/java/com/goafanti/cognizance/service/impl/OrgTechCenterDetailServiceImpl.java
  9. 1 0
      src/main/java/com/goafanti/common/controller/BaseController.java
  10. 4 4
      src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml
  11. 16 0
      src/main/java/com/goafanti/common/model/TechProject.java
  12. 4 1
      src/main/java/com/goafanti/common/model/TechWebsite.java
  13. 6 1
      src/main/java/com/goafanti/common/utils/FileUtils.java
  14. 8 11
      src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java
  15. 45 10
      src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java
  16. 2 1
      src/main/java/com/goafanti/techproject/service/TechWebsiteService.java
  17. 3 2
      src/main/java/com/goafanti/techproject/service/impl/TechWebsiteServiceImpl.java
  18. 2 2
      src/main/resources/props/config_dev.properties
  19. 2 2
      src/main/resources/props/config_local.properties
  20. 1 1
      src/main/resources/props/config_prod.properties
  21. 1 1
      src/main/resources/props/config_test.properties

+ 9 - 12
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -206,9 +206,8 @@ public class AdminApiController extends BaseApiController {
 		}
 		if (StringUtils.isBlank(userIdentity.getId())){
 			userIdentity.setId(UUID.randomUUID().toString());
-			userIdentity.setAuditStatus(0);
-			userIdentity.setProcess(0);
-			userIdentity.setWrongCount(0);
+			userIdentity.setAuditStatus(null == userIdentity.getAuditStatus() ? 0 : userIdentity.getAuditStatus());
+			userIdentity.setProcess(null == userIdentity.getProcess() ? 0 : userIdentity.getProcess());
 			res.setData(userIdentityService.insert(userIdentity));
 		} else {
 			res.setData(userIdentityService.updateUserDetail(userIdentity));
@@ -275,12 +274,11 @@ public class AdminApiController extends BaseApiController {
 		}
 		if (StringUtils.isBlank(orgIdentity.getId())){
 			orgIdentity.setId(UUID.randomUUID().toString());
-			orgIdentity.setIdentityType(0);
-			orgIdentity.setAuditStatus(0);
-			orgIdentity.setProcess(0);
-			orgIdentity.setWrongCount(0);
-			orgIdentity.setListed(0);
-			orgIdentity.setListedType(0);
+			orgIdentity.setIdentityType(null == orgIdentity.getIdentityType() ? 0 : orgIdentity.getIdentityType());
+			orgIdentity.setAuditStatus(null == orgIdentity.getAuditStatus() ? 0 : orgIdentity.getAuditStatus());
+			orgIdentity.setProcess(null == orgIdentity.getProcess() ? 0 : orgIdentity.getProcess());
+			orgIdentity.setListed(null == orgIdentity.getListed() ? 0 : orgIdentity.getListed());
+			orgIdentity.setListedType(null == orgIdentity.getListedType() ? 0 : orgIdentity.getListedType());
 			res.setData(organizationIdentityService.insert(orgIdentity));
 		} else {
 			res.setData(organizationIdentityService.updateOrgDetail(orgIdentity));
@@ -601,7 +599,6 @@ public class AdminApiController extends BaseApiController {
 			orgActivityCost.setStartDate(ac.getStartDate());
 			orgActivityCost.setEndDate(ac.getEndDate());
 			orgActivityCost.setId(UUID.randomUUID().toString());
-			orgActivityCost.setUid(TokenManager.getUserId());
 			orgActivityCost.setDeletedSign(0);
 			orgActivityCostService.insert(orgActivityCost);
 		} else {
@@ -1144,7 +1141,7 @@ public class AdminApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/cultivate", method = RequestMethod.POST)
-	public Result cultivationList(String province, String uid, String pageNo, String pageSize){
+	public Result cultivationList(String province, String unitName, String pageNo, String pageSize){
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -1154,7 +1151,7 @@ public class AdminApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgCognizanceService.listCultivation(province, uid, pNo, pSize));
+		res.setData(orgCognizanceService.listCultivation(province, unitName, pNo, pSize));
 		return res;
 	}
 

+ 21 - 11
src/main/java/com/goafanti/admin/controller/AdminTechProjectController.java

@@ -20,6 +20,7 @@ import com.goafanti.common.utils.AesUtils;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techproject.bo.TechWebsiteListBo;
 import com.goafanti.techproject.service.TechProjectLogService;
 import com.goafanti.techproject.service.TechProjectService;
 import com.goafanti.techproject.service.TechWebsiteService;
@@ -29,7 +30,7 @@ import com.goafanti.user.service.UserService;
 @RequestMapping(value = "/api/admintechproject")
 public class AdminTechProjectController extends BaseApiController{
 	@Value(value = "${aesSecretKey}")
-	private static String aesSecretKey = null;
+	private  String aesSecretKey = null;
 	@Resource
 	private TechProjectService techProjectService;
 	@Resource
@@ -133,15 +134,17 @@ public class AdminTechProjectController extends BaseApiController{
 			pNo = Integer.parseInt(pageNo);
 		}
 		
-		Pagination<TechWebsite> t = techWebsiteService.listTechWebsite(province, unitName, pNo, pSize);
-		List<TechWebsite> l =  (List<TechWebsite>) t.getList();
-		for (TechWebsite w : l){
-			if (!StringUtils.isBlank(w.getPassword())){
-				w.setPassword(AesUtils.AesDecrypt(w.getPassword(), aesSecretKey));
+		Pagination<TechWebsiteListBo> t = techWebsiteService.listTechWebsite(province, unitName, pNo, pSize);
+		if (null != t){
+			List<TechWebsiteListBo> l =  (List<TechWebsiteListBo>) t.getList();
+			for (TechWebsiteListBo w : l){
+				if (!StringUtils.isBlank(w.getPassword())){
+					w.setPassword(AesUtils.AesDecrypt(w.getPassword(), aesSecretKey));
+				}
 			}
+			t.setList(l);
+			res.setData(t);
 		}
-		t.setList(l);
-		res.setData(t);
 		return res;
 	}
 	
@@ -153,7 +156,11 @@ public class AdminTechProjectController extends BaseApiController{
 	@RequestMapping(value = "/techWebsiteDetail", method = RequestMethod.POST)
 	public Result techWebsiteDetail(String id){
 		Result res = new Result();
-		res.setData(techWebsiteService.selectByPrimaryKey(id));
+		TechWebsite w = techWebsiteService.selectByPrimaryKey(id);
+		if (null != w && !StringUtils.isBlank(w.getPassword())){
+			w.setPassword(AesUtils.AesDecrypt(w.getPassword(), aesSecretKey));
+		}
+		res.setData(w);
 		return res;
 	}
 	
@@ -163,9 +170,12 @@ public class AdminTechProjectController extends BaseApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/disposeTechWebsite", method = RequestMethod.POST)
-	public Result disposeTechWebsite(TechWebsite t){
+	public Result disposeTechWebsite(TechWebsite w){
 		Result res = new Result();
-		res.setData(techWebsiteService.saveWebsite(t));
+		if (null != w && null != w.getPassword()){
+			w.setPassword(AesUtils.AesEncrypt(w.getPassword(), aesSecretKey));
+		}
+		res.setData(techWebsiteService.saveWebsite(w));
 		return res;
 	}
 }

+ 1 - 1
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -847,7 +847,7 @@ public class CognizanceApiController extends BaseApiController {
 			if (StringUtils.isBlank(orgTechCenterDetail.getId())) {
 				orgTechCenterDetail.setId(UUID.randomUUID().toString());
 				orgTechCenterDetail.setDeletedSign(0);
-				orgTechCenterDetailService.inset(orgTechCenterDetail);
+				orgTechCenterDetailService.insert(orgTechCenterDetail);
 			} else {
 				orgTechCenterDetailService.updateByPrimaryKeySelective(orgTechCenterDetail);
 			}

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java

@@ -43,7 +43,7 @@ public interface OrgCognizanceService {
 
 	void insertCognizance(Integer contacts, String comment, Integer year, Integer state, String aid, String uid);
 
-	Pagination<CultivationListBo> listCultivation(String province, String uid, Integer pNo, Integer pSize);
+	Pagination<CultivationListBo> listCultivation(String province, String unitName, Integer pNo, Integer pSize);
 
 
 }

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgTechCenterDetailService.java

@@ -9,7 +9,7 @@ public interface OrgTechCenterDetailService {
 
 	Pagination<OrgTechCenterDetail> listOrgTechCenterDetail(Integer pNo, Integer pSize, String cid);
 
-	OrgTechCenterDetail inset(OrgTechCenterDetail orgTechCenterDetail);
+	OrgTechCenterDetail insert(OrgTechCenterDetail orgTechCenterDetail);
 
 	int updateByPrimaryKeySelective(OrgTechCenterDetail orgTechCenterDetail);
 

+ 0 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgActivityCostServiceImpl.java

@@ -34,7 +34,6 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 			params.put("activityNumber", activityNumber);
 		}
 		
-		
 		if (!StringUtils.isBlank(sDate)){
 			startDate = DateUtils.parseDate(sDate, "yyyy-MM-dd");
 			params.put("startDate", startDate);
@@ -49,7 +48,6 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 			params.put("uid", uid);
 		}
 		
-		
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}

+ 3 - 3
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -227,11 +227,11 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CultivationListBo> listCultivation(String province, String uid, Integer pageNo, Integer pageSize) {
+	public Pagination<CultivationListBo> listCultivation(String province, String unitName, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		
-		if (!StringUtils.isBlank(uid)){
-			params.put("uid", uid);
+		if (!StringUtils.isBlank(unitName)){
+			params.put("unitName", unitName);
 		}
 		
 		if (!StringUtils.isBlank(province)){

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgTechCenterDetailServiceImpl.java

@@ -41,7 +41,7 @@ public class OrgTechCenterDetailServiceImpl extends BaseMybatisDao<OrgTechCenter
 	}
 
 	@Override
-	public OrgTechCenterDetail inset(OrgTechCenterDetail orgTechCenterDetail) {
+	public OrgTechCenterDetail insert(OrgTechCenterDetail orgTechCenterDetail) {
 		orgTechCenterDetailMapper.insert(orgTechCenterDetail);
 		return null;
 	}

+ 1 - 0
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -42,6 +42,7 @@ public class BaseController {
 	@Value(value = "${upload.private.path}")
 	private String uploadPrivatePath = null;
 	
+	
 	@Value(value = "${accessKey}")
 	private String accessKey = null;
 	

+ 4 - 4
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -414,8 +414,8 @@
 	RIGHT JOIN user u  on u.id = i.uid 
 	LEFT JOIN admin a on a.id = i.consultant
 	where u.type = 1 and u.lvl = 1
-	<if test="uid != null">
-	    and u.id = #{uid,jdbcType=VARCHAR}
+	<if test="unitName != null">
+	    and i.unit_name = #{unitName,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
 	    and i.location_province = #{province,jdbcType=VARCHAR}
@@ -431,8 +431,8 @@
 	RIGHT JOIN user u  on u.id = i.uid 
 	LEFT JOIN admin a on a.id = i.consultant
 	where u.type = 1 and u.lvl = 1
-	<if test="uid != null">
-	    and u.id = #{uid,jdbcType=VARCHAR}
+	<if test="unitName != null">
+	    and i.unit_name = #{unitName,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
 	    and i.location_province = #{province,jdbcType=VARCHAR}

+ 16 - 0
src/main/java/com/goafanti/common/model/TechProject.java

@@ -3,7 +3,10 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.goafanti.common.utils.FileUtils;
 
 public class TechProject {
     private String id;
@@ -273,4 +276,17 @@ public class TechProject {
     public void setDeletedSign(Integer deletedSign) {
         this.deletedSign = deletedSign;
     }
+    
+    //科技项目资料
+    public String getApprovalDownloadFileName(){
+		if (StringUtils.isBlank(this.approvalUrl)){
+			return null;
+		} else {
+			return FileUtils.getDownloadFileName(this.approvalUrl);
+		}
+	}
+	
+	public void setApprovalDownloadFileName(String approvalDownloadFileName){
+		
+	}
 }

+ 4 - 1
src/main/java/com/goafanti/common/model/TechWebsite.java

@@ -2,6 +2,8 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 
 
 public class TechWebsite {
@@ -95,7 +97,8 @@ public class TechWebsite {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
+    
+    @JsonIgnore
     public Integer getDeletedSign() {
         return deletedSign;
     }

+ 6 - 1
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -88,7 +88,8 @@ public class FileUtils {
 		boolean uniq = false;
 		if (sign.indexOf("protocol") != -1 || sign.indexOf("achievement") != -1 || sign.indexOf("honor") != -1
 				|| sign.indexOf("proof") != -1 || sign.indexOf("activity_cost_account") != -1
-				|| sign.indexOf("tech_product") != -1 || sign.indexOf("property_ritht") != -1) {
+				|| sign.indexOf("tech_product") != -1 || sign.indexOf("property_ritht") != -1 
+				|| sign.indexOf("tech_project") != -1) {
 			uniq = true;
 		}
 		String fileName = "";
@@ -179,6 +180,10 @@ public class FileUtils {
 		if (path.indexOf("ratepay") != -1) {
 			prefix = subStr(path) + "纳税申报表";
 		}
+		
+		if (path.indexOf("tech_project") != -1){
+			prefix = "科技项目资料";
+		}
 
 		return prefix + suffix;
 	}

+ 8 - 11
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -25,6 +25,7 @@ import com.goafanti.common.model.PatentInfo;
 import com.goafanti.common.model.PatentLog;
 import com.goafanti.common.model.PatentRegistration;
 import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -116,16 +117,12 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		Date pEnd = null;
 
 		if (cDate != null && cDate.length > 0) {
-			cStart = DateUtils.parseDate(cDate[0], "yyyy-MM-dd");
-			if (cDate.length == 2) {
-				cEnd = DateUtils.addDays(DateUtils.parseDate(cDate[1], "yyyy-MM-dd"), 1);
-			}
+			cStart = StringUtils.isBlank(cDate[0]) ? null : DateUtils.parseDate(cDate[0], "yyyy-MM-dd");
+		    cEnd = StringUtils.isBlank(cDate[1]) ? null : DateUtils.addDays(DateUtils.parseDate(cDate[1], "yyyy-MM-dd"), 1);
 		}
 		if (pDate != null && pDate.length > 0) {
-			pStart = DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
-			if (pDate.length == 2) {
-				pEnd = DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
-			}
+			pStart = StringUtils.isBlank(pDate[0]) ? null : DateUtils.parseDate(pDate[0], "yyyy-MM-dd");
+			pEnd = StringUtils.isBlank(pDate[1]) ? null :  DateUtils.addDays(DateUtils.parseDate(pDate[1], "yyyy-MM-dd"), 1);
 		}
 
 		if (cStart != null) {
@@ -185,7 +182,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		}
 
 		if (pageSize == null || pageSize < 0) {
-			pageSize = 15;
+			pageSize = 10;
 		}
 		return (Pagination<PatentCompositeBo>) findPage("findManagePatentListByPage", "findManagePatentCount", params,
 				pageNo, pageSize);
@@ -206,7 +203,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		}
 
 		if (pageSize == null || pageSize < 0) {
-			pageSize = 15;
+			pageSize = 10;
 		}
 		return (Pagination<PatentPendingBo>) findPage("findManagePendingPaymentListByPage",
 				"findManagePendingPaymentCount", params, pageNo, pageSize);
@@ -264,7 +261,7 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 		}
 
 		if (pageSize == null || pageSize < 0) {
-			pageSize = 15;
+			pageSize = 10;
 		}
 		return (Pagination<PatentNoticeOfCorrectionBo>) findPage("findNoticeOfCorrectionListByPage",
 				"findNoticeOfCorrectionCount", params, pageNo, pageSize);

+ 45 - 10
src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java

@@ -2,20 +2,23 @@ package com.goafanti.techproject.controller;
 
 
 
+import java.io.IOException;
 import java.text.ParseException;
-import java.util.Date;
+import java.util.List;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.TechProject;
-import com.goafanti.common.model.TechProjectLog;
-import com.goafanti.common.utils.DateUtils;
+import com.goafanti.common.utils.FileUtils;
+import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.techproject.service.TechProjectLogService;
@@ -64,7 +67,6 @@ public class TechProjectApiController extends BaseApiController{
 		Result res = new Result();
 		techProjectService.saveTechProject(techProject, TokenManager.getUserId(), TokenManager.getToken().getAid());
 		return res;
-		
 	}
 	
 	/**
@@ -100,16 +102,49 @@ public class TechProjectApiController extends BaseApiController{
 	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/updateTechProject", method = RequestMethod.POST)
-	public Result updateTechProject(TechProject t, TechProjectLog l, String recordTimeFormattedDate) throws ParseException{
+	public Result updateTechProject(TechProject t) throws ParseException{
 		Result res = new Result();
-		Date recordTime =null;
-		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
-			recordTime = DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd");
-		}
-		res.setData(techProjectService.updateTechProject(t, l, recordTime));
+		res.setData(techProjectService.updateTechProject(t, null, null));
 		return res;
 	}
 	
+	/**
+	 * 科技项目申报材料上传
+	 * 
+	 * @param req
+	 * @param sign
+	 * @return
+	 */
+	@RequestMapping(value = "/upload", method = RequestMethod.POST)
+	public Result cognizanceFile(HttpServletRequest req, String uid) {
+		Result res = new Result();
+		String sign = "tech_project";
+		res.setData(handleFile(res, "/techProject/", true, req, sign, uid));
+		return res;
+	}
+	
+	private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req, String sign,
+			String uid) {
+		List<MultipartFile> files = getFiles(req);
+		MultipartFile mf = files.get(0);
+
+		String fileName = FileUtils.mosaicFileName(mf, isPrivate, sign, path,
+				StringUtils.isBlank(uid) ? TokenManager.getUserId() : uid);
+		if (!files.isEmpty()) {
+			try {
+				mf.transferTo(toPrivateFile(fileName));
+				LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
+			} catch (IllegalStateException | IOException e) {
+				LoggerUtils.error(getClass(), "文件上传失败", e);
+				res.getError().add(buildError("", "文件上传失败!"));
+				return "";
+			}
+		} else {
+			res.getError().add(buildError("", "文件上传失败!"));
+			return "";
+		}
+		return fileName;
+	}
 	
 	
 	

+ 2 - 1
src/main/java/com/goafanti/techproject/service/TechWebsiteService.java

@@ -4,12 +4,13 @@ import java.util.Map;
 
 import com.goafanti.common.model.TechWebsite;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techproject.bo.TechWebsiteListBo;
 
 public interface TechWebsiteService {
 
 	Map<String, String> getDepartment(String uid);
 
-	Pagination<TechWebsite> listTechWebsite(String province, String uid, Integer pNo, Integer pSize);
+	Pagination<TechWebsiteListBo> listTechWebsite(String province, String uid, Integer pNo, Integer pSize);
 
 	int saveWebsite(TechWebsite t);
 

+ 3 - 2
src/main/java/com/goafanti/techproject/service/impl/TechWebsiteServiceImpl.java

@@ -15,6 +15,7 @@ import com.goafanti.common.dao.TechWebsiteMapper;
 import com.goafanti.common.model.TechWebsite;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techproject.bo.TechWebsiteListBo;
 import com.goafanti.techproject.service.TechWebsiteService;
 
 @Service
@@ -36,7 +37,7 @@ public class TechWebsiteServiceImpl extends BaseMybatisDao<TechWebsiteMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TechWebsite> listTechWebsite(String province, String unitName, Integer pageNo, Integer pageSize) {
+	public Pagination<TechWebsiteListBo> listTechWebsite(String province, String unitName, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		if (!StringUtils.isBlank(province)) {
 			params.put("province", province);
@@ -52,7 +53,7 @@ public class TechWebsiteServiceImpl extends BaseMybatisDao<TechWebsiteMapper> im
 		if (pageSize == null || pageSize < 0) {
 			pageSize = 10;
 		}
-		return (Pagination<TechWebsite>) findPage("findTechWebsiteListByPage", "findTechWebsiteCount", params, pageNo,
+		return (Pagination<TechWebsiteListBo>) findPage("findTechWebsiteListByPage", "findTechWebsiteCount", params, pageNo,
 				pageSize);
 	}
 

+ 2 - 2
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.9
+static.host=//afts.hnzhiming.com/1.0.10
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload
@@ -61,4 +61,4 @@ accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
 
 avatar.host=//afts.hnzhiming.com
 
-aesSecretKey = aft666
+aesSecretKey=aft666

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.9
+static.host=//afts.hnzhiming.com/1.0.10
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc
@@ -63,4 +63,4 @@ accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
 
 avatar.host=//afts.hnzhiming.com
 
-aesSecretKey = aft666
+aesSecretKey=aft666

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.9
+static.host=//afts.hnzhiming.com/1.0.10

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.9
+static.host=//aftts.hnzhiming.com/1.0.10
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload