Browse Source

Merge branch 'test02' into test

# Conflicts:
#	src/main/java/com/goafanti/common/controller/PublicController.java
#	src/main/resources/props/config_local.properties
#	src/main/resources/props/config_test.properties
anderx 2 years ago
parent
commit
dd97d8c928

+ 27 - 0
src/main/java/com/goafanti/common/bo/InputPoverty.java

@@ -0,0 +1,27 @@
+package com.goafanti.common.bo;
+
+import com.goafanti.common.utils.excel.Excel;
+
+public class InputPoverty {
+
+    @Excel(name = "姓名")
+    private String name;
+    @Excel(name = "身份证号码")
+    private String idCard;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+}

+ 147 - 0
src/main/java/com/goafanti/common/bo/OutPoverty.java

@@ -0,0 +1,147 @@
+package com.goafanti.common.bo;
+
+import com.goafanti.common.utils.excel.Excel;
+
+public class OutPoverty {
+    //序号 市 县 乡镇 村 人口数  姓名 与户主关系  脱贫年度
+    @Excel(name = "序号")
+    private String id;
+    @Excel(name = "名称")
+    private String name;
+    @Excel(name = "市")
+    private String city;
+    @Excel(name = "县")
+    private String county;
+    @Excel(name = "乡镇")
+    private String township;
+    @Excel(name = "村")
+    private String village;
+    @Excel(name = "人口数")
+    private String peopleSum;
+    @Excel(name = "与户主关系")
+    private String relationship;
+    @Excel(name = "脱贫年度")
+    private String povertyYear;
+    @Excel(name = "户类型")
+    private String householdType;
+    @Excel(name = "监测对象类别")
+    private String monitoringObjectType;
+    @Excel(name = "风险是否已消除")
+    private String riskStatus;
+    @Excel(name = "识别监测时间")
+    private String identifyMonitoringTime;
+    @Excel(name = "消除监测时间")
+    private String eliminateMonitoringTime;
+
+    public String getHouseholdType() {
+        return householdType;
+    }
+
+    public void setHouseholdType(String householdType) {
+        this.householdType = householdType;
+    }
+
+    public String getMonitoringObjectType() {
+        return monitoringObjectType;
+    }
+
+    public void setMonitoringObjectType(String monitoringObjectType) {
+        this.monitoringObjectType = monitoringObjectType;
+    }
+
+    public String getRiskStatus() {
+        return riskStatus;
+    }
+
+    public void setRiskStatus(String riskStatus) {
+        this.riskStatus = riskStatus;
+    }
+
+    public String getIdentifyMonitoringTime() {
+        return identifyMonitoringTime;
+    }
+
+    public void setIdentifyMonitoringTime(String identifyMonitoringTime) {
+        this.identifyMonitoringTime = identifyMonitoringTime;
+    }
+
+    public String getEliminateMonitoringTime() {
+        return eliminateMonitoringTime;
+    }
+
+    public void setEliminateMonitoringTime(String eliminateMonitoringTime) {
+        this.eliminateMonitoringTime = eliminateMonitoringTime;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getCounty() {
+        return county;
+    }
+
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    public String getTownship() {
+        return township;
+    }
+
+    public void setTownship(String township) {
+        this.township = township;
+    }
+
+    public String getVillage() {
+        return village;
+    }
+
+    public void setVillage(String village) {
+        this.village = village;
+    }
+
+    public String getPeopleSum() {
+        return peopleSum;
+    }
+
+    public void setPeopleSum(String peopleSum) {
+        this.peopleSum = peopleSum;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRelationship() {
+        return relationship;
+    }
+
+    public void setRelationship(String relationship) {
+        this.relationship = relationship;
+    }
+
+    public String getPovertyYear() {
+        return povertyYear;
+    }
+
+    public void setPovertyYear(String povertyYear) {
+        this.povertyYear = povertyYear;
+    }
+}

+ 28 - 0
src/main/java/com/goafanti/common/bo/OutPovertyFlag.java

@@ -0,0 +1,28 @@
+package com.goafanti.common.bo;
+
+import com.goafanti.common.utils.excel.Excel;
+
+public class OutPovertyFlag {
+
+    @Excel(name = "名称")
+    private String name;
+    @Excel(name = "查询结果")
+    private String povertyStatus;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPovertyStatus() {
+        return povertyStatus;
+    }
+
+    public void setPovertyStatus(String povertyStatus) {
+        this.povertyStatus = povertyStatus;
+    }
+}

+ 161 - 7
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -3,18 +3,17 @@ package com.goafanti.common.controller;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.AttachmentService;
 import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.OutUser;
-import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.dao.TOrderMidMapper;
 import com.goafanti.common.enums.UserType;
 import com.goafanti.common.model.User;
 import com.goafanti.common.service.DistrictGlossoryService;
 import com.goafanti.common.service.IndustryCategoryService;
+import com.goafanti.common.service.PovertyService;
 import com.goafanti.common.utils.*;
 import com.goafanti.common.utils.excel.FileUtils;
 import com.goafanti.common.utils.excel.NewExcelUtil;
+import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.websocket.SystemWebSocketHandler;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
@@ -95,6 +94,9 @@ public class PublicController extends CertifyApiController {
 	@Value(value = "${patentTemplate}")
 	private String					patentTemplate		= null;
 
+	@Autowired
+	private JDBCIdGenerator jdbcIdGenerator;
+
 	@Resource(name = "passwordUtil")
 	private PasswordUtil			passwordUtil;
 
@@ -774,15 +776,167 @@ public class PublicController extends CertifyApiController {
 		return res;
 	}
 
+	/**
+	 * 查询贫困信息
+	 * @return
+	 */
+	@RequestMapping("/selectPoverty")
+	public Result selectPoverty(@RequestParam(value = "file", required = false) MultipartFile file) {
+		Result res=new Result();
+		//判断文件是否存在
+		if(null == file){
+			res.getError().add(buildError("文件不存在!","文件不存在!"));
+			return res;
+		}
+		String fileName = file.getOriginalFilename();
+		if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+			res.getError().add(buildError("格式不正确","格式不正确"));
+			return res;
+		}
+		String id = jdbcIdGenerator.generateId().toString();
+		res.data(povertyService.selectPoverty(file,id));
+		return res;
+	}
+
+
+	/**
+	 * 查询贫困信息
+	 * @param id 贫困信息编号
+	 * @param type 0=所有 ,1=只看有效数据
+	 * @return
+	 */
+	@RequestMapping("/selectPovertyById/export")
+	public Result selectPovertyByIdExport(String id,Integer type) {
+		Map<String,Object> o = povertyService.selectPoverty(null, id);
+		if (type==null)type=0;
+		List<OutPoverty> resList=new ArrayList<>();
+		if (type==1){
+			List<OutPoverty> list = (List<OutPoverty>) o.get("list");
+			for (OutPoverty outPoverty : list) {
+				if (com.goafanti.common.utils.StringUtils.isNotEmpty(outPoverty.getId())){
+					resList.add(outPoverty);
+				}
+			}
+
+		}else {
+			resList = (List<OutPoverty>) o.get("list");
+		}
+		NewExcelUtil<OutPoverty> newExcelUtil=new NewExcelUtil<>(OutPoverty.class);
+		return newExcelUtil.exportExcel(resList,"广西贫困信息表",uploadPath);
+	}
+
+
+	@RequestMapping("/selectPovertyById")
+	public Result selectPovertyById(String id,Integer type) {
+		Result res=new Result();
+		Map<String,Object> o = povertyService.selectPoverty(null, id);
+		if (type==null)type=0;
+		if (type==1){
+			List<OutPoverty> list = (List<OutPoverty>) o.get("list");
+			List<OutPoverty> resList=new ArrayList<>();
+			for (OutPoverty outPoverty : list) {
+				if (com.goafanti.common.utils.StringUtils.isNotEmpty(outPoverty.getId())){
+					resList.add(outPoverty);
+				}
+			}
+			o.remove("list");
+			o.put("list",resList);
+		}
+		res.data(o);
+		return res;
+	}
+
+	/**
+	 * 	批量导入回款模版
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/downloadPovertyTemplate", method = RequestMethod.GET)
+	public void downloadTemplate(HttpServletResponse response) {
+		Result res = new Result();
+		StringBuffer url= new StringBuffer(uploadPath);
+		url=url.append("/tmp").append("/poverty_template.xls");
+		try {
+			response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+			FileUtils.setAttachmentResponseHeader(response, url.toString(),"poverty导入模版.xls");
+			FileUtils.writeBytes(url.toString(), response.getOutputStream());
+		}
+		catch (Exception e) {
+			LoggerUtils.error(PublicController.class,"下载文件失败", e);
+		}
+	}
 
 	/**
-	 * 旧数据处理
+	 * 查询贫困信息
 	 * @return
 	 */
-	@RequestMapping("/pushStatistics")
-	public Result pushStatistics() {
+	@RequestMapping("/selectFlag")
+	public Result selectFlag(@RequestParam(value = "file", required = false) MultipartFile file) {
 		Result res=new Result();
-		res.data(adminService.pushStatistics());
+		//判断文件是否存在
+		if(null == file){
+			res.getError().add(buildError("文件不存在!","文件不存在!"));
+			return res;
+		}
+		String fileName = file.getOriginalFilename();
+		if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+			res.getError().add(buildError("格式不正确","格式不正确"));
+			return res;
+		}
+		String id = jdbcIdGenerator.generateId().toString();
+		Map<String, Object> map = povertyService.selectFlag(file, id);
+		List<OutPovertyFlag> falseList = (List<OutPovertyFlag>) map.get("falseList");
+		List<OutPovertyFlag> list = (List<OutPovertyFlag>) map.get("trueList");
+		list.addAll(falseList);
+		map.put("list",list);
+		map.remove("falseList");
+		map.remove("trueList");
+		res.data(map);
 		return res;
 	}
+
+	/**
+	 * 查询贫困信息
+	 * @param id 贫困信息编号
+	 * @param type 0=所有 ,1=只看有效数据
+	 * @return
+	 */
+	@RequestMapping("/selectPovertyFlagById")
+	public Result selectPovertyFlagById(String id,Integer type) {
+		Result res =new Result();
+		Map<String,Object> map = povertyService.selectFlag(null, id);
+		if (type==null)type=0;
+		List<OutPovertyFlag> resList=new ArrayList<>();
+		if (type==1){
+			map.put("list",map.get("trueList"));
+		}else {
+			map.put("list",map.get("falseList"));
+		}
+		map.remove("trueList");
+		map.remove("falseList");
+		return res.data(map);
+	}
+	/**
+	 * 查询贫困信息
+	 * @param id 贫困信息编号
+	 * @param type 0=所有 ,1=只看有效数据
+	 * @return
+	 */
+	@RequestMapping("/selectPovertyFlagById/export")
+	public Result selectPovertyFlagByIdExport(String id,Integer type) {
+		Map<String,Object> map = povertyService.selectFlag(null, id);
+		if (type==null)type=0;
+		List<OutPovertyFlag> resList=new ArrayList<>();
+		if (type==1){
+			map.put("list",map.get("trueList"));
+
+		}else {
+			map.put("list",map.get("falseList"));
+		}
+		map.remove("trueList");
+		map.remove("falseList");
+		NewExcelUtil<OutPovertyFlag> newExcelUtil=new NewExcelUtil<>(OutPovertyFlag.class);
+		return newExcelUtil.exportExcel(resList,"全国贫困信息表",uploadPath);
+	}
+
 }

+ 16 - 12
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1,26 +1,24 @@
 package com.goafanti.common.controller;
 
-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.servlet.ModelAndView;
-
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.model.Banners;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.service.DemandService;
-import com.goafanti.user.service.OrganizationIdentityService;
-import com.goafanti.user.service.UserIdentityService;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
+import com.goafanti.user.service.OrganizationIdentityService;
+import com.goafanti.user.service.UserIdentityService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @Controller
 public class WebpageController extends BaseController {
@@ -504,5 +502,11 @@ public class WebpageController extends BaseController {
 		modelview.setViewName("/portal/index");
 		return modelview;
 	}
+	@RequestMapping(value = "/admin/povertyInquiry", method = RequestMethod.GET)
+	public ModelAndView povertyInquiry(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/admin/povertyInquiry");
+		return modelview;
+	}
+
 
 }

+ 162 - 0
src/main/java/com/goafanti/common/service/PovertyService.java

@@ -0,0 +1,162 @@
+package com.goafanti.common.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.goafanti.common.bo.InputPoverty;
+import com.goafanti.common.bo.OutPoverty;
+import com.goafanti.common.bo.OutPovertyFlag;
+import com.goafanti.common.utils.HttpUtils;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.common.utils.excel.NewExcelUtil;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class PovertyService {
+
+
+    private static final String   gx_url="http://fpb.gxxw.cn/index.php?m=check&c=index&a=list_jdlk&name=";
+    private static final String   gx_jiance_url="http://fpb.gxxw.cn/index.php?m=check&c=index&a=list_fpjc&name=";
+
+
+    @Cacheable(value = "selectPoverty#300", key = "'selectPoverty:key='+#id")
+    public Map<String,Object> selectPoverty(MultipartFile file,String id) {
+
+        NewExcelUtil<InputPoverty> newExcelUtil=new NewExcelUtil<>(InputPoverty.class);
+        List<InputPoverty> list = null;
+        try {
+            list = newExcelUtil.importExcel(file.getInputStream(),0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        List<OutPoverty> res=new ArrayList<>();
+        Integer totalcount =0;
+        Integer effectiveCount =0;
+        for (InputPoverty e : list) {
+            OutPoverty outPoverty = selectAggravationHttpPoverty(e);
+            if (outPoverty.getId()!=null){
+                effectiveCount++;
+            }
+            totalcount++;
+            res.add(outPoverty);
+        }
+        Map<String ,Object> map=new HashMap<>();
+        map.put("list",res);
+        map.put("totalcount",totalcount);
+        map.put("effectiveCount",effectiveCount);
+        map.put("id",id);
+        return map;
+    }
+    private OutPoverty selectAggravationHttpPoverty(InputPoverty in){
+        OutPoverty outPoverty = selectHttpPoverty(in, 0);
+        if (StringUtils.isBlank(outPoverty.getId()))outPoverty=selectHttpPoverty(in,1);
+        if (StringUtils.isBlank(outPoverty.getName()))outPoverty.setName(in.getName());
+        return outPoverty;
+    }
+
+    private OutPoverty selectHttpPoverty(InputPoverty in,Integer type) {
+        OutPoverty out=new OutPoverty();
+        try {
+
+            String name= StringUtils.deleteWhitespace(in.getName());
+            String idcard=in.getIdCard();
+            StringBuffer url=new StringBuffer();
+            if (type==0)url=url.append(gx_url);
+            else url=url.append(gx_jiance_url);
+            url=url.append(name).append("&idcard=").append(idcard);
+            Document document = Jsoup
+                    .connect(url.toString()).get();
+            Elements filequery_table = document.getElementsByClass("Filequery_table");
+            Elements tr = filequery_table.select("tr");
+            if (tr.size()>1){
+                Element element = tr.get(1);
+                Elements td = element.select("td");
+                if (type==0){
+                    out.setId(td.get(0).text());
+                    out.setCity(td.get(1).text());
+                    out.setCounty(td.get(2).text());
+                    out.setTownship(td.get(3).text());
+                    out.setVillage(td.get(4).text());
+                    out.setPeopleSum(td.get(5).text());
+                    out.setName(td.get(6).text());
+                    out.setRelationship(td.get(7).text());
+                    out.setPovertyYear(td.get(8).text());
+                }else {
+                    out.setId(td.get(0).text());
+                    out.setCity(td.get(1).text());
+                    out.setCounty(td.get(2).text());
+                    out.setTownship(td.get(3).text());
+                    out.setVillage(td.get(4).text());
+                    out.setName(td.get(5).text());
+                    out.setRelationship(td.get(6).text());
+                    out.setPeopleSum(td.get(7).text());
+                    out.setHouseholdType(td.get(8).text());
+                    out.setMonitoringObjectType(td.get(9).text());
+                    out.setRiskStatus(td.get(10).text());
+                    out.setIdentifyMonitoringTime(td.get(11).text());
+                    out.setEliminateMonitoringTime(td.get(12).text());
+                }
+
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return out;
+    }
+    private static final String flag_url="https://cpadis.cpad.gov.cn:1443/cpad_par/app/observeHouse/checkIdentity?loginToken=&userId=&version=";
+
+    @Cacheable(value = "selectPovertytFlag#300", key = "'selectPovertytFlag:key='+#id")
+    public Map<String, Object> selectFlag(MultipartFile file, String id) {
+        NewExcelUtil<InputPoverty> newExcelUtil=new NewExcelUtil<>(InputPoverty.class);
+        List<InputPoverty> list = null;
+        try {
+            list = newExcelUtil.importExcel(file.getInputStream(),0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        List<OutPovertyFlag> trueList=new ArrayList<>();
+        List<OutPovertyFlag> falseList=new ArrayList<>();
+        Map<String, Object> param=new HashMap<>();
+        Map<String, Object> res=new HashMap<>();
+        Integer totalcount =0;
+        Integer effectiveCount =0;
+        for (InputPoverty in : list) {
+            String name=StringUtils.deleteWhitespace(in.getName());
+            String idCode=StringUtils.deleteWhitespace(in.getIdCard());
+            param.put("name",name);
+            param.put("idCode",idCode);
+            JSONObject jsonObject = HttpUtils.httpPostBody(flag_url, param);
+            String data = jsonObject.getString("data");
+            OutPovertyFlag outPovertyFlag=new OutPovertyFlag();
+            outPovertyFlag.setName(name);
+            if (StringUtils.equals(data,"true")){
+                outPovertyFlag.setPovertyStatus("是");
+                trueList.add(outPovertyFlag);
+            effectiveCount++;
+            }else if (StringUtils.equals(data,"false")){
+                outPovertyFlag.setPovertyStatus("否");
+                falseList.add(outPovertyFlag);
+            }else {
+                outPovertyFlag.setPovertyStatus("查询错误");
+                falseList.add(outPovertyFlag);
+            }
+            totalcount++;
+        }
+        res.put("trueList",trueList);
+        res.put("falseList",falseList);
+        res.put("totalcount",totalcount);
+        res.put("effectiveCount",effectiveCount);
+        res.put("id",id);
+        return res;
+    }
+}

+ 37 - 15
src/main/java/com/goafanti/common/utils/HttpUtils.java

@@ -1,9 +1,7 @@
 package com.goafanti.common.utils;
 
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Map;
-
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.ParseException;
@@ -15,13 +13,15 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.Map;
+import java.util.Set;
 
 public class HttpUtils {
-	
-	
-	
+
+
+
 	 public static JSONObject httpGet(String url) {
 			JSONObject jsonResult = null;
 			try {
@@ -39,19 +39,33 @@ public class HttpUtils {
 			}
 			return jsonResult;
 		}
-	    
+
+
+	public static JSONObject httpPost(String url,Map<String, Object>map){
+		return httpPost(url,map,0);
+	}
+	public static JSONObject httpPostBody(String url,Map<String, Object>map){
+		return httpPost(url,map,1);
+	}
 		 /**
-		  *  
+		  *
 		  * @param url 地址
 		  * @param map 参数
+		  * @param type  0 json  1body
 		  * @return
 		  */
-		public static JSONObject httpPost(String url,Map<String, Object>map){
+		public static JSONObject httpPost(String url,Map<String, Object>map,Integer type) {
 			HttpClient httpClient = HttpClientBuilder.create().build();
 			HttpPost httpPost = new HttpPost(url);
-			httpPost.addHeader("Content-type", "application/json");
 			httpPost.setHeader("Accept", "application/json");
-			httpPost.setEntity(new StringEntity(JSON.toJSONString(map), Charset.forName("UTF-8")));
+			if (type==0){
+				httpPost.addHeader("Content-type", "application/json");
+				httpPost.setEntity(new StringEntity(JSON.toJSONString(map), Charset.forName("UTF-8")));
+			}else{
+				httpPost.addHeader("Content-type", "application/x-www-form-urlencoded");
+				httpPost.setEntity(new StringEntity(ParamMap(map), Charset.forName("UTF-8")));
+			}
+
 			HttpResponse response = null;
 			try {
 				response = httpClient.execute(httpPost);
@@ -77,7 +91,15 @@ public class HttpUtils {
 			return jsonObj;
 			}
 
+	private static String ParamMap(Map<String, Object> map) {
+		StringBuffer str =new StringBuffer();
+		Set<String> strings = map.keySet();
+		for (String string : strings) {
+			str=str.append(string).append("=").append(map.get(string)).append("&");
+		}
+		String substring = str.substring(0, str.length() - 1);
+		return substring;
+	}
 
-		
 
 }

+ 2 - 0
src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java

@@ -29,6 +29,8 @@ public class FastJsonRedisSerializer implements RedisSerializer<Object> {
 		pc.addAccept("com.goafanti.permission.bo.PermissionBo");
 		pc.addAccept("com.goafanti.expenseAccount.bo.OutExpenseAccountStatistics");
 		pc.addAccept("java.util.Map");
+		pc.addAccept("com.goafanti.common.bo.OutPoverty");
+		pc.addAccept("com.goafanti.common.bo.OutPovertyFlag");
 
 	}
 

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

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.82
+static.host=//static.jishutao.com/1.2.84
 rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

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

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.82
+static.host=//static.jishutao.com/1.2.84
 rd.static.host=//static.jishutao.com/RD/1.0.01
 avatar.upload.host=//static.jishutao.com/upload
 

+ 18 - 0
src/main/webapp/WEB-INF/views/admin/povertyInquiry.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>管理中心首页</title>
+	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
+	<link th:href="${staticHost+'/admin/povertyInquiry.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/dll/dll.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/povertyInquiry.js'}"></script>
+	</div>
+</body>
+</html>