Commit c64b2198 authored by suichenguang's avatar suichenguang

测试接口更新

parent 14ace7f2
...@@ -70,7 +70,7 @@ public class ReadXmlApi { ...@@ -70,7 +70,7 @@ public class ReadXmlApi {
//将当前上下文初始化给 CommonsMutipartResolver (多部分解析器) //将当前上下文初始化给 CommonsMutipartResolver (多部分解析器)
CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver( CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
requ.getSession().getServletContext()); requ.getSession().getServletContext());
// 判断是否是多数据段提交格式 // 判断是否是多数据段提交格式
if (multipartResolver.isMultipart(requ)) { if (multipartResolver.isMultipart(requ)) {
MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ; MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;
Iterator<String> iter = multiRequest.getFileNames(); Iterator<String> iter = multiRequest.getFileNames();
...@@ -79,7 +79,7 @@ public class ReadXmlApi { ...@@ -79,7 +79,7 @@ public class ReadXmlApi {
try { try {
// 如果fileitem中封装的是普通输入项的数据 // 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件 // 如果fileitem中封装的是上传文件
// 得到上传的文件名称 // 得到上传的文件名称
filename = item.getName(); filename = item.getName();
if (filename == null || filename.trim().equals("")) { if (filename == null || filename.trim().equals("")) {
continue; continue;
......
...@@ -88,7 +88,6 @@ public class PackageInformationApi { ...@@ -88,7 +88,6 @@ public class PackageInformationApi {
jsonStr7.put("cardType ","普通证"); jsonStr7.put("cardType ","普通证");
list.add(jsonStr7); list.add(jsonStr7);
map.put("commonCardCount",2300); map.put("commonCardCount",2300);
map.put("postCardCount",1200); map.put("postCardCount",1200);
map.put("forbiddenCount",2); map.put("forbiddenCount",2);
......
...@@ -117,8 +117,6 @@ public class SelectExcelApi { ...@@ -117,8 +117,6 @@ public class SelectExcelApi {
countyList.add(jsonStr10); countyList.add(jsonStr10);
countyList.add(jsonStr11); countyList.add(jsonStr11);
return countyList.toString(); return countyList.toString();
} }
......
...@@ -18,7 +18,7 @@ public class SortingGroupListApi { ...@@ -18,7 +18,7 @@ public class SortingGroupListApi {
* @return * @return
*/ */
@RequestMapping("sortingGroupList") @RequestMapping("sortingGroupList")
public String sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){ public List<JSONObject> sortingGroupList(@Param("readXMLDate")String readXMLDate,@Param("state")String state){
List<JSONObject> countyList = new ArrayList<>(); List<JSONObject> countyList = new ArrayList<>();
JSONObject jsonStr1 = new JSONObject(); JSONObject jsonStr1 = new JSONObject();
...@@ -69,7 +69,7 @@ public class SortingGroupListApi { ...@@ -69,7 +69,7 @@ public class SortingGroupListApi {
jsonStr6.put("postCardCount",13000); jsonStr6.put("postCardCount",13000);
countyList.add(jsonStr6); countyList.add(jsonStr6);
return countyList.toString(); return countyList;
} }
} }
...@@ -4,7 +4,6 @@ import net.sf.json.JSONObject; ...@@ -4,7 +4,6 @@ import net.sf.json.JSONObject;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -19,9 +18,9 @@ public class TaskListFakeApi { ...@@ -19,9 +18,9 @@ public class TaskListFakeApi {
* @return * @return
*/ */
@RequestMapping("selectByDate") @RequestMapping("selectByDate")
public String selectByDate(@Param("date") String date){ public List<Map> selectByDate(@Param("date") String date){
List<String> result = new ArrayList<>(); List<Map> result = new ArrayList<>();
Map<String,Object> map1 = new HashMap<>(); Map<String,Object> map1 = new HashMap<>();
Map<String,Object> map2 = new HashMap<>(); Map<String,Object> map2 = new HashMap<>();
...@@ -91,11 +90,11 @@ public class TaskListFakeApi { ...@@ -91,11 +90,11 @@ public class TaskListFakeApi {
map2.put("list",list2); map2.put("list",list2);
result.add(map1.toString()); result.add(map1);
result.add(map2.toString()); result.add(map2);
return result.toString(); return result;
} }
} }
package com.yxproject.start.entity;
import javax.persistence.Entity;
public class CountDataEntity {
private String uploadDate;
private Integer packageCount;
private Integer cardCount;
private Integer commonCardCount;
private Integer postCardCount;
public String getUploadDate() {
return uploadDate;
}
public void setUploadDate(String uploadDate) {
this.uploadDate = uploadDate;
}
public Integer getPackageCount() {
return packageCount;
}
public void setPackageCount(Integer packageCount) {
this.packageCount = packageCount;
}
public Integer getCardCount() {
return cardCount;
}
public void setCardCount(Integer cardCount) {
this.cardCount = cardCount;
}
public Integer getCommonCardCount() {
return commonCardCount;
}
public void setCommonCardCount(Integer commonCardCount) {
this.commonCardCount = commonCardCount;
}
public Integer getPostCardCount() {
return postCardCount;
}
public void setPostCardCount(Integer postCardCount) {
this.postCardCount = postCardCount;
}
}
package com.yxproject.start.mapper;
public interface Analysis {
}
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import com.yxproject.start.entity.CountDataEntity;
import com.yxproject.start.entity.FilesEntity; import com.yxproject.start.entity.FilesEntity;
import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper @Mapper
public interface FilesMapper { public interface FilesMapper {
...@@ -10,4 +14,9 @@ public interface FilesMapper { ...@@ -10,4 +14,9 @@ public interface FilesMapper {
@Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREAT_TIME,SOURCE_FILE_NAME)" + @Insert("INSERT INTO FILES (VERSION_CODE,DWDM,DWMC,RECORD_NUMBER,CREAT_TIME,SOURCE_FILE_NAME)" +
"VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{creatTime},#{sourceFileName})") "VALUES(#{versionCode},#{dwdm},#{dwmc},#{recordNumber},#{creatTime},#{sourceFileName})")
public boolean insertFiles(FilesEntity filesEntity); public boolean insertFiles(FilesEntity filesEntity);
@Select("")
public List<CountDataEntity> selectFilesCount();
} }
package com.yxproject.start.mapper; package com.yxproject.start.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;
@Mapper
public interface GroupNoMapper { public interface GroupNoMapper {
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment