Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 12005cfa authored by dahai's avatar dahai
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	src/main/java/com/yxproject/start/api/FailedCardApi.java
#	src/main/java/com/yxproject/start/api/TaskListApi.java
parents fac08ecb 5b5a3977
Hide whitespace changes
Inline Side-by-side
Showing with 2205 additions and 1091 deletions
src/main/java/com/yxproject/start/api/AdminApi.java
View file @ 12005cfa
...@@ -9,15 +9,15 @@ import com.yxproject.start.service.UserInfoService; ...@@ -9,15 +9,15 @@ import com.yxproject.start.service.UserInfoService;
import com.yxproject.start.utils.Md5Utils; import com.yxproject.start.utils.Md5Utils;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.shiro.authz.annotation.RequiresRoles; import org.apache.shiro.authz.annotation.RequiresRoles;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/** /**
...@@ -37,6 +37,7 @@ public class AdminApi { ...@@ -37,6 +37,7 @@ public class AdminApi {
@Autowired @Autowired
private SysRoleService sysRoleService; private SysRoleService sysRoleService;
Logger logger= Logger.getLogger(AdminApi.class);
@RequestMapping("test") @RequestMapping("test")
public String hello() { public String hello() {
...@@ -50,8 +51,15 @@ public class AdminApi { ...@@ -50,8 +51,15 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping("getUserList") @RequestMapping("getUserList")
public List<UserInfo> selectAllUser() { public List<UserInfo> selectAllUser(HttpServletRequest requ) {
List<UserInfo> list = userInfoService.getAllUserInfo(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<UserInfo> list = new ArrayList<UserInfo>();
try {
list = userInfoService.getAllUserInfo();
}catch (Exception e){
logger.error("Exception 获得用户列表异常", e);
}
return list; return list;
} }
...@@ -61,21 +69,30 @@ public class AdminApi { ...@@ -61,21 +69,30 @@ public class AdminApi {
* @return * @return
*/ */
@PostMapping("userAdd") @PostMapping("userAdd")
public Map<String, String> userInfoAdd(@RequestBody String json) { public Map<String, String> userInfoAdd(@RequestBody String json, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(json); String remoteAddr = requ.getRemoteAddr();
String salt = UUID.randomUUID().toString(); MDC.put("ip", remoteAddr);
UserInfo userInfo = new UserInfo(); JSONObject jsonObject = new JSONObject();
userInfo.setPassword(Md5Utils.entryptPassword(jsonObject.getString("password"), salt)); Map<String, String> map = null;
userInfo.setSalt(salt); try {
userInfo.setUsername(jsonObject.getString("username")); jsonObject = JSONObject.fromObject(json);
userInfo.setName(jsonObject.getString("name")); String salt = UUID.randomUUID().toString();
Map<String, String> map = new HashMap<>(); UserInfo userInfo = new UserInfo();
boolean flag = false; userInfo.setPassword(Md5Utils.entryptPassword(jsonObject.getString("password"), salt));
flag = userInfoService.addUser(userInfo, Integer.parseInt(jsonObject.getString("roleId"))); userInfo.setSalt(salt);
if (flag) { userInfo.setUsername(jsonObject.getString("username"));
map.put("resultMsg", "添加成功"); userInfo.setName(jsonObject.getString("name"));
} else { map = new HashMap<>();
map.put("resultMsg", "添加失败"); boolean flag = false;
flag = userInfoService.addUser(userInfo, Integer.parseInt(jsonObject.getString("roleId")));
if (flag) {
map.put("resultMsg", "添加成功");
} else {
map.put("resultMsg", "添加失败");
}
}catch (Exception e){
logger.error("添加用户参数：" + jsonObject);
logger.error("Exception 用户添加异常", e);
} }
return map; return map;
} }
...@@ -86,11 +103,19 @@ public class AdminApi { ...@@ -86,11 +103,19 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping(value = "getUserById", method = RequestMethod.GET) @RequestMapping(value = "getUserById", method = RequestMethod.GET)
public Map<String, Object> getUserById(@RequestParam("userId") String userId, HttpServletResponse response) { public Map<String, Object> getUserById(@RequestParam("userId") String userId, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = null;
UserInfo userInfo = userInfoService.getUserInfoByUserId(Integer.parseInt(userId)); try {
map.put("user", userInfo); map = new HashMap<>();
UserInfo userInfo = userInfoService.getUserInfoByUserId(Integer.parseInt(userId));
map.put("user", userInfo);
}catch (Exception e){
logger.error("用户ID：" + userId);
logger.error("Exception 通过id查询用户异常", e);
}
return map; return map;
} }
...@@ -102,19 +127,25 @@ public class AdminApi { ...@@ -102,19 +127,25 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping(value = "userDel", method = RequestMethod.GET) @RequestMapping(value = "userDel", method = RequestMethod.GET)
public Map<String, Object> userInfoDel(@RequestParam("userId") String userId, HttpServletResponse response) { public Map<String, Object> userInfoDel(@RequestParam("userId") String userId, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = null;
boolean flag = false; try {
flag = userInfoService.deleteUserInfo(Integer.parseInt(userId)); map = new HashMap<>();
if (flag) { boolean flag = false;
map.put("returnMsg", "删除成功"); flag = userInfoService.deleteUserInfo(Integer.parseInt(userId));
} else { if (flag) {
map.put("returnMsg", "删除失败"); map.put("returnMsg", "删除成功");
} else {
map.put("returnMsg", "删除失败");
}
}catch (Exception e){
logger.error("用户ID：" + userId);
logger.error("Exception 用户删除异常", e);
} }
return map; return map;
} }
/** /**
...@@ -123,32 +154,51 @@ public class AdminApi { ...@@ -123,32 +154,51 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping(value = "userBack", method = RequestMethod.GET) @RequestMapping(value = "userBack", method = RequestMethod.GET)
public Map<String, Object> userInfoBack(@RequestParam("userId") String userId, HttpServletResponse response) { public Map<String, Object> userInfoBack(@RequestParam("userId") String userId, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = null;
boolean flag = false; try {
flag = userInfoService.BackUserInfo(Integer.parseInt(userId)); map = new HashMap<>();
if (flag) { boolean flag = false;
map.put("returnMsg", "启用成功"); flag = userInfoService.BackUserInfo(Integer.parseInt(userId));
} else { if (flag) {
map.put("returnMsg", "启用失败"); map.put("returnMsg", "启用成功");
} else {
map.put("returnMsg", "启用失败");
}
}catch (Exception e){
logger.error("用户ID：" + userId);
logger.error("Exception 用户删除异常", e);
} }
return map; return map;
} }
@RequestMapping("getRoleList") @RequestMapping("getRoleList")
public List<SysRole> selectAllRole() { public List<SysRole> selectAllRole(HttpServletRequest requ) {
List<SysRole> list = sysRoleService.getAllRoleInfo(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<SysRole> list = new ArrayList <SysRole>();
try {
list = sysRoleService.getAllRoleInfo();
}catch (Exception e){
logger.error("Exception 获取角色列表异常", e);
}
return list; return list;
} }
@RequestMapping("getPermissionList") @RequestMapping("getPermissionList")
public List<SysPermission> selectAllPermission() { public List<SysPermission> selectAllPermission(HttpServletRequest requ) {
List<SysPermission> list = sysPermissionService.getAllPermission(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<SysPermission> list = new ArrayList <SysPermission>();;
try {
list = sysPermissionService.getAllPermission();
}catch (Exception e){
logger.error("Exception 获取权限列表异常", e);
}
return list; return list;
} }
...@@ -159,15 +209,23 @@ public class AdminApi { ...@@ -159,15 +209,23 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping("permissionDel") @RequestMapping("permissionDel")
public Map permissionDel(@RequestParam("permissionId") String permissionId, HttpServletResponse response) { public Map permissionDel(@RequestParam("permissionId") String permissionId, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
Map map = new HashMap(); Map map = null;
boolean flag = false; try {
flag = sysPermissionService.deletePermission(Integer.parseInt(permissionId)); map = new HashMap();
if (flag) { boolean flag = false;
map.put("returnMsg", "删除成功"); flag = sysPermissionService.deletePermission(Integer.parseInt(permissionId));
} else { if (flag) {
map.put("returnMsg", "删除失败"); map.put("returnMsg", "删除成功");
} else {
map.put("returnMsg", "删除失败");
}
}catch (Exception e){
logger.error("id：" + permissionId);
logger.error("Exception 权限删除异常", e);
} }
return map; return map;
} }
...@@ -178,15 +236,23 @@ public class AdminApi { ...@@ -178,15 +236,23 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping("permissionOpen") @RequestMapping("permissionOpen")
public Map permissionBack(@RequestParam("permissionId") String permissionId, HttpServletResponse response) { public Map permissionBack(@RequestParam("permissionId") String permissionId, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
Map map = new HashMap(); Map map = null;
boolean flag = false; try {
flag = sysPermissionService.backPermission(Integer.parseInt(permissionId)); map = new HashMap();
if (flag) { boolean flag = false;
map.put("returnMsg", "启用成功"); flag = sysPermissionService.backPermission(Integer.parseInt(permissionId));
} else { if (flag) {
map.put("returnMsg", "启用失败"); map.put("returnMsg", "启用成功");
} else {
map.put("returnMsg", "启用失败");
}
}catch (Exception e){
logger.error("id：" + permissionId);
logger.error("Exception 权限启用异常", e);
} }
return map; return map;
} }
...@@ -197,13 +263,20 @@ public class AdminApi { ...@@ -197,13 +263,20 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping(value = "getPermsById", method = RequestMethod.GET) @RequestMapping(value = "getPermsById", method = RequestMethod.GET)
public Map<String, Object> getPermsById(@RequestParam("permissionId") String permissionId, HttpServletResponse response) { public Map<String, Object> getPermsById(@RequestParam("permissionId") String permissionId, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = null;
SysPermission sysPermission = sysPermissionService.getPermissionByPId(Integer.parseInt(permissionId)); try {
map.put("permission", sysPermission); map = new HashMap<>();
SysPermission sysPermission = sysPermissionService.getPermissionByPId(Integer.parseInt(permissionId));
map.put("permission", sysPermission);
}catch (Exception e){
logger.error("id：" + permissionId);
logger.error("Exception 通过id查询权限异常", e);
}
return map; return map;
} }
/** /**
...@@ -212,13 +285,20 @@ public class AdminApi { ...@@ -212,13 +285,20 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping(value = "getRoleById", method = RequestMethod.GET) @RequestMapping(value = "getRoleById", method = RequestMethod.GET)
public Map<String, Object> getRoleById(@RequestParam("roleId") String roleId, HttpServletResponse response) { public Map<String, Object> getRoleById(@RequestParam("roleId") String roleId, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = null;
SysRole sysRole = sysRoleService.getRoleByRoleId(Integer.parseInt(roleId)); try {
map.put("role", sysRole); map = new HashMap<>();
SysRole sysRole = sysRoleService.getRoleByRoleId(Integer.parseInt(roleId));
map.put("role", sysRole);
}catch (Exception e){
logger.error("id：" + roleId);
logger.error("Exception 通过id查询角色异常", e);
}
return map; return map;
} }
/** /**
...@@ -229,29 +309,38 @@ public class AdminApi { ...@@ -229,29 +309,38 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping(value = "permissionAdd", method = RequestMethod.POST) @RequestMapping(value = "permissionAdd", method = RequestMethod.POST)
public Map<String, String> userAdd(@RequestBody String jsonStr, HttpServletResponse resp) { public Map<String, String> userAdd(@RequestBody String jsonStr, HttpServletResponse resp, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
Map<String, String> map = new HashMap<>(); Map<String, String> map = null;
JSONObject jsonObject = JSONObject.fromObject(jsonStr); JSONObject jsonObject = new JSONObject();
boolean flag = false; try {
String str = "0"; map = new HashMap<>();
SysPermission sysPermission = new SysPermission(); jsonObject = JSONObject.fromObject(jsonStr);
sysPermission.setName(jsonObject.getString("name")); boolean flag = false;
sysPermission.setUrl(jsonObject.getString("url")); String str = "0";
sysPermission.setPermission(jsonObject.getString("permission")); SysPermission sysPermission = new SysPermission();
sysPermission.setName(jsonObject.getString("name"));
sysPermission.setUrl(jsonObject.getString("url"));
sysPermission.setPermission(jsonObject.getString("permission"));
// sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId"))); // sysPermission.setParent_id(Long.parseLong(jsonObject.getString("parentId")));
// if(jsonObject.getString("parentId").equals(str)){ // if(jsonObject.getString("parentId").equals(str)){
// sysPermission.setParent_ids(jsonObject.getString("parentId")+"/"); // sysPermission.setParent_ids(jsonObject.getString("parentId")+"/");
// }else{ // }else{
// sysPermission.setParent_ids(str+"/"+jsonObject.getString("parentId")); // sysPermission.setParent_ids(str+"/"+jsonObject.getString("parentId"));
// } // }
System.out.println(sysPermission); System.out.println(sysPermission);
flag = sysPermissionService.addPermission(sysPermission); flag = sysPermissionService.addPermission(sysPermission);
if (flag) { if (flag) {
map.put("resultMsg", "添加成功"); map.put("resultMsg", "添加成功");
} else { } else {
map.put("resultMsg", "添加失败"); map.put("resultMsg", "添加失败");
}
}catch (Exception e){
logger.error("权限添加参数：" + jsonObject);
logger.error("Exception 添加权限异常", e);
} }
return map; return map;
...@@ -265,8 +354,15 @@ public class AdminApi { ...@@ -265,8 +354,15 @@ public class AdminApi {
*/ */
@RequestMapping(value = "getAllActiveRoleList", method = RequestMethod.GET) @RequestMapping(value = "getAllActiveRoleList", method = RequestMethod.GET)
public List<SysRole> userInfoAdd() { public List<SysRole> userInfoAdd(HttpServletRequest requ) {
List<SysRole> list = sysRoleService.getAllActiveRoleInfo(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<SysRole> list = new ArrayList <SysRole>();
try {
list = sysRoleService.getAllActiveRoleInfo();
}catch (Exception e){
logger.error("Exception 查询所有非锁定角色异常", e);
}
return list; return list;
} }
...@@ -277,8 +373,15 @@ public class AdminApi { ...@@ -277,8 +373,15 @@ public class AdminApi {
*/ */
@RequestMapping(value = "getAllActivePermissionList", method = RequestMethod.GET) @RequestMapping(value = "getAllActivePermissionList", method = RequestMethod.GET)
public List<SysPermission> getAllActivePermissionList() { public List<SysPermission> getAllActivePermissionList(HttpServletRequest requ) {
List<SysPermission> list = sysPermissionService.getAllActivePermission(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<SysPermission> list = new ArrayList <SysPermission>();
try {
list = sysPermissionService.getAllActivePermission();
}catch (Exception e){
logger.error("Exception 查询所有非锁定权限异常", e);
}
return list; return list;
} }
...@@ -327,94 +430,128 @@ public class AdminApi { ...@@ -327,94 +430,128 @@ public class AdminApi {
* @return * @return
*/ */
@RequestMapping("roleAdd") @RequestMapping("roleAdd")
public Map<String, String> roleAdd(@RequestBody String jsonStr, HttpServletResponse resp) { public Map<String, String> roleAdd(@RequestBody String jsonStr, HttpServletResponse resp,HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
Map<String, String> map = new HashMap<>(); Map<String, String> map = null;
JSONObject jsonObject = JSONObject.fromObject(jsonStr); JSONObject jsonObject = new JSONObject();
boolean flag = false; try {
SysRole sysRole = new SysRole(); map = new HashMap<>();
sysRole.setRole(jsonObject.getString("role")); jsonObject = JSONObject.fromObject(jsonStr);
sysRole.setDescription(jsonObject.getString("description")); boolean flag = false;
sysRole.setProcess(Integer.parseInt(jsonObject.getString("process"))); SysRole sysRole = new SysRole();
String permissionIds = jsonObject.getString("permissionIds"); sysRole.setRole(jsonObject.getString("role"));
sysRole.setDescription(jsonObject.getString("description"));
JSONArray jsonArray = JSONArray.fromObject(permissionIds); sysRole.setProcess(Integer.parseInt(jsonObject.getString("process")));
flag = sysRoleService.addRole(sysRole, jsonArray); String permissionIds = jsonObject.getString("permissionIds");
if (flag) {
map.put("resultMsg", "添加成功"); JSONArray jsonArray = JSONArray.fromObject(permissionIds);
flag = sysRoleService.addRole(sysRole, jsonArray);
} else { if (flag) {
map.put("resultMsg", "添加失败"); map.put("resultMsg", "添加成功");
} else {
map.put("resultMsg", "添加失败");
}
}catch (Exception e){
logger.error("添加角色参数：" + jsonObject);
logger.error("Exception 添加角色异常", e);
} }
return map; return map;
} }
@PostMapping("userUpdate") @PostMapping("userUpdate")
public Map<String, String> userInfoUpdate(@RequestBody String json, HttpServletResponse resp) { public Map<String, String> userInfoUpdate(@RequestBody String json, HttpServletResponse resp,HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
JSONObject jsonObject = JSONObject.fromObject(json); Map<String, String> map = null;
UserInfo userInfo = new UserInfo(); JSONObject jsonObject = new JSONObject();
userInfo.setUsername(jsonObject.getString("username")); try {
userInfo.setName(jsonObject.getString("name")); map = new HashMap<>();
userInfo.setId(Integer.parseInt(jsonObject.getString("id"))); jsonObject = JSONObject.fromObject(json);
Map<String, String> map = new HashMap<>(); UserInfo userInfo = new UserInfo();
boolean flag = false; userInfo.setUsername(jsonObject.getString("username"));
flag = userInfoService.updateUser(userInfo, Integer.parseInt(jsonObject.getString("roleId")), Integer.parseInt(jsonObject.getString("oldRoleId"))); userInfo.setName(jsonObject.getString("name"));
if (flag) { userInfo.setId(Integer.parseInt(jsonObject.getString("id")));
map.put("resultMsg", "修改成功");
boolean flag = false;
} else { flag = userInfoService.updateUser(userInfo, Integer.parseInt(jsonObject.getString("roleId")), Integer.parseInt(jsonObject.getString("oldRoleId")));
map.put("resultMsg", "修改失败"); if (flag) {
map.put("resultMsg", "修改成功");
} else {
map.put("resultMsg", "修改失败");
}
}catch (Exception e){
logger.error("更新用户参数：" + jsonObject);
logger.error("Exception 更新用户异常", e);
} }
return map; return map;
} }
@RequestMapping("roleUpdate") @RequestMapping("roleUpdate")
public Map roleUpdate(@RequestBody String jsonStr, HttpServletResponse resp) { public Map roleUpdate(@RequestBody String jsonStr, HttpServletResponse resp,HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
Map<String, String> map = new HashMap<>(); Map<String, String> map = null;
JSONObject jsonObject = JSONObject.fromObject(jsonStr); JSONObject jsonObject = new JSONObject();
boolean flag = false; try {
SysRole sysRole = new SysRole(); map=new HashMap <>();
sysRole.setId(Integer.parseInt(jsonObject.getString("roleId"))); jsonObject = JSONObject.fromObject(jsonStr);
sysRole.setRole(jsonObject.getString("role")); boolean flag=false;
sysRole.setDescription(jsonObject.getString("description")); SysRole sysRole=new SysRole();
String oldPermissionIds = jsonObject.getString("oldPermissionIds"); sysRole.setId(Integer.parseInt(jsonObject.getString("roleId")));
JSONArray jsonArrayOldPids = JSONArray.fromObject(oldPermissionIds); sysRole.setRole(jsonObject.getString("role"));
String permissionIds = jsonObject.getString("permissionId"); sysRole.setDescription(jsonObject.getString("description"));
JSONArray jsonArrayPids = JSONArray.fromObject(permissionIds); String oldPermissionIds=jsonObject.getString("oldPermissionIds");
flag = sysRoleService.updateRole(sysRole, jsonArrayPids, jsonArrayOldPids); JSONArray jsonArrayOldPids=JSONArray.fromObject(oldPermissionIds);
if (flag) { String permissionIds=jsonObject.getString("permissionId");
map.put("resultMsg", "修改成功"); JSONArray jsonArrayPids=JSONArray.fromObject(permissionIds);
flag=sysRoleService.updateRole(sysRole, jsonArrayPids, jsonArrayOldPids);
} else { if(flag){
map.put("resultMsg", "修改失败"); map.put("resultMsg", "修改成功");
} else {
map.put("resultMsg", "修改失败");
}
}catch (Exception e){
logger.error("更新角色参数：" + jsonObject);
logger.error("Exception 更新角色异常", e);
} }
return map; return map;
} }
@PostMapping("permissionUpdate") @PostMapping("permissionUpdate")
public Map<String, String> permissionUpdate(@RequestBody String jsonStr, HttpServletResponse resp) { public Map<String, String> permissionUpdate(@RequestBody String jsonStr, HttpServletResponse resp,HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
JSONObject jsonObject = JSONObject.fromObject(jsonStr); Map<String, String> map = null;
Map<String, String> map = new HashMap<>(); JSONObject jsonObject = new JSONObject();
boolean flag = false; try {
SysPermission sysPermission = new SysPermission(); map=new HashMap <>();
sysPermission.setId(Integer.parseInt(jsonObject.getString("id"))); jsonObject = JSONObject.fromObject(jsonStr);
sysPermission.setName(jsonObject.getString("name")); boolean flag=false;
sysPermission.setUrl(jsonObject.getString("url")); SysPermission sysPermission=new SysPermission();
sysPermission.setPermission(jsonObject.getString("permission")); sysPermission.setId(Integer.parseInt(jsonObject.getString("id")));
System.out.println(sysPermission); sysPermission.setName(jsonObject.getString("name"));
flag = sysPermissionService.updatePermission(sysPermission); sysPermission.setUrl(jsonObject.getString("url"));
if (flag) { sysPermission.setPermission(jsonObject.getString("permission"));
map.put("resultMsg", "修改成功"); System.out.println(sysPermission);
flag=sysPermissionService.updatePermission(sysPermission);
} else { if(flag){
map.put("resultMsg", "修改失败"); map.put("resultMsg", "修改成功");
} else {
map.put("resultMsg", "修改失败");
}
}catch (Exception e){
logger.error("更新权限参数：" + jsonObject);
logger.error("Exception 更新权限异常", e);
} }
return map; return map;
......
src/main/java/com/yxproject/start/api/CardDetailedListApi.java
View file @ 12005cfa
...@@ -2,11 +2,15 @@ package com.yxproject.start.api; ...@@ -2,11 +2,15 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.DetailReceiptListEntity; import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.service.CardDetailedListService; import com.yxproject.start.service.CardDetailedListService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -20,6 +24,8 @@ public class CardDetailedListApi { ...@@ -20,6 +24,8 @@ public class CardDetailedListApi {
@Autowired @Autowired
private CardDetailedListService cardDetailedListService; private CardDetailedListService cardDetailedListService;
Logger logger= Logger.getLogger(CardDetailedListApi.class);
/** /**
* 查询身份证详单 * 查询身份证详单
*通过身份证号 *通过身份证号
...@@ -27,8 +33,16 @@ public class CardDetailedListApi { ...@@ -27,8 +33,16 @@ public class CardDetailedListApi {
* @return * @return
*/ */
@RequestMapping("findCardDetailedList") @RequestMapping("findCardDetailedList")
public List<DetailReceiptListEntity> findCardDetailedList(@RequestParam("idCard") String idCard) { public List<DetailReceiptListEntity> findCardDetailedList(@RequestParam("idCard") String idCard, HttpServletRequest requ) {
List<DetailReceiptListEntity> list = cardDetailedListService.findCardDetailedListByIdCard(idCard); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<DetailReceiptListEntity> list = new ArrayList<DetailReceiptListEntity>();
try{
list = cardDetailedListService.findCardDetailedListByIdCard(idCard);
} catch (Exception e){
logger.error("身份证号：" + idCard);
logger.error("Exception 通过身份证号查询身份证详单异常", e);
}
return list; return list;
} }
...@@ -40,8 +54,16 @@ public class CardDetailedListApi { ...@@ -40,8 +54,16 @@ public class CardDetailedListApi {
* @return * @return
*/ */
@RequestMapping("findAllCardDetailedList") @RequestMapping("findAllCardDetailedList")
public List<Map<String,Object>> findAllCardDetailedList(@RequestParam("idCard") String idCard) { public List<Map<String,Object>> findAllCardDetailedList(@RequestParam("idCard") String idCard, HttpServletRequest requ) {
List<Map<String,Object>> list = cardDetailedListService.findAllCardDetailedListByIdCard(idCard); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String,Object>> list = new ArrayList <>();
try{
list = cardDetailedListService.findAllCardDetailedListByIdCard(idCard);
} catch (Exception e){
logger.error("身份证号：" + idCard);
logger.error("Exception 通过身份证号查询所有的身份证详单异常", e);
}
return list; return list;
} }
......
src/main/java/com/yxproject/start/api/DeliveredApi.java
View file @ 12005cfa
...@@ -10,6 +10,8 @@ import net.sf.json.JSONArray; ...@@ -10,6 +10,8 @@ import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -27,10 +29,7 @@ import javax.ws.rs.Produces; ...@@ -27,10 +29,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.*;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
/** /**
* @auther zhangyusheng * @auther zhangyusheng
...@@ -47,6 +46,7 @@ public class DeliveredApi { ...@@ -47,6 +46,7 @@ public class DeliveredApi {
@Autowired @Autowired
private ReceiptService receiptService; private ReceiptService receiptService;
Logger logger= Logger.getLogger(DeliveredApi.class);
/** /**
* 导入妥投信息表 * 导入妥投信息表
...@@ -56,9 +56,12 @@ public class DeliveredApi { ...@@ -56,9 +56,12 @@ public class DeliveredApi {
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean ReadDeliveredInfo( @RequestParam("importName") String importName, HttpServletResponse resp, HttpServletRequest requ) { public boolean ReadDeliveredInfo( @RequestParam("importName") String importName, HttpServletResponse resp, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
YXJSONResponse yxresp = new YXJSONResponse(); YXJSONResponse yxresp = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
String filename = ""; String filename = "";
Map<String,Object> map = new LinkedHashMap<>();
DiskFileItemFactory factory = new DiskFileItemFactory(); DiskFileItemFactory factory = new DiskFileItemFactory();
// 设置缓冲区的大小为100KB，如果不指定，那么缓冲区的大小默认是10KB // 设置缓冲区的大小为100KB，如果不指定，那么缓冲区的大小默认是10KB
...@@ -96,6 +99,8 @@ public class DeliveredApi { ...@@ -96,6 +99,8 @@ public class DeliveredApi {
item.transferTo(file); item.transferTo(file);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传人姓名" + importName + "文件名" + filename);
logger.error("", e);
} }
ReadExcel readExcel = new ReadExcel(); ReadExcel readExcel = new ReadExcel();
List list1 = readExcel.readExcel(file); List list1 = readExcel.readExcel(file);
...@@ -107,11 +112,13 @@ public class DeliveredApi { ...@@ -107,11 +112,13 @@ public class DeliveredApi {
deliveredService.saveDeliveredImportDic(deliveredImportDicEntity); deliveredService.saveDeliveredImportDic(deliveredImportDicEntity);
//保存个人邮寄信息 //保存个人邮寄信息
List<DeliveredInfoEntity> entityList = new ArrayList<>(); List<DeliveredInfoEntity> entityList = new ArrayList<>();
int success=0;
int failed = 0;
for (int i = 0; i < list1.size(); i++) { for (int i = 0; i < list1.size(); i++) {
DeliveredInfoEntity deliveredInfoEntity = new DeliveredInfoEntity(); DeliveredInfoEntity deliveredInfoEntity = new DeliveredInfoEntity();
List list2 = (List) list1.get(i); List list2 = (List) list1.get(i);
//跳过空行和第一行 //跳过空行和第一行
if (list2 == null || i == 0||list2.size()<2) { if (list2 == null || i == 0 ||list2.size()<2) {
continue; continue;
} }
deliveredInfoEntity.setWaybillNumber((String) list2.get(0)); deliveredInfoEntity.setWaybillNumber((String) list2.get(0));
...@@ -128,6 +135,8 @@ public class DeliveredApi { ...@@ -128,6 +135,8 @@ public class DeliveredApi {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传人姓名：" + importName + "文件名：" + filename);
logger.error("Exception 上传文件时发生错误,非法XML文件:", e);
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename); yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
continue; continue;
} finally { } finally {
...@@ -136,6 +145,8 @@ public class DeliveredApi { ...@@ -136,6 +145,8 @@ public class DeliveredApi {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传人姓名：" + importName + "文件名：" + filename);
logger.error("FileUploadException 文件上载发生异常", e);
yxresp.outPutError("FileUploadException", "文件上载发生异常:" + e.getMessage()); yxresp.outPutError("FileUploadException", "文件上载发生异常:" + e.getMessage());
} finally { } finally {
return true; return true;
...@@ -144,7 +155,8 @@ public class DeliveredApi { ...@@ -144,7 +155,8 @@ public class DeliveredApi {
} }
} }
}catch (Exception e){ }catch (Exception e){
logger.error("上传人姓名：" + importName + "文件名：" + filename);
logger.error("Exception 导入妥投信息表异常", e);
}finally { }finally {
} }
...@@ -157,8 +169,12 @@ public class DeliveredApi { ...@@ -157,8 +169,12 @@ public class DeliveredApi {
@RequestMapping("saveDeliveredFailedInfo") @RequestMapping("saveDeliveredFailedInfo")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean saveDeliveredFailedInfo(@RequestBody String jsonStr){ public boolean saveDeliveredFailedInfo(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONArray jsonarray = JSONArray.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
JSONArray jsonarray = new JSONArray();
try {
jsonarray = JSONArray.fromObject(jsonStr);
List<DeliveredFailedInfoEntity> deliveredFailedInfoEntities = new ArrayList<>(); List<DeliveredFailedInfoEntity> deliveredFailedInfoEntities = new ArrayList<>();
for (int i = 0; i < jsonarray.size(); i++) { for (int i = 0; i < jsonarray.size(); i++) {
JSONObject jsonObject = (JSONObject) jsonarray.get(i); JSONObject jsonObject = (JSONObject) jsonarray.get(i);
...@@ -176,6 +192,10 @@ public class DeliveredApi { ...@@ -176,6 +192,10 @@ public class DeliveredApi {
deliveredFailedInfoEntities.add(deliveredFailedInfoEntity); deliveredFailedInfoEntities.add(deliveredFailedInfoEntity);
} }
deliveredService.saveDeliveredFailedInfoList(deliveredFailedInfoEntities); deliveredService.saveDeliveredFailedInfoList(deliveredFailedInfoEntities);
}catch (Exception e){
logger.error("异常参数:" + jsonarray);
logger.error("Exception 登记投递失败信息异常", e);
}
return true; return true;
} }
...@@ -188,8 +208,16 @@ public class DeliveredApi { ...@@ -188,8 +208,16 @@ public class DeliveredApi {
@RequestMapping("queryDeliveredReport") @RequestMapping("queryDeliveredReport")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public List<Map<String,Object>> queryDeliveredReport(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate){ public List<Map<String,Object>> queryDeliveredReport(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate, HttpServletRequest requ) {
List<Map<String, Object>> report = deliveredService.selectDeliveredReport(replaceDate(startDate), replaceDate(endDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> report = new ArrayList <>();
try {
report=deliveredService.selectDeliveredReport(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e){
logger.error("运单寄出开始时间:" + startDate + "运单寄出结束时间:" + endDate);
logger.error("Exception 登记投递失败信息异常", e);
}
return report; return report;
} }
...@@ -202,8 +230,16 @@ public class DeliveredApi { ...@@ -202,8 +230,16 @@ public class DeliveredApi {
@RequestMapping("queryDeliveredByImportDate") @RequestMapping("queryDeliveredByImportDate")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public List<DeliveredImportDicEntity> queryDeliveredByImportDate(@RequestParam("date") String date){ public List<DeliveredImportDicEntity> queryDeliveredByImportDate(@RequestParam("date") String date, HttpServletRequest requ){
List<DeliveredImportDicEntity> deliveredImportDicEntities = deliveredService.selectDeliveredByImportDate(replaceDate(date)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<DeliveredImportDicEntity> deliveredImportDicEntities = new ArrayList <DeliveredImportDicEntity>();
try {
deliveredImportDicEntities = deliveredService.selectDeliveredByImportDate(replaceDate(date));
}catch (Exception e){
logger.error("导入妥投信息时间:" + date );
logger.error("Exception 查询导入妥投信息异常", e);
}
return deliveredImportDicEntities; return deliveredImportDicEntities;
} }
...@@ -215,8 +251,16 @@ public class DeliveredApi { ...@@ -215,8 +251,16 @@ public class DeliveredApi {
@RequestMapping("queryDeliveredFailedByRegisterDate") @RequestMapping("queryDeliveredFailedByRegisterDate")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public List<Map<String, Object>> queryDeliveredFailedByRegisterDate(@RequestParam("date") String date){ public List<Map<String, Object>> queryDeliveredFailedByRegisterDate(@RequestParam("date") String date, HttpServletRequest requ) {
List<Map<String, Object>> mapList = deliveredService.selectDeliveredFailedByRegisterDate(replaceDate(date)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
try {
mapList = deliveredService.selectDeliveredFailedByRegisterDate(replaceDate(date));
}catch (Exception e){
logger.error("登记妥投失败信息时间:" + date );
logger.error("Exception 查询登记妥投失败信息异常", e);
}
return mapList; return mapList;
} }
...@@ -228,29 +272,37 @@ public class DeliveredApi { ...@@ -228,29 +272,37 @@ public class DeliveredApi {
@RequestMapping("acceptDeliveredFailed") @RequestMapping("acceptDeliveredFailed")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean acceptDeliveredFailed(@RequestBody String json) { public boolean acceptDeliveredFailed(@RequestBody String json, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(json); String remoteAddr = requ.getRemoteAddr();
JSONArray jsonArray = (JSONArray) jsonObject.get("cardIdList"); MDC.put("ip", remoteAddr);
String name = jsonObject.getString("name")+""; JSONObject jsonObject = new JSONObject();
List<String> list = (List<String>) jsonArray; try {
for (String cardId:list){ jsonObject = JSONObject.fromObject(json);
//todo 确认接收妥投失败证件 JSONArray jsonArray = (JSONArray) jsonObject.get("cardIdList");
//查询出对应详单信息 String name = jsonObject.getString("name")+"";
List<DetailReceiptListEntity> detailReceiptListEntityList = detailReceiptListService.selectDetailReceiptListEntityByCardId(cardId); List<String> list = (List<String>) jsonArray;
if (detailReceiptListEntityList.size()>0){ for (String cardId:list){
//生成新的交接单信息 //todo 确认接收妥投失败证件
ReceiptListEntity receiptListEntity = new ReceiptListEntity(); //查询出对应详单信息
DetailReceiptListEntity detailReceiptListEntity = detailReceiptListEntityList.get(0); List<DetailReceiptListEntity> detailReceiptListEntityList = detailReceiptListService.selectDetailReceiptListEntityByCardId(cardId);
receiptListEntity.setPoliceCode(detailReceiptListEntity.getUploadNo().substring(0,9)); if (detailReceiptListEntityList.size()>0){
receiptListEntity.setQrCode(detailReceiptListEntity.getAcceptNo()); //生成新的交接单信息
receiptListEntity.setFinishCount((long)1); ReceiptListEntity receiptListEntity = new ReceiptListEntity();
receiptListEntity.setState((long)1); DetailReceiptListEntity detailReceiptListEntity = detailReceiptListEntityList.get(0);
receiptListEntity.setCheckName(name); receiptListEntity.setPoliceCode(detailReceiptListEntity.getUploadNo().substring(0,9));
receiptListEntity.setCardTypeId((long)0); receiptListEntity.setQrCode(detailReceiptListEntity.getAcceptNo());
long id = receiptService.saveReceiptList(receiptListEntity); receiptListEntity.setFinishCount((long)1);
//更改对应的详单信息 receiptListEntity.setState((long)1);
detailReceiptListService.updateDetailReceiptList(detailReceiptListEntity,id); receiptListEntity.setCheckName(name);
receiptListEntity.setCardTypeId((long)0);
long id = receiptService.saveReceiptList(receiptListEntity);
//更改对应的详单信息
detailReceiptListService.updateDetailReceiptList(detailReceiptListEntity,id);
}
} }
}catch (Exception e){
logger.error("妥投失败证件号：" + jsonObject);
logger.error("Exception 库房确认接收妥投失败证件异常", e);
} }
return true; return true;
} }
...@@ -265,8 +317,15 @@ public class DeliveredApi { ...@@ -265,8 +317,15 @@ public class DeliveredApi {
@RequestMapping("deleteDeliveredByFileId") @RequestMapping("deleteDeliveredByFileId")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean deleteDeliveredByFileId(@RequestParam("fileId") String fileId){ public boolean deleteDeliveredByFileId(@RequestParam("fileId") String fileId, HttpServletRequest requ) {
deliveredService.deleteDeliveredByFileId(Long.valueOf(fileId)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
deliveredService.deleteDeliveredByFileId(Long.valueOf(fileId));
}catch (Exception e){
logger.error("妥投信息文件ID：" + fileId);
logger.error("Exception 删除导入妥投信息异常", e);
}
return true; return true;
} }
...@@ -278,8 +337,17 @@ public class DeliveredApi { ...@@ -278,8 +337,17 @@ public class DeliveredApi {
@RequestMapping("deleteDeliveredFailedById") @RequestMapping("deleteDeliveredFailedById")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean deleteDeliveredFailedById(@RequestParam("id") String id){ public boolean deleteDeliveredFailedById(@RequestParam("id") String id, HttpServletRequest requ) {
return deliveredService.deleteDeliveredFailedById(Long.valueOf(id)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
boolean delivered = true;
try {
delivered = deliveredService.deleteDeliveredFailedById(Long.valueOf(id));
}catch (Exception e){
logger.error("登记妥投失败信息ID：" + id);
logger.error("Exception 删除登记妥投失败信息异常", e);
}
return delivered;
} }
/** /**
...@@ -288,8 +356,16 @@ public class DeliveredApi { ...@@ -288,8 +356,16 @@ public class DeliveredApi {
*/ */
@RequestMapping("queryDeliveredFailedType") @RequestMapping("queryDeliveredFailedType")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public List<DeliveredFailedReasonEntity> queryDeliveredFailedType(){ public List<DeliveredFailedReasonEntity> queryDeliveredFailedType(HttpServletRequest requ) {
return deliveredService.selectDeliveredFailedType(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<DeliveredFailedReasonEntity> list = new ArrayList <DeliveredFailedReasonEntity>();
try{
list = deliveredService.selectDeliveredFailedType();
}catch (Exception e){
logger.error("Exception 查询登记妥投失败类型异常", e);
}
return list;
} }
......
src/main/java/com/yxproject/start/api/ExportExcelApi.java
View file @ 12005cfa
...@@ -6,6 +6,7 @@ import com.yxproject.start.utils.ExportExcel; ...@@ -6,6 +6,7 @@ import com.yxproject.start.utils.ExportExcel;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC; import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -31,6 +32,8 @@ public class ExportExcelApi { ...@@ -31,6 +32,8 @@ public class ExportExcelApi {
@Autowired @Autowired
private ReceiptService receiptService; private ReceiptService receiptService;
Logger logger= Logger.getLogger(ExportExcelApi.class);
/** /**
* 导出公安网数据 * 导出公安网数据
*/ */
...@@ -42,7 +45,7 @@ public class ExportExcelApi { ...@@ -42,7 +45,7 @@ public class ExportExcelApi {
JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list")); JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list"));
// String type = jsonObject.get("type").toString(); // String type = jsonObject.get("type").toString();
String name = jsonObject.get("name").toString(); String name = jsonObject.get("name").toString();
List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray,name); List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray, name);
response.setContentType("application/x-download"); response.setContentType("application/x-download");
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd"); String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
...@@ -59,21 +62,31 @@ public class ExportExcelApi { ...@@ -59,21 +62,31 @@ public class ExportExcelApi {
return b; return b;
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("导出文件名:" + fout);
logger.error("FileNotFoundException 导出公安网数据未找到异常", e);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("导出文件名:" + fout);
logger.error("IOException 导出公安网数据IO异常", e);
} }
return null; return null;
} }
/** /**
* 导出交接单 * 导出交接单
*/ */
@RequestMapping("printReceiptExcelData") @RequestMapping("printReceiptExcelData")
public Map<String, Object> printReceiptExcelData(@RequestBody String list) { public Map<String, Object> printReceiptExcelData(@RequestBody String list, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(list); String remoteAddr = requ.getRemoteAddr();
JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list")); MDC.put("ip", remoteAddr);
String type = jsonObject.get("type").toString(); JSONObject jsonObject = null;
Map<String, Object> map = receiptService.selectReceiptList(jsonArray, Long.valueOf(type)); JSONArray jsonArray;
String type = null;
Map<String, Object> map = null;
try {
jsonObject=JSONObject.fromObject(list);
type=jsonObject.get("type").toString();
jsonArray=JSONArray.fromObject(jsonObject.get("list"));
map=receiptService.selectReceiptList(jsonArray, Long.valueOf(type));
// response.setContentType("application/x-download"); // response.setContentType("application/x-download");
// response.setCharacterEncoding("UTF-8"); // response.setCharacterEncoding("UTF-8");
// String dateTime = DateFormatUtils.format(new Date(), "yyyy_MM_dd"); // String dateTime = DateFormatUtils.format(new Date(), "yyyy_MM_dd");
...@@ -97,6 +110,11 @@ public class ExportExcelApi { ...@@ -97,6 +110,11 @@ public class ExportExcelApi {
// e.printStackTrace(); // e.printStackTrace();
// } // }
// return null; // return null;
}catch (Exception e) {
e.printStackTrace();
logger.error("异常参数：" + jsonObject);
logger.error("Exception 导出交接单异常", e);
}
return map; return map;
} }
......
src/main/java/com/yxproject/start/api/ExportXMLApi.java
View file @ 12005cfa
...@@ -7,6 +7,8 @@ import com.yxproject.start.service.FilesService; ...@@ -7,6 +7,8 @@ import com.yxproject.start.service.FilesService;
import com.yxproject.start.service.NewFilesService; import com.yxproject.start.service.NewFilesService;
import com.yxproject.start.service.PreproPersonService; import com.yxproject.start.service.PreproPersonService;
import com.yxproject.start.utils.ZipUtils; import com.yxproject.start.utils.ZipUtils;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.dom4j.Document; import org.dom4j.Document;
import org.dom4j.DocumentHelper; import org.dom4j.DocumentHelper;
import org.dom4j.Element; import org.dom4j.Element;
...@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
...@@ -39,13 +42,16 @@ public class ExportXMLApi { ...@@ -39,13 +42,16 @@ public class ExportXMLApi {
@Autowired @Autowired
private FilesService filesService; private FilesService filesService;
Logger logger= Logger.getLogger(ExportXMLApi.class);
/** /**
* 导出制证数据包 * 导出制证数据包
*/ */
@RequestMapping("printXmlData") @RequestMapping("printXmlData")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public byte[] printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard") String IDCard, @RequestParam("oldFile") String oldFile, @RequestParam("newFile") String newFile, @RequestParam("SSXQDM") String SSXQDM, @RequestParam("cardType") String cardType, @RequestParam("state") String state, @RequestParam("uploadDate") String uploadDate, @RequestParam("downloadState") String downloadState, HttpServletResponse response) { public byte[] printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard") String IDCard, @RequestParam("oldFile") String oldFile, @RequestParam("newFile") String newFile, @RequestParam("SSXQDM") String SSXQDM, @RequestParam("cardType") String cardType, @RequestParam("state") String state, @RequestParam("uploadDate") String uploadDate, @RequestParam("downloadState") String downloadState, HttpServletResponse response, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
//使用Servlet实现文件下载的时候，避免浏览器自动打开文件 //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate), downloadState); List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate), downloadState);
// List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate)); // List<PreproPersonEntity> preproPersonEntities = preproPersonService.selectAllPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
...@@ -140,6 +146,8 @@ public class ExportXMLApi { ...@@ -140,6 +146,8 @@ public class ExportXMLApi {
xml = createToMakePackageXML(preproPersonEntityList1, filesEntity, "\\zhang"); xml = createToMakePackageXML(preproPersonEntityList1, filesEntity, "\\zhang");
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("个人上传受理号：" + uploadNo + "个人身份证号：" + IDCard + "包号：" + oldFile + "新文件名：" + newFile + "签发机关：" + SSXQDM + "制证类型：" + cardType + "是否有效（1有效，0无效）：" + state + "下载时间：" + uploadDate + "下载状态（0未下载，1已下载）：" + downloadState);
logger.error("IOException 导出制证数据包IO异常", e);
} }
documentList.add(xml); documentList.add(xml);
} }
...@@ -155,6 +163,8 @@ public class ExportXMLApi { ...@@ -155,6 +163,8 @@ public class ExportXMLApi {
out = new ZipOutputStream(response.getOutputStream()); out = new ZipOutputStream(response.getOutputStream());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("制证包数据打包名：" + zipName);
logger.error("IOException 制证包数据打包下载IO异常", e);
} }
try { try {
for (String document : documentList) { for (String document : documentList) {
...@@ -163,15 +173,17 @@ public class ExportXMLApi { ...@@ -163,15 +173,17 @@ public class ExportXMLApi {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("制证包数据打包名：" + zipName);
logger.error("Exception 制证包数据打包下载异常", e);
} finally { } finally {
try { try {
out.close(); out.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("制证包数据打包名：" + zipName);
logger.error("IOException 制证包数据打包下载IO异常", e);
} }
} }
} }
return null; return null;
} }
...@@ -283,6 +295,7 @@ public class ExportXMLApi { ...@@ -283,6 +295,7 @@ public class ExportXMLApi {
writer.close(); writer.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("IOException XML文件生成异常", e);
} }
System.out.println("XML文件生成成功..." + new Date()); System.out.println("XML文件生成成功..." + new Date());
return "D:\\XML\\" + "ZAGL_ZZJH_" + filesEntity.getDwdm() + simpleDateFormat.format(new Date()) + cardType + files_seq + ".xml"; return "D:\\XML\\" + "ZAGL_ZZJH_" + filesEntity.getDwdm() + simpleDateFormat.format(new Date()) + cardType + files_seq + ".xml";
......
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ 12005cfa
...@@ -8,6 +8,7 @@ import com.yxproject.start.service.FailedCardService; ...@@ -8,6 +8,7 @@ import com.yxproject.start.service.FailedCardService;
import com.yxproject.start.service.TaskListService; import com.yxproject.start.service.TaskListService;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC; import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -34,14 +35,23 @@ public class FailedCardApi { ...@@ -34,14 +35,23 @@ public class FailedCardApi {
@Autowired @Autowired
private TaskListService taskListService; private TaskListService taskListService;
Logger logger= Logger.getLogger(FailedCardApi.class);
/** /**
* 查询所有废证类型 * 查询所有废证类型
* *
* @return * @return
*/ */
@RequestMapping("selectFailedCardDic") @RequestMapping("selectFailedCardDic")
public List<FailedCardReasonDicEntity> selectFailedCardDic() { public List<FailedCardReasonDicEntity> selectFailedCardDic(HttpServletRequest requ) {
List<FailedCardReasonDicEntity> resultList = failedCardService.selectFailedCardDic(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<FailedCardReasonDicEntity> resultList = new ArrayList <FailedCardReasonDicEntity>();
try {
resultList = failedCardService.selectFailedCardDic();
}catch (Exception e){
logger.error("Exception 查询所有废证类型异常", e);
}
return resultList; return resultList;
} }
...@@ -52,26 +62,34 @@ public class FailedCardApi { ...@@ -52,26 +62,34 @@ public class FailedCardApi {
* @return * @return
*/ */
@RequestMapping("selectInfoByCardId") @RequestMapping("selectInfoByCardId")
public List<Map<String, Object>> selectInfoByCardId(@RequestBody String jsonStr ) { public List<Map<String, Object>> selectInfoByCardId(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONArray jsonarray = JSONArray.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
JSONArray jsonarray = new JSONArray();
List<Map<String, Object>> resultList = new ArrayList<>(); List<Map<String, Object>> resultList = new ArrayList<>();
for (Object o : jsonarray) { try {
String acceptNo = o.toString().replace("e", "E").replace("g", "G").replace("l","L"); jsonarray = JSONArray.fromObject(jsonStr);
Map<String, Object> resultMap = failedCardService.selectInfoByCardId(acceptNo); for (Object o : jsonarray) {
if (resultMap == null) { String acceptNo = o.toString().replace("e", "E").replace("g", "G").replace("l","L");
resultMap = new LinkedHashMap<>(); Map<String, Object> resultMap = failedCardService.selectInfoByCardId(acceptNo);
resultMap.put("ID_NO", o.toString()); if (resultMap == null) {
resultMap.put("NAME", "查无此人"); resultMap = new LinkedHashMap<>();
resultMap.put("SEX_NO", "-1"); resultMap.put("ID_NO", o.toString());
resultMap.put("NAME", "查无此人");
resultMap.put("SEX_NO", "-1");
}
resultList.add(resultMap);
} }
resultList.add(resultMap); }catch (Exception e){
logger.error("身份证号或受理号：" + jsonarray);
logger.error("Exception 根据身份证号或受理号查询身份信息及组号异常", e);
} }
return resultList; return resultList;
} }
/** /**
* 查询提交人上传的废证详情 * 查询提交人上传的废证详情
* * @param date 提交日期
* @param name 提交人姓名 * @param name 提交人姓名
* @param startDate 提交起始日期 * @param startDate 提交起始日期
* @param endDate 提交结束日期 * @param endDate 提交结束日期
...@@ -93,8 +111,17 @@ public class FailedCardApi { ...@@ -93,8 +111,17 @@ public class FailedCardApi {
* @return * @return
*/ */
@RequestMapping("deleteFailedCardInfo") @RequestMapping("deleteFailedCardInfo")
public boolean deleteFailedCardInfo(@RequestParam("failedCardId") String failedCardId) { public boolean deleteFailedCardInfo(@RequestParam("failedCardId") String failedCardId, HttpServletRequest requ) {
return failedCardService.deleteFailedCardInfo(failedCardId); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
boolean failedCardInfo = true;
try {
failedCardInfo = failedCardService.deleteFailedCardInfo(failedCardId);
}catch (Exception e){
logger.error("废证ID：" + failedCardId);
logger.error("Exception 删除提交人上传的废证详情异常", e);
}
return failedCardInfo;
} }
...@@ -106,22 +133,30 @@ public class FailedCardApi { ...@@ -106,22 +133,30 @@ public class FailedCardApi {
*/ */
@RequestMapping("insertFailedCard") @RequestMapping("insertFailedCard")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean insertFailedCard(@RequestBody String jsonStr) { public Boolean insertFailedCard(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONArray jsonarray = JSONArray.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
for (Object o : jsonarray) { MDC.put("ip", remoteAddr);
JSONObject jsonObject = (JSONObject) o; JSONArray jsonarray = new JSONArray();
String name = ((JSONObject) o).getString("name"); try{
String acceptNo = formateAcceptNo(((JSONObject) o).getString("cardId")); jsonarray = JSONArray.fromObject(jsonStr);
String result = failedCardService.selectSpecialCard(acceptNo); for (Object o : jsonarray) {
Map<String, Object> idMap; JSONObject jsonObject = (JSONObject) o;
//判断是否是特殊证件 String name = ((JSONObject) o).getString("name");
if (result != null && result != "") {
idMap = failedCardService.selectDataById(acceptNo); String result = failedCardService.selectSpecialCard(((JSONObject) o).getString("cardId"));
} else { Map<String, Object> idMap;
idMap = failedCardService.selectCountIdByCardId(acceptNo); //判断是否是特殊证件
if (result != null && result != "") {
idMap = failedCardService.selectDataById(jsonObject.getString("cardId"));
} else {
idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
}
int initiator = 5;
failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString(), name);
} }
int initiator = 5; }catch (Exception e){
failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString(),name); logger.error("身份证号或受理号：" + jsonarray);
logger.error("Exception 添加废证异常", e);
} }
return true; return true;
} }
...@@ -134,38 +169,49 @@ public class FailedCardApi { ...@@ -134,38 +169,49 @@ public class FailedCardApi {
*/ */
@RequestMapping("insertRemaining") @RequestMapping("insertRemaining")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean insertRemaining(@RequestBody String jsonStr) { public Boolean insertRemaining(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
JSONArray jsonarray = JSONArray.fromObject(jsonObject.get("list")); MDC.put("ip", remoteAddr);
String name = jsonObject.get("name").toString(); JSONObject jsonObject = new JSONObject();
TaskEntity taskEntity = new TaskEntity(); JSONArray jsonarray = new JSONArray();
for (int i = 0; i < jsonarray.size(); i++) { String name;
TaskEntity taskEntity;
try {
jsonObject = JSONObject.fromObject(jsonStr);
jsonarray = JSONArray.fromObject(jsonObject.get("list"));
name = jsonObject.get("name").toString();
taskEntity = new TaskEntity();
for (int i = 0; i < jsonarray.size(); i++) {
/*查询生成任务单需要的数据*/ /*查询生成任务单需要的数据*/
Map<String, Object> resultMap = failedCardService.selectTaskListDate((jsonarray.get(i)+"").replace("e","E").replace("g","G")); Map<String, Object> resultMap = failedCardService.selectTaskListDate((String) jsonarray.get(i));
String countyCode = resultMap.get("COUNTY_CODE").toString(); String countyCode = resultMap.get("COUNTY_CODE").toString();
Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE") + ""); Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE") + "");
String acceptNo = (String) resultMap.get("ACCEPT_NO"); String acceptNo = (String) resultMap.get("ACCEPT_NO");
taskEntity.setCountyCode(countyCode); taskEntity.setCountyCode(countyCode);
taskEntity.setCardType(cardType); taskEntity.setCardType(cardType);
taskEntity.setTaskStateId((long) 1); taskEntity.setTaskStateId((long) 1);
taskEntity.setSubmitName(name); taskEntity.setSubmitName(name);
if ("null".equals(resultMap.get("WORK_GROUP") + "")) { if ("null".equals(resultMap.get("WORK_GROUP") + "")) {
} else { } else {
taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP") + "")); taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP") + ""));
} }
/*特证数+1*/ /*特证数+1*/
failedCardService.specialCardAdd(acceptNo); failedCardService.specialCardAdd(acceptNo);
/*生成新任务单*/ /*生成新任务单*/
taskListService.saveTask(taskEntity); taskListService.saveTask(taskEntity);
/*特证表添加特证*/ /*特证表添加特证*/
SpecialCardEntity specialCardEntity = new SpecialCardEntity(); SpecialCardEntity specialCardEntity = new SpecialCardEntity();
specialCardEntity.setAcceptNo(acceptNo); specialCardEntity.setAcceptNo(acceptNo);
specialCardEntity.setInitiator(name); specialCardEntity.setInitiator(name);
specialCardEntity.setTaskId(taskEntity.getTaskId()); specialCardEntity.setTaskId(taskEntity.getTaskId());
specialCardEntity.setGroupNo(acceptNo.substring(0, 8)); specialCardEntity.setGroupNo(acceptNo.substring(0, 8));
failedCardService.addSpecialCard(specialCardEntity); failedCardService.addSpecialCard(specialCardEntity);
}
}catch (Exception e){
logger.error("身份证号或受理号：" + jsonObject);
logger.error("Exception 生成余证异常", e);
} }
return true; return true;
} }
...@@ -176,8 +222,15 @@ public class FailedCardApi { ...@@ -176,8 +222,15 @@ public class FailedCardApi {
* @return List * @return List
*/ */
@RequestMapping("selectCardType") @RequestMapping("selectCardType")
public List<String> selectCardType() { public List<String> selectCardType(HttpServletRequest requ) {
List<String> result = failedCardService.selectCardType(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<String> result = new ArrayList <>();
try {
result = failedCardService.selectCardType();
}catch (Exception e){
logger.error("Exception 查询所有证件类型异常", e);
}
return result; return result;
} }
...@@ -189,10 +242,14 @@ public class FailedCardApi { ...@@ -189,10 +242,14 @@ public class FailedCardApi {
*/ */
@RequestMapping("insertBackCard") @RequestMapping("insertBackCard")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean insertBackCard(@RequestBody String jsonStr) { public Boolean insertBackCard(@RequestBody String jsonStr, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
TaskEntity taskEntity;
JSONArray jsonarray = new JSONArray();
try { try {
JSONArray jsonarray = JSONArray.fromObject(jsonStr); jsonarray = JSONArray.fromObject(jsonStr);
TaskEntity taskEntity = new TaskEntity(); taskEntity = new TaskEntity();
String str2 = null; String str2 = null;
for (int i = 0; i < jsonarray.size(); i++) { for (int i = 0; i < jsonarray.size(); i++) {
JSONObject jsonObject = (JSONObject) jsonarray.get(i); JSONObject jsonObject = (JSONObject) jsonarray.get(i);
...@@ -222,6 +279,8 @@ public class FailedCardApi { ...@@ -222,6 +279,8 @@ public class FailedCardApi {
failedCardService.insertGroupNo(String.valueOf(groupDataMap.get("GROUP_NO")), String.valueOf(groupDataMap.get("TASK_ID")), (Long) groupDataMap.get("VALID_COUNT"), (Long) groupDataMap.get("INVALID_COUNT")); failedCardService.insertGroupNo(String.valueOf(groupDataMap.get("GROUP_NO")), String.valueOf(groupDataMap.get("TASK_ID")), (Long) groupDataMap.get("VALID_COUNT"), (Long) groupDataMap.get("INVALID_COUNT"));
} }
} catch (NullPointerException e) { } catch (NullPointerException e) {
logger.error("身份证号或受理号：" + jsonarray);
logger.error("生成历史回迁证异常", e);
return false; return false;
} }
return true; return true;
......
src/main/java/com/yxproject/start/api/FilesAnalysisApi.java
View file @ 12005cfa
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.service.PersonPostService; import com.yxproject.start.service.PersonPostService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@RestController @RestController
@RequestMapping("FilesAnalysis") @RequestMapping("FilesAnalysis")
public class FilesAnalysisApi { public class FilesAnalysisApi {
@Autowired @Autowired
private PersonPostService personPostService; private PersonPostService personPostService;
Logger logger= Logger.getLogger(FilesAnalysisApi.class);
/** /**
* 文件解析 修改解析状态 * 文件解析 修改解析状态
* @param fileId * @param fileId
...@@ -19,8 +25,15 @@ public class FilesAnalysisApi { ...@@ -19,8 +25,15 @@ public class FilesAnalysisApi {
* @return * @return
*/ */
@RequestMapping("anailsis") @RequestMapping("anailsis")
public boolean filesAnailsis(@RequestParam(value = "fileId") String fileId,@RequestParam(value = "creatTime") String creatTime){ public boolean filesAnailsis(@RequestParam(value = "fileId") String fileId,@RequestParam(value = "creatTime") String creatTime, HttpServletRequest requ) {
personPostService.updateIsPost(fileId,creatTime); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
personPostService.updateIsPost(fileId,creatTime);
}catch (Exception e){
logger.error("文件ID：" + fileId + "生成时间：" + creatTime);
logger.error("Exception 文件解析 修改解析状态异常", e);
}
return true; return true;
} }
} }
src/main/java/com/yxproject/start/api/InfoManagementApi.java
View file @ 12005cfa
...@@ -3,12 +3,16 @@ package com.yxproject.start.api; ...@@ -3,12 +3,16 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.NewFilesEntity; import com.yxproject.start.entity.NewFilesEntity;
import com.yxproject.start.service.InfoManagementService; import com.yxproject.start.service.InfoManagementService;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@RestController @RestController
...@@ -17,6 +21,8 @@ public class InfoManagementApi { ...@@ -17,6 +21,8 @@ public class InfoManagementApi {
@Autowired @Autowired
private InfoManagementService infoManagementService; private InfoManagementService infoManagementService;
Logger logger= Logger.getLogger(InfoManagementApi.class);
/** /**
* 按条件查询制证信息数据 * 按条件查询制证信息数据
* @param beginFileName * @param beginFileName
...@@ -29,8 +35,16 @@ public class InfoManagementApi { ...@@ -29,8 +35,16 @@ public class InfoManagementApi {
* @return * @return
*/ */
@RequestMapping("selectInfoManagement") @RequestMapping("selectInfoManagement")
public List<NewFilesEntity>selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){ public List<NewFilesEntity>selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize, HttpServletRequest requ) {
List<NewFilesEntity> resultList = infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate), Long.valueOf(currPage),Long.valueOf(pageSize)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<NewFilesEntity> resultList = new ArrayList<NewFilesEntity>();
try {
infoManagementService.selectInfoManagement(beginFileName, endFileName, gajgMc, replaceDate(beginDate), replaceDate(endDate), Long.valueOf(currPage),Long.valueOf(pageSize));
}catch (Exception e){
logger.error("起始文件名：" + beginFileName + "截止文件名：" + endFileName + "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate + "页数：" + currPage + "行数：" + pageSize);
logger.error("Exception 按条件查询制证信息数据异常", e);
}
return resultList; return resultList;
} }
...@@ -45,9 +59,17 @@ public class InfoManagementApi { ...@@ -45,9 +59,17 @@ public class InfoManagementApi {
* @return * @return
*/ */
@RequestMapping("selectCount") @RequestMapping("selectCount")
public long selectCount(@Param("beginFileId")String beginFileId, @Param("endFileId")String endFileId, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){ public long selectCount(@Param("beginFileId")String beginFileId, @Param("endFileId")String endFileId, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, HttpServletRequest requ) {
long count= infoManagementService.count(beginFileId,endFileId,gajgMc,replaceDate(beginDate),replaceDate(endDate)); String remoteAddr = requ.getRemoteAddr();
return count; MDC.put("ip", remoteAddr);
long count= 0;
try {
count = infoManagementService.count(beginFileId,endFileId,gajgMc,replaceDate(beginDate),replaceDate(endDate));
}catch (Exception e){
logger.error( "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate);
logger.error("Exception 查询制证信息数据条数异常", e);
}
return count;
} }
/** /**
...@@ -61,10 +83,18 @@ public class InfoManagementApi { ...@@ -61,10 +83,18 @@ public class InfoManagementApi {
*/ */
@RequestMapping("deleteInfo") @RequestMapping("deleteInfo")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){ public boolean deleteInfo(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, HttpServletRequest requ) {
boolean result= infoManagementService.deleteInfo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate)); String remoteAddr = requ.getRemoteAddr();
//更改新文件状态 MDC.put("ip", remoteAddr);
infoManagementService.updatePackageNo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate)); boolean result = true;
try {
result = infoManagementService.deleteInfo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
//更改新文件状态
infoManagementService.updatePackageNo(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
}catch (Exception e){
logger.error("起始文件名：" + beginFileName + "截止文件名：" + endFileName + "公安机关名称：" + gajgMc + "起始时间：" + beginDate + "截止时间：" + endDate);
logger.error("Exception 删除制证信息数据异常", e);
}
return result; return result;
} }
......
src/main/java/com/yxproject/start/api/LogApi.java
View file @ 12005cfa
...@@ -2,12 +2,15 @@ package com.yxproject.start.api; ...@@ -2,12 +2,15 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.CountyDicEntity; import com.yxproject.start.entity.CountyDicEntity;
import com.yxproject.start.service.LogService; import com.yxproject.start.service.LogService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -20,6 +23,9 @@ import java.util.Map; ...@@ -20,6 +23,9 @@ import java.util.Map;
public class LogApi { public class LogApi {
@Autowired @Autowired
private LogService logService; private LogService logService;
Logger logger= Logger.getLogger(LogApi.class);
/** /**
* 查询新包生成日志 * 查询新包生成日志
* @param newFileName 新文件名 * @param newFileName 新文件名
...@@ -31,8 +37,16 @@ public class LogApi { ...@@ -31,8 +37,16 @@ public class LogApi {
* @return * @return
*/ */
@RequestMapping("selectNewFilesLog") @RequestMapping("selectNewFilesLog")
public List<Map<String,Object>> selectNewFilesLog (@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId, @RequestParam("createDate")String createDate, @RequestParam("uploadCountyCode")String uploadCountyCode, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){ public List<Map<String,Object>> selectNewFilesLog (@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId, @RequestParam("createDate")String createDate, @RequestParam("uploadCountyCode")String uploadCountyCode, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize, HttpServletRequest requ) {
List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,replaceDate(createDate),uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String,Object>> result = new ArrayList <>();
try {
result = logService.selectNewFilesLog(newFileName,cardId,replaceDate(createDate),uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
}catch (Exception e){
logger.error("新文件名：" + newFileName + "公民身份号码：" + cardId + "核验时间：" + createDate + "上传地市名称：" + uploadCountyCode + "页数：" + currPage + "行数：" + pageSize);
logger.error("Exception 查询新包生成日志异常", e);
}
return result; return result;
} }
...@@ -46,9 +60,17 @@ public class LogApi { ...@@ -46,9 +60,17 @@ public class LogApi {
* *
*/ */
@RequestMapping("selectNewFileLogCount") @RequestMapping("selectNewFileLogCount")
public int selectNewFileLogCount(@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId,@RequestParam("createDate")String createDate,@RequestParam("uploadCountyCode")String uploadCountyCode){ public int selectNewFileLogCount(@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId,@RequestParam("createDate")String createDate,@RequestParam("uploadCountyCode")String uploadCountyCode, HttpServletRequest requ) {
int total = logService.selectNewFileLogCount(newFileName,cardId,replaceDate(createDate),uploadCountyCode); String remoteAddr = requ.getRemoteAddr();
return total; MDC.put("ip", remoteAddr);
int total = 0;
try {
total = logService.selectNewFileLogCount(newFileName,cardId,replaceDate(createDate),uploadCountyCode);
}catch (Exception e){
logger.error("新文件名：" + newFileName + "公民身份号码：" + cardId + "核验时间：" + createDate + "上传地市名称：" + uploadCountyCode);
logger.error("Exception 查询新包生成日志总数异常", e);
}
return total;
} }
/** /**
...@@ -56,8 +78,15 @@ public class LogApi { ...@@ -56,8 +78,15 @@ public class LogApi {
* @return list * @return list
*/ */
@RequestMapping("selectCountyList") @RequestMapping("selectCountyList")
public List<CountyDicEntity> selectCountyList(){ public List<CountyDicEntity> selectCountyList(HttpServletRequest requ) {
List<CountyDicEntity> list = logService.getCountyList(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<CountyDicEntity> list = new ArrayList <>();
try {
list = logService.getCountyList();
}catch (Exception e){
logger.error("Exception 查询公安局列表异常", e);
}
return list; return list;
} }
...@@ -69,8 +98,16 @@ public class LogApi { ...@@ -69,8 +98,16 @@ public class LogApi {
* @return resultList * @return resultList
*/ */
@RequestMapping("selectByAnalysisLog") @RequestMapping("selectByAnalysisLog")
public List<Map<String,Object>> selectByAnalysisLog(@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){ public List<Map<String,Object>> selectByAnalysisLog(@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize, HttpServletRequest requ) {
List<Map<String,Object>> resultList = logService.selectAnalysisLog(fileName,replaceDate(analysisTime),Long.valueOf(currPage),Long.valueOf(pageSize)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String,Object>> resultList = new ArrayList <>();
try {
resultList = logService.selectAnalysisLog(fileName,replaceDate(analysisTime),Long.valueOf(currPage),Long.valueOf(pageSize));
}catch (Exception e){
logger.error("文件名：" + fileName + "解析时间：" + analysisTime + "页数：" + currPage + "行数：" + pageSize);
logger.error("Exception 查询解析日志异常", e);
}
return resultList; return resultList;
} }
...@@ -82,8 +119,16 @@ public class LogApi { ...@@ -82,8 +119,16 @@ public class LogApi {
* @return total * @return total
*/ */
@RequestMapping("selectAnalysisLogCount") @RequestMapping("selectAnalysisLogCount")
public int selectAnalysisLogCount (@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime){ public int selectAnalysisLogCount (@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime, HttpServletRequest requ) {
int total = logService.selectAnalysisLogCount(fileName,replaceDate(analysisTime)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
int total = 0;
try {
total = logService.selectAnalysisLogCount(fileName,replaceDate(analysisTime));
}catch (Exception e){
logger.error("文件名：" + fileName + "解析时间：" + analysisTime);
logger.error("Exception 查询解析日志总数异常", e);
}
return total; return total;
} }
...@@ -93,11 +138,20 @@ public class LogApi { ...@@ -93,11 +138,20 @@ public class LogApi {
* @return resultList * @return resultList
*/ */
@RequestMapping("selectAnalysisData") @RequestMapping("selectAnalysisData")
public List<Map<String,Object>> selectAnalysisData(@RequestParam("uploadDate")String uploadDate){ public List<Map<String,Object>> selectAnalysisData(@RequestParam("uploadDate")String uploadDate, HttpServletRequest requ) {
List<Map<String,Object>> resultList = logService.selectAnalysisData(replaceDate(uploadDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String,Object>> resultList = new ArrayList <>();
try {
resultList = logService.selectAnalysisData(replaceDate(uploadDate));
}catch (Exception e){
logger.error("导入时间：" + uploadDate);
logger.error("Exception 根据导入时间查询解析数据异常", e);
}
return resultList; return resultList;
} }
/** /**
* 解析 * 解析
* @param printDate * @param printDate
...@@ -106,33 +160,40 @@ public class LogApi { ...@@ -106,33 +160,40 @@ public class LogApi {
*/ */
@RequestMapping("analysis") @RequestMapping("analysis")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean analysis(@RequestParam("printDate")String printDate,@RequestParam("fileId")String fileId){ public boolean analysis(@RequestParam("printDate")String printDate,@RequestParam("fileId")String fileId, HttpServletRequest requ) {
logService.changeCardType(printDate,fileId); String remoteAddr = requ.getRemoteAddr();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMddhhmmss"); MDC.put("ip", remoteAddr);
logService.insertAnalysisDate(df.format(new Date()),fileId); try {
//查询XML文件信息 logService.changeCardType(printDate, fileId);
List<Map<String,Object>> resultList = logService.selectFileIdByUploadDate(printDate); SimpleDateFormat df=new SimpleDateFormat("yyyyMMddhhmmss");
//查询Excel文件信息 logService.insertAnalysisDate(df.format(new Date()), fileId);
Map<String, Object> resultMap = logService.selectFileNameDic(fileId); //查询XML文件信息
//更改解析状态 List <Map <String, Object>> resultList=logService.selectFileIdByUploadDate(printDate);
logService.changeFileState(fileId); //查询Excel文件信息
//查询身份数据 Map <String, Object> resultMap=logService.selectFileNameDic(fileId);
List<Map<String, Object>> dataList = logService.selectIdData(fileId); //更改解析状态
//将身份数据插入到邮寄表中 logService.changeFileState(fileId);
for (int i=0;i<dataList.size();i++){ //查询身份数据
logService.insertIdData((String) dataList.get(i).get("GMSFHM"),(String) dataList.get(i).get("SSXQDM"),(String) dataList.get(i).get("YXQQSRQ"),(String) dataList.get(i).get("YXQJZRQ"), (String) dataList.get(i).get("JMSFZSLH")); List <Map <String, Object>> dataList=logService.selectIdData(fileId);
} //将身份数据插入到邮寄表中
List<Map<String,Object>> result = new ArrayList<>(); for (int i=0; i < dataList.size(); i++) {
for (int i=0; i<resultList.size();i++){ logService.insertIdData((String) dataList.get(i).get("GMSFHM"), (String) dataList.get(i).get("SSXQDM"), (String) dataList.get(i).get("YXQQSRQ"), (String) dataList.get(i).get("YXQJZRQ"), (String) dataList.get(i).get("JMSFZSLH"));
String fileName=(BigDecimal)(resultList.get(i).get("ID"))+""; }
//查询证件类型计数 List <Map <String, Object>> result=new ArrayList <>();
Map<String,Object>countMap= logService.selectCountByCardType( (BigDecimal)(resultList.get(i).get("ID"))+""); for (int i=0; i < resultList.size(); i++) {
resultMap.put("fileName",fileName); String fileName=(BigDecimal) (resultList.get(i).get("ID")) + "";
resultMap.put("commonCount",countMap.get("PUSUM")); //查询证件类型计数
resultMap.put("postCount",countMap.get("YOUSUM")); Map <String, Object> countMap=logService.selectCountByCardType((BigDecimal) (resultList.get(i).get("ID")) + "");
result.add(resultMap); resultMap.put("fileName", fileName);
//生成解析表 resultMap.put("commonCount", countMap.get("PUSUM"));
logService.insertIntoAnalysis(fileId,fileName,String.valueOf(countMap.get("PUSUM")),String.valueOf(countMap.get("YOUSUM"))); resultMap.put("postCount", countMap.get("YOUSUM"));
result.add(resultMap);
//生成解析表
logService.insertIntoAnalysis(fileId, fileName, String.valueOf(countMap.get("PUSUM")), String.valueOf(countMap.get("YOUSUM")));
}
}catch (Exception e){
logger.error("导入时间：" + printDate + "文件名：" + fileId);
logger.error("Exception 解析异常", e);
} }
return true; return true;
} }
...@@ -145,13 +206,21 @@ public class LogApi { ...@@ -145,13 +206,21 @@ public class LogApi {
*/ */
@RequestMapping("deleteFiles") @RequestMapping("deleteFiles")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean deleteFiles(@RequestParam("uploadTime")String uploadTime){ public boolean deleteFiles(@RequestParam("uploadTime")String uploadTime, HttpServletRequest requ) {
List<String> idList =logService.selectId(uploadTime); String remoteAddr = requ.getRemoteAddr();
for (int i=0;i<idList.size();i++){ MDC.put("ip", remoteAddr);
logService.deleteFilesData(idList.get(i)); List<String> idList =new ArrayList <String>();
} try {
for (int i=0;i<idList.size();i++){ idList = logService.selectId(uploadTime);
logService.deleteFile(idList.get(i)); for (int i=0;i<idList.size();i++){
logService.deleteFilesData(idList.get(i));
}
for (int i=0;i<idList.size();i++){
logService.deleteFile(idList.get(i));
}
}catch (Exception e){
logger.error("导入时间：" + uploadTime);
logger.error("Exception 解析异常", e);
} }
return true; return true;
} }
......
src/main/java/com/yxproject/start/api/MaterialManagementApi.java
View file @ 12005cfa
...@@ -4,11 +4,15 @@ import com.yxproject.start.entity.CardBodyEntity; ...@@ -4,11 +4,15 @@ import com.yxproject.start.entity.CardBodyEntity;
import com.yxproject.start.entity.PlasticFilmEntity; import com.yxproject.start.entity.PlasticFilmEntity;
import com.yxproject.start.service.MaterialManagementService; import com.yxproject.start.service.MaterialManagementService;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -19,6 +23,8 @@ public class MaterialManagementApi { ...@@ -19,6 +23,8 @@ public class MaterialManagementApi {
@Autowired @Autowired
private MaterialManagementService materialManagementService; private MaterialManagementService materialManagementService;
Logger logger= Logger.getLogger(MaterialManagementApi.class);
/** /**
* 插入膜耗材数据 * 插入膜耗材数据
* @param totalCount * @param totalCount
...@@ -27,8 +33,16 @@ public class MaterialManagementApi { ...@@ -27,8 +33,16 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("insertFilm") @RequestMapping("insertFilm")
public boolean insertFilm(@Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note, @Param("name")String name,@Param("state")String state){ public boolean insertFilm(@Param("totalCount")String totalCount, @Param("plasticFilmType")String plasticFilmType, @Param("note")String note, @Param("name")String name,@Param("state")String state, HttpServletRequest requ) {
boolean result = materialManagementService.insertFilm(totalCount, plasticFilmType, note,name,Long.valueOf(state)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
boolean result = true;
try {
result = materialManagementService.insertFilm(totalCount, plasticFilmType, note,name,Long.valueOf(state));
}catch (Exception e){
logger.error("数量：" + totalCount + "膜类型（1出库2入库）：" + plasticFilmType + "备注：" + note + "提交人姓名：" + name + "是否审核1审核0未审核：" + state);
logger.error("Exception 插入膜耗材数据异常", e);
}
return result; return result;
} }
...@@ -40,8 +54,16 @@ public class MaterialManagementApi { ...@@ -40,8 +54,16 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("insertCardBody") @RequestMapping("insertCardBody")
public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name, @Param("cardBodyType")String cardBodyType,@Param("state")String state){ public boolean insertCardBody(@Param("cardType")String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name, @Param("cardBodyType")String cardBodyType,@Param("state")String state, HttpServletRequest requ) {
boolean result = materialManagementService.insertCardBody(cardType, totalCount, note,name,cardBodyType,Long.valueOf(state)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
boolean result = true;
try {
result = materialManagementService.insertCardBody(cardType, totalCount, note,name,cardBodyType,Long.valueOf(state));
}catch (Exception e){
logger.error("数量：" + totalCount + "卡基类型(1出库2入库)：" + cardType + "备注：" + note + "提交人姓名：" + name + "是否审核1审核0未审核：" + state);
logger.error("Exception 插入卡体耗材数据异常", e);
}
return result; return result;
} }
...@@ -77,16 +99,22 @@ public class MaterialManagementApi { ...@@ -77,16 +99,22 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("selectCardBodyManagement") @RequestMapping("selectCardBodyManagement")
public Map<String,Object> selectCardBodyManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name,@Param("cardBodyType")String cardBodyType){ public Map<String,Object> selectCardBodyManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name,@Param("cardBodyType")String cardBodyType, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String,Object> resultMap = new HashMap<>(); Map<String,Object> resultMap = new HashMap<>();
List<CardBodyEntity> cardBodyEntities = materialManagementService.selectCardBody(replaceDate(beginDate),replaceDate(endDate),typeCode,name,cardBodyType); try {
String cardCount1 = materialManagementService.selectCardCount1(replaceDate(beginDate),replaceDate(endDate),typeCode,name); List<CardBodyEntity> cardBodyEntities = materialManagementService.selectCardBody(replaceDate(beginDate),replaceDate(endDate),typeCode,name,cardBodyType);
String cardCount2 = materialManagementService.selectCardCount2(replaceDate(beginDate),replaceDate(endDate),typeCode,name); String cardCount1 = materialManagementService.selectCardCount1(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
resultMap.put("cardBody",cardBodyEntities); String cardCount2 = materialManagementService.selectCardCount2(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
resultMap.put("cardCount1",cardCount1); resultMap.put("cardBody",cardBodyEntities);
resultMap.put("cardCount2",cardCount2); resultMap.put("cardCount1",cardCount1);
resultMap.put("cardCount2",cardCount2);
}catch (Exception e){
logger.error("起始时间：" + beginDate + "截止时间：" + endDate + "卡基类型(1出库2入库)：" + typeCode + "提交人姓名：" + name + "1身份卡2港澳3台湾：" + cardBodyType);
logger.error("Exception 查询卡机统计数据异常", e);
}
return resultMap; return resultMap;
} }
...@@ -97,16 +125,22 @@ public class MaterialManagementApi { ...@@ -97,16 +125,22 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("selectPlasticFilmManagement") @RequestMapping("selectPlasticFilmManagement")
public Map<String,Object> selectPlasticFilmManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name){ public Map<String,Object> selectPlasticFilmManagement(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String,Object> resultMap = new HashMap<>(); Map<String,Object> resultMap = new HashMap<>();
List<PlasticFilmEntity> plasticFilmEntities = materialManagementService.selectFilm(replaceDate(beginDate),replaceDate(endDate),typeCode,name); try {
String plasticFilmCount1=materialManagementService.selectFilmCount1(replaceDate(beginDate),replaceDate(endDate),typeCode,name); List<PlasticFilmEntity> plasticFilmEntities = materialManagementService.selectFilm(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
String plasticFilmCount2=materialManagementService.selectFilmCount2(replaceDate(beginDate),replaceDate(endDate),typeCode,name); String plasticFilmCount1=materialManagementService.selectFilmCount1(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
resultMap.put("plasticFilm",plasticFilmEntities); String plasticFilmCount2=materialManagementService.selectFilmCount2(replaceDate(beginDate),replaceDate(endDate),typeCode,name);
resultMap.put("plasticFilmCount1",plasticFilmCount1); resultMap.put("plasticFilm",plasticFilmEntities);
resultMap.put("plasticFilmCount2",plasticFilmCount2); resultMap.put("plasticFilmCount1",plasticFilmCount1);
resultMap.put("plasticFilmCount2",plasticFilmCount2);
}catch (Exception e){
logger.error( "起始时间：" + beginDate + "截止时间：" + endDate + "膜类型（1出库2入库）：" + typeCode + "提交人姓名：" + name);
logger.error("Exception 查询膜统计数据异常", e);
}
return resultMap; return resultMap;
} }
/** /**
...@@ -115,40 +149,73 @@ public class MaterialManagementApi { ...@@ -115,40 +149,73 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("updateCardBody") @RequestMapping("updateCardBody")
public boolean updateCardBody(@Param("id")String id){ public boolean updateCardBody(@Param("id")String id, HttpServletRequest requ) {
return materialManagementService.updateCardBodyState(Long.valueOf(id)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
boolean cardBody = true;
try {
cardBody = materialManagementService.updateCardBodyState(Long.valueOf(id));
}catch (Exception e){
logger.error( "卡基统计信息表ID：" + id);
logger.error("Exception 更新卡体详情状态异常", e);
}
return cardBody;
} }
/** /**
* 查询未审核卡体详情 * 查询未审核卡体详情
*/ */
@RequestMapping("selectCardBody") @RequestMapping("selectCardBody")
public List<CardBodyEntity> selectCardBody(@Param("date")String date,@Param("name")String name){ public List<CardBodyEntity> selectCardBody(@Param("date")String date,@Param("name")String name, HttpServletRequest requ) {
return materialManagementService.selectCardBody(replaceDate(date),name); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<CardBodyEntity> cardBody = new ArrayList<>();
try {
cardBody=materialManagementService.selectCardBody(replaceDate(date), name);
}catch (Exception e){
logger.error( "审核时间：" + date + "提交人姓名：" + name);
logger.error("Exception 查询未审核卡体详情异常", e);
}
return cardBody;
} }
/** /**
* 更新膜详情状态 * 更新膜详情状态
* @param id cardBodyID * @param id cardBodyID
* @return * @return
*/ */
@RequestMapping("updatePlasticFilm") @RequestMapping("updatePlasticFilm")
public boolean updatePlasticFilm(@Param("id")String id){ public boolean updatePlasticFilm(@Param("id")String id, HttpServletRequest requ) {
return materialManagementService.updatePlasticFilm(Long.valueOf(id)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
boolean plasticFilm = true;
try {
plasticFilm = materialManagementService.updatePlasticFilm(Long.valueOf(id));
}catch (Exception e){
logger.error( "塑料膜表流水号：" + id );
logger.error("Exception 更新膜详情状态异常", e);
}
return plasticFilm;
} }
/** /**
* 查询未审核膜详情 * 查询未审核膜详情
*/ */
@RequestMapping("selectPlasticFilm") @RequestMapping("selectPlasticFilm")
public List<PlasticFilmEntity> selectPlasticFilm(@Param("date")String date,@Param("name")String name){ public List<PlasticFilmEntity> selectPlasticFilm(@Param("date")String date,@Param("name")String name, HttpServletRequest requ) {
return materialManagementService.selectPlasticFilm(replaceDate(date),name); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
} List<PlasticFilmEntity> plasticFilm = new ArrayList <PlasticFilmEntity>();
try {
plasticFilm = materialManagementService.selectPlasticFilm(replaceDate(date), name);
}catch (Exception e){
logger.error( "审核时间：" + date + "提交人姓名：" + name);
logger.error("Exception 查询未审核膜详情异常", e);
}
return plasticFilm;
}
/** /**
...@@ -161,10 +228,17 @@ public class MaterialManagementApi { ...@@ -161,10 +228,17 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("queryCardBodyReport") @RequestMapping("queryCardBodyReport")
public Map<String,Object> queryCardBodyReport(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, @Param("cardBodyType")String cardBodyType, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){ public Map<String,Object> queryCardBodyReport(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, @Param("cardBodyType")String cardBodyType, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize, HttpServletRequest requ) {
Map<String, Object> map = materialManagementService.selectCardBodyReport(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name), cardBodyType,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String, Object> map = null;
try {
map = materialManagementService.selectCardBodyReport(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name), cardBodyType, (Long.valueOf(currPage) - 1) * Long.valueOf(pageSize) + 1, Long.valueOf(currPage) * Long.valueOf(pageSize));
}catch (Exception e){
logger.error( "起始时间：" + beginDate + "截止时间：" + endDate + "卡基类型(1出库2入库)：" + operateType + "提交人姓名：" + name + "1身份卡2港澳3台湾：" + cardBodyType + "页数：" + currPage + "条数：" + pageSize);
logger.error("Exception 查询卡基报表统计数据异常", e);
}
return map; return map;
} }
/** /**
...@@ -177,8 +251,16 @@ public class MaterialManagementApi { ...@@ -177,8 +251,16 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("queryCardBodyReportCount") @RequestMapping("queryCardBodyReportCount")
public int queryCardBodyReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, @Param("cardBodyType")String cardBodyType){ public int queryCardBodyReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, @Param("cardBodyType")String cardBodyType, HttpServletRequest requ) {
int i = materialManagementService.selectCardBodyReportCount(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name), cardBodyType); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
int i = 0;
try{
i = materialManagementService.selectCardBodyReportCount(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name), cardBodyType);
}catch (Exception e){
logger.error( "起始时间：" + beginDate + "截止时间：" + endDate + "卡基类型(1出库2入库)：" + operateType + "提交人姓名：" + name + "1身份卡2港澳3台湾：" + cardBodyType);
logger.error("Exception 查询卡基报表统计数量异常", e);
}
return i; return i;
} }
...@@ -186,10 +268,16 @@ public class MaterialManagementApi { ...@@ -186,10 +268,16 @@ public class MaterialManagementApi {
* 查询卡基操作人 * 查询卡基操作人
*/ */
@RequestMapping("queryCardBodyOperation") @RequestMapping("queryCardBodyOperation")
public List<Map<String,Object>> queryCardBodyOperation(){ public List<Map<String,Object>> queryCardBodyOperation(HttpServletRequest requ) {
List<Map<String, Object>> maps = materialManagementService.selectCardBodyOperation(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> maps = null;
try {
maps = materialManagementService.selectCardBodyOperation();
}catch (Exception e){
logger.error("Exception 查询卡基操作人异常", e);
}
return maps; return maps;
} }
/** /**
...@@ -201,8 +289,16 @@ public class MaterialManagementApi { ...@@ -201,8 +289,16 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("queryPlasticFilmReport") @RequestMapping("queryPlasticFilmReport")
public Map<String,Object> queryPlasticFilmReport(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("operateType")String operateType,@Param("name")String name, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){ public Map<String,Object> queryPlasticFilmReport(@Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("operateType")String operateType,@Param("name")String name, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize, HttpServletRequest requ) {
Map<String, Object> map = materialManagementService.selectPlasticFilmReport(replaceDate(beginDate), replaceDate(endDate), operateType,replaceNullString(name),(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String, Object> map = null;
try {
map = materialManagementService.selectPlasticFilmReport(replaceDate(beginDate), replaceDate(endDate), operateType,replaceNullString(name),(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1,Long.valueOf(currPage)*Long.valueOf(pageSize));
}catch (Exception e){
logger.error( "起始时间：" + beginDate + "截止时间：" + endDate + "卡基类型(1出库2入库)：" + operateType + "提交人姓名：" + name + "页数：" + currPage + "条数：" + pageSize);
logger.error("Exception 查询膜报表统计数据异常", e);
}
return map; return map;
} }
...@@ -215,20 +311,33 @@ public class MaterialManagementApi { ...@@ -215,20 +311,33 @@ public class MaterialManagementApi {
* @return * @return
*/ */
@RequestMapping("queryPlasticFilmReportCount") @RequestMapping("queryPlasticFilmReportCount")
public int queryPlasticFilmReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name){ public int queryPlasticFilmReportCount(@Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("operateType")String operateType, @Param("name")String name, HttpServletRequest requ) {
int i = materialManagementService.selectPlasticFilmReportCount(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
int i = 0;
try {
i = materialManagementService.selectPlasticFilmReportCount(replaceDate(beginDate), replaceDate(endDate), operateType, replaceNullString(name));
}catch (Exception e){
logger.error( "起始时间：" + beginDate + "截止时间：" + endDate + "卡基类型(1出库2入库)：" + operateType + "提交人姓名：" + name);
logger.error("Exception 查询膜报表统计数量异常", e);
}
return i; return i;
} }
/** /**
* 查询膜操作人 * 查询膜操作人
*/ */
@RequestMapping("queryPlasticFilmOperation") @RequestMapping("queryPlasticFilmOperation")
public List<Map<String,Object>> queryPlasticFilmOperation(){ public List<Map<String,Object>> queryPlasticFilmOperation(HttpServletRequest requ) {
List<Map<String, Object>> maps = materialManagementService.selectPlasticFilmOperation(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> maps = new ArrayList <>();
try {
maps = materialManagementService.selectPlasticFilmOperation();
}catch (Exception e){
logger.error("Exception 查询膜操作人异常", e);
}
return maps; return maps;
} }
/** /**
......
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ 12005cfa
...@@ -5,6 +5,8 @@ import com.yxproject.start.entity.PersonPostEntity; ...@@ -5,6 +5,8 @@ import com.yxproject.start.entity.PersonPostEntity;
import com.yxproject.start.service.PersonPostService; import com.yxproject.start.service.PersonPostService;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.HorizontalAlignment;
...@@ -37,6 +39,9 @@ public class PersonPostApi { ...@@ -37,6 +39,9 @@ public class PersonPostApi {
@Autowired @Autowired
PersonPostService personPostService; PersonPostService personPostService;
Logger logger= Logger.getLogger(PersonPostApi.class);
/** /**
* 查询备注信息 * 查询备注信息
* @param jsonStr * @param jsonStr
...@@ -44,13 +49,21 @@ public class PersonPostApi { ...@@ -44,13 +49,21 @@ public class PersonPostApi {
*/ */
@RequestMapping("selectNote") @RequestMapping("selectNote")
@Transactional @Transactional
public List<Map<String,Object>>selectNote(@RequestBody String jsonStr){ public List<Map<String,Object>>selectNote(@RequestBody String jsonStr, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
List<Map<String,Object>> resultList = new ArrayList<>(); MDC.put("ip", remoteAddr);
JSONArray jsonArray = JSONArray.fromObject(jsonStr); List<Map<String,Object>> resultList = new ArrayList <>();
for (int i=0;i<jsonArray.size();i++){ JSONArray jsonArray = new JSONArray();
Map<String,Object> resultMap=personPostService.selectNote((int)(jsonArray.get(i))); try {
resultList.add(resultMap); resultList = new ArrayList<>();
jsonArray = JSONArray.fromObject(jsonStr);
for (int i=0;i<jsonArray.size();i++){
Map<String,Object> resultMap=personPostService.selectNote((int)(jsonArray.get(i)));
resultList.add(resultMap);
}
}catch (Exception e){
logger.error("备注信息：" + jsonArray );
logger.error("Exception 查询备注信息异常", e);
} }
return resultList; return resultList;
} }
...@@ -62,11 +75,19 @@ public class PersonPostApi { ...@@ -62,11 +75,19 @@ public class PersonPostApi {
*/ */
@RequestMapping("addNote") @RequestMapping("addNote")
@Transactional @Transactional
public boolean addNote(@RequestBody String jsonStr){ public boolean addNote(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONArray jsonArray = JSONArray.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
for (int i=0;i<jsonArray.size();i++){ MDC.put("ip", remoteAddr);
Map<String,Object> noteMap = (Map<String, Object>) jsonArray.get(i); JSONArray jsonArray = new JSONArray();
personPostService.addNote(noteMap.get("id").toString(),noteMap.get("note").toString()); try {
jsonArray = JSONArray.fromObject(jsonStr);
for (int i=0;i<jsonArray.size();i++){
Map<String,Object> noteMap = (Map<String, Object>) jsonArray.get(i);
personPostService.addNote(noteMap.get("id").toString(),noteMap.get("note").toString());
}
}catch (Exception e){
logger.error("备注信息：" + jsonArray );
logger.error("Exception 更改备注信息异常", e);
} }
return true; return true;
} }
...@@ -79,17 +100,26 @@ public class PersonPostApi { ...@@ -79,17 +100,26 @@ public class PersonPostApi {
*/ */
@RequestMapping("findPersonalDataCount") @RequestMapping("findPersonalDataCount")
@Transactional @Transactional
public int findPersonalDataCount(@RequestBody String jsonStr){ public int findPersonalDataCount(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
String applicantName = jsonObject.getString("applicantName"); MDC.put("ip", remoteAddr);
String orderNumber = jsonObject.getString("orderNumber"); JSONObject jsonObject = new JSONObject();
String state = jsonObject.getString("state"); int count = 0;
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation"); try {
JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty"); jsonObject = JSONObject.fromObject(jsonStr);
String uploadDate = replaceDate(jsonObject.getString("uploadDate")); String applicantName = jsonObject.getString("applicantName");
String emailNo = jsonObject.getString("emailNo"); String orderNumber = jsonObject.getString("orderNumber");
String notNull = jsonObject.getString("notNull"); String state = jsonObject.getString("state");
int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,emailNo,notNull); String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty");
String uploadDate = replaceDate(jsonObject.getString("uploadDate"));
String emailNo = jsonObject.getString("emailNo");
String notNull = jsonObject.getString("notNull");
count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,emailNo,notNull);
}catch (Exception e){
logger.error("个人邮寄信息：" + jsonObject );
logger.error("Exception 按条件查询个人邮寄信息异常", e);
}
return count; return count;
} }
...@@ -100,19 +130,28 @@ public class PersonPostApi { ...@@ -100,19 +130,28 @@ public class PersonPostApi {
*/ */
@RequestMapping("findPersonalData") @RequestMapping("findPersonalData")
@Transactional @Transactional
public List<PersonPostEntity> findPersonalData(@RequestBody String jsonStr){ public List<PersonPostEntity> findPersonalData(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
String applicantName = jsonObject.getString("applicantName"); MDC.put("ip", remoteAddr);
String orderNumber = jsonObject.getString("orderNumber"); JSONObject jsonObject = new JSONObject();
String state = jsonObject.getString("state"); List<PersonPostEntity> list = new ArrayList <>();
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation"); try {
JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty"); jsonObject = JSONObject.fromObject(jsonStr);
String uploadDate =replaceDate(jsonObject.getString("uploadDate")); String applicantName = jsonObject.getString("applicantName");
String firstIndex = jsonObject.getString("firstIndex"); String orderNumber = jsonObject.getString("orderNumber");
String pageSize = jsonObject.getString("pageSize"); String state = jsonObject.getString("state");
String emailNo = jsonObject.getString("emailNo"); String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
int notNull = Integer.parseInt((jsonObject.getString("notNull"))); JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty");
List<PersonPostEntity> list = personPostService.findPersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,firstIndex,pageSize,emailNo,notNull); String uploadDate =replaceDate(jsonObject.getString("uploadDate"));
String firstIndex = jsonObject.getString("firstIndex");
String pageSize = jsonObject.getString("pageSize");
String emailNo = jsonObject.getString("emailNo");
int notNull = Integer.parseInt((jsonObject.getString("notNull")));
list = personPostService.findPersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate,firstIndex,pageSize,emailNo,notNull);
}catch (Exception e){
logger.error("个人邮寄信息：" + jsonObject );
logger.error("Exception 按条件查询个人邮寄信息异常", e);
}
return list; return list;
} }
...@@ -122,15 +161,23 @@ public class PersonPostApi { ...@@ -122,15 +161,23 @@ public class PersonPostApi {
* @return * @return
*/ */
@RequestMapping("deletePersonalData") @RequestMapping("deletePersonalData")
public boolean deletePersonalData(@RequestBody String jsonStr){ public boolean deletePersonalData(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
String applicantName = jsonObject.getString("applicantName"); MDC.put("ip", remoteAddr);
String orderNumber = jsonObject.getString("orderNumber"); JSONObject jsonObject = new JSONObject();
String state = jsonObject.getString("state"); try {
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation"); jsonObject = JSONObject.fromObject(jsonStr);
JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty"); String applicantName = jsonObject.getString("applicantName");
String uploadDate = jsonObject.getString("uploadDate"); String orderNumber = jsonObject.getString("orderNumber");
personPostService.deletePersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate); String state = jsonObject.getString("state");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty");
String uploadDate = jsonObject.getString("uploadDate");
personPostService.deletePersonalData(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate);
}catch (Exception e){
logger.error("个人邮寄信息：" + jsonObject );
logger.error("Exception 按条件删除个人邮寄信息异常", e);
}
return true; return true;
} }
...@@ -140,39 +187,70 @@ public class PersonPostApi { ...@@ -140,39 +187,70 @@ public class PersonPostApi {
* @return * @return
*/ */
@RequestMapping("recordsHaveNotPrinted") @RequestMapping("recordsHaveNotPrinted")
public boolean deletePersonalDataByImportDate(@RequestParam("importDate")String importDate){ public boolean deletePersonalDataByImportDate(@RequestParam("importDate")String importDate, HttpServletRequest requ) {
personPostService.deletePersonalDataByImportDate(replaceDate(importDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
personPostService.deletePersonalDataByImportDate(replaceDate(importDate));
}catch (Exception e){
logger.error("导入日期：" + importDate );
logger.error("Exception 根据导入日期删除未打印的邮政信息异常", e);
}
return true; return true;
} }
/** /**
* 根据导入日期删除未打印的邮政信息数量 * 根据导入日期删除未打印的邮政信息数量
* @param importDate * @param importDate
* @return * @return
*/ */
@RequestMapping("findPersonalDataCountByImportDate") @RequestMapping("findPersonalDataCountByImportDate")
public int findPersonalDataCountByImportDate(@RequestParam("importDate")String importDate){ public int findPersonalDataCountByImportDate(@RequestParam("importDate")String importDate, HttpServletRequest requ) {
int count = personPostService.findPersonalDataCountByImportDate(replaceDate(importDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
int count = 0;
try {
count = personPostService.findPersonalDataCountByImportDate(replaceDate(importDate));
}catch (Exception e){
logger.error("导入日期：" + importDate );
logger.error("Exception 根据导入日期删除未打印的邮政信息数量异常", e);
}
return count; return count;
} }
@RequestMapping("download") @RequestMapping("download")
public void exportExcel(HttpServletRequest request,HttpServletResponse response, public void exportExcel(HttpServletRequest request,HttpServletResponse response,
@RequestParam("uploadDate") String uploadDate, @RequestParam("hasPrinted") String hasPrinted, @RequestParam("uploadDate") String uploadDate, @RequestParam("hasPrinted") String hasPrinted,
@RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh, @RequestParam("djx") List<String> djx, @RequestParam("gkxx") String gkxx, @RequestParam("ddh") String ddh,
@RequestParam("sequence")String sequence, @RequestParam("sqrxm") String sqrxm,@RequestParam("emailNo") String emailNo) throws Exception { @RequestParam("sequence")String sequence, @RequestParam("sqrxm") String sqrxm,@RequestParam("emailNo") String emailNo) throws Exception {
JSONArray jsonArray = JSONArray.fromObject(djx); String remoteAddr = request.getRemoteAddr();
List<PersonPostEntity> list = personPostService.downLoadReportForm(request,response,sqrxm,ddh,hasPrinted,gkxx,jsonArray,replaceDate(uploadDate),emailNo); MDC.put("ip", remoteAddr);
exportExcel(request, response, list); JSONArray jsonArray = new JSONArray();
try {
jsonArray = JSONArray.fromObject(djx);
List<PersonPostEntity> list = personPostService.downLoadReportForm(request,response,sqrxm,ddh,hasPrinted,gkxx,jsonArray,replaceDate(uploadDate),emailNo);
exportExcel(request, response, list);
}catch (Exception e){
logger.error("上传时间：" + uploadDate +"类型普证-0，邮寄-9：" + hasPrinted +"格口信息：" + gkxx +"订单号：" + ddh +"申请人姓名：" + sqrxm +"运单号码：" + emailNo);
logger.error("Exception 下载Excel异常", e);
}
} }
/** /**
*刷身份证查询邮寄单信息详情 *刷身份证查询邮寄单信息详情
*/ */
@RequestMapping("getPostInfo") @RequestMapping("getPostInfo")
public List<PersonPostEntity> findPersonalData(@RequestBody ReadCardDto readCardDto){ public List<PersonPostEntity> findPersonalData(@RequestBody ReadCardDto readCardDto, HttpServletRequest requ) {
List<PersonPostEntity> list = personPostService.getPostInfo(readCardDto); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<PersonPostEntity> list = new ArrayList <PersonPostEntity>();
try {
list = personPostService.getPostInfo(readCardDto);
}catch (Exception e){
logger.error("身份证号：" + readCardDto.getIdCard() + "起始时间" + readCardDto.getStartDate() + "截止时间" + readCardDto.getEndDate());
logger.error("Exception 刷身份证查询邮寄单信息详情异常", e);
}
return list; return list;
} }
...@@ -183,13 +261,17 @@ public class PersonPostApi { ...@@ -183,13 +261,17 @@ public class PersonPostApi {
* @return * @return
*/ */
@RequestMapping("updatePrintDate") @RequestMapping("updatePrintDate")
public boolean updatePrintDate(@RequestParam("id") int id, @RequestParam("printTime") String printTime) { public boolean updatePrintDate(@RequestParam("id") int id, @RequestParam("printTime") String printTime, HttpServletRequest requ) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String remoteAddr = requ.getRemoteAddr();
boolean flag=false; MDC.put("ip", remoteAddr);
boolean flag = false;
try { try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
flag = personPostService.printPostList(id, sdf.parse(printTime)); flag = personPostService.printPostList(id, sdf.parse(printTime));
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("打印机ID" + id + "打印时间" + printTime);
logger.error("更改打印状态异常", e);
} }
return flag; return flag;
} }
...@@ -210,94 +292,97 @@ public class PersonPostApi { ...@@ -210,94 +292,97 @@ public class PersonPostApi {
* *
*/ */
private void exportExcel(HttpServletRequest request, HttpServletResponse response, List<PersonPostEntity> records) throws Exception { private void exportExcel(HttpServletRequest request, HttpServletResponse response, List<PersonPostEntity> records) throws Exception {
HSSFWorkbook wb = new HSSFWorkbook(); String remoteAddr = request.getRemoteAddr();
HSSFSheet sheet = wb.createSheet("模板明细"); MDC.put("ip", remoteAddr);
HSSFCellStyle style = wb.createCellStyle(); try {
HSSFWorkbook wb=new HSSFWorkbook();
HSSFSheet sheet=wb.createSheet("模板明细");
HSSFCellStyle style=wb.createCellStyle();
style.setAlignment(HorizontalAlignment.CENTER); style.setAlignment(HorizontalAlignment.CENTER);
HSSFRow firstRow = sheet.createRow(0); HSSFRow firstRow=sheet.createRow(0);
String []rowTitle = {"订单号", "寄件人姓名", "寄件人电话2", "寄件人详细地址", "收件人姓名", "收件人电话2", String[] rowTitle={"订单号", "寄件人姓名", "寄件人电话2", "寄件人详细地址", "收件人姓名", "收件人电话2",
"收件人邮编", "邮件号", "内件性质", "重量", "长", "宽", "高", "收件人城市","收件人区县", "收件人详细地址", "收件人邮编", "邮件号", "内件性质", "重量", "长", "宽", "高", "收件人城市", "收件人区县", "收件人详细地址",
"回单标识", "回单运单号", "商品名称", "内件号", "内件名称"}; "回单标识", "回单运单号", "商品名称", "内件号", "内件名称"};
for (int i = 0; i < rowTitle.length; i++) { for (int i=0; i < rowTitle.length; i++) {
HSSFCell cell = firstRow.createCell(i); HSSFCell cell=firstRow.createCell(i);
cell.setCellValue(rowTitle[i]); cell.setCellValue(rowTitle[i]);
cell.setCellStyle(style); cell.setCellStyle(style);
} }
sheet.setColumnWidth(0, (int)((6.67 + 0.72) * 256)); sheet.setColumnWidth(0, (int) ((6.67 + 0.72) * 256));
sheet.setColumnWidth(1, (int)((12.36 + 0.72) * 256)); sheet.setColumnWidth(1, (int) ((12.36 + 0.72) * 256));
sheet.setColumnWidth(2, (int)((12.36 + 0.72) * 256)); sheet.setColumnWidth(2, (int) ((12.36 + 0.72) * 256));
sheet.setColumnWidth(3, (int)((27.83 + 0.72) * 256)); sheet.setColumnWidth(3, (int) ((27.83 + 0.72) * 256));
sheet.setColumnWidth(4, (int)((10.55 + 0.72) * 256)); sheet.setColumnWidth(4, (int) ((10.55 + 0.72) * 256));
sheet.setColumnWidth(5, (int)((12.36 + 0.72) * 256)); sheet.setColumnWidth(5, (int) ((12.36 + 0.72) * 256));
sheet.setColumnWidth(6, (int)((10.55 + 0.72) * 256)); sheet.setColumnWidth(6, (int) ((10.55 + 0.72) * 256));
sheet.setColumnWidth(7, (int)((14.64 + 0.72) * 256)); sheet.setColumnWidth(7, (int) ((14.64 + 0.72) * 256));
sheet.setColumnWidth(8, (int)((8.55 + 0.72) * 256)); sheet.setColumnWidth(8, (int) ((8.55 + 0.72) * 256));
sheet.setColumnWidth(9, (int)((4.82 + 0.72) * 256)); sheet.setColumnWidth(9, (int) ((4.82 + 0.72) * 256));
sheet.setColumnWidth(10, (int)((2.91 + 0.72) * 256)); sheet.setColumnWidth(10, (int) ((2.91 + 0.72) * 256));
sheet.setColumnWidth(11, (int)((2.91 + 0.72) * 256)); sheet.setColumnWidth(11, (int) ((2.91 + 0.72) * 256));
sheet.setColumnWidth(12, (int)((2.91 + 0.72) * 256)); sheet.setColumnWidth(12, (int) ((2.91 + 0.72) * 256));
sheet.setColumnWidth(13, (int)((10.55 + 0.72) * 256)); sheet.setColumnWidth(13, (int) ((10.55 + 0.72) * 256));
sheet.setColumnWidth(14, (int)((10.55 + 0.72) * 256)); sheet.setColumnWidth(14, (int) ((10.55 + 0.72) * 256));
sheet.setColumnWidth(15, (int)((74.64 + 0.72) * 256)); sheet.setColumnWidth(15, (int) ((74.64 + 0.72) * 256));
sheet.setColumnWidth(16, (int)((14.09 + 0.72) * 256)); sheet.setColumnWidth(16, (int) ((14.09 + 0.72) * 256));
sheet.setColumnWidth(17, (int)((14.64 + 0.72) * 256)); sheet.setColumnWidth(17, (int) ((14.64 + 0.72) * 256));
sheet.setColumnWidth(18, (int)((8.55 + 0.72) * 256)); sheet.setColumnWidth(18, (int) ((8.55 + 0.72) * 256));
sheet.setColumnWidth(19, (int)((6.64 + 0.72) * 256)); sheet.setColumnWidth(19, (int) ((6.64 + 0.72) * 256));
sheet.setColumnWidth(20, (int)((8.55 + 0.72) * 256)); sheet.setColumnWidth(20, (int) ((8.55 + 0.72) * 256));
for (int i = 0; i < records.size(); i++) { for (int i=0; i < records.size(); i++) {
HSSFRow row = sheet.createRow(i + 1); HSSFRow row=sheet.createRow(i + 1);
PersonPostEntity personPostEntity = records.get(i); PersonPostEntity personPostEntity=records.get(i);
HSSFCell cell = row.createCell(0); HSSFCell cell=row.createCell(0);
cell.setCellValue(personPostEntity.getId()); cell.setCellValue(personPostEntity.getId());
cell = row.createCell(1); cell=row.createCell(1);
cell.setCellValue("人口管理总队"); cell.setCellValue("人口管理总队");
cell = row.createCell(2); cell=row.createCell(2);
cell.setCellValue("010-87682315"); cell.setCellValue("010-87682315");
cell = row.createCell(3); cell=row.createCell(3);
cell.setCellValue("北京市丰台区成寿寺路甲19号"); cell.setCellValue("北京市丰台区成寿寺路甲19号");
cell = row.createCell(4); cell=row.createCell(4);
cell.setCellValue(personPostEntity.getRecipientName()); cell.setCellValue(personPostEntity.getRecipientName());
cell = row.createCell(5); cell=row.createCell(5);
cell.setCellValue(personPostEntity.getRecipientPhone()); cell.setCellValue(personPostEntity.getRecipientPhone());
cell = row.createCell(7); cell=row.createCell(7);
cell.setCellValue(personPostEntity.getWaybillNumber()); cell.setCellValue(personPostEntity.getWaybillNumber());
cell = row.createCell(8); cell=row.createCell(8);
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
cell.setCellValue(1); cell.setCellValue(1);
cell = row.createCell(9); cell=row.createCell(9);
cell.setCellType(CellType.NUMERIC); cell.setCellType(CellType.NUMERIC);
cell.setCellValue(100); cell.setCellValue(100);
cell = row.createCell(13); cell=row.createCell(13);
cell.setCellValue(personPostEntity.getGetToCity()); cell.setCellValue(personPostEntity.getGetToCity());
cell = row.createCell(14); cell=row.createCell(14);
cell.setCellValue(personPostEntity.getGetToProvince()); cell.setCellValue(personPostEntity.getGetToProvince());
cell = row.createCell(15); cell=row.createCell(15);
cell.setCellValue(personPostEntity.getRecipientAddress()); cell.setCellValue(personPostEntity.getRecipientAddress());
cell = row.createCell(16); cell=row.createCell(16);
cell.setCellValue("6"); cell.setCellValue("6");
cell = row.createCell(17); cell=row.createCell(17);
cell.setCellValue(personPostEntity.getBackWaybillNumber()); cell.setCellValue(personPostEntity.getBackWaybillNumber());
} }
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日生产导出"); SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy年MM月dd日生产导出");
String fileName = simpleDateFormat.format(new Date()) + ".xls"; String fileName=simpleDateFormat.format(new Date()) + ".xls";
String rtn = ""; String rtn="";
fileName = URLEncoder.encode(fileName, "UTF8"); fileName=URLEncoder.encode(fileName, "UTF8");
String userAgent = request.getHeader("User-Agent"); String userAgent=request.getHeader("User-Agent");
/*针对IE或者以IE为内核的浏览器：*/ /*针对IE或者以IE为内核的浏览器：*/
if (userAgent != null) { if(userAgent != null){
userAgent = userAgent.toLowerCase(); userAgent=userAgent.toLowerCase();
/*IE浏览器，只能采用URLEncoder编码*/ /*IE浏览器，只能采用URLEncoder编码*/
if (userAgent.contains("msie")) { if(userAgent.contains("msie")){
rtn = "filename=\"" + fileName + "\""; rtn="filename=\"" + fileName + "\"";
} }
/*Opera浏览器只能采用filename**/ /*Opera浏览器只能采用filename**/
else if (userAgent.contains("opera")) { else if(userAgent.contains("opera")){
rtn = "filename*=UTF-8''" + fileName; rtn="filename*=UTF-8''" + fileName;
} }
/*Safari浏览器，只能采用ISO编码的中文输出*/ /*Safari浏览器，只能采用ISO编码的中文输出*/
else if (userAgent.contains("safari")) { else if(userAgent.contains("safari")){
rtn = "filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), "ISO8859-1") + "\""; rtn="filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), "ISO8859-1") + "\"";
} }
/*Chrome浏览器，只能采用MimeUtility编码或ISO编码的中文输出*/ /*Chrome浏览器，只能采用MimeUtility编码或ISO编码的中文输出*/
// else if (userAgent.indexOf("applewebkit") != -1) { // else if (userAgent.indexOf("applewebkit") != -1) {
...@@ -305,16 +390,20 @@ public class PersonPostApi { ...@@ -305,16 +390,20 @@ public class PersonPostApi {
// rtn = "filename=\"" + fileName + "\""; // rtn = "filename=\"" + fileName + "\"";
// } // }
/* FireFox浏览器，可以使用MimeUtility或filename*或ISO编码的中文输出*/ /* FireFox浏览器，可以使用MimeUtility或filename*或ISO编码的中文输出*/
else if (userAgent.contains("mozilla")) { else if(userAgent.contains("mozilla")){
rtn = "filename*=UTF-8''" + fileName; rtn="filename*=UTF-8''" + fileName;
} }
} }
response.setContentType("application/vnd.ms-excel"); response.setContentType("application/vnd.ms-excel");
response.setHeader("Content-Disposition", "attachment;" + rtn); response.setHeader("Content-Disposition", "attachment;" + rtn);
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
OutputStream outputStream = response.getOutputStream(); OutputStream outputStream=response.getOutputStream();
wb.write(outputStream); wb.write(outputStream);
outputStream.flush(); outputStream.flush();
outputStream.close(); outputStream.close();
}catch (Exception e){
logger.error("个人邮寄信息：" + records);
logger.error("Exception 创建报表异常", e);
}
} }
} }
src/main/java/com/yxproject/start/api/ReadExcelApi.java
View file @ 12005cfa
...@@ -9,6 +9,8 @@ import com.yxproject.start.utils.YXJSONResponse; ...@@ -9,6 +9,8 @@ import com.yxproject.start.utils.YXJSONResponse;
import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -40,6 +42,8 @@ public class ReadExcelApi { ...@@ -40,6 +42,8 @@ public class ReadExcelApi {
@Autowired @Autowired
FileNameDicService fileNameDicService; FileNameDicService fileNameDicService;
Logger logger= Logger.getLogger(ReadExcelApi.class);
/** /**
* 导入个人邮寄信息表 * 导入个人邮寄信息表
*/ */
...@@ -48,6 +52,8 @@ public class ReadExcelApi { ...@@ -48,6 +52,8 @@ public class ReadExcelApi {
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean ReadPersonPost(@RequestParam("formStartTime") String startDate,@RequestParam("formDeadLine") String endDate, HttpServletResponse resp, HttpServletRequest requ) { public boolean ReadPersonPost(@RequestParam("formStartTime") String startDate,@RequestParam("formDeadLine") String endDate, HttpServletResponse resp, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
YXJSONResponse yxresp = new YXJSONResponse(); YXJSONResponse yxresp = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
...@@ -75,90 +81,97 @@ public class ReadExcelApi { ...@@ -75,90 +81,97 @@ public class ReadExcelApi {
Iterator<String> iter = multiRequest.getFileNames(); Iterator<String> iter = multiRequest.getFileNames();
while (iter.hasNext()) { while (iter.hasNext()) {
List<MultipartFile> fileRows = multiRequest.getFiles(iter.next().toString()); List<MultipartFile> fileRows = multiRequest.getFiles(iter.next().toString());
for (MultipartFile item :fileRows){ for (MultipartFile item :fileRows){
try { try {
// 如果fileitem中封装的是普通输入项的数据 // 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件 // 如果fileitem中封装的是上传文件
// 得到上传的文件名称 // 得到上传的文件名称
filename = item.getName(); filename = item.getOriginalFilename();
try { try {
// 如果fileitem中封装的是普通输入项的数据 // 如果fileitem中封装的是普通输入项的数据
// 如果fileitem中封装的是上传文件 // 如果fileitem中封装的是上传文件
// 得到上传的文件名称 // 得到上传的文件名称
filename = item.getOriginalFilename(); filename = item.getOriginalFilename();
File file = null; File file = null;
try { try {
file = File.createTempFile("prefix", "_" + item.getOriginalFilename()); file = File.createTempFile("prefix", "_" + item.getOriginalFilename());
item.transferTo(file); item.transferTo(file);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate);
ReadExcel readExcel = new ReadExcel(); logger.error("", e);
List list1 = readExcel.readExcel(file); }
//保存EXCEL文件信息 ReadExcel readExcel = new ReadExcel();
FileNameDicEntity fileNameDicEntity = new FileNameDicEntity(); List list1 = readExcel.readExcel(file);
fileNameDicEntity.setFileName(filename); //保存EXCEL文件信息
fileNameDicEntity.setUploadDate(simpleDateFormat.format(new Date())); FileNameDicEntity fileNameDicEntity = new FileNameDicEntity();
fileNameDicEntity.setFormStartTime(replaceDate(startDate)); fileNameDicEntity.setFileName(filename);
fileNameDicEntity.setFormDeadline(replaceDate(endDate)); fileNameDicEntity.setUploadDate(simpleDateFormat.format(new Date()));
fileNameDicEntity.setState((long)0); fileNameDicEntity.setFormStartTime(replaceDate(startDate));
fileNameDicService.saveFileNameDic(fileNameDicEntity); fileNameDicEntity.setFormDeadline(replaceDate(endDate));
//保存个人邮寄信息 fileNameDicEntity.setState((long)0);
List<PersonPostEntity> entityList = new ArrayList<>(); fileNameDicService.saveFileNameDic(fileNameDicEntity);
for (int i = 0; i < list1.size(); i++) { //保存个人邮寄信息
PersonPostEntity personPostEntity = new PersonPostEntity(); List<PersonPostEntity> entityList = new ArrayList<>();
List list2 = (List) list1.get(i); for (int i = 0; i < list1.size(); i++) {
//跳过空行和第一行 PersonPostEntity personPostEntity = new PersonPostEntity();
if (list2 == null || i == 0) { List list2 = (List) list1.get(i);
continue; //跳过空行和第一行
} if (list2 == null || i == 0) {
personPostEntity.setWaybillNumber((String) list2.get(0)); continue;
personPostEntity.setBackWaybillNumber((String) list2.get(1)); }
personPostEntity.setOrderNumber((String) list2.get(2)); personPostEntity.setWaybillNumber((String) list2.get(0));
personPostEntity.setCreateDate((String) list2.get(3)); personPostEntity.setBackWaybillNumber((String) list2.get(1));
personPostEntity.setOpenid((String) list2.get(4)); personPostEntity.setOrderNumber((String) list2.get(2));
personPostEntity.setWcPlayOrderNumber((String) list2.get(5)); personPostEntity.setCreateDate((String) list2.get(3));
personPostEntity.setPlayState((String) list2.get(6)); personPostEntity.setOpenid((String) list2.get(4));
personPostEntity.setOrderState((String) list2.get(7)); personPostEntity.setWcPlayOrderNumber((String) list2.get(5));
personPostEntity.setApplicantName((String) list2.get(8)); personPostEntity.setPlayState((String) list2.get(6));
personPostEntity.setSenderName((String) list2.get(9)); personPostEntity.setOrderState((String) list2.get(7));
personPostEntity.setSenderPhone((String) list2.get(10)); personPostEntity.setApplicantName((String) list2.get(8));
personPostEntity.setSenderAddress((String) list2.get(11)); personPostEntity.setSenderName((String) list2.get(9));
personPostEntity.setRecipientName((String) list2.get(12)); personPostEntity.setSenderPhone((String) list2.get(10));
personPostEntity.setRecipientPhone((String) list2.get(13)); personPostEntity.setSenderAddress((String) list2.get(11));
personPostEntity.setRecipientAddress((String) list2.get(14)); personPostEntity.setRecipientName((String) list2.get(12));
personPostEntity.setOrderBlankNumber(""); personPostEntity.setRecipientPhone((String) list2.get(13));
personPostEntity.setGetToProvince((String) list2.get(15)); personPostEntity.setRecipientAddress((String) list2.get(14));
personPostEntity.setGetToCity((String) list2.get(16)); personPostEntity.setOrderBlankNumber("");
personPostEntity.setGetToCounty((String) list2.get(17)); personPostEntity.setGetToProvince((String) list2.get(15));
personPostEntity.setBusinessType((String) list2.get(18)); personPostEntity.setGetToCity((String) list2.get(16));
personPostEntity.setLatticeMouthInformation((String) list2.get(19)); personPostEntity.setGetToCounty((String) list2.get(17));
personPostEntity.setNatureOfTheInternal((String) list2.get(20)); personPostEntity.setBusinessType((String) list2.get(18));
personPostEntity.setNatureOfTheInformation((String) list2.get(21)); personPostEntity.setLatticeMouthInformation((String) list2.get(19));
personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,27 ) ); personPostEntity.setNatureOfTheInternal((String) list2.get(20));
personPostEntity.setFileId(fileNameDicEntity.getFileId()); personPostEntity.setNatureOfTheInformation((String) list2.get(21));
entityList.add(personPostEntity); personPostEntity.setFirstWhite(list2.get(22).toString().substring(5,27 ) );
} personPostEntity.setFileId(fileNameDicEntity.getFileId());
personPostService.savePersonPost(entityList); entityList.add(personPostEntity);
} catch (Exception e) { }
e.printStackTrace(); personPostService.savePersonPost(entityList);
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename); } catch (Exception e) {
continue; e.printStackTrace();
} finally { logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("", e);
} yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
continue;
} catch (Exception e) { } finally {
e.printStackTrace();
yxresp.outPutError("FileUploadException", "文件上载发生异常:" + e.getMessage()); }
} finally {
return true; } catch (Exception e) {
} e.printStackTrace();
} logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("", e);
yxresp.outPutError("FileUploadException", "文件上载发生异常:" + e.getMessage());
} finally {
return true;
}
}
} }
} }
}catch (Exception e){ }catch (Exception e){
logger.error("上传文件名" + filename + "起始时间" + startDate + "截止时间" + endDate);
logger.error("Exception 导入个人邮寄信息表异常", e);
}finally { }finally {
} }
...@@ -174,10 +187,17 @@ public class ReadExcelApi { ...@@ -174,10 +187,17 @@ public class ReadExcelApi {
* @return * @return
*/ */
@RequestMapping("queryPersonPost") @RequestMapping("queryPersonPost")
public String queryPersonPost(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, @RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize) { public String queryPersonPost(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, @RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletRequest requ) {
List<FileNameDicEntity> fileNameDicEntities = fileNameDicService.queryFileNameDic(replaceDate(uploadDate),replaceNullString(fileName), Long.valueOf(analysisState), Long.valueOf(currPage), Long.valueOf(pageSize)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
yxjsonResponse.outPutSuccess(fileNameDicEntities); try {
List<FileNameDicEntity> fileNameDicEntities = fileNameDicService.queryFileNameDic(replaceDate(uploadDate),replaceNullString(fileName), Long.valueOf(analysisState), Long.valueOf(currPage), Long.valueOf(pageSize));
yxjsonResponse.outPutSuccess(fileNameDicEntities);
}catch (Exception e){
logger.error("文件名：" + fileName + "是否解析1-解析，0-未解析：" + analysisState + "上传时间：" + uploadDate + "页数：" + currPage + "条数：" + pageSize);
logger.error("Exception 查询个人邮寄解析信息异常", e);
}
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -188,19 +208,34 @@ public class ReadExcelApi { ...@@ -188,19 +208,34 @@ public class ReadExcelApi {
* @return * @return
*/ */
@RequestMapping("queryPersonPostCount") @RequestMapping("queryPersonPostCount")
public String queryPersonPostCount(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate) { public String queryPersonPostCount(@RequestParam("fileName") String fileName,@RequestParam("analysisState") String analysisState,@RequestParam("uploadDate") String uploadDate, HttpServletRequest requ) {
int i = fileNameDicService.queryFileNameDicCount(replaceDate(uploadDate),replaceNullString(fileName), Long.valueOf(analysisState)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
yxjsonResponse.outPutSuccess(i+""); try {
int i = fileNameDicService.queryFileNameDicCount(replaceDate(uploadDate),replaceNullString(fileName), Long.valueOf(analysisState));
yxjsonResponse.outPutSuccess(i+"");
}catch (Exception e){
logger.error("文件名：" + fileName + "是否解析1-解析，0-未解析：" + analysisState + "上传时间：" + uploadDate);
logger.error("Exception 查询个人邮寄解析信息总数量异常", e);
}
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
@RequestMapping("deleteByFileId") @RequestMapping("deleteByFileId")
public Map<String,String> deleteFileById(@RequestParam("fileId")String fileId){ public Map<String,String> deleteFileById(@RequestParam("fileId")String fileId, HttpServletRequest requ) {
fileNameDicService.deleteFileByFileId(fileId); String remoteAddr = requ.getRemoteAddr();
Map<String,String> map = new HashMap<>(); MDC.put("ip", remoteAddr);
map.put("msg","删除成功"); Map<String,String> map = null;
try {
map = new HashMap<>();
fileNameDicService.deleteFileByFileId(fileId);
map.put("msg","删除成功");
}catch (Exception e){
logger.error("文件名：" + fileId);
logger.error("Exception 通过file_ID删除个人邮寄解析信息异常", e);
}
return map; return map;
} }
......
src/main/java/com/yxproject/start/api/ReadXmlApi.java
View file @ 12005cfa
...@@ -9,6 +9,8 @@ import com.yxproject.start.utils.YXJSONResponse; ...@@ -9,6 +9,8 @@ import com.yxproject.start.utils.YXJSONResponse;
import com.yxproject.start.utils.YXStringUtils; import com.yxproject.start.utils.YXStringUtils;
import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.dom4j.DocumentException; import org.dom4j.DocumentException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -36,6 +38,8 @@ public class ReadXmlApi { ...@@ -36,6 +38,8 @@ public class ReadXmlApi {
@Autowired @Autowired
private ImportXmlService importXmlService; private ImportXmlService importXmlService;
Logger logger= Logger.getLogger(ReadXmlApi.class);
/** /**
* 导入检测XML * 导入检测XML
* *
...@@ -49,6 +53,8 @@ public class ReadXmlApi { ...@@ -49,6 +53,8 @@ public class ReadXmlApi {
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean getXMLToCheck(@Context HttpServletResponse resp, @Context HttpServletRequest requ) { public boolean getXMLToCheck(@Context HttpServletResponse resp, @Context HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
YXJSONResponse yxresp = new YXJSONResponse(); YXJSONResponse yxresp = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
String filename = ""; String filename = "";
...@@ -89,26 +95,36 @@ public class ReadXmlApi { ...@@ -89,26 +95,36 @@ public class ReadXmlApi {
idcardsFactory(idCardFactory.extractIDCard(str,date)); idcardsFactory(idCardFactory.extractIDCard(str,date));
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传文件名" + filename );
logger.error("UnsupportedEncodingException 上传文件时发现文件编码错误", e);
yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage()); yxresp.outPutError("UnsupportedEncodingException", "上传文件时发现文件编码错误:" + e.getMessage());
continue; continue;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传文件名" + filename );
logger.error("IOException 上传文件时发生IO错误", e);
yxresp.outPutError("IOException", "上传文件时发生IO错误:" + e.getMessage()); yxresp.outPutError("IOException", "上传文件时发生IO错误:" + e.getMessage());
continue; continue;
} catch (DocumentException e) { } catch (DocumentException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传文件名" + filename );
logger.error("DocumentException 上传文件时发生IO错误", e);
yxresp.outPutError("DocumentException", "上传文件时发生IO错误:" + e.getMessage()); yxresp.outPutError("DocumentException", "上传文件时发生IO错误:" + e.getMessage());
continue; continue;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传文件名" + filename );
logger.error("Exception 上传文件时发生错误,非法XML文件", e);
yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename); yxresp.outPutError("Exception", "上传文件时发生错误,非法XML文件:" + filename);
continue; continue;
} }
} }
} }
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("上传文件名" + filename );
logger.error("FileUploadException 文件上传发生异常", e);
yxresp.outPutError("FileUploadException", "文件上传发生异常:" + e.getMessage()); yxresp.outPutError("FileUploadException", "文件上传发生异常:" + e.getMessage());
} finally { } finally {
return true; return true;
...@@ -128,63 +144,66 @@ public class ReadXmlApi { ...@@ -128,63 +144,66 @@ public class ReadXmlApi {
* @return * @return
*/ */
@RequestMapping("queryPersonXML") @RequestMapping("queryPersonXML")
public String queryPersonXMLCount(@RequestParam("importDate") String importDate,@RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletResponse resp) { public String queryPersonXMLCount(@RequestParam("importDate") String importDate,@RequestParam("currPage") String currPage,@RequestParam("pageSize") String pageSize, HttpServletResponse resp, HttpServletRequest requ) {
List<CountDataEntity> countDataEntities = importXmlService.queryPersonXml(replaceDate(importDate),Long.valueOf(currPage)*Long.valueOf(pageSize) ,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String,Object> map = new LinkedHashMap<>(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
for (int i=0;i<countDataEntities.size();i++){ try {
if(map!=null && map.containsKey(countDataEntities.get(i).getUploadDate()+"")){ List<CountDataEntity> countDataEntities = importXmlService.queryPersonXml(replaceDate(importDate),Long.valueOf(currPage)*Long.valueOf(pageSize) ,(Long.valueOf(currPage)-1)*Long.valueOf(pageSize)+1);
List list=(List) map.get(countDataEntities.get(i).getUploadDate()+""); Map<String,Object> map = new LinkedHashMap<>();
list.add(countDataEntities.get(i)); for (int i=0;i<countDataEntities.size();i++){
map.put(countDataEntities.get(i).getUploadDate()+"",list); if(map!=null && map.containsKey(countDataEntities.get(i).getUploadDate()+"")){
}else { List list=(List) map.get(countDataEntities.get(i).getUploadDate()+"");
List list = new ArrayList(); list.add(countDataEntities.get(i));
list.add(countDataEntities.get(i)); map.put(countDataEntities.get(i).getUploadDate()+"",list);
map.put(countDataEntities.get(i).getUploadDate()+"",list); }else {
List list = new ArrayList();
list.add(countDataEntities.get(i));
map.put(countDataEntities.get(i).getUploadDate()+"",list);
}
} }
} List<Map<String,Object>> mapList = new ArrayList<>();
List<Map<String,Object>> mapList = new ArrayList<>(); for (String date: map.keySet()){
for (String date: map.keySet()){ Map<String,Object> dateMap = new LinkedHashMap<>();
Map<String,Object> dateMap = new LinkedHashMap<>(); List<CountDataEntity> list=(List) map.get(date);
List<CountDataEntity> list=(List) map.get(date); int dateCount = 0;
int dateCount = 0; int commonCount = 0;
int commonCount = 0; int postCount = 0;
int postCount = 0; for (CountDataEntity countDataEntity :list){
for (CountDataEntity countDataEntity :list){ dateCount+=countDataEntity.getCardCount();
dateCount+=countDataEntity.getCardCount(); commonCount+=countDataEntity.getCommonCardCount();
commonCount+=countDataEntity.getCommonCardCount(); postCount+=countDataEntity.getPostCardCount();
postCount+=countDataEntity.getPostCardCount(); }
dateMap.put("dateCount",dateCount);
dateMap.put("commonCount",commonCount);
dateMap.put("postCount",postCount);
dateMap.put("packageCount",list.size());
dateMap.put("date",date);
mapList.add(dateMap);
} }
dateMap.put("dateCount",dateCount); Map<String,Object> resultMap = new HashMap<>();
dateMap.put("commonCount",commonCount); if (mapList.size()>=Integer.parseInt(pageSize)){
dateMap.put("postCount",postCount); int max=Integer.parseInt(currPage)*Integer.parseInt(pageSize);
dateMap.put("packageCount",list.size()); int min = (Integer.parseInt(currPage)-1)*Integer.parseInt(pageSize)+1;
dateMap.put("date",date); List list = new ArrayList();
mapList.add(dateMap); if (mapList.size()<max){
} for (int i=min-1;i<mapList.size();i++){
Map<String,Object> resultMap = new HashMap<>(); list.add(mapList.get(i));
if (mapList.size()>=Integer.parseInt(pageSize)){ }
int max=Integer.parseInt(currPage)*Integer.parseInt(pageSize); }else {
int min = (Integer.parseInt(currPage)-1)*Integer.parseInt(pageSize)+1; for (int i=min-1;i<max;i++){
List list = new ArrayList(); }
if (mapList.size()<max){
for (int i=min-1;i<mapList.size();i++){
list.add(mapList.get(i));
} }
resultMap.put("mapList",list);
}else { }else {
for (int i=min-1;i<max;i++){ resultMap.put("mapList",mapList);
}
} }
resultMap.put("mapList",list); resultMap.put("count",mapList.size());
}else { yxjsonResponse.outPutSuccess(resultMap);
resultMap.put("mapList",mapList); }catch (Exception e){
logger.error("上传时间：" + importDate + "页数：" + currPage + "条数：" + pageSize);
logger.error("Exception 查询XML解析信息异常", e);
} }
resultMap.put("count",mapList.size());
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(resultMap);
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
...@@ -195,11 +214,18 @@ public class ReadXmlApi { ...@@ -195,11 +214,18 @@ public class ReadXmlApi {
* @return * @return
*/ */
@RequestMapping("queryPersonXMLCount") @RequestMapping("queryPersonXMLCount")
public String queryPersonXMLCount(@RequestParam("importDate") String importDate, HttpServletResponse resp) { public String queryPersonXMLCount(@RequestParam("importDate") String importDate, HttpServletResponse resp, HttpServletRequest requ) {
int i = importXmlService.queryPersonXmlCount(replaceDate(importDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
YXJSONResponse yxjsonResponse = new YXJSONResponse(); YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8"); try {
yxjsonResponse.outPutSuccess(i+""); int i = importXmlService.queryPersonXmlCount(replaceDate(importDate));
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(i+"");
}catch (Exception e){
logger.error("上传时间：" + importDate);
logger.error("Exception 查询XML解析信息异常", e);
}
return yxjsonResponse.toJSONString(); return yxjsonResponse.toJSONString();
} }
......
src/main/java/com/yxproject/start/api/ReceiptApi.java
View file @ 12005cfa
...@@ -4,6 +4,8 @@ import com.yxproject.start.entity.DetailReceiptListEntity; ...@@ -4,6 +4,8 @@ import com.yxproject.start.entity.DetailReceiptListEntity;
import com.yxproject.start.entity.ReceiptListEntity; import com.yxproject.start.entity.ReceiptListEntity;
import com.yxproject.start.service.ReceiptService; import com.yxproject.start.service.ReceiptService;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
...@@ -26,6 +29,8 @@ public class ReceiptApi { ...@@ -26,6 +29,8 @@ public class ReceiptApi {
@Autowired @Autowired
private ReceiptService receiptService; private ReceiptService receiptService;
Logger logger= Logger.getLogger(ReceiptApi.class);
/** /**
* 生成交接单 快证保存ACCEPT_NO 普通证保存GROUP_NO * 生成交接单 快证保存ACCEPT_NO 普通证保存GROUP_NO
* @param id 证件ID * @param id 证件ID
...@@ -36,134 +41,160 @@ public class ReceiptApi { ...@@ -36,134 +41,160 @@ public class ReceiptApi {
*/ */
@RequestMapping("createReceiptList") @RequestMapping("createReceiptList")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map<String,Object> createReceiptList(String id,String name,String beginDate,String expireDate) { public Map<String,Object> createReceiptList(String id,String name,String beginDate,String expireDate, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
//判断是否是特证 //判断是否是特证
if ("长期".equals(expireDate)){ if ("长期".equals(expireDate)){
expireDate="00000000"; expireDate="00000000";
} }
Map<String,Object> map = new HashMap<>();
if (receiptService.selectSpecialCardByAcceptNo(id,replaceDate(beginDate),replaceDate(expireDate)) == 1) { if (receiptService.selectSpecialCardByAcceptNo(id,replaceDate(beginDate),replaceDate(expireDate)) == 1) {
//查询这个受理号是否生成了交接单 //查询这个受理号是否生成了交接单
List<Map<String, Object>> mapList = receiptService.selectCountById(id,replaceDate(beginDate),replaceDate(expireDate)); List<Map<String, Object>> mapList = receiptService.selectCountById(id,replaceDate(beginDate),replaceDate(expireDate));
//判断是否生成了交接单 //判断是否生成了交接单
if (mapList.size() == 0) { if (mapList.size() == 0) {
//查询特证交接单所需数据 try {
Map<String, Object> resultDate = receiptService.selectReceiptListDate(id,replaceDate(beginDate),replaceDate(expireDate)); //查询特证交接单所需数据
ReceiptListEntity receiptListEntity = new ReceiptListEntity(); Map<String, Object> resultDate = receiptService.selectReceiptListDate(id,replaceDate(beginDate),replaceDate(expireDate));
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
Long card_type = Long.valueOf((BigDecimal) resultDate.get("CARD_TYPE") + "");
receiptListEntity.setCardTypeId(card_type); Long card_type = Long.valueOf((BigDecimal) resultDate.get("CARD_TYPE") + "");
if (card_type==9){ receiptListEntity.setCardTypeId(card_type);
receiptListEntity.setPoliceCode("110001580800"); if (card_type==9){
}else { receiptListEntity.setPoliceCode("110001580800");
receiptListEntity.setPoliceCode(resultDate.get("GAJG_DM").toString()); }else {
} receiptListEntity.setPoliceCode(resultDate.get("GAJG_DM").toString());
if ("null".equals(resultDate.get("OLD_CARD_TYPE") + "")) { }
} else { if ("null".equals(resultDate.get("OLD_CARD_TYPE") + "")) {
receiptListEntity.setOldCardTypeId(Long.valueOf(resultDate.get("OLD_CARD_TYPE") + "")); } else {
receiptListEntity.setOldCardTypeId(Long.valueOf(resultDate.get("OLD_CARD_TYPE") + ""));
}
receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
receiptListEntity.setQrCode(resultDate.get("ACCEPT_NO").toString());
receiptListEntity.setState((long) 0);
receiptListEntity.setCheckName(name);
//生成特证交接单
long S = receiptService.createReceiptList(receiptListEntity);
//查询特证详单所需数据
Map<String, Object> detailedData = receiptService.selectDetailedData2(id,replaceDate(beginDate),replaceDate(expireDate));
String uploadNo = (String) detailedData.get("UPLOAD_NO");
String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
String name2 = (String) detailedData.get("NAME");
String sex = (String) detailedData.get("SEX_NO");
String signGovt = (String) detailedData.get("SIGN_GOVT");
String gajg_dm = (String) detailedData.get("GAJG_DM");
Long receiptId = receiptListEntity.getId();
//生成特证详单
receiptService.createDetailedList(uploadNo, acceptNo2, name2, id, gajg_dm, receiptId, sex, signGovt);
map.put("show",true);
map.put("state",1);
map.put("msg","生成交接单");
map.put("id",S);
}catch (Exception e){
logger.error("证件ID：" + id + "生成人姓名：" + name + "起始有效期：" + beginDate + "截止有效期" + expireDate);
logger.error("Exception 生成交接单异常", e);
} }
receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
receiptListEntity.setQrCode(resultDate.get("ACCEPT_NO").toString());
receiptListEntity.setState((long) 0);
receiptListEntity.setCheckName(name);
//生成特证交接单
long S = receiptService.createReceiptList(receiptListEntity);
//查询特证详单所需数据
Map<String, Object> detailedData = receiptService.selectDetailedData2(id,replaceDate(beginDate),replaceDate(expireDate));
String uploadNo = (String) detailedData.get("UPLOAD_NO");
String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
String name2 = (String) detailedData.get("NAME");
String sex = (String) detailedData.get("SEX_NO");
String signGovt = (String) detailedData.get("SIGN_GOVT");
String gajg_dm = (String) detailedData.get("GAJG_DM");
Long receiptId = receiptListEntity.getId();
//生成特证详单
receiptService.createDetailedList(uploadNo, acceptNo2, name2, id, gajg_dm, receiptId, sex, signGovt);
Map<String,Object> map = new HashMap<>();
map.put("show",true);
map.put("state",1);
map.put("msg","生成交接单");
map.put("id",S);
return map; return map;
} else { } else {
//已经生成特证交接单，不做操作。 try {
Map<String,Object> map = new HashMap<>(); //已经生成特证交接单，不做操作。
map.put("show",false); map.put("show",false);
map.put("state",2); map.put("state",2);
map.put("msg","已生成交接单"); map.put("msg","已生成交接单");
map.put("id",mapList.get(0).get("ID")); map.put("id",mapList.get(0).get("ID"));
map.put("checkName",mapList.get(0).get("CHECK_NAME")); map.put("checkName",mapList.get(0).get("CHECK_NAME"));
map.put("policeName",mapList.get(0).get("GAJG_MC")); map.put("policeName",mapList.get(0).get("GAJG_MC"));
}catch (Exception e){
logger.error("证件ID：" + id + "生成人姓名：" + name + "起始有效期：" + beginDate + "截止有效期" + expireDate);
logger.error("Exception 已经生成特证交接单", e);
}
return map; return map;
} }
} else { } else {
//根据身份证号查组号 try {
String groupNo = receiptService.selectGroupNoById(id,replaceDate(beginDate),replaceDate(expireDate)); //根据身份证号查组号
//查询详单所需数据 String groupNo = receiptService.selectGroupNoById(id,replaceDate(beginDate),replaceDate(expireDate));
List<Map<String, Object>> receiptListDate = receiptService.selectReceiptListDate2(groupNo); //查询详单所需数据
List<Map<String, Object>> receiptListDate = receiptService.selectReceiptListDate2(groupNo);
for (int i = 0; i < receiptListDate.size(); i++) {
for (int i = 0; i < receiptListDate.size(); i++) {
ReceiptListEntity receiptListEntity = new ReceiptListEntity();
receiptListEntity.setPoliceCode(receiptListDate.get(i).get("GAJG_DM").toString()); ReceiptListEntity receiptListEntity = new ReceiptListEntity();
receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal) receiptListDate.get(i).get("CARD_TYPE") + "")); Long card_type = Long.valueOf((BigDecimal) receiptListDate.get(i).get("CARD_TYPE") + "");
if ("null".equals(receiptListDate.get(i).get("OLD_CARD_TYPE") + "")) { receiptListEntity.setCardTypeId(card_type);
if (card_type==9){
receiptListEntity.setPoliceCode("110001580800");
}else {
receiptListEntity.setPoliceCode(receiptListDate.get(i).get("GAJG_DM").toString());
}
if ("null".equals(receiptListDate.get(i).get("OLD_CARD_TYPE") + "")) {
} else { } else {
receiptListEntity.setOldCardTypeId(Long.valueOf(receiptListDate.get(i).get("OLD_CARD_TYPE") + "")); receiptListEntity.setOldCardTypeId(Long.valueOf(receiptListDate.get(i).get("OLD_CARD_TYPE") + ""));
} }
receiptListEntity.setFinishCount((long) receiptListDate.size()); receiptListEntity.setFinishCount((long) receiptListDate.size());
receiptListEntity.setQrCode(receiptListDate.get(i).get("GROUP_NO").toString()); receiptListEntity.setQrCode(receiptListDate.get(i).get("GROUP_NO").toString());
// 状态0未复核 // 状态0未复核
receiptListEntity.setState((long) 0); receiptListEntity.setState((long) 0);
receiptListEntity.setCheckName(name); receiptListEntity.setCheckName(name);
//查询这个组号是否生成了交接单 //查询这个组号是否生成了交接单
List<Map<String, Object>> mapList = receiptService.selectByGroupNo(receiptListDate.get(i).get("GROUP_NO").toString()); List<Map<String, Object>> mapList = receiptService.selectByGroupNo(receiptListDate.get(i).get("GROUP_NO").toString());
//没有生成交接单 //没有生成交接单
if (mapList.size() == 0) { if (mapList.size() == 0) {
//生成交接单 try {
long receiptList = receiptService.createReceiptList(receiptListEntity); //生成交接单
for (int n = 0; n < receiptListDate.size(); n++) { long receiptList = receiptService.createReceiptList(receiptListEntity);
//查询这个受理号是否生成了详单 for (int n = 0; n < receiptListDate.size(); n++) {
int receiptCount = receiptService.selectReceiptByAcceptNo(receiptListDate.get(n).get("ACCEPT_NO").toString()); //查询这个受理号是否生成了详单
//没有生成交接单详单 int receiptCount = receiptService.selectReceiptByAcceptNo(receiptListDate.get(n).get("ACCEPT_NO").toString());
if (receiptCount == 0) { //没有生成交接单详单
Map<String, Object> detailedData = receiptService.selectDetailedData(receiptListDate.get(n).get("ACCEPT_NO").toString()); if (receiptCount == 0) {
String uploadNo = (String) detailedData.get("UPLOAD_NO"); Map<String, Object> detailedData = receiptService.selectDetailedData(receiptListDate.get(n).get("ACCEPT_NO").toString());
String acceptNo2 = (String) detailedData.get("ACCEPT_NO"); String uploadNo = (String) detailedData.get("UPLOAD_NO");
String name2 = (String) detailedData.get("NAME"); String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
String sex = (String) detailedData.get("SEX_NO"); String name2 = (String) detailedData.get("NAME");
String signGovt = (String) detailedData.get("SIGN_GOVT"); String sex = (String) detailedData.get("SEX_NO");
String gajg_dm = (String) detailedData.get("GAJG_DM"); String signGovt = (String) detailedData.get("SIGN_GOVT");
int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + ""); String gajg_dm = (String) detailedData.get("GAJG_DM");
//生成详单 int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
receiptService.createDetailedList(uploadNo, acceptNo2, name2, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex, signGovt); //生成详单
} else { receiptService.createDetailedList(uploadNo, acceptNo2, name2, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex, signGovt);
//不做操作 } else {
//不做操作
}
}
map.put("show",true);
map.put("state",1);
map.put("id",receiptList);
}catch (Exception e){
logger.error("证件ID：" + id + "生成人姓名：" + name + "起始有效期：" + beginDate + "截止有效期" + expireDate);
logger.error("Exception 生成交接单异常", e);
}
return map;
} else {
try {
//已生成交接单
map.put("show",false);
map.put("msg","已生成交接单");
map.put("state",2);
map.put("id",mapList.get(0).get("ID"));
map.put("checkName",mapList.get(0).get("CHECK_NAME"));
map.put("policeName",mapList.get(0).get("GAJG_MC"));
}catch (Exception e){
logger.error("证件ID：" + id + "生成人姓名：" + name + "起始有效期：" + beginDate + "截止有效期" + expireDate);
logger.error("Exception 已经生成特证交接单", e);
} }
return map;
} }
Map<String,Object> map = new HashMap<>();
map.put("show",true);
map.put("state",1);
map.put("id",receiptList);
return map;
} else {
//已生成交接单
Map<String,Object> map = new HashMap<>();
map.put("show",false);
map.put("msg","已生成交接单");
map.put("state",2);
map.put("id",mapList.get(0).get("ID"));
map.put("checkName",mapList.get(0).get("CHECK_NAME"));
map.put("policeName",mapList.get(0).get("GAJG_MC"));
return map;
} }
map.put("show",false);
map.put("state",3);
map.put("msg","未查询出对应的信息");
}catch (Exception e){
logger.error("证件ID：" + id + "生成人姓名：" + name + "起始有效期：" + beginDate + "截止有效期" + expireDate);
logger.error("Exception 生成特证交接单异常", e);
} }
Map<String,Object> map = new HashMap<>();
map.put("show",false);
map.put("state",3);
map.put("msg","未查询出对应的信息");
return map; return map;
} }
} }
...@@ -175,23 +206,31 @@ public class ReceiptApi { ...@@ -175,23 +206,31 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("selectRecriptData") @RequestMapping("selectRecriptData")
public List<Map<String, Object>> selectRecriptData(String name) { public List<Map<String, Object>> selectRecriptData(String name, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
//返回交接单数据 //返回交接单数据
List<Map<String, Object>> resultMap = receiptService.selectReceiptListOfSpecialCard(name); List<Map<String, Object>> resultMap = new ArrayList <>();
for (int i = 0; i < resultMap.size(); i++) { try {
String groupNo = (String) resultMap.get(i).get("QR_CODE"); resultMap=receiptService.selectReceiptListOfSpecialCard(name);
//判断是否是特证 for (int i=0; i < resultMap.size(); i++) {
if (groupNo.length() == 10) { String groupNo=(String) resultMap.get(i).get("QR_CODE");
Map<String, Object> map = receiptService.selectCountTimeT(groupNo); //判断是否是特证
resultMap.get(i).put("download", map.get("DOWNLOAD")); if(groupNo.length() == 10){
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT")); Map <String, Object> map=receiptService.selectCountTimeT(groupNo);
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT")); resultMap.get(i).put("download", map.get("DOWNLOAD"));
} else { resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT"));
Map<String, Object> map = receiptService.selectCountTime(groupNo); resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT"));
resultMap.get(i).put("download", map.get("DOWNLOAD")); } else {
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT")); Map <String, Object> map=receiptService.selectCountTime(groupNo);
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT")); resultMap.get(i).put("download", map.get("DOWNLOAD"));
resultMap.get(i).put("checkerCount", map.get("CHECKERCOUNT"));
resultMap.get(i).put("electricCount", map.get("ELECTRICCOUNT"));
}
} }
}catch (Exception e){
logger.error( "生成人姓名：" + name);
logger.error("Exception 查询交接单数据异常", e);
} }
return resultMap; return resultMap;
} }
...@@ -204,15 +243,23 @@ public class ReceiptApi { ...@@ -204,15 +243,23 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("selectDetailList") @RequestMapping("selectDetailList")
public List<Map<String, Object>> selectDetailList( String receiptId) { public List<Map<String, Object>> selectDetailList( String receiptId, HttpServletRequest requ) {
List<Map<String, Object>> resultList = receiptService.selectDetailList(receiptId); String remoteAddr = requ.getRemoteAddr();
for (int i = 0; i < resultList.size(); i++) { MDC.put("ip", remoteAddr);
String acceptNo = (String) resultList.get(i).get("ACCEPT_NO"); List<Map<String, Object>> resultList = new ArrayList <>();
Map<String, Object> map = receiptService.selectTimes(acceptNo); try {
resultList.get(i).put("downloadDate", map.get("DOWNLOADDATE")); resultList=receiptService.selectDetailList(receiptId);
resultList.get(i).put("checkDate", map.get("CHECKDATE")); for (int i=0; i < resultList.size(); i++) {
resultList.get(i).put("electricDate", map.get("ELECTRICDATE")); String acceptNo=(String) resultList.get(i).get("ACCEPT_NO");
resultList.get(i).put("styleClass", ""); Map <String, Object> map=receiptService.selectTimes(acceptNo);
resultList.get(i).put("downloadDate", map.get("DOWNLOADDATE"));
resultList.get(i).put("checkDate", map.get("CHECKDATE"));
resultList.get(i).put("electricDate", map.get("ELECTRICDATE"));
resultList.get(i).put("styleClass", "");
}
}catch (Exception e){
logger.error( "交接单ID：" + receiptId);
logger.error("Exception 根据任务单查询详细信息异常", e);
} }
return resultList; return resultList;
} }
...@@ -224,17 +271,23 @@ public class ReceiptApi { ...@@ -224,17 +271,23 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("selectDetailListByReceiptId") @RequestMapping("selectDetailListByReceiptId")
public Map<String, Object> selectDetailListByReceiptId( String receiptId) { public Map<String, Object> selectDetailListByReceiptId( String receiptId, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String,Object> mapList = new HashMap<>(); Map<String,Object> mapList = new HashMap<>();
List<Map<String, Object>> resultList = receiptService.selectDetailList(receiptId); try {
if (resultList.size()>0){ List<Map<String, Object>> resultList = receiptService.selectDetailList(receiptId);
mapList.put("policeName",resultList.get(0).get("GAJG_MC")); if (resultList.size()>0){
mapList.put("groupNo",resultList.get(0).get("ACCEPT_NO").toString().substring(0,8)); mapList.put("policeName",resultList.get(0).get("GAJG_MC"));
mapList.put("checkDate",resultList.get(0).get("RECEIPT_DATE")); mapList.put("groupNo",resultList.get(0).get("ACCEPT_NO").toString().substring(0,8));
mapList.put("count",resultList.get(0).get("FINISH_COUNT")); mapList.put("checkDate",resultList.get(0).get("RECEIPT_DATE"));
mapList.put("count",resultList.get(0).get("FINISH_COUNT"));
}
mapList.put("list",resultList);
}catch (Exception e){
logger.error( "交接单ID：" + receiptId);
logger.error("Exception 根据任务单查询详细信息异常", e);
} }
mapList.put("list",resultList);
return mapList; return mapList;
} }
...@@ -246,13 +299,17 @@ public class ReceiptApi { ...@@ -246,13 +299,17 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("updateReceiptList") @RequestMapping("updateReceiptList")
public boolean updateReceiptList(@RequestParam("receiptId") String receiptId, @RequestParam("checkName") String checkName) { public boolean updateReceiptList(@RequestParam("receiptId") String receiptId, @RequestParam("checkName") String checkName, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
SimpleDateFormat dt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 SimpleDateFormat dt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
try { try {
Date date = dt.parse(dt.format(new Date())); Date date = dt.parse(dt.format(new Date()));
receiptService.updateReceiptList(receiptId, checkName, date); receiptService.updateReceiptList(receiptId, checkName, date);
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
logger.error("交接单ID：" + receiptId + "复核人姓名：" + checkName);
logger.error("ParseException 数据核验--更改交接单状态异常", e);
} }
return true; return true;
} }
...@@ -265,12 +322,21 @@ public class ReceiptApi { ...@@ -265,12 +322,21 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("selectDetailByAcceptNo") @RequestMapping("selectDetailByAcceptNo")
public List<DetailReceiptListEntity> selectDetailByAcceptNo(@RequestBody String jsonStr) { public List<DetailReceiptListEntity> selectDetailByAcceptNo(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONArray jsonarray = JSONArray.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
List<DetailReceiptListEntity> resultList = new ArrayList<>(); MDC.put("ip", remoteAddr);
for (int i = 0; i < jsonarray.size(); i++) { JSONArray jsonarray = new JSONArray();
DetailReceiptListEntity detailReceiptListEntity = receiptService.selectDetailByAcceptNo((String) jsonarray.get(i)); List<DetailReceiptListEntity> resultList = null;
resultList.add(detailReceiptListEntity); try {
jsonarray = JSONArray.fromObject(jsonStr);
resultList = new ArrayList<>();
for (int i = 0; i < jsonarray.size(); i++) {
DetailReceiptListEntity detailReceiptListEntity = receiptService.selectDetailByAcceptNo((String) jsonarray.get(i));
resultList.add(detailReceiptListEntity);
}
}catch (Exception e) {
logger.error("受理号：" + jsonStr );
logger.error("Exception 根据受理号查询详单信息异常", e);
} }
return resultList; return resultList;
} }
...@@ -282,11 +348,19 @@ public class ReceiptApi { ...@@ -282,11 +348,19 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("updateDetailNote") @RequestMapping("updateDetailNote")
public boolean updateDetailNote(@RequestBody String jsonStr) { public boolean updateDetailNote(@RequestBody String jsonStr, HttpServletRequest requ) {
JSONArray jsonArray = JSONArray.fromObject(jsonStr); String remoteAddr = requ.getRemoteAddr();
for (int i = 0; i < jsonArray.size(); i++) { MDC.put("ip", remoteAddr);
Map<String, Object> resultMap = (Map<String, Object>) jsonArray.get(i); JSONArray jsonArray = new JSONArray();
receiptService.updateDetail(formateAcceptNo(resultMap.get("acceptNo").toString()), resultMap.get("note").toString()); try {
jsonArray = JSONArray.fromObject(jsonStr);
for (int i = 0; i < jsonArray.size(); i++) {
Map<String, Object> resultMap = (Map<String, Object>) jsonArray.get(i);
receiptService.updateDetail(formateAcceptNo(resultMap.get("acceptNo").toString()), resultMap.get("note").toString());
}
}catch (Exception e) {
logger.error("备注信息：" + jsonStr );
logger.error("Exception 更改备注信息异常", e);
} }
return true; return true;
} }
...@@ -299,11 +373,14 @@ public class ReceiptApi { ...@@ -299,11 +373,14 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("updateReceiptDateByReceiptId") @RequestMapping("updateReceiptDateByReceiptId")
public boolean updateReceiptDateByReceiptId(@RequestParam("receiptId") String receiptId) { public boolean updateReceiptDateByReceiptId(@RequestParam("receiptId") String receiptId, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try { try {
receiptService.updateReceiptDateByReceiptId(receiptId); receiptService.updateReceiptDateByReceiptId(receiptId);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); logger.error("交接单ID:" + receiptId);
logger.error("Exception 生成交接单异常", e);
} }
return true; return true;
} }
...@@ -315,8 +392,17 @@ public class ReceiptApi { ...@@ -315,8 +392,17 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("queryReceiptDateByCheckDate") @RequestMapping("queryReceiptDateByCheckDate")
public List<Map<String, Object>> queryReceiptDateByCheckDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate) { public List<Map<String, Object>> queryReceiptDateByCheckDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate, HttpServletRequest requ) {
return receiptService.selectReceiptDateByCheckDate(replaceNullString(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", ""))),replaceNullString(replaceDate(endDate.replaceAll(" ", "").replaceAll(":", "")))); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> receiptDate = new ArrayList <>();
try {
receiptDate = receiptService.selectReceiptDateByCheckDate(replaceNullString(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", ""))),replaceNullString(replaceDate(endDate.replaceAll(" ", "").replaceAll(":", ""))));
}catch (Exception e) {
logger.error("复核起始时间：" + startDate + "复核结束时间：" + endDate);
logger.error("Exception 查询交接单异常", e);
}
return receiptDate;
} }
...@@ -327,8 +413,17 @@ public class ReceiptApi { ...@@ -327,8 +413,17 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("queryReceiptDateByReceiptDate") @RequestMapping("queryReceiptDateByReceiptDate")
public List<Map<String, Object>> queryReceiptDateByReceiptDate(String startDate, String endDate) { public List<Map<String, Object>> queryReceiptDateByReceiptDate(String startDate,String endDate, HttpServletRequest requ) {
return receiptService.selectReceiptDateByReceiptDate(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", "")),replaceDate(endDate.replaceAll(" ", "").replaceAll(":", ""))); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> receiptDate = new ArrayList <>();
try {
receiptDate = receiptService.selectReceiptDateByReceiptDate(replaceDate(startDate.replaceAll(" ", "").replaceAll(":", "")),replaceDate(endDate.replaceAll(" ", "").replaceAll(":", "")));
}catch (Exception e) {
logger.error("交接起始时间：" + startDate + "交接结束时间：" + endDate);
logger.error("Exception 查询历史交接单异常", e);
}
return receiptDate;
} }
/** /**
...@@ -338,6 +433,18 @@ public class ReceiptApi { ...@@ -338,6 +433,18 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("queryPoliceName") @RequestMapping("queryPoliceName")
public List<Map<String, Object>> queryPoliceName(@RequestParam("policeCode") String policeCode, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List <Map <String, Object>> policeName = new ArrayList <>();
try {
policeName = receiptService.queryPoliceName(policeCode);
}catch (Exception e) {
logger.error("派出所代码：" + policeCode);
logger.error("Exception 查询分局名称异常", e);
}
return policeName;
}
public List<Map<String, Object>> queryPoliceName(@RequestParam("qrCode") String qrCode) { public List<Map<String, Object>> queryPoliceName(@RequestParam("qrCode") String qrCode) {
return receiptService.queryPoliceName(qrCode); return receiptService.queryPoliceName(qrCode);
} }
...@@ -350,8 +457,17 @@ public class ReceiptApi { ...@@ -350,8 +457,17 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("queryPoliceData") @RequestMapping("queryPoliceData")
public List<Map<String, Object>> queryPoliceData(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate) { public List<Map<String, Object>> queryPoliceData(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate, HttpServletRequest requ) {
return receiptService.selectPoliceData(replaceDate(startDate),replaceDate(endDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List <Map <String, Object>> policeData = new ArrayList <>();
try {
policeData = receiptService.selectPoliceData(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate);
logger.error("Exception 查询公安网数据异常", e);
}
return policeData;
} }
/** /**
...@@ -362,8 +478,17 @@ public class ReceiptApi { ...@@ -362,8 +478,17 @@ public class ReceiptApi {
* @return * @return
*/ */
@RequestMapping("queryPoliceDataByDownLoadDate") @RequestMapping("queryPoliceDataByDownLoadDate")
public List<Map<String, Object>> queryPoliceDataByDownLoadDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate) { public List<Map<String, Object>> queryPoliceDataByDownLoadDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate, HttpServletRequest requ) {
return receiptService.selectPoliceDataByDownLoadDate(replaceDate(startDate),replaceDate(endDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List <Map <String, Object>> policeData = new ArrayList <>();
try {
policeData = receiptService.selectPoliceDataByDownLoadDate(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e) {
logger.error("开始时间：" + startDate + "结束时间：" + endDate);
logger.error("Exception 查询公安网数据(历史)异常", e);
}
return policeData;
} }
......
src/main/java/com/yxproject/start/api/ReportApi.java
View file @ 12005cfa
...@@ -3,11 +3,15 @@ package com.yxproject.start.api; ...@@ -3,11 +3,15 @@ package com.yxproject.start.api;
import com.yxproject.start.service.DataAuditingService; import com.yxproject.start.service.DataAuditingService;
import com.yxproject.start.service.ReceiptService; import com.yxproject.start.service.ReceiptService;
import com.yxproject.start.service.TaskListService; import com.yxproject.start.service.TaskListService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -26,6 +30,8 @@ public class ReportApi { ...@@ -26,6 +30,8 @@ public class ReportApi {
@Autowired @Autowired
private ReceiptService receiptService; private ReceiptService receiptService;
Logger logger= Logger.getLogger(ReportApi.class);
/** /**
* 查询报表 * 查询报表
* 数据核验 * 数据核验
...@@ -34,8 +40,16 @@ public class ReportApi { ...@@ -34,8 +40,16 @@ public class ReportApi {
* @return * @return
*/ */
@RequestMapping("queryDataAuditingReport") @RequestMapping("queryDataAuditingReport")
public List<Map<String, Object>> queryDataAuditingReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "policeName") String policeName,@RequestParam(value = "policeCode") String policeCode) { public List<Map<String, Object>> queryDataAuditingReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "policeName") String policeName,@RequestParam(value = "policeCode") String policeCode, HttpServletRequest requ) {
List<Map<String, Object>> mapList = dataAuditingService.selectDataAuditingReport(replaceDate(startDate), replaceDate(endDate),policeName,policeCode); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
try {
mapList = dataAuditingService.selectDataAuditingReport(replaceDate(startDate), replaceDate(endDate),policeName,policeCode);
}catch (Exception e){
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "公安机关名称：" + policeName + "公安机关代码：" + policeCode);
logger.error("Exception 查询数据核验报表异常", e);
}
return mapList; return mapList;
} }
...@@ -47,8 +61,16 @@ public class ReportApi { ...@@ -47,8 +61,16 @@ public class ReportApi {
* @return * @return
*/ */
@RequestMapping("queryFilmPrintReport") @RequestMapping("queryFilmPrintReport")
public List<Map<String, Object>> queryFilmPrintReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate) { public List<Map<String, Object>> queryFilmPrintReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate, HttpServletRequest requ) {
List<Map<String, Object>> mapList = taskListService.selectFilmReport(replaceDate(startDate), replaceDate(endDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
try {
mapList = taskListService.selectFilmReport(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e){
logger.error("开始时间：" + startDate + "结束时间：" + endDate);
logger.error("Exception 查询膜打印报表异常", e);
}
return mapList; return mapList;
} }
...@@ -61,9 +83,17 @@ public class ReportApi { ...@@ -61,9 +83,17 @@ public class ReportApi {
* @return * @return
*/ */
@RequestMapping("queryWorkGroupReport") @RequestMapping("queryWorkGroupReport")
public List<Map<String,Object>> queryWorkGroupReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "workGroup") String workGroup) { public List<Map<String,Object>> queryWorkGroupReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "workGroup") String workGroup, HttpServletRequest requ) {
List<Map<String,Object>> map = taskListService.selectWorkGroupReport(replaceDate(startDate), replaceDate(endDate), workGroup); String remoteAddr = requ.getRemoteAddr();
return map; MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
try {
mapList = taskListService.selectWorkGroupReport(replaceDate(startDate), replaceDate(endDate), workGroup);
}catch (Exception e){
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "工作组：" + workGroup);
logger.error("Exception 查询工作组报表异常", e);
}
return mapList;
} }
/** /**
...@@ -75,8 +105,16 @@ public class ReportApi { ...@@ -75,8 +105,16 @@ public class ReportApi {
* @return * @return
*/ */
@RequestMapping("querySortingReport") @RequestMapping("querySortingReport")
public List<Map<String, Object>> querySortingReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "name") String name) { public List<Map<String, Object>> querySortingReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "name") String name, HttpServletRequest requ) {
List<Map<String, Object>> mapList = receiptService.selectReceiptReport(replaceDate(startDate), replaceDate(endDate), name); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
try {
mapList = receiptService.selectReceiptReport(replaceDate(startDate), replaceDate(endDate), name);
}catch (Exception e){
logger.error("开始时间：" + startDate + "结束时间：" + endDate + "分拣人员：" + name);
logger.error("Exception 查询分拣报表异常", e);
}
return mapList; return mapList;
} }
...@@ -88,8 +126,16 @@ public class ReportApi { ...@@ -88,8 +126,16 @@ public class ReportApi {
* @return * @return
*/ */
@RequestMapping("queryQualityCheckReport") @RequestMapping("queryQualityCheckReport")
public List<Map<String, Object>> queryQualityCheckReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate) { public List<Map<String, Object>> queryQualityCheckReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate, HttpServletRequest requ) {
List<Map<String, Object>> mapList = taskListService.selectQualityCheckReport(replaceDate(startDate), replaceDate(endDate)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> mapList = new ArrayList <>();
try {
mapList = taskListService.selectQualityCheckReport(replaceDate(startDate), replaceDate(endDate));
}catch (Exception e){
logger.error("开始时间：" + startDate + "结束时间：" + endDate);
logger.error("Exception 查询质检（仓库）报表异常", e);
}
return mapList; return mapList;
} }
......
src/main/java/com/yxproject/start/api/SelectApi.java
View file @ 12005cfa
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.service.SelectSerialNumberService; import com.yxproject.start.service.SelectSerialNumberService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -23,43 +26,53 @@ public class SelectApi { ...@@ -23,43 +26,53 @@ public class SelectApi {
@Autowired @Autowired
private SelectSerialNumberService selectSerialNumberService; private SelectSerialNumberService selectSerialNumberService;
@RequestMapping(value = "selectByCard") Logger logger= Logger.getLogger(SelectApi.class);
public Map<String, Object> selectByCard(@RequestParam("id") String string) {
String id = formateAcceptNo(string);
Map<String, Object> resultMap = new HashMap<>();
if (id.length() == 11) {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByWorkOrderFromYX(id);
List<Map<String, Object>> ACCdata = new ArrayList<>();
List<Map<String, Object>> PRODData = new ArrayList<>();
resultMap.put("workOrderData", workOrderData);
resultMap.put("ACCdata", ACCdata);
resultMap.put("PRODData", PRODData);
} else if (id.length() == 8) {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id.replace("e","E").replace("g","G"));
List<Map<String, Object>> ACCdata = new ArrayList<>();
List<Map<String, Object>> PRODData = new ArrayList<>();
resultMap.put("workOrderData", workOrderData);
resultMap.put("ACCdata", ACCdata);
resultMap.put("PRODData", PRODData);
} else if (id.length() == 10 || id.length() == 18) {
//查询是否是特证，如果是，返回新的任务单信息 @RequestMapping(value = "selectByCard")
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id.replace("e","E").replace("g","G")); public Map<String, Object> selectByCard(@RequestParam("id") String id, HttpServletRequest requ) {
if (workOrderData.size() != 0) { String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String, Object> resultMap = null;
try {
resultMap = new HashMap<>();
id = formateAcceptNo(id);
if (id.length() == 11) {
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByWorkOrderFromYX(id);
List<Map<String, Object>> ACCdata = new ArrayList<>();
List<Map<String, Object>> PRODData = new ArrayList<>();
resultMap.put("workOrderData", workOrderData); resultMap.put("workOrderData", workOrderData);
} else { resultMap.put("ACCdata", ACCdata);
List<Map<String, Object>> workOrderData2 = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id.replace("e","E").replace("g","G")); resultMap.put("PRODData", PRODData);
resultMap.put("workOrderData", workOrderData2); } else if (id.length() == 8) {
} List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id);
List<Map<String, Object>> ACCdata = new ArrayList<>();
List<Map<String, Object>> PRODData = new ArrayList<>();
resultMap.put("workOrderData", workOrderData);
resultMap.put("ACCdata", ACCdata);
resultMap.put("PRODData", PRODData);
} else if (id.length() == 10 || id.length() == 18) {
//查询是否是特证，如果是，返回新的任务单信息
List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
if (workOrderData.size() != 0) {
resultMap.put("workOrderData", workOrderData);
} else {
List<Map<String, Object>> workOrderData2 = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
resultMap.put("workOrderData", workOrderData2);
}
List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id.replace("e","E").replace("g","G")); List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id.replace("e","E").replace("g","G")); List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);
resultMap.put("ACCdata", ACCdata); resultMap.put("ACCdata", ACCdata);
resultMap.put("PRODData", PRODData); resultMap.put("PRODData", PRODData);
} else { } else {
// return null; // return null;
}
}catch (Exception e){
logger.error("传入的组号8位、受理号10位、身份证号18位、任务单号11位" + id);
logger.error("Exception SelectApi异常", e);
} }
return resultMap; return resultMap;
} }
......
src/main/java/com/yxproject/start/api/SpecialCardApi.java
View file @ 12005cfa
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.service.SpecialCardService; import com.yxproject.start.service.SpecialCardService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -19,13 +23,24 @@ public class SpecialCardApi { ...@@ -19,13 +23,24 @@ public class SpecialCardApi {
@Autowired @Autowired
private SpecialCardService specialCardService; private SpecialCardService specialCardService;
Logger logger= Logger.getLogger(SpecialCardApi.class);
/** /**
* 查询特殊证件详情 * 查询特殊证件详情
* @param groupNo 组号 * @param groupNo 组号
* @return * @return
*/ */
@RequestMapping("selectSpecialCard") @RequestMapping("selectSpecialCard")
public List<Map> updateState2(@RequestParam("groupNo") String groupNo) { public List<Map> updateState2(@RequestParam("groupNo") String groupNo, HttpServletRequest requ) {
return specialCardService.selectSpecialCardByGroupNo(groupNo); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map> map = new ArrayList<>();
try {
map = specialCardService.selectSpecialCardByGroupNo(groupNo);
}catch (Exception e){
logger.error("组号：" + groupNo );
logger.error("Exception 查询特殊证件详情异常", e);
}
return map;
} }
} }
src/main/java/com/yxproject/start/api/TaskListApi.java
View file @ 12005cfa
...@@ -4,6 +4,7 @@ import com.yxproject.start.entity.*; ...@@ -4,6 +4,7 @@ import com.yxproject.start.entity.*;
import com.yxproject.start.service.*; import com.yxproject.start.service.*;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC; import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -14,10 +15,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -14,10 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import java.util.ArrayList; import java.util.*;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/** /**
* @author Administrator * @author Administrator
...@@ -37,6 +35,7 @@ public class TaskListApi { ...@@ -37,6 +35,7 @@ public class TaskListApi {
@Autowired @Autowired
private ReceiptService receiptService; private ReceiptService receiptService;
Logger logger= Logger.getLogger(TaskListApi.class);
/** /**
* 更改任务单状态 * 更改任务单状态
...@@ -48,20 +47,29 @@ public class TaskListApi { ...@@ -48,20 +47,29 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("updateState") @RequestMapping("updateState")
public boolean updateState(@RequestBody String json) { public boolean updateState(@RequestBody String json, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(json); String remoteAddr = requ.getRemoteAddr();
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList"); MDC.put("ip", remoteAddr);
JSONArray failedList = (JSONArray) jsonObject.get("failedList"); JSONObject jsonObject = new JSONObject();
String process = jsonObject.get("process").toString(); boolean state = true;
String name = jsonObject.get("name").toString(); try {
List<String> list = (List<String>) jsonArray; jsonObject = JSONObject.fromObject(json);
if ("1".equals(process)){ JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
String workGroup = jsonObject.get("workGroup").toString(); JSONArray failedList = (JSONArray) jsonObject.get("failedList");
return taskListService.updateState1(failedList, list, process, name,workGroup); String process = jsonObject.get("process").toString();
}else { String name = jsonObject.get("name").toString();
return taskListService.updateState(failedList, list, process, name); List<String> list = (List<String>) jsonArray;
if ("1".equals(process)) {
String workGroup = jsonObject.get("workGroup").toString();
state = taskListService.updateState1(failedList, list, process, name, workGroup);
} else {
state = taskListService.updateState(failedList, list, process, name);
}
}catch (Exception e){
logger.error("任务单状态：" + jsonObject);
logger.error("Exception 更改任务单状态（下发、预订位、平压、冲切、分拣）异常", e);
} }
return state;
} }
/** /**
...@@ -75,14 +83,25 @@ public class TaskListApi { ...@@ -75,14 +83,25 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("updateState2") @RequestMapping("updateState2")
public boolean updateState2(@RequestBody String json) { public boolean updateState2(@RequestBody String json, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(json); String remoteAddr = requ.getRemoteAddr();
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList"); MDC.put("ip", remoteAddr);
JSONArray failedList = (JSONArray) jsonObject.get("failedList"); JSONObject jsonObject = new JSONObject();
String process = jsonObject.get("process").toString(); boolean state = true;
String name = jsonObject.get("name").toString(); try {
List<String> list = (List<String>) jsonArray; jsonObject=JSONObject.fromObject(json);
return taskListService.updateState2(failedList, list, process, name); JSONArray jsonArray=(JSONArray) jsonObject.get("taskIdList");
JSONArray failedList=(JSONArray) jsonObject.get("failedList");
String process=jsonObject.get("process").toString();
String name=jsonObject.get("name").toString();
// String printer = jsonObject.get("printer").toString();
List <String> list=(List <String>) jsonArray;
state = taskListService.updateState2(failedList, list, process, name);
}catch (Exception e){
logger.error("任务单状态：" + jsonObject);
logger.error("Exception 更改任务单状态（打印转出）异常", e);
}
return state;
} }
/** /**
* 更改任务单工作组 * 更改任务单工作组
...@@ -93,12 +112,22 @@ public class TaskListApi { ...@@ -93,12 +112,22 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("updateWorkGroup") @RequestMapping("updateWorkGroup")
public boolean updateWorkGroup(@RequestBody String json) { public boolean updateWorkGroup(@RequestBody String json, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(json); String remoteAddr = requ.getRemoteAddr();
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList"); MDC.put("ip", remoteAddr);
String workGroup = jsonObject.get("workGroup").toString(); JSONObject jsonObject = new JSONObject();
List<String> list = (List<String>) jsonArray; boolean state = true;
return taskListService.updateWorkGroup(list, workGroup); try {
jsonObject=JSONObject.fromObject(json);
JSONArray jsonArray=(JSONArray) jsonObject.get("taskIdList");
String workGroup=jsonObject.get("workGroup").toString();
List <String> list=(List <String>) jsonArray;
state = taskListService.updateWorkGroup(list, workGroup);
}catch (Exception e){
logger.error("任务单状态：" + jsonObject);
logger.error("Exception 更改任务单状态（打印转出）异常", e);
}
return state;
} }
/** /**
...@@ -112,10 +141,17 @@ public class TaskListApi { ...@@ -112,10 +141,17 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryByCountyAtACCU") @RequestMapping("queryByCountyAtACCU")
public List<Object> queryByCountyAtACCU(@RequestParam("process") String process, @RequestParam("date") String date, HttpServletResponse resp) { public List<Object> queryByCountyAtACCU(@RequestParam("process") String process, @RequestParam("date") String date, HttpServletResponse resp, HttpServletRequest requ) {
List<Object> objects = taskListService.selectByCountyAtACCU(replaceDate(date)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Object> objects = new ArrayList<>();
try {
objects = taskListService.selectByCountyAtACCU(replaceDate(date));
}catch (Exception e){
logger.error("工序：" + process + "查询时间：" + date);
logger.error("Exception 查询任务单详情(受理库)异常", e);
}
return objects; return objects;
} }
/** /**
...@@ -129,10 +165,17 @@ public class TaskListApi { ...@@ -129,10 +165,17 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryByGroupNoAtACCU") @RequestMapping("queryByGroupNoAtACCU")
public Map<String, Object> queryByPoliceAtACCU(@RequestParam("date") String date, @RequestParam("typeCode") String typeCode, @RequestParam("countyCode") String countyCode, @RequestParam("currPage") String currPage, @RequestParam("pageSize") String pageSize, HttpServletResponse resp) { public Map<String, Object> queryByPoliceAtACCU(@RequestParam("date") String date, @RequestParam("typeCode") String typeCode, @RequestParam("countyCode") String countyCode, @RequestParam("currPage") String currPage, @RequestParam("pageSize") String pageSize, HttpServletResponse resp, HttpServletRequest requ) {
Map<String, Object> objects = taskListService.selectByGroupNoAtACCU(replaceDate(date), typeCode, countyCode, Long.valueOf(currPage), Long.valueOf(pageSize)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map<String, Object> objects = null;
try {
objects = taskListService.selectByGroupNoAtACCU(replaceDate(date), typeCode, countyCode, Long.valueOf(currPage), Long.valueOf(pageSize));
}catch (Exception e){
logger.error("查询时间：" + date + "制证类型：" + typeCode + "区县代码：" + countyCode + "页数：" + currPage + "条数：" + pageSize);
logger.error("Exception 查询组号列表详情(受理库)异常", e);
}
return objects; return objects;
} }
/** /**
...@@ -145,8 +188,16 @@ public class TaskListApi { ...@@ -145,8 +188,16 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryByCountyAtAuxiliary") @RequestMapping("queryByCountyAtAuxiliary")
public List<Object> queryByCountyAtAuxiliary(@RequestParam("process") String process, HttpServletResponse resp) { public List<Object> queryByCountyAtAuxiliary(@RequestParam("process") String process, HttpServletResponse resp, HttpServletRequest requ) {
List<Object> objects = taskListService.selectByCountyAtAuxiliary(Long.valueOf(process) - 1); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Object> objects = new ArrayList <>();
try {
objects = taskListService.selectByCountyAtAuxiliary(Long.valueOf(process) - 1);
}catch (Exception e){
logger.error("工序：" + process);
logger.error("Exception 查询任务单详情(辅助库)（下发、数据核验、膜打印）异常", e);
}
return objects; return objects;
} }
...@@ -160,8 +211,16 @@ public class TaskListApi { ...@@ -160,8 +211,16 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryByCountyAtAuxiliaryState1") @RequestMapping("queryByCountyAtAuxiliaryState1")
public Map queryByCountyAtAuxiliaryState1(@RequestParam("process") String process,@RequestParam("workGroup") String workGroup, HttpServletResponse resp) { public Map queryByCountyAtAuxiliaryState1(@RequestParam("process") String process,@RequestParam("workGroup") String workGroup, HttpServletResponse resp, HttpServletRequest requ) {
Map map = taskListService.selectByCountyAtAuxiliary2(Long.valueOf(process),workGroup); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
Map map = new HashMap();
try {
map = taskListService.selectByCountyAtAuxiliary2(Long.valueOf(process),workGroup);
}catch (Exception e){
logger.error("工序：" + process + "工作组" + workGroup);
logger.error("Exception 查询任务单详情(辅助库)（预订位、平压）异常", e);
}
return map; return map;
} }
...@@ -175,8 +234,16 @@ public class TaskListApi { ...@@ -175,8 +234,16 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryByCountyAtAuxiliaryState3") @RequestMapping("queryByCountyAtAuxiliaryState3")
public List<Object> queryByCountyAtAuxiliaryState3(@RequestParam("process") String process,@RequestParam("workGroup")String workGroup, HttpServletResponse resp) { public List<Object> queryByCountyAtAuxiliaryState3(@RequestParam("process") String process,@RequestParam("workGroup")String workGroup, HttpServletResponse resp, HttpServletRequest requ) {
List<Object> objects = taskListService.selectByCountyAtAuxiliary3(Long.valueOf(process) - 1,workGroup); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Object> objects = new ArrayList <>();
try {
objects = taskListService.selectByCountyAtAuxiliary3(Long.valueOf(process) - 1,workGroup);
}catch (Exception e){
logger.error("工序：" + process + "工作组" + workGroup);
logger.error("Exception 查询任务单详情(辅助库、制证库)（电写入）异常", e);
}
return objects; return objects;
} }
...@@ -189,8 +256,16 @@ public class TaskListApi { ...@@ -189,8 +256,16 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryByCountyAtAuxiliaryState4") @RequestMapping("queryByCountyAtAuxiliaryState4")
public List<Object> queryByCountyAtAuxiliaryState4(@RequestParam("process") String process) { public List<Object> queryByCountyAtAuxiliaryState4(@RequestParam("process") String process, HttpServletRequest requ) {
List<Object> objects = taskListService.selectByCountyAtAuxiliary4(Long.valueOf(process) - 1); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Object> objects = new ArrayList <>();
try {
objects = taskListService.selectByCountyAtAuxiliary4(Long.valueOf(process) - 1);
}catch (Exception e){
logger.error("工序：" + process);
logger.error("Exception 查询任务单详情(辅助库)（下发、数据核验、膜打印）异常", e);
}
return objects; return objects;
} }
...@@ -206,8 +281,16 @@ public class TaskListApi { ...@@ -206,8 +281,16 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryHistoryTaskAtAuxiliary") @RequestMapping("queryHistoryTaskAtAuxiliary")
public List<Object> queryHistoryTaskAtAuxiliary(@RequestParam("process") String process, @RequestParam("date") String date,@RequestParam("workGroup") String workGroup, HttpServletResponse resp) { public List<Object> queryHistoryTaskAtAuxiliary(@RequestParam("process") String process, @RequestParam("date") String date, @RequestParam("workGroup") String workGroup, HttpServletResponse resp, HttpServletRequest requ) {
List<Object> objects = taskListService.selectHistoryTaskAtAuxiliary(Long.valueOf(process), replaceDate(date),workGroup); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Object> objects = new ArrayList <>();
try {
objects = taskListService.selectHistoryTaskAtAuxiliary(Long.valueOf(process), replaceDate(date), workGroup);
}catch (Exception e){
logger.error("工序：" + process + "查询时间：" + date + "工作组" + workGroup);
logger.error("Exception 查询任务单详情（历史）(辅助库)（创建、下发、膜打印、预订位、平压、冲切）异常", e);
}
return objects; return objects;
} }
...@@ -220,8 +303,16 @@ public class TaskListApi { ...@@ -220,8 +303,16 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryHistoryTaskAtAuxiliary2") @RequestMapping("queryHistoryTaskAtAuxiliary2")
public List<Object> queryHistoryTaskAtAuxiliary2(@RequestParam("date") String date ) { public List<Object> queryHistoryTaskAtAuxiliary2(@RequestParam("date") String date, HttpServletRequest requ) {
List<Object> objects = taskListService.selectHistoryTaskAtAuxiliary2(replaceDate(date)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Object> objects = new ArrayList <>();
try {
objects = taskListService.selectHistoryTaskAtAuxiliary2(replaceDate(date));
}catch (Exception e){
logger.error("查询时间：" + date);
logger.error("Exception 查询任务单详情（历史）(辅助库)（分拣）异常", e);
}
return objects; return objects;
} }
...@@ -237,30 +328,38 @@ public class TaskListApi { ...@@ -237,30 +328,38 @@ public class TaskListApi {
*/ */
@RequestMapping("createTask") @RequestMapping("createTask")
@Transactional @Transactional
public Map<String, Object> queryByCountyAtACCU(@RequestBody String str, HttpServletResponse resp) { public Map<String, Object> queryByCountyAtACCU(@RequestBody String str, HttpServletResponse resp, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(str); String remoteAddr = requ.getRemoteAddr();
String name = jsonObject.getString("name"); MDC.put("ip", remoteAddr);
JSONArray jsonGroup = jsonObject.getJSONArray("groupList"); JSONObject jsonObject = new JSONObject();
//生成某几个组的区县任务单 Map<String, Object> map = new LinkedHashMap<>();
if (jsonGroup.size() > 0) { try {
List<List<String>> listList = jsonGroup; jsonObject = JSONObject.fromObject(str);
for (List<String> groupList :listList){ String name = jsonObject.getString("name");
//查询组号详情 JSONArray jsonGroup = jsonObject.getJSONArray("groupList");
String groupNo = ""; //生成某几个组的区县任务单
for (int i = 0; i < groupList.size(); i++) { if (jsonGroup.size() > 0) {
if (i != groupList.size() - 1) { List<List<String>> listList = jsonGroup;
groupNo += "'" + groupList.get(i) + "',"; for (List<String> groupList :listList){
} else { //查询组号详情
groupNo += "'" + groupList.get(i) + "'"; String groupNo = "";
for (int i = 0; i < groupList.size(); i++) {
if (i != groupList.size() - 1) {
groupNo += "'" + groupList.get(i) + "',";
} else {
groupNo += "'" + groupList.get(i) + "'";
}
} }
} List<Map<String, Object>> objects = taskListService.selectGroupAtACCU(groupNo);
List<Map<String, Object>> objects = taskListService.selectGroupAtACCU(groupNo); boolean b = taskListService.saveTask(objects, name, 0 + "",groupNo);
boolean b = taskListService.saveTask(objects, name, 0 + "",groupNo);
}
} }
map.put("msg", "成功生成任务单");
}catch (Exception e){
logger.error("任务单生成参数：" + jsonObject);
logger.error("Exception 生成任务单异常", e);
} }
Map<String, Object> map = new LinkedHashMap<>();
map.put("msg", "成功生成任务单");
return map; return map;
} }
...@@ -277,77 +376,80 @@ public class TaskListApi { ...@@ -277,77 +376,80 @@ public class TaskListApi {
*/ */
@RequestMapping("createFastTask") @RequestMapping("createFastTask")
@Transactional @Transactional
public Map<String, Object> createFastTask(@RequestBody String object) { public Map<String, Object> createFastTask(@RequestBody String object, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
// 添加没有解析进去受理库情况 // 添加没有解析进去受理库情况
JSONObject jsonObject = JSONObject.fromObject(object); JSONObject jsonObject = new JSONObject();
String acceptNo = jsonObject.getString("acceptNo"); Map<String, Object> map = new LinkedHashMap<>();
String cardType = jsonObject.getString("cardType"); try {
String countyCode = jsonObject.getString("countyCode"); jsonObject = JSONObject.fromObject(object);
String name = jsonObject.getString("name"); String acceptNo = jsonObject.getString("acceptNo");
// 判断是否添加快证 通过受理号查询交接单详情数量 String cardType = jsonObject.getString("cardType");
List<DetailReceiptListEntity> detailReceiptListEntityList = receiptService.queryReceipt(acceptNo); String countyCode = jsonObject.getString("countyCode");
if (detailReceiptListEntityList.size()!=0){ String name = jsonObject.getString("name");
Map<String, Object> map = new LinkedHashMap<>(); // 判断是否添加快证 通过受理号查询交接单详情数量
map.put("msg", "证件已经生成交接单，无法加入快证"); List<DetailReceiptListEntity> detailReceiptListEntityList = receiptService.queryReceipt(acceptNo);
return map; if (detailReceiptListEntityList.size() != 0) {
} map = new LinkedHashMap<>();
if ("null".equals(countyCode.substring(0, 4))) { map.put("msg", "证件已经生成交接单，无法加入快证");
countyCode = "000000"; return map;
} }
//查询快证是否存在受理库 if ("null".equals(countyCode.substring(0, 4))) {
List<Map<String, Object>> objects = taskListService.selectFastCardAtACCU(acceptNo.substring(0, 8)); countyCode = "000000";
//存在受理库 }
if (objects.size() == 1) { //查询快证是否存在受理库
taskListService.saveFastTask(objects, name, acceptNo, Long.valueOf(cardType)); List<Map<String, Object>> objects = taskListService.selectFastCardAtACCU(acceptNo.substring(0, 8));
} else { //存在受理库
//存在任务单（余证任务单 普通证任务单） if (objects.size() == 1) {
//1 存在余证任务单 taskListService.saveFastTask(objects, name, acceptNo, Long.valueOf(cardType));
List<SpecialCardEntity> specialCardEntities = specialCardService.selectSpecialCardAtSpecialCard(acceptNo);
if (specialCardEntities.size() > 0) {
for (SpecialCardEntity specialCardEntity : specialCardEntities) {
specialCardEntity.setSpecialType((long) 2);
specialCardService.updateSpecialCardSpecialType(specialCardEntity);
}
} else { } else {
//2 存在普通证任务单 //存在任务单（余证任务单 普通证任务单）
//更改组号详情的特证数量+1 //1 存在余证任务单
List<GroupNoEntity> groupNoEntities = groupNoService.selectGroupNoEntityByGroupNo(acceptNo.substring(0, 8)); List<SpecialCardEntity> specialCardEntities = specialCardService.selectSpecialCardAtSpecialCard(acceptNo);
if (groupNoEntities.size() > 0) { if (specialCardEntities.size() > 0) {
for (GroupNoEntity groupNoEntity : groupNoEntities) { for (SpecialCardEntity specialCardEntity : specialCardEntities) {
// if (groupNoEntity.getValidCount()==1){ specialCardEntity.setSpecialType((long) 2);
// taskListService.deleteRedoTask(groupNoEntity.getTaskId()); specialCardService.updateSpecialCardSpecialType(specialCardEntity);
// break;
// }
groupNoEntity.setSpecialCardCount(groupNoEntity.getSpecialCardCount() + 1);
groupNoService.updateGroupNoSpecialCount(groupNoEntity);
} }
List<TaskEntity> taskEntities = taskListService.selectTaskEntityByTaskId(groupNoEntities.get(0).getTaskId()); } else {
//添加快证任务单 //2 存在普通证任务单
TaskEntity taskEntity = taskEntities.get(0); //更改组号详情的特证数量+1
taskEntity.setOldCardType(Long.valueOf(cardType)); List<GroupNoEntity> groupNoEntities = groupNoService.selectGroupNoEntityByGroupNo(acceptNo.substring(0, 8));
taskEntity.setCardType((long) 1); if (groupNoEntities.size() > 0) {
taskEntity.setCountyCode(countyCode); for (GroupNoEntity groupNoEntity : groupNoEntities) {
taskEntity.setSubmitName(name); groupNoEntity.setSpecialCardCount(groupNoEntity.getSpecialCardCount() + 1);
taskListService.saveFastTask(taskEntity); groupNoService.updateGroupNoSpecialCount(groupNoEntity);
SpecialCardEntity specialCardEntity = new SpecialCardEntity(); }
specialCardEntity.setSpecialType((long) 2); List<TaskEntity> taskEntities = taskListService.selectTaskEntityByTaskId(groupNoEntities.get(0).getTaskId());
specialCardEntity.setInitiator(name); //添加快证任务单
specialCardEntity.setAcceptNo(acceptNo); TaskEntity taskEntity = taskEntities.get(0);
specialCardEntity.setGroupNo(acceptNo.substring(0, 8)); taskEntity.setOldCardType(Long.valueOf(cardType));
specialCardEntity.setTaskId(taskEntity.getTaskId()); taskEntity.setCardType((long) 1);
specialCardService.saveSpecialCard(specialCardEntity); taskEntity.setCountyCode(countyCode);
for (GroupNoEntity groupNoEntity : groupNoEntities) { taskEntity.setSubmitName(name);
if (groupNoEntity.getValidCount()==1){ taskListService.saveFastTask(taskEntity);
taskListService.deleteRedoTask(groupNoEntity.getTaskId()); SpecialCardEntity specialCardEntity = new SpecialCardEntity();
break; specialCardEntity.setSpecialType((long) 2);
specialCardEntity.setInitiator(name);
specialCardEntity.setAcceptNo(acceptNo);
specialCardEntity.setGroupNo(acceptNo.substring(0, 8));
specialCardEntity.setTaskId(taskEntity.getTaskId());
specialCardService.saveSpecialCard(specialCardEntity);
for (GroupNoEntity groupNoEntity : groupNoEntities) {
if (groupNoEntity.getValidCount()==1){
taskListService.deleteRedoTask(groupNoEntity.getTaskId());
break;
}
} }
} }
} }
} }
map.put("msg", "成功添加快证任务单");
}catch (Exception e){
logger.error("快证任务单生成参数：" + jsonObject);
logger.error("Exception 快证生成任务单异常", e);
} }
Map<String, Object> map = new LinkedHashMap<>();
map.put("msg", "成功添加快证任务单");
return map; return map;
} }
...@@ -399,23 +501,38 @@ public class TaskListApi { ...@@ -399,23 +501,38 @@ public class TaskListApi {
* @param requ * @param requ
* @return * @return
*/ */
@RequestMapping("queryRedoTask") @RequestMapping("queryRedoTask")
public List<Map<String, Object>> queryRedoTask( @RequestParam("startDate")String startDate,@RequestParam("endDate")String endDate, HttpServletRequest requ) { public List<Map<String, Object>> queryRedoTask( @RequestParam("startDate")String startDate,@RequestParam("endDate")String endDate, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr); MDC.put("ip", remoteAddr);
List<Map<String, Object>> maps = new ArrayList<>(); List<Map<String, Object>> maps = new ArrayList <>();
try {
maps = taskListService.selectRedoTask(replaceDate(startDate),replaceDate(endDate)); maps = taskListService.selectRedoTask(replaceDate(startDate),replaceDate(endDate));
}catch (Exception e){
logger.error("登记时间：" + startDate+"-------"+endDate);
logger.error("Exception 查询重做返回登记任务单异常", e);
}
return maps; return maps;
} }
/** /**
* 删除重做返回登记任务单 * 删除重做返回登记任务单
* @param taskId 任务单ID * @param taskId 任务单ID
* @return * @return
*/ */
@RequestMapping("deleteRedoTask") @RequestMapping("deleteRedoTask")
public boolean deleteRedoTask( @RequestParam("taskId")String taskId){ public boolean deleteRedoTask( @RequestParam("taskId")String taskId, HttpServletRequest requ) {
return taskListService.deleteRedoTask(Long.valueOf(taskId)); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
boolean redoTask = true;
try {
redoTask = taskListService.deleteRedoTask(Long.valueOf(taskId));
}catch (Exception e){
logger.error("任务单ID：" + taskId);
logger.error("Exception 删除重做返回登记任务单异常", e);
}
return redoTask;
} }
...@@ -429,38 +546,46 @@ public class TaskListApi { ...@@ -429,38 +546,46 @@ public class TaskListApi {
*/ */
@RequestMapping("addBackCard") @RequestMapping("addBackCard")
@Transactional @Transactional
public Map<String, Object> addBackCard(@RequestBody String object, HttpServletResponse resp) { public Map<String, Object> addBackCard(@RequestBody String object, HttpServletResponse resp, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(object); String remoteAddr = requ.getRemoteAddr();
String acceptNo = jsonObject.getString("acceptNo"); MDC.put("ip", remoteAddr);
String taskId = jsonObject.getString("taskId"); Map<String, Object> map = new LinkedHashMap <>();
String name = jsonObject.getString("name"); JSONObject jsonObject = new JSONObject();
List<Map<String, Object>> objects = preproPersonService.selectUploadNoByAcceptNo(acceptNo); try {
if (objects.size() > 0) { jsonObject = JSONObject.fromObject(object);
for (Map<String, Object> map : objects) { String acceptNo = jsonObject.getString("acceptNo");
PreproPersonEntity preproPersonEntity = new PreproPersonEntity(); String taskId = jsonObject.getString("taskId");
preproPersonEntity.setJmsfzslh(map.get("UPLOAD_NO").toString()); String name = jsonObject.getString("name");
preproPersonEntity.setIsValid(0); List<Map<String, Object>> objects = preproPersonService.selectUploadNoByAcceptNo(acceptNo);
preproPersonService.updatePreproPersonIsValid(preproPersonEntity); if (objects.size() > 0) {
for (Map<String, Object> map1 : objects) {
PreproPersonEntity preproPersonEntity = new PreproPersonEntity();
preproPersonEntity.setJmsfzslh(map1.get("UPLOAD_NO").toString());
preproPersonEntity.setIsValid(0);
preproPersonService.updatePreproPersonIsValid(preproPersonEntity);
}
} }
} //存在任务单
//存在任务单 //更改组号详情的特证数量+1
//更改组号详情的特证数量+1 List<GroupNoEntity> groupNoEntities = groupNoService.selectGroupNoEntityByGroupNo(acceptNo.substring(0, 8));
List<GroupNoEntity> groupNoEntities = groupNoService.selectGroupNoEntityByGroupNo(acceptNo.substring(0, 8)); if (groupNoEntities.size() > 0) {
if (groupNoEntities.size() > 0) { for (GroupNoEntity groupNoEntity : groupNoEntities) {
for (GroupNoEntity groupNoEntity : groupNoEntities) { groupNoEntity.setSpecialCardCount(groupNoEntity.getSpecialCardCount() + 1);
groupNoEntity.setSpecialCardCount(groupNoEntity.getSpecialCardCount() + 1); groupNoService.updateGroupNoSpecialCount(groupNoEntity);
groupNoService.updateGroupNoSpecialCount(groupNoEntity); }
SpecialCardEntity specialCardEntity = new SpecialCardEntity();
specialCardEntity.setSpecialType((long) 3);
specialCardEntity.setInitiator(name);
specialCardEntity.setAcceptNo(acceptNo);
specialCardEntity.setGroupNo(acceptNo.substring(0, 8));
specialCardEntity.setTaskId(Long.valueOf(taskId));
specialCardService.saveSpecialCard(specialCardEntity);
} }
SpecialCardEntity specialCardEntity = new SpecialCardEntity(); map.put("msg", "成功添加退证");
specialCardEntity.setSpecialType((long) 3); }catch (Exception e){
specialCardEntity.setInitiator(name); logger.error("生成退证参数：" + jsonObject);
specialCardEntity.setAcceptNo(acceptNo); logger.error("Exception 生成退证异常", e);
specialCardEntity.setGroupNo(acceptNo.substring(0, 8));
specialCardEntity.setTaskId(Long.valueOf(taskId));
specialCardService.saveSpecialCard(specialCardEntity);
} }
Map<String, Object> map = new LinkedHashMap<>();
map.put("msg", "成功添加退证");
return map; return map;
} }
...@@ -470,11 +595,19 @@ public class TaskListApi { ...@@ -470,11 +595,19 @@ public class TaskListApi {
* 查询制证类型列表 * 查询制证类型列表
*/ */
@RequestMapping("getTypeList") @RequestMapping("getTypeList")
public List<CardTypeDicEntity> getTypeList() { public List<CardTypeDicEntity> getTypeList( HttpServletRequest requ) {
List<CardTypeDicEntity> list = taskListService.getTypeList(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<CardTypeDicEntity> list = new ArrayList <>();
try {
list = taskListService.getTypeList();
}catch (Exception e){
logger.error("Exception 查询制证类型列表异常", e);
}
return list; return list;
} }
/** /**
* 查询提交人上传的余证详情 * 查询提交人上传的余证详情
* @param date 提交日期 * @param date 提交日期
...@@ -482,8 +615,16 @@ public class TaskListApi { ...@@ -482,8 +615,16 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("queryRemainderCardInfo") @RequestMapping("queryRemainderCardInfo")
public List<Map<String,Object>> queryRemainderCardInfo(@RequestParam("date") String date,@RequestParam("name") String name) { public List<Map<String, Object>> queryRemainderCardInfo(@RequestParam("date") String date, @RequestParam("name") String name, HttpServletRequest requ) {
List<Map<String,Object>> failedCardEntities = taskListService.selectRemainderCardInfo(replaceDate(date), name); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> failedCardEntities = new ArrayList <>();
try {
failedCardEntities = taskListService.selectRemainderCardInfo(replaceDate(date), name);
}catch (Exception e){
logger.error("提交日期：" + date + "提交人姓名" + name);
logger.error("Exception 查询已转出数量异常", e);
}
return failedCardEntities; return failedCardEntities;
} }
...@@ -492,8 +633,15 @@ public class TaskListApi { ...@@ -492,8 +633,15 @@ public class TaskListApi {
* 查询已转出数量 * 查询已转出数量
*/ */
@RequestMapping("getPrintOutCount") @RequestMapping("getPrintOutCount")
public List<Map<String, Object>> getPrintOutCount() { public List<Map<String, Object>> getPrintOutCount(HttpServletRequest requ) {
List<Map<String, Object>> printOutCount = taskListService.getPrintOutCount(); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
List<Map<String, Object>> printOutCount = new ArrayList <>();
try {
printOutCount = taskListService.getPrintOutCount();
}catch (Exception e){
logger.error("Exception 查询已转出数量异常", e);
}
return printOutCount; return printOutCount;
} }
...@@ -506,12 +654,22 @@ public class TaskListApi { ...@@ -506,12 +654,22 @@ public class TaskListApi {
* @return * @return
*/ */
@RequestMapping("updateFailedCardWorkGroup") @RequestMapping("updateFailedCardWorkGroup")
public boolean updateFailedCardWorkGroup(@RequestBody String json) { public boolean updateFailedCardWorkGroup(@RequestBody String json, HttpServletRequest requ) {
JSONObject jsonObject = JSONObject.fromObject(json); String remoteAddr = requ.getRemoteAddr();
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList"); MDC.put("ip", remoteAddr);
String workGroup = jsonObject.get("workGroup").toString(); JSONObject jsonObject = new JSONObject();
List<String> list = (List<String>) jsonArray; boolean state = true;
return taskListService.updateFailedCardWorkGroup(list, workGroup); try {
jsonObject = JSONObject.fromObject(json);
JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
String workGroup = jsonObject.get("workGroup").toString();
List<String> list = (List<String>) jsonArray;
state = taskListService.updateFailedCardWorkGroup(list, workGroup);
}catch (Exception e){
logger.error("废证任务单参数：" + jsonObject);
logger.error("Exception 更改废证任务单工作组（打印转出）异常", e);
}
return state;
} }
/** /**
......
src/main/java/com/yxproject/start/api/UpdateStateApi.java
View file @ 12005cfa
package com.yxproject.start.api; package com.yxproject.start.api;
import com.yxproject.start.service.PreproPersonService; import com.yxproject.start.service.PreproPersonService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@RestController @RestController
@RequestMapping("updateState") @RequestMapping("updateState")
public class UpdateStateApi { public class UpdateStateApi {
@Autowired @Autowired
PreproPersonService preproPersonService; PreproPersonService preproPersonService;
Logger logger= Logger.getLogger(UpdateStateApi.class);
@RequestMapping("updateState") @RequestMapping("updateState")
public boolean updateState(@RequestParam(value = "state") String state,@RequestParam(value = "acceptNo") String acceptNo){ public boolean updateState(@RequestParam(value = "state") String state,@RequestParam(value = "acceptNo") String acceptNo, HttpServletRequest requ) {
preproPersonService.uploadState(state,acceptNo); String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
try {
preproPersonService.uploadState(state,acceptNo);
}catch (Exception e){
logger.error("状态(是否打包)：" + state + "受理号：" + acceptNo);
logger.error("Exception updateState异常", e);
}
return true; return true;
} }
......
src/main/java/com/yxproject/start/api/UserApi.java
View file @ 12005cfa
...@@ -2,6 +2,8 @@ package com.yxproject.start.api; ...@@ -2,6 +2,8 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.UserInfo; import com.yxproject.start.entity.UserInfo;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.IncorrectCredentialsException; import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.UnknownAccountException; import org.apache.shiro.authc.UnknownAccountException;
...@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
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 javax.servlet.http.HttpServletRequest;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
...@@ -22,8 +25,12 @@ import java.util.Map; ...@@ -22,8 +25,12 @@ import java.util.Map;
@RequestMapping("user") @RequestMapping("user")
public class UserApi { public class UserApi {
Logger logger= Logger.getLogger(UserApi.class);
@PostMapping("login") @PostMapping("login")
public Map<String, Object> submitLogin(@RequestBody String jsonStr) { public Map<String, Object> submitLogin(@RequestBody String jsonStr, HttpServletRequest requ) {
String remoteAddr = requ.getRemoteAddr();
MDC.put("ip", remoteAddr);
JSONObject jsonObject = JSONObject.fromObject(jsonStr); JSONObject jsonObject = JSONObject.fromObject(jsonStr);
String username = jsonObject.getString("username"); String username = jsonObject.getString("username");
String password = jsonObject.getString("password"); String password = jsonObject.getString("password");
...@@ -40,21 +47,33 @@ public class UserApi { ...@@ -40,21 +47,33 @@ public class UserApi {
} catch (UnknownAccountException e) { } catch (UnknownAccountException e) {
resultMap.put("status", 201); resultMap.put("status", 201);
resultMap.put("message", "账号不存在！"); resultMap.put("message", "账号不存在！");
logger.error("不存在的用户名：" + username);
logger.error("", e);
} catch (IncorrectCredentialsException e1) { } catch (IncorrectCredentialsException e1) {
resultMap.put("status", 202); resultMap.put("status", 202);
resultMap.put("message", "密码错误！"); resultMap.put("message", "密码错误！");
logger.error("用户密码错误，用户名：" + username + "错误密码：" + password);
logger.error("", e1);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("status", 500); resultMap.put("status", 500);
resultMap.put("message", "用户名密码错误"); resultMap.put("message", "用户名密码错误");
logger.error("用户名错误：" + username + "错误密码：" + password);
logger.error("Exception 用户登录异常", e);
} }
return resultMap; return resultMap;
} }
@RequestMapping("logout") @RequestMapping("logout")
public void logout() { public void logout( HttpServletRequest requ) {
Subject subject = SecurityUtils.getSubject(); String remoteAddr = requ.getRemoteAddr();
if (subject.isAuthenticated()) { MDC.put("ip", remoteAddr);
subject.logout(); try {
Subject subject = SecurityUtils.getSubject();
if (subject.isAuthenticated()) {
subject.logout();
}
}catch (Exception e){
logger.error("Exception 用户登出异常", e);
} }
} }
......
src/main/java/com/yxproject/start/api/queryPreproPerson.java
View file @ 12005cfa
...@@ -2,11 +2,14 @@ package com.yxproject.start.api; ...@@ -2,11 +2,14 @@ package com.yxproject.start.api;
import com.yxproject.start.entity.PreproPersonEntity; import com.yxproject.start.entity.PreproPersonEntity;
import com.yxproject.start.service.PreproPersonService; import com.yxproject.start.service.PreproPersonService;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
...@@ -21,34 +24,45 @@ import java.util.Map; ...@@ -21,34 +24,45 @@ import java.util.Map;
public class queryPreproPerson { public class queryPreproPerson {
@Autowired @Autowired
private PreproPersonService preproPersonService; private PreproPersonService preproPersonService;
Logger logger= Logger.getLogger(queryPreproPerson.class);
/** /**
* 查询制证数据 * 查询制证数据
*/ */
@RequestMapping("queryPreproPerson") @RequestMapping("queryPreproPerson")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("currPage")String currPage,@RequestParam("pageSize")String pageSize,@RequestParam("downloadState")String downloadState, HttpServletResponse response){ public Map<String,Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("currPage")String currPage,@RequestParam("pageSize")String pageSize,@RequestParam("downloadState")String downloadState, HttpServletResponse response, HttpServletRequest requ) {
List<Map<String, Object>> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize,downloadState); String remoteAddr = requ.getRemoteAddr();
Map<String,Object> map = new LinkedHashMap<>(); MDC.put("ip", remoteAddr);
//todo Map<String,Object> map = null;
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState); try {
map.put("total",preproPersonEntityList.size()); map = new LinkedHashMap<>();
int youSum =0; List<Map<String, Object>> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize,downloadState);
int puSum=0; //todo
int invaildCount = 0; List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState);
for (Map<String, Object> map1 :preproPersonEntityList){ map.put("total",preproPersonEntityList.size());
if ("9".equals(map1.get("CARD_TYPE_ID")+"")){ int youSum =0;
youSum++; int puSum=0;
}else if ("0".equals(map1.get("CARD_TYPE_ID")+"")){ int invaildCount = 0;
puSum++; for (Map<String, Object> map1 :preproPersonEntityList){
} if ("9".equals(map1.get("CARD_TYPE_ID")+"")){
if ("0".equals(map1.get("IS_VALID")+"")){ youSum++;
invaildCount++; }else if ("0".equals(map1.get("CARD_TYPE_ID")+"")){
puSum++;
}
if ("0".equals(map1.get("IS_VALID")+"")){
invaildCount++;
}
} }
map.put("list",preproPersonEntities);
map.put("youSum",youSum);
map.put("puSum",puSum);
map.put("invaildCount",invaildCount);
}catch (Exception e){
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard+ "包号：" + oldFile+ "文件名：" + newFile+ "签发机关：" + SSXQDM+ "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate+ "页数：" + currPage+ "条数：" + pageSize+ "生成时间：" + downloadState);
logger.error("Exception 查询制证数据异常", e);
} }
map.put("list",preproPersonEntities);
map.put("youSum",youSum);
map.put("puSum",puSum);
map.put("invaildCount",invaildCount);
return map; return map;
} }
...@@ -57,13 +71,21 @@ public class queryPreproPerson { ...@@ -57,13 +71,21 @@ public class queryPreproPerson {
*/ */
@RequestMapping("updatePreproPerson") @RequestMapping("updatePreproPerson")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> updatePreproPerson(@RequestParam("id") String id, @RequestParam("isValid")String isValid, HttpServletResponse response){ public Map<String,Object> updatePreproPerson(@RequestParam("id") String id, @RequestParam("isValid")String isValid, HttpServletResponse response, HttpServletRequest requ) {
PreproPersonEntity preproPersonEntity = new PreproPersonEntity(); String remoteAddr = requ.getRemoteAddr();
preproPersonEntity.setId(Long.valueOf(id)); MDC.put("ip", remoteAddr);
preproPersonEntity.setIsValid(Long.valueOf(isValid)); Map<String,Object> map = null;
preproPersonService.updatePreproPersonIsValid(preproPersonEntity); try {
Map<String,Object> map = new LinkedHashMap<>(); PreproPersonEntity preproPersonEntity = new PreproPersonEntity();
map.put("msg","成功更新制证数据是否有效"); preproPersonEntity.setId(Long.valueOf(id));
preproPersonEntity.setIsValid(Long.valueOf(isValid));
preproPersonService.updatePreproPersonIsValid(preproPersonEntity);
map = new LinkedHashMap<>();
map.put("msg","成功更新制证数据是否有效");
} catch (Exception e){
logger.error("制证信息ID：" + id + "是否有效（1有效，0无效）：" + isValid );
logger.error("Exception 更新制证数据是否有效异常", e);
}
return map; return map;
} }
...@@ -72,11 +94,19 @@ public class queryPreproPerson { ...@@ -72,11 +94,19 @@ public class queryPreproPerson {
*/ */
@RequestMapping("queryPreproPersonCount") @RequestMapping("queryPreproPersonCount")
// @RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public Map<String,Object> queryPreproPersonCount(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("downloadState")String downloadState, HttpServletResponse response){ public Map<String,Object> queryPreproPersonCount(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state,@RequestParam("uploadDate")String uploadDate,@RequestParam("downloadState")String downloadState, HttpServletResponse response, HttpServletRequest requ) {
Map<String,Object> map = new LinkedHashMap<>(); String remoteAddr = requ.getRemoteAddr();
//todo MDC.put("ip", remoteAddr);
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState); Map<String,Object> map = null;
map.put("total",preproPersonEntityList.size()); try {
map = new LinkedHashMap<>();
//todo
List<Map<String, Object>> preproPersonEntityList = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),downloadState);
map.put("total",preproPersonEntityList.size());
}catch (Exception e){
logger.error("oldFile：" + uploadNo + "公民身份号码：" + IDCard+ "包号：" + oldFile+ "文件名：" + newFile+ "签发机关：" + SSXQDM+ "制证类型代码（9邮寄0大批）：" + cardType + "是否有效（1有效，0无效）：" + state + "上传时间：" + uploadDate+ "页数：" + "生成时间：" + downloadState);
logger.error("Exception 查询制证数据总数异常", e);
}
return map; return map;
} }
......
src/main/resources/application.yml
View file @ 12005cfa
...@@ -4,7 +4,7 @@ server: ...@@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin url: jdbc:oracle:thin:@192.168.10.208:1521:yingxin
username: yingxin username: yingxin
password: yingxin password: yingxin
servlet: servlet:
......
src/test/java/com/yxproject/start/test.java
View file @ 12005cfa
package com.yxproject.start; //package com.yxproject.start;
//
import com.yxproject.start.api.SelectApi; //import com.yxproject.start.api.SelectApi;
//
public class test { //public class test {
public static void main(String[] args){ // public static void main(String[] args){
SelectApi selectApi = new SelectApi(); // SelectApi selectApi = new SelectApi();
selectApi.selectByCard("20190305001"); // selectApi.selectByCard("20190305001");
} // }
} //}
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