Merge remote-tracking branch 'origin/feature-2022.07.29' into feature-2022.07.29

eladmin-security/src/main/java/me/zhengjie/security/security/TokenFilter.java

@@ -102,8 +102,7 @@ public class TokenFilter extends GenericFilterBean {
 //			filterChain.doFilter(servletRequest, servletResponse);
 //			return;
 //		}
-		// 排除打印的日志数据，
-		log.info("请求路径：" + reqUrl);
+
 
 		// 这里是处理app的接口
 		String token = resolveToken(httpServletRequest);

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/OrderRoomIdController.java

@@ -42,7 +42,7 @@ public class OrderRoomIdController {
 		AppBaseResponse<JSONObject> rep = new AppBaseResponse<>();
 		JSONObject jsonObj = JSONObject.parseObject(json);
 		QueryWrapper<OrderRoomIdEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("orderId", jsonObj.getString("orderId"));
+		queryWrapper.eq("business_no", jsonObj.getString("businessNo"));
 		queryWrapper.orderByDesc("update_time");
 		List<OrderRoomIdEntity> orderRoomList = orderRoomService.list(queryWrapper);
 		if (orderRoomList != null && orderRoomList.size() > 0) {

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/TencentPushController.java

@@ -22,6 +22,8 @@ import me.zhengjie.application.bank.service.TencentPushService;
 import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
 import me.zhengjie.base.util.DownloadUtils;
 
+//"stream_id":"1400574616_166123743_2222_aux"    这个是app的
+//"stream_id":"1400574616_166123743_share_45_main"     这个是PC的
 @Controller
 public class TencentPushController {
 
@@ -35,21 +37,21 @@ public class TencentPushController {
 	@AnonymousPostMapping("/tencentpush")
 	@ResponseBody
 	public Map<String, Object> tencentpush(@RequestBody Map<String, String> json) throws Exception {
-		// 转成json形式
-		log.info("pc端的推送信息：" + JSON.toJSON(json));
-		String fileId = (String) json.get("file_id");
-		PushDataEntity pushData = new PushDataEntity();
-		pushData.setFileId(fileId);
-		pushData.setPushType("pc");
-		pushData.setTypeName(json.get("appname"));
-		pushData.setData(JSON.toJSONString(json));
-		pushData.setPath(json.get("video_url"));
-		pushService.save(pushData);
 
 		String channelId = json.get("channel_id");
-		log.info("pc端的推送信息：" + JSON.toJSON(json));
+
 		Map<String, String> map = split(json.get("stream_param"));
 		if (channelId.contains("share")) {
+			// 转成json形式
+			String fileId = (String) json.get("file_id");
+			PushDataEntity pushData = new PushDataEntity();
+			pushData.setFileId(fileId);
+			pushData.setPushType("pc");
+			pushData.setTypeName(json.get("appname"));
+			pushData.setData(JSON.toJSONString(json));
+			pushData.setPath(json.get("video_url"));
+			pushService.save(pushData);
+			log.info("pc端的推送信息：" + JSON.toJSON(json));
 			// 文件fileId
 			String roomId = map.get("groupid");
 			QueryWrapper<OrderRoomIdEntity> orderRoomQuery = new QueryWrapper<>();
@@ -59,8 +61,7 @@ public class TencentPushController {
 			// 这里通过订单查询相关信息
 			if (orderRoomId != null && orderRoomId.size() > 0) {
 				OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
-				String orderType = StepStatusEnum.getType(orderRoomIdEntity.getOrderId());
-				String filePath = orderRoomIdEntity.getBusinessNo() + "/" + orderType;
+				String filePath = orderRoomIdEntity.getBusinessNo();
 				String fileName = filePath + "/PC" + fileId + ".mp4";
 				DownloadUtils.downloadFile(json.get("video_url"), fileName);
 				OrderRoomIdEntity update = new OrderRoomIdEntity();
@@ -70,13 +71,43 @@ public class TencentPushController {
 				orderRoomIdService.updateById(update);
 			}
 		}
+		if (channelId.contains("aux")) {
+			// 转成json形式
+			String fileId = (String) json.get("file_id");
+			PushDataEntity pushData = new PushDataEntity();
+			pushData.setFileId(fileId);
+			pushData.setPushType("pc");
+			pushData.setTypeName(json.get("appname"));
+			pushData.setData(JSON.toJSONString(json));
+			pushData.setPath(json.get("video_url"));
+			pushService.save(pushData);
+			log.info("app的视频推送：" + JSON.toJSON(json));
+			// 文件fileId
+			String roomId = map.get("groupid");
+			QueryWrapper<OrderRoomIdEntity> orderRoomQuery = new QueryWrapper<>();
+			orderRoomQuery.eq("roomId", roomId);
+			orderRoomQuery.orderByDesc("create_time");
+			List<OrderRoomIdEntity> orderRoomId = orderRoomIdService.list(orderRoomQuery);
+			// 这里通过订单查询相关信息
+			if (orderRoomId != null && orderRoomId.size() > 0) {
+				OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
+				String filePath = orderRoomIdEntity.getBusinessNo();
+				String fileName = filePath + "/APP" + fileId + ".mp4";
+				DownloadUtils.downloadFile(json.get("video_url"), fileName);
+				OrderRoomIdEntity update = new OrderRoomIdEntity();
+				update.setAppFileId(fileId);
+				update.setAppVideoUrl(fileName);
+				update.setId(orderRoomIdEntity.getId());
+				orderRoomIdService.updateById(update);
+			}
+		}
 		Map<String, Object> result = new HashMap<>();
 		result.put("success", true);
 		result.put("code", 200);
 		return result;
 	}
 
-	@AnonymousPostMapping("/apppush")
+//	@AnonymousPostMapping("/apppush")
 	@ResponseBody
 	public Map<String, Object> apppush(@RequestBody JSONObject json) throws Exception {
 		Object data = JSON.toJSON(json);
@@ -109,8 +140,8 @@ public class TencentPushController {
 							String roomId = param.get("roomId");
 							OrderRoomIdEntity orderRoomId = new OrderRoomIdEntity();
 							orderRoomId.setAppFileId(fileId);
-							String orderType = StepStatusEnum.getType(orderRoomId.getOrderId());
-							String filePath = orderRoomId.getBusinessNo() + "/" + orderType;
+
+							String filePath = orderRoomId.getBusinessNo() + "/";
 							String fileName = filePath + "/APP" + fileId + ".mp4";
 							DownloadUtils.downloadFile(videoUrl.get("Url").toString(), fileName);
 							orderRoomId.setAppVideoUrl(fileName);
@@ -152,8 +183,8 @@ public class TencentPushController {
 
 				if (orderRoomId != null && orderRoomId.size() > 0) {
 					OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
-					String orderType = StepStatusEnum.getType(orderRoomIdEntity.getOrderId());
-					String filePath = orderRoomIdEntity.getBusinessNo() + "/" + orderType;
+
+					String filePath = orderRoomIdEntity.getBusinessNo() + "/";
 					String fileName = filePath + "/APP" + fileId + ".mp4";
 					DownloadUtils.downloadFile(path, fileName);
 					OrderRoomIdEntity update = new OrderRoomIdEntity();

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/vo/WorkerInfo.java

@@ -1,17 +0,0 @@
-package me.zhengjie.application.bank.controller.vo;
-
-import lombok.Data;
-
-/*
-公证员信息
- */
-@Data
-public class WorkerInfo {
-
-	private String name;
-	private String phone;
-	private String idNo;
-	private String signPicture;
-	private String imgBase;
-
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/IdentityValidationService.java

@@ -1,24 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import me.zhengjie.base.ResponseDTO;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 身份验证服务
- */
-public interface IdentityValidationService {
-
-    //活体核身
-	ResponseDTO<?> liveVerify(MultipartFile file, HttpServletRequest request);
-
-    //活体对比
-	ResponseDTO<?> liveCompare(MultipartFile file, HttpServletRequest request);
-
-
-    //人脸比对
-	ResponseDTO<?> faceCompare(HttpServletRequest request);
-
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/OssService.java

@@ -1,45 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import me.zhengjie.base.ResponseDTO;
-
-public interface OssService {
-
-    /**
-     * 上传文件
-     *
-     * @param file     文件流
-     * @param loanNo   流水号
-     * @param fileName 文件名
-     * @param types    类型
-     * @param appid    银行标识
-     * @return
-     */
-	ResponseDTO<?> uploadToOSS(byte[] file, String loanNo, String fileName, String types, String appid);
-
-    /**
-     * 生成有时限的url
-     *
-     * @param ObjectName oss存储路径
-     * @param second     有效时长，秒
-     * @return
-     */
-    String CreateFileURL(String ObjectName, int second);
-
-    /**
-     * 下载文件
-     *
-     * @param objectName oss存储路径
-     * @return
-     */
-    byte[] downLoadForOSS(String objectName);
-
-
-    /**
-     * 删除单个文件
-     *
-     * @param objectName
-     */
-    void deleteFile(String objectName);
-
-
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/PdfService.java

@@ -1,11 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import me.zhengjie.application.bank.controller.vo.Order;
-
-public interface PdfService {
-    void createPdf(Order order);
-
-    void createNote(Order order);
-
-    void createNotaryBook(Order order);
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/SignService.java

@@ -1,15 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import me.zhengjie.base.ResponseDTO;
-
-
-
-
-
-
-public interface SignService {
-
-	ResponseDTO<?> sigin(MultipartFile file, Integer orderId);
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/IdentityValidationServiceImpl.java

@@ -1,154 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import java.io.IOException;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.alibaba.fastjson.JSONObject;
-
-import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.dao.jdbc.AccountDao;
-import me.zhengjie.dao.jdbc.FileInfoDao;
-import me.zhengjie.dao.jdbc.OrderDao;
-import me.zhengjie.application.bank.controller.vo.Account;
-import me.zhengjie.application.bank.controller.vo.FileInfo;
-import me.zhengjie.application.bank.controller.vo.Order;
-import me.zhengjie.application.bank.service.IdentityValidationService;
-import me.zhengjie.application.bank.service.OssService;
-import me.zhengjie.base.util.StatusEnum.FileCodeEnum;
-import me.zhengjie.base.util.TencentUtil;
-import me.zhengjie.base.ResponseDTO;
-import me.zhengjie.base.ResultCode;
-
-@Slf4j
-@Service
-public class IdentityValidationServiceImpl implements IdentityValidationService {
-
-	@Autowired
-	FileInfoDao fileInfoDao;
-	@Autowired
-	OssService ossService;
-	@Autowired
-	OrderDao orderDao;
-	@Autowired
-	AccountDao accountDao;
-
-	@Override
-	public ResponseDTO<?> liveVerify(MultipartFile file, HttpServletRequest request) {
-		HashMap<String, Object> map = new HashMap<>();
-		// 这边是记录的id
-		int id = Integer.parseInt(request.getParameter("orderId"));
-		String idNo = request.getParameter("idNo");
-		String name = request.getParameter("name");
-		String videoBase64 = "";
-		try {
-			videoBase64 = Base64.getEncoder().encodeToString(file.getBytes());
-		} catch (IOException e) {
-			log.error("活体视频转换失败: " + e.getMessage());
-			// return Function.returnMsg(200, "活体视频无效", null);
-			return ResponseDTO.error(ResultCode.LIVE_VIDEO_CONVERSION);
-		}
-
-		Order order = orderDao.selectOrder(id);
-		String loanNo = order.getLoanNo();
-
-		String result = TencentUtil.FaceNuclearBody(idNo, name, videoBase64);
-//        String result = "{\"BestFrameBase64\":\"\",\"Description\":\"成功\",\"RequestId\":\"b8c0e5c5-68e0-4507-896c-29e9bdf08ff5\",\"Sim\":100.0,\"Result\":\"Success\"}";
-		if (StringUtils.isEmpty(result)) {
-			return ResponseDTO.error(ResultCode.LIVE_VIDEO_INVALID);
-		}
-		JSONObject obj = JSONObject.parseObject(result);
-		Double sim = obj.getDouble("Sim");
-		if (sim >= 40.0) {
-			// 保存业务底照
-			String bestFrameBase64 = obj.getString("BestFrameBase64");
-			byte[] decode = Base64.getDecoder().decode(bestFrameBase64);
-			String typeName = FileCodeEnum.BASICS.getName();
-			String fileName = loanNo + "-" + typeName + "-" + idNo + ".jpg";
-			ossService.uploadToOSS(decode, loanNo, fileName, typeName, getOrgName(id));
-			obj.put("BestFrameBase64", "");
-			map.put("result", obj);
-			// return Function.returnMsg(100, "success", map);
-			return ResponseDTO.success(map);
-		}
-		return ResponseDTO.error(ResultCode.SIMILARITY_IS_LT_40_PERCENT);
-
-	}
-
-	@Override
-	public ResponseDTO<?> liveCompare(MultipartFile file, HttpServletRequest request) {
-
-		HashMap<String, Object> map = new HashMap<>();
-
-		String videoBase64 = "";
-		try {
-			videoBase64 = Base64.getEncoder().encodeToString(file.getBytes());
-		} catch (IOException e) {
-			log.error("活体视频转换失败: " + e.getMessage());
-			return ResponseDTO.error(ResultCode.LIVE_VIDEO_CONVERSION);
-		}
-		int id = Integer.parseInt(request.getParameter("orderId"));
-		Order order = orderDao.selectOrder(id);
-		String loanNo = order.getLoanNo();
-
-		// 查找业务底照
-		List<FileInfo> fileInfos = fileInfoDao.selectByLoanNoAndType(loanNo,
-				String.valueOf(FileCodeEnum.BASICS.getName()));
-		String path = fileInfos.get(0).getPath();
-		byte[] bytes = ossService.downLoadForOSS(path);
-		String imageBase64 = Base64.getEncoder().encodeToString(bytes);
-
-		String result = TencentUtil.liveFaceContrast(imageBase64, videoBase64);
-		if (StringUtils.isEmpty(result)) {
-			// return Function.returnMsg(200, "活体人脸对比失败", null);
-			return ResponseDTO.error(ResultCode.LIVE_VIDEO_INVALID);
-		}
-		JSONObject obj = JSONObject.parseObject(result);
-		Double sim = obj.getDouble("Sim");
-		if (sim >= 40.0) {
-			obj.put("BestFrameBase64", "");
-			map.put("result", obj);
-			// return Function.returnMsg(100, "success", map);
-			return ResponseDTO.success(map);
-		}
-		return ResponseDTO.error(ResultCode.LIVE_VIDEO_INVALID);
-	}
-
-	@Override
-	public ResponseDTO<?> faceCompare(HttpServletRequest request) {
-		String imageBase64 = request.getParameter("imageBase64");
-		int id = Integer.parseInt(request.getParameter("orderId"));
-		Order order = orderDao.selectOrder(id);
-		String loanNo = order.getLoanNo();
-
-		String type = String.valueOf(FileCodeEnum.BASICS.getName());
-		List<FileInfo> file = fileInfoDao.selectByLoanNoAndType(loanNo, type);
-		String path = ossService.CreateFileURL(file.get(0).getPath(), 300);
-		String result = TencentUtil.compareFace(imageBase64, path);
-		if (StringUtils.isEmpty(result)) {
-			return ResponseDTO.error(ResultCode.LIVE_VIDEO_INVALID);
-		}
-		HashMap<Object, Object> map = new HashMap<>();
-		map.put("result", result);
-		// return Function.returnMsg(100, "Success", new HashMap<>());
-		return ResponseDTO.success(map);
-	}
-
-	private String getOrgName(int id) {
-		Order order = orderDao.selectOrder(id);
-		String province = order.getCompanyProvince() + "";
-		String city = order.getCompanyCity() + "";
-		String district = order.getCompanyDistrict() + "";
-
-		Account account = accountDao.selectAccountByArea(province, city, district);
-		return account.getAccountNo();
-	}
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/OrderServiceImpl.java

@@ -490,12 +490,11 @@ public class OrderServiceImpl implements OrderService {
 		log.info("推送的参数: " + json);
 		// 保存数据
 		JSONObject jsonObject = JSONObject.parseObject(json);
-		String orderId = jsonObject.getString("orderId");
 		String businessNo = jsonObject.getString("businessNo");
 		String roomId = jsonObject.getString("roomId");
 
 		OrderRoomIdEntity orderRoomId = new OrderRoomIdEntity();
-		orderRoomId.setOrderId(orderId);
+		
 		// 业务流水
 		orderRoomId.setBusinessNo(businessNo);
 		// 房间号
@@ -506,7 +505,7 @@ public class OrderServiceImpl implements OrderService {
 		orderRoomId.setUpdateTime(LocalDateTime.now());
 		// 这里先判断是否存在，不存在就插入数据
 		OrderRoomIdEntity orderQuery = new OrderRoomIdEntity();
-		orderQuery.setOrderId(orderId);
+	
 		orderQuery.setRoomId(roomId);
 		// 业务流水
 		orderQuery.setBusinessNo(businessNo);

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/OssServiceImpl.java

@@ -1,79 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-
-import java.io.IOException;
-import java.util.HashMap;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.dao.jdbc.FileInfoDao;
-import me.zhengjie.application.bank.controller.vo.FileInfo;
-import me.zhengjie.application.bank.service.OssService;
-import me.zhengjie.base.util.OssUtil;
-import me.zhengjie.base.ResponseDTO;
-import me.zhengjie.base.ResultCode;
-
-@Slf4j
-@Service
-public class OssServiceImpl implements OssService {
-
-    @Autowired
-    FileInfoDao fileInfoDao;
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public ResponseDTO<?> uploadToOSS(byte[] file, String loanNo, String fileName, String types, String appid) {
-
-        String objectName = "fuqiang/test/" + appid + "/" + loanNo + "/" + types + "/" + fileName;
-        FileInfo fileInfo = fileInfoDao.selectByPath(objectName);
-        if (fileInfo.getPath() != null) {
-            log.info("上传的文件已存在: " + objectName);
-            return ResponseDTO.error(ResultCode.FILE_EXISTING);
-        }
-        try {
-            OssUtil.upload(objectName, file);
-            fileInfo = new FileInfo();
-            fileInfo.setLoanNo(loanNo);
-            fileInfo.setAppid(appid);
-            fileInfo.setFileName(fileName);
-            fileInfo.setType(types);
-            fileInfo.setPath(objectName);
-            fileInfoDao.insertFile(fileInfo);
-        } catch (Exception e) {
-            log.error("oss上传失败: " + e.getMessage());
-            return ResponseDTO.error(ResultCode.FILE_UPLOAD_FAIL);
-        }
-
-        HashMap<String, String> hm = new HashMap<>();
-        hm.put("filePath", objectName);
-        return ResponseDTO.success(hm);
-    }
-
-
-    @Override
-    public byte[] downLoadForOSS(String objectName) {
-
-        try {
-            byte[] download = OssUtil.download(objectName);
-            return download;
-        } catch (IOException e) {
-            log.error("OSS下载失败: " + e.getMessage());
-            return null;
-        }
-    }
-
-    @Override
-    public String CreateFileURL(String objectName, int second) {
-        String url = OssUtil.createUrl(objectName, second);
-        url = url.replace("http://", "https://");
-        return url;
-    }
-
-    @Override
-    public void deleteFile(String objectName) {
-        OssUtil.deleteFile(objectName);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/PdfServiceImpl.java

@@ -1,338 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import static me.zhengjie.base.util.StatusEnum.PdfEnum.APPLY;
-import static me.zhengjie.base.util.StatusEnum.PdfEnum.BORROWERNOTE;
-import static me.zhengjie.base.util.StatusEnum.PdfEnum.CONFIRMATION;
-import static me.zhengjie.base.util.StatusEnum.PdfEnum.ENTRUST;
-import static me.zhengjie.base.util.StatusEnum.PdfEnum.NOTARYBOOK;
-import static me.zhengjie.base.util.StatusEnum.PdfEnum.NOTIFICATION;
-import static me.zhengjie.base.util.StatusEnum.PdfEnum.PROMISE;
-import static me.zhengjie.base.util.StatusEnum.PdfEnum.RECEIPT;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-
-import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.dao.jdbc.AccountDao;
-import me.zhengjie.dao.jdbc.AreaDao;
-import me.zhengjie.dao.jdbc.ConfinfoDao;
-import me.zhengjie.dao.jdbc.ModelDao;
-import me.zhengjie.dao.jdbc.OrderDao;
-import me.zhengjie.dao.jdbc.OrgInfoDao;
-import me.zhengjie.application.bank.controller.vo.Account;
-import me.zhengjie.application.bank.controller.vo.Model;
-import me.zhengjie.application.bank.controller.vo.Order;
-import me.zhengjie.application.bank.controller.vo.OrgInfo;
-import me.zhengjie.application.bank.service.OssService;
-import me.zhengjie.application.bank.service.PdfService;
-import me.zhengjie.base.util.HtmlConvertPdf;
-import me.zhengjie.base.util.PdfModel;
-import me.zhengjie.base.util.StatusEnum;
-import me.zhengjie.base.util.SysUtil;
-
-
-@Slf4j
-@Service
-public class PdfServiceImpl implements PdfService {
-
-    @Autowired
-    ModelDao modelDao;
-
-    @Autowired
-    OssService ossService;
-
-    @Autowired
-    AccountDao accountDao;
-
-   // @Value("${file.linix.uploadFolder}")
-    private String linuxUploadFolder;
-
-  //  @Value("${file.window.uploadFolder}")
-    private String windowUploadFolder;
-
-    @Autowired
-    OrderDao orderDao;
-
-    @Autowired
-    AreaDao areaDao;
-
-    @Autowired
-    OrgInfoDao orgInfoDao;
-
-    @Autowired
-    ConfinfoDao confinfoDao;
-
-
-    @Override
-    public void createPdf(Order order) {
-        Integer companyProvince = order.getCompanyProvince();
-        Integer companyCity = order.getCompanyCity();
-        Integer companyDistrict = order.getCompanyDistrict();
-        String companyFullName = order.getCompanyFullName();
-        String companyCertNo = order.getCompanyCertNo();
-        String appId = order.getAppId();
-        String loanNo = order.getLoanNo();
-        String legalName = order.getLegalName();
-        String legalPhone = order.getLegalPhone();
-        String legalBirthday = order.getLegalBirthday();
-        String legalCertNo = order.getLegalCertNo();
-        String companyAddress = order.getCompanyAddress();
-        String sex = SysUtil.getCarInfo(legalCertNo).get("sex");
-
-        String orgName = getOrgName(order.getId());
-
-        List<Model> models = modelDao.selectModelListByArea(companyProvince, companyCity, companyDistrict);
-        log.info("********: " + JSON.toJSONString(models, SerializerFeature.WriteMapNullValue));
-        String htmlStr = "";
-        for (Model model : models) {
-            Integer configCode = model.getConfigCode();
-            String finalPath = model.getFinalPath();
-            log.info("configCode: " + configCode + " , finalPath: " + finalPath);
-            htmlStr = new String(ossService.downLoadForOSS(finalPath));
-            if (configCode == PROMISE.getStatus()) {
-                createPromise(htmlStr, loanNo, legalCertNo, 1, orgName);
-            } else if (configCode == APPLY.getStatus()) {
-                createApply(htmlStr, legalName, sex, legalBirthday, companyAddress, loanNo, legalCertNo, legalPhone, orgName);
-            } else if (configCode == RECEIPT.getStatus()) {
-                createReceipt(htmlStr, loanNo, legalCertNo, legalName, orgName);
-            } else if (configCode == CONFIRMATION.getStatus()) {
-                createConfirmation(htmlStr, legalCertNo, legalPhone, companyAddress, loanNo, legalCertNo, orgName);
-            } else if (configCode == ENTRUST.getStatus()) {
-                //委托人暂时填写法人本人 杜婧闻20201020
-                createEntrust(htmlStr, loanNo, companyFullName, companyCertNo, legalName, legalName, legalCertNo, orgName);
-            } else if (configCode == NOTIFICATION.getStatus()) {
-                createPromise(htmlStr, loanNo, legalCertNo, 2, orgName);
-            }
-        }
-    }
-
-    @Override
-    public void createNote(Order order) {
-        Integer companyProvince = order.getCompanyProvince();
-        Integer companyCity = order.getCompanyCity();
-        Integer companyDistrict = order.getCompanyDistrict();
-        Integer accountId = order.getAccountId();
-        Account account = accountDao.selectAccountById(accountId);
-        String userName = account.getUserName();
-        String loanNo = order.getLoanNo();
-        String legalName = order.getLegalName();
-        String legalBirthday = order.getLegalBirthday();
-        String legalCertNo = order.getLegalCertNo();
-        String loanAmount = String.valueOf(order.getLoanAmount());
-        String loanTerm = String.valueOf(order.getLoanTerm());
-        String loanRate = String.valueOf(order.getLoanRate());
-        String orgNo = accountDao.selectAccountById(account.getAccountId()).getAccountNo();
-
-        List<Model> models = modelDao.selectModelListByArea(companyProvince, companyCity, companyDistrict);
-        for (Model model : models) {
-            Integer configCode = model.getConfigCode();
-            if (configCode == BORROWERNOTE.getStatus()) {
-                String finalPath = model.getFinalPath();
-                String htmlStr = new String(ossService.downLoadForOSS(finalPath));
-                createBorrowernote(htmlStr, userName, legalName, loanNo, legalBirthday, legalCertNo, loanAmount, loanTerm, loanRate, orgNo);
-            }
-        }
-    }
-
-    @Override
-    public void createNotaryBook(Order order) {
-
-        String loanNo = order.getLoanNo();
-        String name = order.getLegalName();
-        String idNo = order.getLegalCertNo();
-        String bank = "***";
-        String bankAddress = "***";
-        //银行客户经理
-        String corporation = "***";
-        String amount = String.valueOf(order.getLoanAmount());
-        String rate = String.valueOf(order.getLoanRate());
-        String term = String.valueOf(order.getLoanTerm());
-        //贷款起始日期
-        String startTime = "***";
-        //贷款终止日期
-        String endTime = "***";
-        //合同签署日期
-        String signatureDate = "***";
-        String province = codeToArea(String.valueOf(order.getCompanyProvince()));
-        String city = codeToArea(String.valueOf(order.getCompanyCity()));
-        //公证处
-        Account account = accountDao.selectaccountByAccountId(order.getAccountId());
-        String notaryOffice = account.getCompany();
-        String accountNo = account.getAccountNo();
-        Integer id = account.getId();
-        OrgInfo orgInfo = orgInfoDao.selectByAccountId(id);
-        String proveKind = orgInfo.getProveKind();
-        Integer nextCode = orgInfo.getNextCode();
-        String year = new SimpleDateFormat("yyyyMMdd").format(new Date()).substring(0, 4);
-        //公证书编号
-        String crtificateno = "(" + year + ")" + proveKind + "证字第" + nextCode + "号";
-        log.info("公证书编号: " + crtificateno);
-        Map<String, String> params = new HashMap<>();
-        params.put("crtificateno", crtificateno);
-        params.put("loanNo", loanNo);
-        params.put("name", name);
-        params.put("idNo", idNo);
-        params.put("bank", bank);
-        params.put("bankAddress", bankAddress);
-        params.put("corporation", corporation);
-        params.put("amount", amount);
-        params.put("rate", rate);
-        params.put("term", term);
-        params.put("startTime", startTime);
-        params.put("endTime", endTime);
-        params.put("signatureDate", signatureDate);
-        params.put("province", province);
-        params.put("city", city);
-        params.put("notaryOffice", notaryOffice);
-        params.put("accountNo", accountNo);
-
-        String objectName = confinfoDao.selectValueByName("notarization");
-        String htmlStr = new String(ossService.downLoadForOSS(objectName));
-        createNotaryBook(htmlStr, params);
-
-        orgInfoDao.updateNextCode(id, nextCode + 1);
-    }
-
-    /**
-     * 生成承诺书 + 债权文书
-     *
-     * @param htmlStr
-     * @param loanNo
-     * @param idNo
-     * @param type
-     */
-    private void createPromise(String htmlStr, String loanNo, String idNo, Integer type, String accountN0) {
-        htmlStr = PdfModel.promise(htmlStr);
-        String fileName = "";
-        if (type == 1) {
-            String desc = StatusEnum.PdfEnum.PROMISE.getName();
-            fileName = loanNo + "-" + desc + "-" + idNo + ".pdf";
-        } else {
-            String desc = NOTIFICATION.getName();
-            fileName = loanNo + "-" + desc + "-" + idNo + ".pdf";
-        }
-        createAndUpload(htmlStr, fileName, loanNo, accountN0);
-    }
-
-    /**
-     * 受理回执
-     */
-    private void createReceipt(String htmlStr, String loanNo, String idNo, String name, String accountN0) {
-        htmlStr = PdfModel.receipt(htmlStr, name);
-        String desc = StatusEnum.PdfEnum.RECEIPT.getName();
-        String fileName = loanNo + "-" + desc + "-" + idNo + ".pdf";
-        createAndUpload(htmlStr, fileName, loanNo, accountN0);
-    }
-
-    /**
-     * 送达确认书
-     */
-    private void createConfirmation(String htmlStr, String name, String phone, String address, String loanNo, String idNo, String accountN0) {
-        htmlStr = PdfModel.confirmation(htmlStr, name, phone, address);
-        String desc = CONFIRMATION.getName();
-        String fileName = loanNo + "-" + desc + "-" + idNo + ".pdf";
-        createAndUpload(htmlStr, fileName, loanNo, accountN0);
-    }
-
-    /**
-     * 申请表
-     */
-    private void createApply(String htmlStr, String name, String sex, String birthday, String address, String loanNo, String idNo, String phone, String accountN0) {
-        htmlStr = PdfModel.apply(htmlStr, name, sex, birthday, address, "2", phone);
-        String desc = StatusEnum.PdfEnum.APPLY.getName();
-        String fileName = loanNo + "-" + desc + "-" + idNo + ".pdf";
-        createAndUpload(htmlStr, fileName, loanNo, accountN0);
-    }
-
-    /**
-     * 委托书
-     */
-    private void createEntrust(String htmlStr, String loanNo, String companyName, String creditCode, String attorney, String name, String idNo, String accountN0) {
-        htmlStr = PdfModel.entrust(htmlStr, companyName, creditCode, attorney, name, idNo);
-        String desc = ENTRUST.getName();
-        String fileName = loanNo + "-" + desc + "-" + idNo + ".pdf";
-        createAndUpload(htmlStr, fileName, loanNo, accountN0);
-
-    }
-
-    /**
-     * 借款人笔录
-     */
-    private void createBorrowernote(String htmlStr, String notaryName, String borrowerName, String loanNo,
-                                    String birthday, String idNo, String amount, String term, String rate, String accountN0) {
-        htmlStr = PdfModel.borrowernote(htmlStr, notaryName, borrowerName, birthday, idNo, amount, term, rate);
-        String desc = BORROWERNOTE.getName();
-        String fileName = loanNo + "-" + desc + "-" + idNo + ".pdf";
-        createAndUpload(htmlStr, fileName, loanNo, accountN0);
-    }
-
-
-    /**
-     * 公证书生成
-     *
-     * @param htmlStr
-     * @param params
-     */
-    private void createNotaryBook(String htmlStr, Map<String, String> params) {
-        htmlStr = PdfModel.notaryBook(htmlStr, params);
-        String typename = NOTARYBOOK.getName();
-        String fileName = params.get("loanNo") + "-" + typename + "-" + params.get("idNo") + ".pdf";
-        createAndUpload(htmlStr, fileName, params.get("loanNo"), params.get("accountNo"));
-
-    }
-
-
-    /**
-     * 生成pdf并上传
-     *
-     * @param fileName
-     * @param loanNo
-     */
-    private void createAndUpload(String htmlStr, String fileName, String loanNo, String accountN0) {
-
-        String path = this.linuxUploadFolder;
-        //判断当前系统是linux还是windows
-        if (System.getProperty("os.name").toLowerCase().contains("windows")) {
-            path = this.windowUploadFolder;
-        }
-        File file = new File(path + fileName);
-        try {
-            log.info("正在生成pdf: " + fileName);
-            HtmlConvertPdf.createPdfFile(htmlStr, path + fileName);
-            String typeName = StatusEnum.FileCodeEnum.PDF.getName();
-            ossService.uploadToOSS(SysUtil.File2byte(file), loanNo, fileName, typeName, accountN0);
-            boolean delete = file.delete();
-            log.info("是否删除成功: " + delete);
-        } catch (Exception e) {
-            log.error("生成pdf发生异常: " + e.getMessage());
-            file.delete();
-            log.error("PDF文件生成失败: " + fileName);
-        }
-    }
-
-
-    private String getOrgName(int id) {
-        Order order = orderDao.selectOrder(id);
-        String province = order.getCompanyProvince() + "";
-        String city = order.getCompanyCity() + "";
-        String district = order.getCompanyDistrict() + "";
-
-        Account account = accountDao.selectAccountByArea(province, city, district);
-        return account.getAccountNo();
-    }
-
-    private String codeToArea(String code) {
-        return areaDao.queryArea(code);
-    }
-
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/SignServiceImpl.java

@@ -1,133 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-
-import org.apache.commons.io.FileUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.alibaba.fastjson.JSONObject;
-
-import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.dao.jdbc.AccountDao;
-import me.zhengjie.dao.jdbc.FileInfoDao;
-import me.zhengjie.dao.jdbc.OrderDao;
-import me.zhengjie.application.bank.controller.vo.Account;
-import me.zhengjie.application.bank.controller.vo.FileInfo;
-import me.zhengjie.application.bank.controller.vo.Order;
-import me.zhengjie.application.bank.service.OssService;
-import me.zhengjie.application.bank.service.SignService;
-import me.zhengjie.base.util.StatusEnum;
-import me.zhengjie.base.util.SysUtil;
-import me.zhengjie.base.util.UinidUtils;
-import me.zhengjie.base.ResponseDTO;
-import me.zhengjie.base.ResultCode;
-
-@Slf4j
-@Service
-public class SignServiceImpl implements SignService {
-
-	@Autowired
-	FileInfoDao fileInfoDao;
-
-	@Autowired
-	OrderDao orderDao;
-
-	@Autowired
-	AccountDao accountDao;
-
-	@Autowired
-	OssService ossService;
-
-	@Override
-	public ResponseDTO<?> sigin(MultipartFile file, Integer orderId) {
-
-		String accountNo = getOrgName(orderId);
-		String type = String.valueOf(StatusEnum.FileCodeEnum.SIGNATURE.getName());
-		String typeName = StatusEnum.FileCodeEnum.SIGNATURE.getName();
-		Order order = orderDao.selectOrder(orderId);
-		String loanNo = order.getLoanNo();
-		String legalName = order.getLegalName();
-		String legalCertNo = order.getLegalCertNo();
-		List<FileInfo> fileInfos = fileInfoDao.selectByLoanNoAndType(loanNo, type);
-		if (fileInfos.size() == 0) {
-			String fileName = loanNo + "-" + typeName + "-" + legalCertNo + ".jpg";
-			try {
-				ossService.uploadToOSS(file.getBytes(), loanNo, fileName, typeName, accountNo);
-			} catch (IOException e) {
-				log.error("签字图片上传失败: " + e.getMessage());
-				return ResponseDTO.error(ResultCode.SIGN_UPLOAD_FAIL);
-			}
-			List<String> pdfTypes = new ArrayList<>();
-			pdfTypes.add(StatusEnum.PdfEnum.BORROWERNOTE.getName());
-			pdfTypes.add(StatusEnum.PdfEnum.PROMISE.getName());
-			pdfTypes.add(StatusEnum.PdfEnum.APPLY.getName());
-			pdfTypes.add(StatusEnum.PdfEnum.RECEIPT.getName());
-			pdfTypes.add(StatusEnum.PdfEnum.CONFIRMATION.getName());
-			pdfTypes.add(StatusEnum.PdfEnum.ENTRUST.getName());
-			pdfTypes.add(StatusEnum.PdfEnum.NOTIFICATION.getName());
-			String objectName;
-			File file1 = null;
-			try {
-				// 申请证书
-				String s = UinidUtils.applyCert(legalName, legalCertNo);
-				log.info("申请证书: " + s);
-				// 获取证书编号
-				String dnList = UinidUtils.getDnList(legalCertNo);
-				JSONObject dnListObj = JSONObject.parseObject(dnList);
-				if (dnListObj.getInteger("status") != 0) {
-					log.error("获取用户证书编号发生错误: " + dnList);
-					return ResponseDTO.error(ResultCode.CERTIFICATE_NO_ERROR);
-				}
-				String dnid = dnListObj.getString("dnid");
-				String userid = dnListObj.getString("userid");
-				for (String pdfType : pdfTypes) {
-					String pdfName = loanNo + "-" + pdfType + "-" + legalCertNo + ".pdf";
-					objectName = "fuqiang/" + accountNo + "/" + loanNo + "/PDF/" + pdfName;
-					FileInfo fileInfo = fileInfoDao.selectByPath(objectName);
-					if (fileInfo.getPath() == null) {
-						continue;
-					}
-					byte[] bytes = ossService.downLoadForOSS(objectName);
-					String base64Pdf = Base64.getEncoder().encodeToString(bytes);
-					String base64Str = Base64.getEncoder().encodeToString(file.getBytes());
-					String keywordsign = UinidUtils.keywordsignDown(base64Str, dnid, userid, base64Pdf, "");
-					log.info("签章结果: " + keywordsign);
-					JSONObject obj = JSONObject.parseObject(keywordsign);
-					if (obj.getInteger("code") == 0) {
-						log.info("签字成功: " + pdfName);
-						// 删除远端未签名的文件 oss可以不用删除，会自动替换
-//                        aliService.deleteFile(objectName);
-						fileInfoDao.deleteByName(pdfName);
-						// 将已签名的本地文件上传到远端
-						file1 = new File(obj.getString("pdfpath"));
-						byte[] pdfBytes = SysUtil.File2byte(file1);
-						ossService.uploadToOSS(pdfBytes, loanNo, pdfName, "PDF", accountNo);
-						file1.delete();
-					}
-				}
-			} catch (Exception e) {
-				log.error(e.getMessage());
-				// file1.delete();
-				FileUtils.deleteQuietly(file1);
-			}
-		}
-		return ResponseDTO.success();
-	}
-
-	private String getOrgName(int id) {
-		Order order = orderDao.selectOrder(id);
-		String province = order.getCompanyProvince() + "";
-		String city = order.getCompanyCity() + "";
-		String district = order.getCompanyDistrict() + "";
-
-		Account account = accountDao.selectAccountByArea(province, city, district);
-		return account.getAccountNo();
-	}
-
-}

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/SmsServiceImpl.java

@@ -12,10 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.google.gson.JsonObject;
 
 import me.zhengjie.domain.sms.CommonConstants;
-import me.zhengjie.dao.jdbc.AccountDao;
-import me.zhengjie.dao.jdbc.ConfinfoDao;
-import me.zhengjie.dao.jdbc.OrderDao;
-import me.zhengjie.dao.jdbc.SmsLogDao;
+
 import me.zhengjie.application.bank.controller.vo.Sms;
 import me.zhengjie.application.bank.controller.vo.SmsLog;
 import me.zhengjie.application.bank.service.OrderService;
@@ -29,20 +26,11 @@ import me.zhengjie.base.ResultCode;
 @Service
 public class SmsServiceImpl implements SmsService {
 
-	@Autowired
-	private SmsLogDao smsLogDao;
-
+	
 	@Autowired
 	private OrderService orderService;
 
-	@Autowired
-	OrderDao orderDao;
 
-	@Autowired
-	AccountDao accountDao;
-
-	@Autowired
-	ConfinfoDao confinfoDao;
 
 	private String getRandom(int len) {
 		Random random = new Random();
@@ -81,7 +69,7 @@ public class SmsServiceImpl implements SmsService {
 		}
 		sms.setParam(templateParam.toString());
 		sms.setTemplate(template);
-		Integer sendCount = this.smsLogDao.selectSendCount(template, sendContent);
+		Integer sendCount = 3;
 
 		if (sendCount > 5) {
 			// return Function.returnMsg(200, "操作太频繁请稍后在试", null);
@@ -103,7 +91,7 @@ public class SmsServiceImpl implements SmsService {
 		smsLog.setCreateTime(nowTime);
 		if (StringUtils.isNotBlank(returnContent)) {
 			smsLog.setReturnContent(returnContent); // 记录返回信息
-			this.smsLogDao.insertSmsLog(smsLog);
+		
 			return ResponseDTO.success();
 		}
 		return ResponseDTO.error(ResultCode.MSG_SEND_FAIL);
@@ -114,7 +102,7 @@ public class SmsServiceImpl implements SmsService {
 
 	@Override
 	public String chkSmsLog(Sms sms) {
-		return this.smsLogDao.selectSmsLogByLoginParameter(sms);
+		return null;
 	}
 
 }

eladmin-system/src/main/java/me/zhengjie/application/user/app/controller/AppUserController.java

@@ -33,12 +33,9 @@ public class AppUserController {
 
 	@Autowired
 	private ApiService apiService;
-
-	@Autowired
-	private IdentityValidationService identityValidationService;
-
-	@Autowired
-    SignService signService;
+//
+//	@Autowired
+//    SignService signService;
 
 	@Autowired
     BorrowerService borrowerService;
@@ -100,10 +97,10 @@ public class AppUserController {
 		return ResponseDTO.success(order);
 	}
 
-	@RequestMapping("/live/verify")
-	public ResponseDTO<?> liveVerify(MultipartFile file, HttpServletRequest request) {
-		return identityValidationService.liveVerify(file, request);
-	}
+//	@RequestMapping("/live/verify")
+//	public ResponseDTO<?> liveVerify(MultipartFile file, HttpServletRequest request) {
+//		return identityValidationService.liveVerify(file, request);
+//	}
 
 	@AnonymousPostMapping("/video/call")
 	public ResponseDTO<?> videoCall(@RequestBody String json) {
@@ -161,31 +158,6 @@ public class AppUserController {
 		return this.apiService.videoComplete(request);
 	}
 
-	@RequestMapping("/order/upfile")
-	public ResponseDTO<?> appUpload(MultipartFile file, HttpServletRequest request) {
-		return this.apiService.appUpload(file, request);
-	}
-
-	// 功能点，云点播，视频通话，等杜
-	@RequestMapping("/live/compare")
-	public ResponseDTO<?> liveCompare(MultipartFile file, HttpServletRequest request) {
-		return identityValidationService.liveCompare(file, request);
-	}
-
-	@RequestMapping("/face/compare")
-	public ResponseDTO<?> faceCompare(HttpServletRequest request) {
-		return identityValidationService.faceCompare(request);
-	}
-
-	@RequestMapping("/pdf/sign")
-	public ResponseDTO<?> sigin(MultipartFile file, Integer orderId) {
-		// 判断订单号是否为空
-		if (orderId == null) {
-			return ResponseDTO.error(ResultCode.PARAM_NOT_COMPLETE);
-		}
-		return signService.sigin(file, orderId);
-	}
-
 	// 人脸核身
 	@RequestMapping("/order/getFaceId")
 	public ResponseDTO<?> getFaceId(@RequestBody String json) throws Exception {

eladmin-system/src/main/java/me/zhengjie/application/user/mini/controller/MiniUserController.java

@@ -33,11 +33,6 @@ public class MiniUserController {
 	@Autowired
 	private ApiService apiService;
 
-	@Autowired
-	private IdentityValidationService identityValidationService;
-
-	@Autowired
-    SignService signService;
 
 	@Autowired
     BorrowerService borrowerService;
@@ -106,10 +101,10 @@ public class MiniUserController {
 		return ResponseDTO.success(orders);
 	}
 
-	@RequestMapping("/live/verify")
-	public ResponseDTO<?> liveVerify(MultipartFile file, HttpServletRequest request) {
-		return identityValidationService.liveVerify(file, request);
-	}
+//	@RequestMapping("/live/verify")
+//	public ResponseDTO<?> liveVerify(MultipartFile file, HttpServletRequest request) {
+//		return identityValidationService.liveVerify(file, request);
+//	}
 
 	@AnonymousPostMapping("/video/call")
 	public ResponseDTO<?> videoCall(@RequestBody String json) {
@@ -158,30 +153,30 @@ public class MiniUserController {
 		return this.apiService.videoComplete(request);
 	}
 
-	@RequestMapping("/order/upfile")
-	public ResponseDTO<?> appUpload(MultipartFile file, HttpServletRequest request) {
-		return this.apiService.appUpload(file, request);
-	}
+//	@RequestMapping("/order/upfile")
+//	public ResponseDTO<?> appUpload(MultipartFile file, HttpServletRequest request) {
+//		return this.apiService.appUpload(file, request);
+//	}
 
 	// 功能点，云点播，视频通话，等杜
-	@RequestMapping("/live/compare")
-	public ResponseDTO<?> liveCompare(MultipartFile file, HttpServletRequest request) {
-		return identityValidationService.liveCompare(file, request);
-	}
-
-	@RequestMapping("/face/compare")
-	public ResponseDTO<?> faceCompare(HttpServletRequest request) {
-		return identityValidationService.faceCompare(request);
-	}
-
-	@RequestMapping("/pdf/sign")
-	public ResponseDTO<?> sigin(MultipartFile file, Integer orderId) {
-		// 判断订单号是否为空
-		if (orderId == null) {
-			return ResponseDTO.error(ResultCode.PARAM_NOT_COMPLETE);
-		}
-		return signService.sigin(file, orderId);
-	}
+//	@RequestMapping("/live/compare")
+//	public ResponseDTO<?> liveCompare(MultipartFile file, HttpServletRequest request) {
+//		return identityValidationService.liveCompare(file, request);
+//	}
+//
+//	@RequestMapping("/face/compare")
+//	public ResponseDTO<?> faceCompare(HttpServletRequest request) {
+//		return identityValidationService.faceCompare(request);
+//	}
+
+//	@RequestMapping("/pdf/sign")
+//	public ResponseDTO<?> sigin(MultipartFile file, Integer orderId) {
+//		// 判断订单号是否为空
+//		if (orderId == null) {
+//			return ResponseDTO.error(ResultCode.PARAM_NOT_COMPLETE);
+//		}
+//		return signService.sigin(file, orderId);
+//	}
 
 	@RequestMapping("/order/getFaceId")
 	public ResponseDTO<?> getFaceId(@RequestBody String json) throws Exception {

eladmin-system/src/main/java/me/zhengjie/application/user/service/ApiService.java

@@ -23,7 +23,7 @@ public interface ApiService {
 
 	ResponseDTO<?> getOrderPDF(String businessNo,String prodId);
 
-	ResponseDTO<?> appUpload(MultipartFile file, HttpServletRequest request);
+
 
 	ResponseDTO<?> sendSms(HttpServletRequest request, String phone);
 

eladmin-system/src/main/java/me/zhengjie/application/user/service/impl/ApiServiceImpl.java

@@ -11,7 +11,7 @@ import me.zhengjie.base.mq.RedisCacheConfig;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.IpAddressUtil;
 import me.zhengjie.base.util.StatusEnum;
-import me.zhengjie.dao.jdbc.*;
+
 import me.zhengjie.dao.mybatis.OrderFileRepository;
 import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
 import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
@@ -37,28 +37,12 @@ public class ApiServiceImpl implements ApiService {
 	private OrderService orderService;
 	@Autowired
 	private SmsService smsService;
-	@Autowired
-	OssService ossService;
-	@Autowired
-	OrderDao orderDao;
-	@Autowired
-	FileInfoDao fileInfoDao;
-	@Autowired
-	ModelDao modelDao;
-	@Autowired
-	PdfService pdfService;
-	@Autowired
-	private AccountDao accountDao;
-	@Autowired
-	ConfinfoDao confinfoDao;
+	 
+
+ 
 	@Autowired
 	private TokenProvider tokenProvider;
-//	@Autowired
-//	private BorrowerService borrowerService;
-//	@Autowired
-//	private MortgageService mortgageService;
-//	@Autowired
-//	private GuaranteeService guaranteeService;
+
 	@Autowired
 	ModelService modelService;
 	@Autowired
@@ -66,7 +50,7 @@ public class ApiServiceImpl implements ApiService {
 	@Autowired
 	OrderRoomIdService orderRoomIdService;
 	@Autowired
-    OrderMapper orderMapper;
+	OrderMapper orderMapper;
 	@Autowired
 	OrderFileRepository orderFileRepository;
 
@@ -77,7 +61,7 @@ public class ApiServiceImpl implements ApiService {
 		// 短信模板
 		StatusEnum.MessageEnum smsVerify = StatusEnum.MessageEnum.SMS_VERIFY;
 		String name = smsVerify.getName();
-		String template = confinfoDao.selectValueByName(name);
+		String template = "";
 		Integer status = smsVerify.getStatus();
 		return this.smsService.sendSms(phone, ip, template, status);
 	}
@@ -147,12 +131,11 @@ public class ApiServiceImpl implements ApiService {
 		log.info("推送的参数: " + json);
 		// 保存数据
 		JSONObject jsonObject = JSONObject.parseObject(json);
-		String orderId = jsonObject.getString("orderId");
+//		String orderId = jsonObject.getString("orderId");
 		String businessNo = jsonObject.getString("businessNo");
 		String roomId = jsonObject.getString("roomId");
-
 		OrderRoomIdEntity orderRoomId = new OrderRoomIdEntity();
-		orderRoomId.setOrderId(orderId);
+
 		// 业务流水
 		orderRoomId.setBusinessNo(businessNo);
 		// 房间号
@@ -163,7 +146,6 @@ public class ApiServiceImpl implements ApiService {
 		orderRoomId.setUpdateTime(LocalDateTime.now());
 		// 这里先判断是否存在，不存在就插入数据
 		OrderRoomIdEntity orderQuery = new OrderRoomIdEntity();
-		orderQuery.setOrderId(orderId);
 		orderQuery.setRoomId(roomId);
 		// 业务流水
 		orderQuery.setBusinessNo(businessNo);
@@ -184,8 +166,9 @@ public class ApiServiceImpl implements ApiService {
 	}
 
 	@Override
-	public ResponseDTO<?> getOrderPDF(String businessNo,String prodId) {
-		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(prodId,businessNo, "1,2,3,4,5".split(","));
+	public ResponseDTO<?> getOrderPDF(String businessNo, String prodId) {
+		List<OrderFileEntity> orderFileList = orderFileRepository.getOrderFileListWithCodes(prodId, businessNo,
+				"1,2,3,4,5".split(","));
 		List<FileInfoDto> infos = new ArrayList<>();
 		for (OrderFileEntity orderFile : orderFileList) {
 			FileInfoDto info = new FileInfoDto();
@@ -197,33 +180,6 @@ public class ApiServiceImpl implements ApiService {
 		return ResponseDTO.success(infos);
 	}
 
-	@Override
-	public ResponseDTO<?> appUpload(MultipartFile file, HttpServletRequest request) {
-		int id = Integer.parseInt(request.getParameter("orderId"));
-		Order order = orderDao.selectOrder(id);
-		String loanNo = order.getLoanNo();
-		String filename = file.getOriginalFilename();
-		String typeName = StatusEnum.FileCodeEnum.VIDEO.getName();
-		String orgName = getOrgName(id);
-		try {
-			ossService.uploadToOSS(file.getBytes(), loanNo, filename, typeName, orgName);
-			return ResponseDTO.success();
-		} catch (IOException e) {
-			log.error("文件上传失败: " + e.getMessage());
-			// return Function.returnMsg(200, "文件上传失败", null);
-			return ResponseDTO.error(ResultCode.UPLOAD_ERROR);
-		}
 
-	}
-
-	private String getOrgName(int id) {
-		Order order = orderDao.selectOrder(id);
-		String province = order.getCompanyProvince() + "";
-		String city = order.getCompanyCity() + "";
-		String district = order.getCompanyDistrict() + "";
-
-		Account account = accountDao.selectAccountByArea(province, city, district);
-		return account.getAccountNo();
-	}
 
 }

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/AccountDao.java

@@ -1,35 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import javax.servlet.http.HttpServletRequest;
-
-import me.zhengjie.application.bank.controller.vo.Account;
-
-import java.util.List;
-
-public interface AccountDao {
-	Account selectAccountByAppId(String appId);
-
-	Account selectAccountById(Integer id);
-
-	Account selectAccountByAccountNo(String accountNo);
-
-	List<Account> selectAccountList(Integer id, Account account, Integer page, HttpServletRequest request);
-
-	Account login(String accountNo, String password);
-
-	Account saLogin(String accountNo);
-
-	Account modifyAccountPasswordById(Integer id, String password, String oldPassword);
-
-	Account selectAccountByArea(String province, String city, String district);
-
-	Integer modifyAccountInfoById(Integer id, Account account);
-
-	Integer insertAccountInfoById(Account account);
-
-	void deletetAccountInfoById(Account account);
-
-	// 公证员id查找公证处信息
-	Account selectaccountByAccountId(Integer accountId);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/AreaDao.java

@@ -1,13 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-
-
-import java.util.List;
-
-import me.zhengjie.application.bank.controller.vo.Area;
-
-public interface AreaDao {
-    List<Area> selectAreaByCode(Integer level,String code);
-
-    String queryArea(String code);
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/ConfinfoDao.java

@@ -1,7 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-public interface ConfinfoDao {
-
-    String selectValueByName(String name);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/FileInfoDao.java

@@ -1,17 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import java.util.List;
-
-import me.zhengjie.application.bank.controller.vo.FileInfo;
-
-public interface FileInfoDao {
-
-	void insertFile(FileInfo fileInfo);
-
-	void deleteByName(String name);
-
-	FileInfo selectByPath(String path);
-
-	List<FileInfo> selectByLoanNoAndType(String loanNo, String type);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/MenuDao.java

@@ -1,12 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import java.util.List;
-
-import me.zhengjie.application.bank.controller.vo.Account;
-import me.zhengjie.application.bank.controller.vo.Menu;
-
-public interface MenuDao {
-	List<Menu> selectMenuList(Integer accountType);
-
-	public List<Menu> selectMenuByAccount(Account resAccount);
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/ModelDao.java

@@ -1,22 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-
-import java.util.List;
-
-import me.zhengjie.application.bank.controller.vo.Model;
-
-public interface ModelDao {
-
-    Model selectMoldeConfigByCode(Model model);
-
-    Model selectByCode(String code);
-
-    List<Model> selectModelConfigByAccountId(Integer accountId);
-
-    List<Model> selectModelListByAccountId(Integer accountId);
-
-    List<Model> selectModelListByArea(Integer companyProvince, Integer companyCity, Integer companyDistrict);
-
-    void SaveMoldeConfig(Model model);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/NotaryNoteDao.java

@@ -1,15 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-
-
-import java.util.List;
-
-import me.zhengjie.application.bank.controller.vo.NotaryNote;
-
-public interface NotaryNoteDao {
-
-    void saveNote(List<NotaryNote> list);
-
-    List<NotaryNote> selectById(Integer id);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/NoteQuestionDao.java

@@ -1,15 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-
-import org.springframework.stereotype.Repository;
-
-import me.zhengjie.application.bank.controller.vo.NoteQuestion;
-
-import java.util.List;
-
-@Repository
-public interface NoteQuestionDao {
-
-    List<NoteQuestion> selectByNote(String note);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/OrderDao.java

@@ -1,53 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import me.zhengjie.application.bank.controller.vo.Order;
-import me.zhengjie.application.bank.controller.vo.Sms;
-import me.zhengjie.application.bank.controller.vo.SaOrderQueryPageReq;
-import me.zhengjie.application.bank.controller.vo.SaOrderQueryDetailRes;
-import me.zhengjie.application.bank.controller.vo.SaOrderQueryPageRes;
-
-public interface OrderDao {
-	void insertOrder(Order order);
-
-	HashMap<String, String> selectOrderByOrderNo(String orderNo);
-
-	Order selectOrderById(Integer id);
-
-	Order selectOrderDetailById(Integer id);
-
-	SaOrderQueryDetailRes selectSaOrderDetailById(Integer id);
-
-	Integer selectOrderByLoginParameter(Sms sms);
-
-	List<Order> selectOrderList(Order order);
-
-	Integer selectOrderAccountIdById(Integer id);
-
-	void updateOrderStatusById(Order order);
-
-	Order selectOrder(Integer id);
-
-	void updateOrderAccountId(Integer id, Integer accountId);
-
-	void setStatus(Integer id, Integer status, String reason);
-
-	void setStartEndTime(Integer id, String start, String end);
-
-	List<SaOrderQueryPageRes> getSaOrderPage(SaOrderQueryPageReq req);
-
-	Integer countSaOrderPage(SaOrderQueryPageReq req);
-
-	public Map<String, Object> queryPicByOrderId(int id);
-	/**
-	 * 通过手机号查询订单信息
-	 * @param phone
-	 * @return
-	 */
-	public Integer selectOrderByPhone(String phone);
-	
-	public List<Order> getOrderDetail(Order order);
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/OrgFlowDao.java

@@ -1,12 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import me.zhengjie.application.bank.controller.vo.OrgFlow;
-
-public interface OrgFlowDao {
-
-    void saveOrgFlow(OrgFlow orgFlow);
-
-    void updateOrgFlow(OrgFlow orgFlow);
-
-    OrgFlow selectByOrgFlow(Integer accountId);
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/OrgInfoDao.java

@@ -1,15 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import me.zhengjie.application.bank.controller.vo.OrgInfo;
-
-public interface OrgInfoDao {
-
-    void saveOne(OrgInfo orgInfo);
-
-    OrgInfo selectByAccountId(Integer accountId);
-
-    void updateUsableEndCode(Integer accountId, Integer usableEndCode);
-
-    void updateNextCode(Integer accountId, Integer nextCode);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/RoleDao.java

@@ -1,20 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import me.zhengjie.application.bank.controller.vo.Role;
-
-public interface RoleDao {
-
-	List<Role> selectRoleByAccountId(Integer accountId, HttpServletRequest request);
-
-	Role selectRoleDetailById(Integer id);
-
-	void modifyRoleDetailById(Role role);
-
-	void deleteRoleDetailById(Role role);
-
-	void insertRoleDetailById(Role role);
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/SmsLogDao.java

@@ -1,14 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import me.zhengjie.application.bank.controller.vo.Sms;
-import me.zhengjie.application.bank.controller.vo.SmsLog;
-
-public interface SmsLogDao {
-
-	void insertSmsLog(SmsLog smsLog);
-
-	Integer selectSendCount(String template, String sendContent);
-
-	String selectSmsLogByLoginParameter(Sms sms);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/WorkerInfoDao.java

@@ -1,13 +0,0 @@
-package me.zhengjie.dao.jdbc;
-
-import me.zhengjie.application.bank.controller.vo.WorkerInfo;
-
-public interface WorkerInfoDao {
-
-	void insert(WorkerInfo workerInfo);
-
-	WorkerInfo selectByPhone(String phone);
-
-	WorkerInfo selectById(Integer id);
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/AccountDaoImpl.java

@@ -1,478 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.DigestUtils;
-
-import me.zhengjie.dao.jdbc.AccountDao;
-import me.zhengjie.dao.jdbc.MenuDao;
-import me.zhengjie.application.bank.controller.vo.Account;
-import me.zhengjie.application.bank.controller.vo.Menu;
-
-
-
-
-
-@Repository
-@Transactional
-public class AccountDaoImpl implements AccountDao {
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Autowired
-    private MenuDao menuDao;
-
-    /**
-     * 根据appId查询账户信息
-     *
-     * @param appId
-     * @return
-     */
-    @Override
-    public Account selectAccountByAppId(String appId) {
-        final Account account = new Account();
-        String sql = "select appKey,status from account where appId=?";
-        Object[] arr = new Object[]{appId};
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setAppKey(rs.getString("appKey"));
-                account.setStatus(rs.getInt("status"));
-            }
-        });
-        return account;
-    }
-
-    /**
-     * 根据账户ID查询信息
-     *
-     * @param id
-     * @return
-     */
-    @Override
-    public Account selectAccountById(Integer id) {
-        final Account account = new Account();
-        String sql = "select * from account where id=?";
-        Object[] arr = new Object[]{id};
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setId(rs.getInt("id"));
-                account.setAccountNo(rs.getString("accountNo"));
-                account.setAppId(rs.getString("appId"));
-                account.setAppKey(rs.getString("appKey"));
-                account.setUserName(rs.getString("userName"));
-                account.setCompany(rs.getString("company"));
-                account.setProvinceCode(rs.getString("provinceCode"));
-                account.setCityCode(rs.getString("cityCode"));
-                account.setDistrictCode(rs.getString("districtCode"));
-                account.setAddress(rs.getString("address"));
-                account.setPhone(rs.getString("phone"));
-                account.setRoleId(rs.getInt("roleId"));
-                account.setType(rs.getInt("type"));
-                account.setStatus(rs.getInt("status"));
-                account.setCreateTime(rs.getDate("createTime"));
-                //isys赋值，
-                account.setIsSys(rs.getInt("isSys"));
-                account.setAccountId(rs.getInt("accountId"));
-            }
-        });
-        return account;
-    }
-
-    @Override
-    public Account selectAccountByAccountNo(String accountNo) {
-        final Account account = new Account();
-        String sql = "select accountNo, id from account where accountNo = ?";
-        Object[] arr = new Object[]{accountNo};
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setAccountNo(rs.getString("accountNo"));
-                account.setId(rs.getInt("id"));
-            }
-        });
-        return account;
-    }
-
-    /**
-     * 查询账户列表
-     *
-     * @param id
-     * @param account
-     * @param page
-     * @return
-     */
-    @Override
-    public List<Account> selectAccountList(Integer id, Account account, Integer page, HttpServletRequest request) {
-
-        Integer pageNum = 10;
-        Integer beginMum = (page - 1) * pageNum;
-        String sqlAdd = " ";
-        if (account.getType() != null) {
-            sqlAdd += " and tab.type = " + account.getType();
-        }
-        if (account.getAccountNo() != null) {
-            sqlAdd += " and tab.accountNo like '%" + account.getAccountNo() + "%' ";
-        }
-        if (account.getCompany() != null) {
-            sqlAdd += " and tab.company like '%" + account.getCompany() + "%' ";
-        }
-        if (account.getStatus() != null) {
-            sqlAdd += " and tab.status = " + account.getStatus();
-        }
-
-//      HttpSession session = request.getSession();
-//      Account accountInfo = (Account) session.getAttribute("account");
-//		String token = AuthorizationTimeUtil.getTokenId(request);
-//		Account accountInfo = (Account) AuthorizationTimeUtil.getAttribute(token+"account");
-//
-//        if (accountInfo != null) {
-//            Integer type = accountInfo.getType();
-//            if (type == 1) {
-//                sqlAdd += " and tab.isSys=1 and (tab.type=2 or tab.type=3) ";
-//            } else if (type == 3) {
-//                sqlAdd += " and tab.accountId=" + id;
-//            }
-//        }
-
-        String sqlCount = "select count(tab.id) as num from `account` tab where 1=1 " + sqlAdd;
-        Integer count = selectListCount(sqlCount, pageNum);
-
-        String sql = "select p.title as provinceTitle,c.title as cityTitle,d.title as districtTitle, " +
-                "tab.*" +
-                "from `account` tab " +
-                "left join `area` p on tab.provinceCode=p.code " +
-                "left join `area` c on tab.cityCode=c.code " +
-                "left join `area` d on tab.districtCode=d.code " +
-                "where 1=1 " + sqlAdd + " " +
-                "order by tab.id desc " +
-                "limit " + beginMum + "," + pageNum;
-
-        return this.jdbcTemplate.query(sql, new RowMapper<Account>() {
-            @Override
-            public Account mapRow(ResultSet rs, int rowNum) throws SQLException {
-                Account account = new Account();
-                account.setId(rs.getInt("id"));
-                account.setType(rs.getInt("type"));
-                account.setUserName(rs.getString("userName"));
-                account.setStatus(rs.getInt("status"));
-                account.setAccountNo(rs.getString("accountNo"));
-                
-                account.setAccountId(rs.getInt("accountId"));
-                
-                account.setProvinceTitle(rs.getString("provinceTitle"));
-                account.setCityTitle(rs.getString("cityTitle"));
-                account.setDistrictTitle(rs.getString("districtTitle"));
-                account.setAddress(rs.getString("address"));
-                account.setCompany(rs.getString("company"));
-                account.setCreateTime(rs.getDate("createTime"));
-                account.setUpdateTime(rs.getDate("updateTime"));
-                account.setCount(count);
-                return account;
-            }
-        });
-    }
-
-    /**
-     * 查询账户条数
-     *
-     * @param sql
-     * @param pageNum
-     * @return
-     */
-    public Integer selectListCount(String sql, Integer pageNum) {
-        Integer count = 0;
-        Account account = new Account();
-        this.jdbcTemplate.query(sql, new RowCallbackHandler() {
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setCount(rs.getInt("num"));
-            }
-        });
-        try {
-            Double sum = Math.floor(account.getCount());
-            Double page = Math.ceil(sum / pageNum);
-            return page.intValue();
-        } catch (Exception e) {
-            return 0;
-        }
-    }
-
-    /**
-     * 登录校验
-     *
-     * @param accountNo
-     * @param password
-     * @return
-     */
-    @Override
-    public Account login(String accountNo, String password) {
-        String md5 = DigestUtils.md5DigestAsHex(password.getBytes());
-        System.out.println("登录账户:" + accountNo + ",密码：" + password + ",密码加密：" + md5);
-        final Account account = new Account();
-        String sql = "select r.menuId,tab.id,tab.accountNo,tab.status,tab.type,tab.isSys,tab.roleId,tab.accountId," +
-                "tab.provinceCode,tab.cityCode,tab.districtCode, tab.company,tab.username " +
-                "from `account` tab " +
-                "left join `role` r on tab.roleId=r.id " +
-                "where tab.accountNo=? and tab.password=? ";
-
-        Object[] arr = new Object[]{accountNo, md5};
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setId(rs.getInt("id"));
-                account.setAccountNo(rs.getString("accountNo"));
-                account.setStatus(rs.getInt("status"));
-                account.setType(rs.getInt("type"));
-                account.setIsSys(rs.getInt("isSys"));
-                account.setRoleId(rs.getInt("roleId"));
-                account.setAccountId(rs.getInt("accountId"));
-                account.setMenuId(rs.getString("menuId"));
-                account.setProvinceCode(rs.getString("provinceCode"));
-                account.setCityCode(rs.getString("cityCode"));
-                account.setDistrictCode(rs.getString("districtCode"));
-                account.setCompany(rs.getString("company"));
-                account.setUserName(rs.getString("username"));
-            }
-        });
-
-        List<Menu> list = this.menuDao.selectMenuList(account.getType());
-        account.setLoginMenuIdList(list.toString());
-
-        return account;
-    }
-
-    @Override
-    public Account saLogin(String accountNo) {
-        Account account = new Account();
-        String sql = "select r.menuId,tab.id,tab.accountNo,tab.status,tab.type,tab.isSys,tab.roleId,tab.accountId," +
-                "tab.provinceCode,tab.cityCode,tab.districtCode, tab.company " +
-                "from `account` tab " +
-                "left join `role` r on tab.roleId=r.id " +
-                "where tab.accountNo=?";
-
-        Object[] arr = new Object[]{accountNo};
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setId(rs.getInt("id"));
-                account.setAccountNo(rs.getString("accountNo"));
-                account.setStatus(rs.getInt("status"));
-                account.setType(rs.getInt("type"));
-                account.setIsSys(rs.getInt("isSys"));
-                account.setRoleId(rs.getInt("roleId"));
-                account.setAccountId(rs.getInt("accountId"));
-                account.setMenuId(rs.getString("menuId"));
-                account.setProvinceCode(rs.getString("provinceCode"));
-                account.setCityCode(rs.getString("cityCode"));
-                account.setDistrictCode(rs.getString("districtCode"));
-                account.setCompany(rs.getString("company"));
-            }
-        });
-
-        List<Menu> list = this.menuDao.selectMenuList(account.getType());
-        account.setLoginMenuIdList(list.toString());
-        return account;
-    }
-
-    /**
-     * 修改密码
-     *
-     * @param id
-     * @param password
-     * @param oldPassword
-     * @return
-     */
-    @Override
-    public Account modifyAccountPasswordById(Integer id, String password, String oldPassword) {
-
-        String oldPasswordMd5 = DigestUtils.md5DigestAsHex(oldPassword.getBytes());
-        String passwordMd5 = DigestUtils.md5DigestAsHex(password.getBytes());
-        Account account = new Account();
-
-        String sqlSelect = "select accountNo from account where id=? and password=?";
-        Object[] arr = new Object[]{id, oldPasswordMd5};
-
-        this.jdbcTemplate.query(sqlSelect, arr, new RowCallbackHandler() {
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setAccountNo(rs.getString("accountNo"));
-            }
-        });
-        System.out.println(account.getAccountNo());
-
-        if (account.getAccountNo() != null) {
-            String sqlUpdate = "update `account` set password=? where id=?";
-            this.jdbcTemplate.update(sqlUpdate, passwordMd5, id);
-        }
-        return account;
-    }
-
-    @Override
-    public Account selectAccountByArea(String province, String city, String district) {
-        String sql = "select id,accountNo,userName,company from account where provinceCode=? and cityCode=? and districtCode=? and type=3";
-        Object[] arr = new Object[]{province, city, district};
-        Account account = new Account();
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setId(rs.getInt("id"));
-                account.setAccountNo(rs.getString("accountNo"));
-                account.setUserName(rs.getString("userName"));
-                account.setCompany(rs.getString("company"));
-            }
-        });
-        return account;
-    }
-
-    /**
-     * 修改账户信息
-     *
-     * @param id
-     * @param account
-     */
-    @Override
-    public Integer modifyAccountInfoById(Integer id, Account account) {
-
-        String sqlAdd = "status=" + account.getStatus();
-
-        if (StringUtils.isNotBlank(account.getAccountNo())) {
-            sqlAdd += ",accountNo='" + account.getAccountNo() + "'";
-        }
-
-        if (StringUtils.isNotBlank(account.getCompany())) {
-            sqlAdd += ",company='" + account.getCompany() + "'";
-        }
-        if (StringUtils.isNotBlank(account.getAppKey())) {
-            sqlAdd += ",appKey='" + account.getAppKey() + "'";
-        }
-        if (StringUtils.isNotBlank(account.getPassword())) {
-            String md5 = DigestUtils.md5DigestAsHex(account.getPassword().getBytes());
-            sqlAdd += ",password='" + md5 + "'";
-        }
-        if (StringUtils.isNotBlank(account.getProvinceCode())) {
-            sqlAdd += ",provinceCode='" + account.getProvinceCode() + "'";
-        }
-        if (StringUtils.isNotBlank(account.getCityCode())) {
-            sqlAdd += ",cityCode='" + account.getCityCode() + "'";
-        }
-        if (StringUtils.isNotBlank(account.getDistrictCode())) {
-            sqlAdd += ",districtCode='" + account.getDistrictCode() + "'";
-        }
-        if (StringUtils.isNotBlank(account.getAddress())) {
-            sqlAdd += ",address='" + account.getAddress() + "'";
-        }
-        if (StringUtils.isNotBlank(account.getUserName())) {
-            sqlAdd += ",userName='" + account.getUserName() + "'";
-        }
-        if (StringUtils.isNotBlank(account.getPhone())) {
-            sqlAdd += ",phone='" + account.getPhone() + "'";
-        }
-        if (account.getRoleId() != null) {
-            sqlAdd += ",roleId=" + account.getRoleId() + " ";
-        }
-
-        String sql = "update `account` set " + sqlAdd + " where id=?";
-        return this.jdbcTemplate.update(sql, id);
-    }
-
-    @Override
-    public Integer insertAccountInfoById(Account account) {
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date now = new Date();
-        String createTime = sdf.format(new Date(now.getTime()));
-
-        String sqlAddKey = "accountId,isSys,status,type,createTime";
-        String sqlAddValue = account.getAccountId() + "," + account.getIsSys() + "," + account.getStatus() + "," + account.getType() + ",'" + createTime + "'";
-
-        if (account.getRoleId() != null) {
-            sqlAddKey += ",roleId";
-            sqlAddValue += "," + account.getRoleId();
-        }
-        if (account.getAccountNo() != null) {
-            sqlAddKey += ",accountNo";
-            sqlAddValue += ",'" + account.getAccountNo() + "'";
-        }
-        if (account.getPassword() != null && StringUtils.isEmpty(account.getPassword()) == false) {
-            String md5 = DigestUtils.md5DigestAsHex(account.getPassword().getBytes());
-            sqlAddKey += ",password";
-            sqlAddValue += ",'" + md5 + "'";
-        }
-        if (account.getAppId() != null) {
-            sqlAddKey += ",appId";
-            sqlAddValue += ",'" + account.getAppId() + "'";
-        }
-        if (account.getAppKey() != null) {
-            sqlAddKey += ",appKey";
-            sqlAddValue += ",'" + account.getAppKey() + "'";
-        }
-        if (account.getUserName() != null) {
-            sqlAddKey += ",userName";
-            sqlAddValue += ",'" + account.getUserName() + "'";
-        }
-        if (account.getCompany() != null) {
-            sqlAddKey += ",company";
-            sqlAddValue += ",'" + account.getCompany() + "'";
-        }
-        if (account.getProvinceCode() != null) {
-            sqlAddKey += ",provinceCode";
-            sqlAddValue += ",'" + account.getProvinceCode() + "'";
-        }
-        if (account.getCityCode() != null) {
-            sqlAddKey += ",cityCode";
-            sqlAddValue += ",'" + account.getCityCode() + "'";
-        }
-        if (account.getDistrictCode() != null) {
-            sqlAddKey += ",districtCode";
-            sqlAddValue += ",'" + account.getDistrictCode() + "'";
-        }
-        if (account.getAddress() != null) {
-            sqlAddKey += ",address";
-            sqlAddValue += ",'" + account.getAddress() + "'";
-        }
-        if (account.getPhone() != null) {
-            sqlAddKey += ",phone";
-            sqlAddValue += ",'" + account.getPhone() + "'";
-        }
-
-
-        String sql = "insert into `account` (" + sqlAddKey + ") values (" + sqlAddValue + ")";
-        return this.jdbcTemplate.update(sql);
-    }
-
-    @Override
-    public void deletetAccountInfoById(Account account) {
-        String sql = "delete from `account` where type in (2,3) and accountId=? and id=?";
-        Object[] arr = new Object[]{account.getAccountId(), account.getId()};
-        this.jdbcTemplate.update(sql, arr);
-    }
-
-    @Override
-    public Account selectaccountByAccountId(Integer accountId) {
-        String sql = "select a.id, a.accountNo, a.userName, a.company from account as a left join account as b on a.id=b.accountId where b.id=" + accountId + " and a.type=3";
-        Account account = new Account();
-        this.jdbcTemplate.query(sql, new RowCallbackHandler() {
-            public void processRow(ResultSet rs) throws SQLException {
-                account.setId(rs.getInt("id"));
-                account.setAccountNo(rs.getString("accountNo"));
-                account.setUserName(rs.getString("userName"));
-                account.setCompany(rs.getString("company"));
-            }
-        });
-        return account;
-    }
-    public static void main(String[] args) {
-    	  String md5 = DigestUtils.md5DigestAsHex("12345678".getBytes());
-    	  System.out.println(md5);
-	}
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/AreaDaoImpl.java

@@ -1,47 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.AreaDao;
-import me.zhengjie.application.bank.controller.vo.Area;
-
-@Repository
-@Transactional
-public class AreaDaoImpl implements AreaDao {
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public List<Area> selectAreaByCode(Integer level, String code) {
-        String sqlAdd = " and level=" + level;
-        if (code != null) sqlAdd += " and byCode='" + code + "' ";
-        String sql = "select * from `area` where 1=1" + sqlAdd + " order by id asc";
-        return this.jdbcTemplate.query(sql, new RowMapper<Area>() {
-            @Override
-            public Area mapRow(ResultSet rs, int rowNum) throws SQLException {
-                Area area = new Area();
-                area.setCode(rs.getString("code"));
-                area.setLevel(rs.getInt("level"));
-                area.setTitle(rs.getString("title"));
-                return area;
-            }
-        });
-    }
-
-    @Override
-    public String queryArea(String code) {
-        String sql = "select title from `area` where code='" + code + "'";
-        String title = jdbcTemplate.queryForObject(sql, String.class);
-        return title;
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/ConfinfoDaoImpl.java

@@ -1,23 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.ConfinfoDao;
-
-@Repository
-@Transactional
-public class ConfinfoDaoImpl implements ConfinfoDao {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public String selectValueByName(String name) {
-        String sql = "select value from confinfo where name=? and status=1";
-        return jdbcTemplate.queryForObject(sql, String.class, name);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/FileInfoDaoImpl.java

@@ -1,86 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.FileInfoDao;
-import me.zhengjie.application.bank.controller.vo.FileInfo;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-@Repository
-public class FileInfoDaoImpl implements FileInfoDao {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    @Transactional
-    public void insertFile(FileInfo fileInfo) {
-        String sql = "insert into `file_info` (loan_no,appid,file_name,type,path,status) values (?,?,?,?,?,?)";
-        this.jdbcTemplate.update(sql, new Object[]{
-                fileInfo.getLoanNo(),
-                fileInfo.getAppid(),
-                fileInfo.getFileName(),
-                fileInfo.getType(),
-                fileInfo.getPath(),
-                fileInfo.getStatus()
-        });
-    }
-
-    @Override
-    @Transactional
-    public void deleteByName(String name) {
-        String sql = "delete from `file_info` where file_name = ?";
-        this.jdbcTemplate.update(sql,new Object[]{
-                name
-        });
-    }
-
-    @Override
-    public FileInfo selectByPath(String path) {
-        FileInfo file = new FileInfo();
-
-        String sql = "select loan_no as loanNo,appid,file_name as fileName,type,path,status from `file_info` where path=?";
-        Object[] arr = new Object[]{path};
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                file.setLoanNo(rs.getString("loanNo"));
-                file.setAppid(rs.getString("appid"));
-                file.setFileName(rs.getString("fileName"));
-                file.setType(rs.getString("type"));
-                file.setPath(rs.getString("path"));
-                file.setStatus(rs.getInt("status"));
-            }
-        });
-
-        return file;
-    }
-
-    @Override
-    public List<FileInfo> selectByLoanNoAndType(String loanNo, String type) {
-        String sql = "select loan_no as loanNo,appid,file_name as fileName,type,path,status from `file_info` where loan_no=? and type=?";
-        Object[] arr = new Object[]{loanNo, type};
-        return this.jdbcTemplate.query(sql, arr, new RowMapper<FileInfo>() {
-            @Override
-            public FileInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
-                FileInfo file = new FileInfo();
-                file.setLoanNo(rs.getString("loanNo"));
-                file.setAppid(rs.getString("appid"));
-                file.setFileName(rs.getString("fileName"));
-                file.setType(rs.getString("type"));
-                file.setPath(rs.getString("path"));
-                file.setStatus(rs.getInt("status"));
-                return file;
-            }
-        });
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/MenuDaoImpl.java

@@ -1,86 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.MenuDao;
-import me.zhengjie.dao.jdbc.RoleDao;
-import me.zhengjie.application.bank.controller.vo.Account;
-import me.zhengjie.application.bank.controller.vo.Menu;
-import me.zhengjie.application.bank.controller.vo.Role;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-@Repository
-@Transactional
-public class MenuDaoImpl implements MenuDao {
-
-	@Autowired
-	private JdbcTemplate jdbcTemplate;
-
-	@Autowired
-	private RoleDao roleDao;
-
-	@Override
-	public List<Menu> selectMenuList(Integer accountType) {
-		String sqlAdd = " ";
-		if (accountType.equals(0)) {
-			sqlAdd = " and 1=2";
-		} else if (accountType.equals(1)) {
-			sqlAdd = " and isSys=1";
-		} else if (accountType.equals(2)) {
-			sqlAdd = " and isFinance=1";
-		} else if (accountType.equals(3)) {
-			sqlAdd = " and isNotarization=1";
-		}
-
-		String sql = "select * from `menu` where isHide=0 and type='get' " + sqlAdd + " order by `sort` asc,`id` desc";
-		List<Menu> menu = this.jdbcTemplate.query(sql, new RowMapper<Menu>() {
-			@Override
-			public Menu mapRow(ResultSet rs, int rowNum) throws SQLException {
-				Menu menu = new Menu();
-				menu.setId(rs.getInt("id"));
-				menu.setIcon(rs.getString("icon"));
-				menu.setMenuId(rs.getInt("menuId"));
-				menu.setTitle(rs.getString("title"));
-				menu.setPath(rs.getString("path"));
-				menu.setType(rs.getString("type"));
-				menu.setSort(rs.getInt("sort"));
-				return menu;
-			}
-		});
-		return menu;
-
-	}
-
-	@Override
-	public List<Menu> selectMenuByAccount(Account resAccount) {
-
-		Role role = roleDao.selectRoleDetailById(resAccount.getRoleId());
-		String menuId = role.getMenuId();
-		// 增加在菜单分配给他的权限
-		String sql = "select * from `menu` where  id in (" + menuId + ")";
-		List<Menu> menu = this.jdbcTemplate.query(sql, new RowMapper<Menu>() {
-			@Override
-			public Menu mapRow(ResultSet rs, int rowNum) throws SQLException {
-				Menu menu = new Menu();
-				menu.setId(rs.getInt("id"));
-				menu.setIcon(rs.getString("icon"));
-				menu.setMenuId(rs.getInt("menuId"));
-				menu.setTitle(rs.getString("title"));
-				menu.setPath(rs.getString("path"));
-				menu.setType(rs.getString("type"));
-				menu.setSort(rs.getInt("sort"));
-				return menu;
-			}
-		});
-		return menu;
-	}
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/ModelDaoImpl.java

@@ -1,141 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.ModelDao;
-import me.zhengjie.application.bank.controller.vo.Model;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-@Repository
-@Transactional
-public class ModelDaoImpl implements ModelDao {
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public void SaveMoldeConfig(Model model) {
-        String sql = "";
-        Model resModel = this.selectMoldeConfigByCode(model);
-        if (resModel.getConfigStatus() == null) {
-            sql = "insert into  `model_config` (accountId,code,tag,finalPath,status) values(" + model.getConfigAccountId() + ",'" + model.getConfigCode() + "','" + model.getConfigTag() + "','" + model.getFinalPath() + "'," + model.getConfigStatus() + ")";
-        } else {
-            sql = "update `model_config` set  status=" + model.getConfigStatus() + ",tag='" + model.getConfigTag() + "' ,finalPath= '" + model.getFinalPath() + "' where  accountId=" + model.getConfigAccountId() + " and code=" + model.getConfigCode();
-        }
-        this.jdbcTemplate.update(sql);
-    }
-
-    @Override
-    public Model selectMoldeConfigByCode(Model model) {
-        String sql = "select * from `model_config` where accountId = ? and code = ?";
-        Object[] arr = new Object[]{model.getConfigAccountId(), model.getConfigCode()};
-        final Model resModel = new Model();
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                resModel.setConfigCode(rs.getInt("code"));
-                resModel.setConfigTag(rs.getString("tag"));
-                resModel.setConfigStatus(rs.getInt("status"));
-            }
-        });
-        return resModel;
-    }
-
-    @Override
-    public Model selectByCode(String code) {
-        String sql = "select * from model where code = ?";
-        Object[] arr = new Object[]{code};
-        Model model = new Model();
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                model.setCode(rs.getString("code"));
-                model.setTitle(rs.getString("title"));
-                model.setPath(rs.getString("path"));
-                model.setHtmlPath(rs.getString("htmlPath"));
-                model.setIfModify(rs.getInt("ifModify"));
-                model.setIfVideo(rs.getInt("ifVideo"));
-            }
-        });
-        return model;
-    }
-
-    @Override
-    public List<Model> selectModelConfigByAccountId(Integer accountId) {
-
-        String sql = "select m.* " +
-                "from `model_config` tab " +
-                "left join `model` m on tab.code=m.code " +
-                "where tab.status=1 and tab.accountId=" + accountId;
-        return this.jdbcTemplate.query(sql, new RowMapper<Model>() {
-            @Override
-            public Model mapRow(ResultSet rs, int rowNum) throws SQLException {
-                Model model = new Model();
-                model.setId(rs.getInt("id"));
-                model.setCode(rs.getString("code"));
-                model.setTitle(rs.getString("title"));
-                model.setPath(rs.getString("path"));
-                model.setIfModify(rs.getInt("ifModify"));
-                return model;
-            }
-        });
-    }
-
-    @Override
-    public List<Model> selectModelListByAccountId(Integer accountId) {
-        String sql = "select m.status as configStatus , m.tag , tab.* " +
-                "from model tab " +
-                "left join (select * from model_config where accountId=" + accountId + ") m on tab.code = m.code " +
-                "where tab.status = 1  " +
-                "order by tab.sort asc ";
-        return this.jdbcTemplate.query(sql, new RowMapper<Model>() {
-            @Override
-            public Model mapRow(ResultSet rs, int rowNum) throws SQLException {
-                Model model = new Model();
-                model.setId(rs.getInt("id"));
-                model.setCode(rs.getString("code"));
-                model.setTitle(rs.getString("title"));
-                model.setPath(rs.getString("path"));
-                model.setIfModify(rs.getInt("ifModify"));
-                model.setIfVideo(rs.getInt("ifVideo"));
-                model.setSort(rs.getInt("sort"));
-                model.setStatus(rs.getInt("status"));
-                model.setConfigStatus(rs.getInt("configStatus"));
-                return model;
-            }
-        });
-    }
-
-    @Override
-    public List<Model> selectModelListByArea(Integer companyProvince, Integer companyCity, Integer companyDistrict) {
-        String province = String.valueOf(companyProvince);
-        String city = String.valueOf(companyCity);
-        String district = String.valueOf(companyDistrict);
-
-        String sql = "select m.title title,m.path path,m.htmlPath htmlPath,mC.accountId accountId,mC.code code,mC.tag tag,mC.finalPath finalPath " +
-                "from model m left join model_config mC on m.code = mC.code and mC.status=1 " +
-                "where mC.accountId=(select id from account where provinceCode='" + province + "' and cityCode='" + city + "' and districtCode='" + district + "' and type = 3)";
-        return this.jdbcTemplate.query(sql, new RowMapper<Model>() {
-            @Override
-            public Model mapRow(ResultSet rs, int rowNum) throws SQLException {
-                Model model = new Model();
-                model.setTitle(rs.getString("title"));
-                model.setPath(rs.getString("path"));
-                model.setHtmlPath(rs.getString("htmlPath"));
-                model.setConfigAccountId(rs.getInt("accountId"));
-                model.setConfigCode(rs.getInt("code"));
-                model.setConfigTag(rs.getString("tag"));
-                model.setFinalPath(rs.getString("finalPath"));
-                return model;
-            }
-        });
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/NotaryNoteDaoImpl.java

@@ -1,58 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.NotaryNoteDao;
-import me.zhengjie.application.bank.controller.vo.NotaryNote;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-@Repository
-@Transactional
-public class NotaryNoteDaoImpl implements NotaryNoteDao {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public void saveNote(List<NotaryNote> list) {
-        String sql = "insert into `notary_note` (orderId,loanNo,note,description,question,value) values (?,?,?,?,?,?)";
-
-        List<Object[]> objList = new ArrayList<>();
-        for (NotaryNote note : list) {
-            objList.add(new Object[]{
-                    note.getOrderId(), note.getLoanNo(),
-                    note.getNote(), note.getDescription(),
-                    note.getQuestion(), note.getValue()
-            });
-        }
-        this.jdbcTemplate.batchUpdate(sql, objList);
-    }
-
-    @Override
-    public List<NotaryNote> selectById(Integer id) {
-        String sql = "select * from `notary_note` where orderId=" + id;
-
-        return this.jdbcTemplate.query(sql, new RowMapper<NotaryNote>() {
-            @Override
-            public NotaryNote mapRow(ResultSet rs, int i) throws SQLException {
-                NotaryNote notaryNote = new NotaryNote();
-                notaryNote.setOrderId(rs.getInt("orderId"));
-                notaryNote.setLoanNo(rs.getString("loanNo"));
-                notaryNote.setNote(rs.getString("note"));
-                notaryNote.setDescription(rs.getString("description"));
-                notaryNote.setQuestion(rs.getString("question"));
-                notaryNote.setValue(rs.getString("value"));
-                return notaryNote;
-            }
-        });
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/NoteQuestionDaoImpl.java

@@ -1,41 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.NoteQuestionDao;
-import me.zhengjie.application.bank.controller.vo.NoteQuestion;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-@Repository
-@Transactional
-public class NoteQuestionDaoImpl implements NoteQuestionDao {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public List<NoteQuestion> selectByNote(String note) {
-        String sql = "select * from `note_question` where note='" + note + "'";
-        return this.jdbcTemplate.query(sql, new RowMapper<NoteQuestion>() {
-            @Override
-            public NoteQuestion mapRow(ResultSet rs, int i) throws SQLException {
-                NoteQuestion note = new NoteQuestion();
-                note.setNote(rs.getString("note"));
-                note.setDescription(rs.getString("description"));
-                note.setQuestion(rs.getString("question"));
-                note.setValue(rs.getString("value"));
-                return note;
-            }
-        });
-    }
-
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/OrderDaoImpl.java

@@ -1,589 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.OrderDao;
-import me.zhengjie.application.bank.controller.vo.Order;
-import me.zhengjie.application.bank.controller.vo.Sms;
-import me.zhengjie.application.bank.controller.vo.SaOrderQueryPageReq;
-import me.zhengjie.application.bank.controller.vo.SaOrderQueryDetailRes;
-import me.zhengjie.application.bank.controller.vo.SaOrderQueryPageRes;
-import me.zhengjie.base.util.StatusEnum;
-
-@Repository
-@Transactional
-public class OrderDaoImpl implements OrderDao {
-
-	@Autowired
-	private JdbcTemplate jdbcTemplate;
-
-	@Override
-	@Transactional
-	public void insertOrder(Order order) {
-		String sql = "insert into `order` (businessNo,appId,orderNo,companyFullName,companyCertNo,companyProvince,companyCity,companyDistrict,companyAddress,companyFile,legalName,legalBirthday,legalCertCode,legalCertNo,legalPhone,contactAuthorize,contactCreditor,loanAmount,loanRate,loanTerm,loanPurpose,loanNo,loanFile,contactAuthorizationFile,createTime,pdfCode,ifPutDown,ifVideo,ifSign) "
-				+ "values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
-		this.jdbcTemplate.update(sql, order.getBusinessNo(), order.getAppId(), order.getOrderNo(),
-				order.getCompanyFullName(), order.getCompanyCertNo(), order.getCompanyProvince(),
-				order.getCompanyCity(), order.getCompanyDistrict(), order.getCompanyAddress(), order.getCompanyFile(),
-				order.getLegalName(), order.getLegalBirthday(), order.getLegalCertCode(), order.getLegalCertNo(),
-				order.getLegalPhone(), order.getContactAuthorize(), order.getContactCreditor(), order.getLoanAmount(),
-				order.getLoanRate(), order.getLoanTerm(), order.getLoanPurpose(), order.getLoanNo(),
-				order.getLoanFile(), order.getContactAuthorizationFile(), order.getCreateTime(), order.getPdfCode(),
-				order.getIfPutDown(), order.getIfVideo(), order.getIfSign());
-	}
-
-	@Override
-	public HashMap<String, String> selectOrderByOrderNo(String orderNo) {
-		String sql = "select `status`,`notarizeNo` as `no`, `notarizeStartDate` as `startDate`,"
-				+ "`notarizeEndDate` as `endDate` ,`notarizeFile` as `file`,`notarizeRemark` as `remark`,"
-				+ "`companyProvince` as `province`,`companyCity` as `city`,`companyDistrict` as `district` from `order` where orderNo = ?";
-		final HashMap<String, String> hm = new HashMap<>();
-		Object[] arr = new Object[] { orderNo };
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			@Override
-			public void processRow(ResultSet rs) throws SQLException {
-				hm.put("status", rs.getString("status"));
-				if (rs.getString("status").equals("1")) {
-					hm.put("no", rs.getString("no"));
-					hm.put("startDate", rs.getString("startDate"));
-					hm.put("file", rs.getString("file"));
-					hm.put("remark", rs.getString("remark"));
-				}
-			}
-		});
-		return hm;
-	}
-
-	@Override
-	public Order selectOrderById(Integer id) {
-		Order order = new Order();
-		String sql = "select * from `order` where id=?";
-		Object[] arr = new Object[] { id };
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			@Override
-			public void processRow(ResultSet rs) throws SQLException {
-				order.setBusinessNo(rs.getString("businessNo"));
-				order.setOrderNo(rs.getString("orderNo"));
-				order.setCompanyFullName(rs.getString("companyFullName"));
-
-				order.setPdfCode(rs.getString("pdfCode"));
-				order.setIfVideo(rs.getInt("ifVideo"));
-				order.setIfPutDown(rs.getInt("ifPutDown"));
-				order.setIfSign(rs.getInt("ifSign"));
-//                order.setNotarizeStartDate(rs.getDate(""));
-//                order.setNotarizeEndDate(rs.getDate(""));
-			}
-		});
-		return order;
-	}
-
-	@Override
-	public Order selectOrderDetailById(Integer id) {
-		Order order = new Order();
-		String sql = "select p.title as companyProvinceTitle,c.title as companyCityTitle,d.title as companyDistrictTitle, tab.* from `order` tab "
-				+ "left join `area` p on tab.companyProvince=p.code " + "left join `area` c on tab.companyCity=c.code "
-				+ "left join `area` d on tab.companyDistrict=d.code " + "where tab.id=?";
-
-		Object[] arr = new Object[] { id };
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			@Override
-			public void processRow(ResultSet rs) throws SQLException {
-				order.setBusinessNo(rs.getString("businessNo"));
-				order.setOrderNo(rs.getString("orderNo"));
-
-				order.setCompanyFullName(rs.getString("companyFullName"));
-				order.setCompanyCertNo(rs.getString("companyCertNo"));
-				order.setCompanyProvinceTitle(rs.getString("companyProvinceTitle"));
-				order.setCompanyCityTitle(rs.getString("companyCityTitle"));
-				order.setCompanyDistrictTitle(rs.getString("companyDistrictTitle"));
-				order.setCompanyAddress(rs.getString("companyAddress"));
-				order.setCompanyFile(rs.getString("companyFile"));
-
-				order.setLegalName(rs.getString("legalName"));
-				order.setLegalBirthday(rs.getString("legalBirthday"));
-				order.setLegalCertCode(rs.getString("legalCertCode"));
-				order.setLegalCertNo(rs.getString("legalCertNo"));
-				order.setLegalPhone(rs.getString("legalPhone"));
-
-				// 增加状态
-				order.setStatus(rs.getInt("status"));
-
-				order.setContactAuthorize(rs.getString("contactAuthorize"));
-				order.setContactCreditor(rs.getString("contactCreditor"));
-				order.setLoanAmount(rs.getInt("loanAmount"));
-				order.setLoanRate(rs.getInt("loanRate"));
-				order.setLoanTerm(rs.getInt("loanTerm"));
-				order.setLoanPurpose(rs.getString("loanPurpose"));
-				order.setLoanNo(rs.getString("loanNo"));
-				order.setLoanFile(rs.getString("loanFile"));
-				order.setContactAuthorizationFile(rs.getString("contactAuthorizationFile"));
-				order.setNotarizeRemark(rs.getString("notarizeRemark"));
-			}
-		});
-		return order;
-	}
-
-	@Override
-	public SaOrderQueryDetailRes selectSaOrderDetailById(Integer id) {
-		SaOrderQueryDetailRes order = new SaOrderQueryDetailRes();
-		String sql = "select p.title as companyProvinceTitle,c.title as companyCityTitle,d.title as companyDistrictTitle, tab.* from `order` tab "
-				+ "left join `area` p on tab.companyProvince=p.code " + "left join `area` c on tab.companyCity=c.code "
-				+ "left join `area` d on tab.companyDistrict=d.code " + "where tab.id=?";
-
-		Object[] arr = new Object[] { id };
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			@Override
-			public void processRow(ResultSet rs) throws SQLException {
-				order.setOrderNo(rs.getString("orderNo"));
-				order.setBusinessNo(rs.getString("businessNo"));
-				order.setCompanyFullName(rs.getString("companyFullName"));
-				order.setCompanyCertNo(rs.getString("companyCertNo"));
-				String companyAddress = rs.getString("companyProvinceTitle") + rs.getString("companyCityTitle")
-						+ rs.getString("companyDistrictTitle") + rs.getString("companyAddress");
-				order.setCompanyAddress(companyAddress);
-				order.setLegalName(rs.getString("legalName"));
-				order.setLegalBirthday(rs.getString("legalBirthday"));
-				order.setLegalCertCode(rs.getString("legalCertCode"));
-				order.setLegalCertNo(rs.getString("legalCertNo"));
-				order.setLegalPhone(rs.getString("legalPhone"));
-				order.setContactAuthorize(rs.getString("contactAuthorize"));
-				order.setContactCreditor(rs.getString("contactCreditor"));
-				order.setLoanAmount(rs.getInt("loanAmount"));
-				order.setLoanRate(rs.getInt("loanRate"));
-				order.setLoanTerm(rs.getInt("loanTerm"));
-				order.setLoanPurpose(rs.getString("loanPurpose"));
-				order.setLoanNo(rs.getString("loanNo"));
-				order.setNotarizeRemark(rs.getString("notarizeRemark"));
-			}
-		});
-		return order;
-	}
-
-	@Override
-	public Integer selectOrderByLoginParameter(Sms sms) {
-		String sql = "select count(id) as num from `order` where legalName=? and legalPhone=? and legalCertNo=?";
-		Object[] arr = new Object[] { sms.getUserName(), sms.getPhone(), sms.getIdCode() };
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			@Override
-			public void processRow(ResultSet rs) throws SQLException {
-				sms.setCount(rs.getInt("num"));
-			}
-		});
-		return sms.getCount();
-	}
-
-	@Override
-	public List<Order> selectOrderList(Order order) {
-		Integer pageNum = order.getPageSize();
-		Integer beginMum = (order.getPageIndex() - 1) * pageNum;
-		String sqlAdd = " ";
-		ArrayList<Object> list = new ArrayList<>();
-		if (order.getAccountId() != null) {
-			sqlAdd += " and tab.accountId =? ";
-			list.add(order.getAccountId());
-		}
-		if (order.getLoanNo() != null) {
-			
-			sqlAdd += " and tab.loanNo =? ";
-			list.add(order.getLoanNo());
-		}
-		if (order.getLegalName() != null) {
-			sqlAdd += " and tab.legalName =? ";
-			list.add(order.getLegalName());
-		}
-		if (order.getLegalPhone() != null) {
-			sqlAdd += " and tab.legalPhone=? ";
-			list.add( order.getLegalPhone());
-		}
-		if (order.getLegalCertNo() != null) {
-			sqlAdd += " and tab.legalCertNo = ?";
- 			list.add( order.getLegalCertNo());
-		}
-		if (order.getStatus() != null) {
-			sqlAdd += " and tab.status = ? ";
-			list.add( order.getStatus());
-		}
-		if (order.getCompanyProvince() != null) {
-			sqlAdd += " and tab.companyProvince = ?" ;
-			list.add(order.getCompanyProvince());
-		}
-		if (order.getCompanyCity() != null) {
-			sqlAdd += " and tab.companyCity = ? " ;
-			list.add(order.getCompanyCity());
-		}
-		if (order.getCompanyDistrict() != null) {
-			sqlAdd += " and tab.companyDistrict = ? " ;
-			list.add(order.getCompanyDistrict());
-		}
-		if (StringUtils.isNotBlank(order.getAccountCompany())) {
-			sqlAdd += " and a.company =?  ";
-			list.add(order.getAccountCompany());
-		}
-
-		// 获取页数
-		String sqlCount = "select count(tab.id) as num from `order` tab"
-				+ " left join `account` a on tab.accountId = a.id where 1=1 " + sqlAdd;
-		Integer count = selectListCount(sqlCount,list.toArray(), pageNum);
-		list.add(beginMum);
-		list.add(pageNum);
-		String sql = "select a.userName as accountUserName , a.company as accountCompany, a.type as accountType, tab.*, "
-				+ "date_format(tab.notarizeStartDate,'%Y-%m-%d %H:%i:%s') as start_dt, "
-				+ "date_format(tab.notarizeEndDate,'%Y-%m-%d %H:%i:%s') as end_dt " + "from `order` tab "
-				+ "left join `account` a on tab.accountId = a.id where 1=1 " + sqlAdd +  " order by tab.id desc "
-			    + " limit ?,?";
-
-		return this.jdbcTemplate.query(sql, list.toArray(),new RowMapper<Order>() {
-			@Override
-			public Order mapRow(ResultSet rs, int rowNum) throws SQLException {
-				Order order = new Order();
-				order.setAccountId(rs.getInt("accountId"));
-				order.setId(rs.getInt("id"));
-				order.setOrderNo(rs.getString("orderNo"));
-				order.setBusinessNo(rs.getString("businessNo"));
-				order.setCompanyFullName(rs.getString("companyFullName"));
-				order.setCompanyProvince(rs.getInt("companyProvince"));
-				order.setCompanyCity(rs.getInt("companyCity"));
-				order.setCompanyDistrict(rs.getInt("companyDistrict"));
-				order.setLoanNo(rs.getString("loanNo"));
-				order.setLegalName(rs.getString("legalName"));
-				order.setLegalCertNo(rs.getString("legalCertNo"));
-				order.setLoanAmount(rs.getInt("loanAmount"));
-				order.setLegalPhone(rs.getString("legalPhone"));
-				order.setNotarizeStartDate(rs.getString("notarizeStartDate"));
-				order.setNotarizeEndDate(rs.getString("notarizeEndDate"));
-				order.setNotarizeRemark(rs.getString("notarizeRemark"));
-				order.setStatus(rs.getInt("status"));
-				order.setCreateTime(rs.getDate("createTime"));
-				order.setAccountUserName(rs.getString("accountUserName"));
-				order.setAccountCompany(rs.getString("accountCompany"));
-				order.setAccountType(rs.getInt("accountType"));
-				order.setCount(count);
-				return order;
-			}
-		});
-	}
-
-	/**
-	 * 根据订单ID查询所属客户经理账户ID
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
-	public Integer selectOrderAccountIdById(Integer id) {
-		String sql = "select accountId from `order` where id=?";
-		Object[] arr = new Object[] { id };
-		Order order = new Order();
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			public void processRow(ResultSet rs) throws SQLException {
-				order.setAccountId(rs.getInt("accountId"));
-			}
-		});
-		return order.getAccountId();
-	}
-
-	/**
-	 * 查询条数
-	 *
-	 * @param sql
-	 * @param pageNum
-	 * @return
-	 */
-	public Integer selectListCount(String sql,Object obj[], Integer pageNum) {
-		Integer count = 0;
-		Order order = new Order();
-		this.jdbcTemplate.query(sql,obj, new RowCallbackHandler() {
-			@Override
-			public void processRow(ResultSet rs) throws SQLException {
-				order.setCount(rs.getInt("num"));
-			}
-		});
-		return order.getCount();
-	}
-
-	@Override
-	public void updateOrderStatusById(Order order) {
-		String sqlAdd = " and id=" + order.getId();
-		if (order.getAccountId() != null) {
-			sqlAdd += " and accountId=" + order.getAccountId();
-		}
-		String sql = "update `order` set  status=" + order.getStatus() + " where 1=1 " + sqlAdd;
-		this.jdbcTemplate.update(sql);
-	}
-
-	@Override
-	public Order selectOrder(Integer id) {
-		Order order = new Order();
-		String sql = "select * from `order` where id=?";
-		Object[] arr = new Object[] { id };
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			@Override
-			public void processRow(ResultSet rs) throws SQLException {
-				order.setId(rs.getInt("id"));
-				order.setBusinessNo(rs.getString("businessNo"));
-				order.setAppId(rs.getString("appId"));
-				order.setOrderNo(rs.getString("orderNo"));
-				order.setCompanyFullName(rs.getString("companyFullName"));
-				order.setCompanyCertNo(rs.getString("companyCertNo"));
-				order.setCompanyProvince(rs.getInt("companyProvince"));
-				order.setCompanyCity(rs.getInt("companyCity"));
-				order.setCompanyDistrict(rs.getInt("companyDistrict"));
-				order.setCompanyAddress(rs.getString("companyAddress"));
-				order.setCompanyFile(rs.getString("companyFile"));
-				order.setLegalName(rs.getString("legalName"));
-				order.setLegalCertNo(rs.getString("legalCertNo"));
-				order.setLegalBirthday(rs.getString("legalBirthday"));
-				order.setLegalPhone(rs.getString("legalPhone"));
-				order.setContactAuthorize(rs.getString("contactAuthorize"));
-				order.setContactCreditor(rs.getString("contactCreditor"));
-				order.setLoanAmount(rs.getInt("loanAmount"));
-				order.setLoanRate(rs.getInt("loanRate"));
-				order.setLoanTerm(rs.getInt("loanTerm"));
-				order.setLoanPurpose(rs.getString("loanPurpose"));
-				order.setLoanNo(rs.getString("loanNo"));
-				order.setLoanFile(rs.getString("loanFile"));
-				order.setContactAuthorizationFile(rs.getString("contactAuthorizationFile"));
-				order.setStatus(rs.getInt("status"));
-				order.setNotarizeNo(rs.getString("notarizeNo"));
-				order.setNotarizeStartDate(rs.getString("notarizeStartDate"));
-				order.setNotarizeEndDate(rs.getString("notarizeEndDate"));
-				order.setNotarizeFile(rs.getString("notarizeFile"));
-				order.setNotarizeRemark(rs.getString("notarizeRemark"));
-				order.setPdfCode(rs.getString("pdfCode"));
-				order.setLocalVideoFile(rs.getString("localVideoFile"));
-				order.setAppVideFile(rs.getString("appVideFile"));
-				order.setAppSignFile(rs.getString("appSignFile"));
-				order.setIfPutDown(rs.getInt("ifPutDown"));
-				order.setIfVideo(rs.getInt("ifVideo"));
-				order.setIfSign(rs.getInt("ifSign"));
-				order.setAccountId(rs.getInt("accountId"));
-			}
-		});
-		return order;
-	}
-
-	@Override
-	public void updateOrderAccountId(Integer id, Integer accountId) {
-		String sql = "update `order` set accountId= " + accountId + " where id=" + id;
-		this.jdbcTemplate.update(sql);
-	}
-
-	@Override
-	public void setStatus(Integer id, Integer status, String reason) {
-		String sql = "";
-		if (StringUtils.isNotEmpty(reason)) {
-			sql = "update `order` set status=" + status + " , notarizeRemark='" + reason + "' where id=" + id;
-		} else {
-			sql = "update `order` set status=" + status + " where id=" + id;
-		}
-		this.jdbcTemplate.update(sql);
-	}
-
-	@Override
-	public void setStartEndTime(Integer id, String start, String end) {
-		String sql = "update `order` set notarizeStartDate=? ,notarizeEndDate=? where id=?";
-		this.jdbcTemplate.update(sql, start, end, id);
-	}
-
-	@Override
-	public List<SaOrderQueryPageRes> getSaOrderPage(SaOrderQueryPageReq req) {
-		int offset = req.getPageSize();
-		int index = (req.getPageNum() - 1) * offset;
-		String sqlAdd = " ";
-
-		if (CollectionUtils.isNotEmpty(req.getQueryAppIds())) {
-			sqlAdd += " and a.appid in  (" + StringUtils.join(req.getQueryAppIds(), ",") + ")";
-		}
-
-		if (StringUtils.isNotBlank(req.getLoanNo())) {
-			sqlAdd += " and a.loanNo like concat ('%', " + req.getLoanNo() + ", '%'";
-		}
-
-		if (StringUtils.isNotBlank(req.getLegalName())) {
-			sqlAdd += " and a.legalName like concat ('%', " + req.getLegalName() + ", '%'";
-		}
-
-		if (StringUtils.isNotBlank(req.getLegalCertNo())) {
-			sqlAdd += " and a.legalCertNo like concat ('%', " + req.getLegalCertNo() + ", '%'";
-		}
-
-		if (StringUtils.isNotBlank(req.getLegalPhone())) {
-			sqlAdd += " and a.legalPhone like concat ('%', " + req.getLegalPhone() + ", '%'";
-		}
-		if (req.getNotaryStatus() != null) {
-			sqlAdd += " and a.status = " + req.getNotaryStatus();
-		}
-
-		String sql = "select a.id, a.businessNo, a.loanNo, a.legalName, a.legalCertNo,"
-				+ "a.legalPhone, a.loanAmount, DATE_FORMAT(a.createTime, '%Y-%m-%d %H:%i:%s') as createTime, a.status, "
-				+ "b.company as notaryOffice, b.userName as notary, a.type" + "from `order` a "
-				+ "left join `account` b on a.accountId = b.id " + "where 1=1 " + sqlAdd + " order by a.id " + "limit "
-				+ index + "," + offset;
-
-		return this.jdbcTemplate.query(sql, new RowMapper<SaOrderQueryPageRes>() {
-			@Override
-			public SaOrderQueryPageRes mapRow(ResultSet rs, int rowNum) throws SQLException {
-				SaOrderQueryPageRes order = new SaOrderQueryPageRes();
-				order.setId(rs.getInt("id"));
-				order.setBusinessNo(rs.getString("businessNo"));
-				order.setLoanNo(rs.getString("loanNo"));
-				order.setLegalName(rs.getString("legalName"));
-				order.setLegalCertNo(rs.getString("legalCertNo"));
-				order.setLegalPhone(rs.getString("legalPhone"));
-				order.setLoanAmount(rs.getInt("loanAmount"));
-				order.setCreateTime(rs.getString("createTime"));
-				order.setStatus(rs.getInt("status"));
-				int type = rs.getInt("type");
-				order.setType(type);
-				order.setNotaryOffice(rs.getString("notaryOffice"));
-				order.setNotary(rs.getString("notary"));
-				order.setNotaryStatusDesc(StatusEnum.NotaryStatusEnum.getExplain(rs.getInt("status")));
-				return order;
-			}
-		});
-	}
-
-	@Override
-	public Integer countSaOrderPage(SaOrderQueryPageReq req) {
-		String sqlAdd = " ";
-
-		if (CollectionUtils.isNotEmpty(req.getQueryAppIds())) {
-			sqlAdd += " and a.appid in  (" + StringUtils.join(req.getQueryAppIds(), ",") + ")";
-		}
-
-		if (StringUtils.isNotBlank(req.getLoanNo())) {
-			sqlAdd += " and a.loanNo like concat ('%', " + req.getLoanNo() + ", '%'";
-		}
-
-		if (StringUtils.isNotBlank(req.getLegalName())) {
-			sqlAdd += " and a.legalName like concat ('%', " + req.getLegalName() + ", '%'";
-		}
-
-		if (StringUtils.isNotBlank(req.getLegalCertNo())) {
-			sqlAdd += " and a.legalCertNo like concat ('%', " + req.getLegalCertNo() + ", '%'";
-		}
-
-		if (StringUtils.isNotBlank(req.getLegalPhone())) {
-			sqlAdd += " and a.legalPhone like concat ('%', " + req.getLegalPhone() + ", '%'";
-		}
-		if (req.getNotaryStatus() != null) {
-			sqlAdd += " and a.status = " + req.getNotaryStatus();
-		}
-
-		String sql = "select count(1) as `count` " + "from `order` a " + "left join `account` b on a.accountId = b.id "
-				+ "where 1=1 " + sqlAdd;
-
-		return this.jdbcTemplate.queryForObject(sql, Integer.class);
-	}
-
-	// 查询所有图片
-	public Map<String, Object> queryPicByOrderId(int id) {
-
-		String sql = "select * from pic_path where order_id=" + id;
-
-		return this.jdbcTemplate.queryForMap(sql);
-	}
-	
-	
-	public Integer selectOrderByPhone(String phone) {
-		String sql = "select count(id) as num from `order` where  legalPhone=? ";
-		Object[] arr = new Object[] {phone};
-		 return this.jdbcTemplate.queryForObject(sql, arr,Integer.class);
-		 
-	 
-	}
-	@Override
-	public List<Order> getOrderDetail(Order order) {
- 
-		String sqlAdd = "";
-		ArrayList<Object> list = new ArrayList<>();
-		if (order.getAccountId() != null) {
-			sqlAdd += " and tab.accountId =? ";
-			list.add(order.getAccountId());
-		}
-		if (order.getLoanNo() != null) {
-			
-			sqlAdd += " and tab.loanNo =? ";
-			list.add(order.getLoanNo());
-		}
-		if (order.getLegalName() != null) {
-			sqlAdd += " and tab.legalName =? ";
-			list.add(order.getLegalName());
-		}
-		if (order.getLegalPhone() != null) {
-			sqlAdd += " and tab.legalPhone=? ";
-			list.add( order.getLegalPhone());
-		}
-		if (order.getLegalCertNo() != null) {
-			sqlAdd += " and tab.legalCertNo = ?";
- 			list.add( order.getLegalCertNo());
-		}
-		if (order.getStatus() != null) {
-			sqlAdd += " and tab.status = ? ";
-			list.add( order.getStatus());
-		}
-		if (order.getCompanyProvince() != null) {
-			sqlAdd += " and tab.companyProvince = ?" ;
-			list.add(order.getCompanyProvince());
-		}
-		if (order.getCompanyCity() != null) {
-			sqlAdd += " and tab.companyCity = ? " ;
-			list.add(order.getCompanyCity());
-		}
-		if (order.getCompanyDistrict() != null) {
-			sqlAdd += " and tab.companyDistrict = ? " ;
-			list.add(order.getCompanyDistrict());
-		}
-		if (StringUtils.isNotBlank(order.getAccountCompany())) {
-			sqlAdd += " and a.company =?  ";
-			list.add(order.getAccountCompany());
-		}
-		String sql=" select tab.* from `order` tab where 1=1 ";
-	 
-
-
-		return this.jdbcTemplate.query(sql+sqlAdd.toString(), list.toArray(),new RowMapper<Order>() {
-			@Override
-			public Order mapRow(ResultSet rs, int rowNum) throws SQLException {
-				Order order = new Order();
-				order.setAccountId(rs.getInt("accountId"));
-				order.setId(rs.getInt("id"));
-				order.setOrderNo(rs.getString("orderNo"));
-				order.setBusinessNo(rs.getString("businessNo"));
-				order.setCompanyFullName(rs.getString("companyFullName"));
-				order.setCompanyProvince(rs.getInt("companyProvince"));
-				order.setCompanyCity(rs.getInt("companyCity"));
-				order.setCompanyDistrict(rs.getInt("companyDistrict"));
-				order.setLoanNo(rs.getString("loanNo"));
-				order.setLegalName(rs.getString("legalName"));
-				order.setLegalCertNo(rs.getString("legalCertNo"));
-				order.setLoanAmount(rs.getInt("loanAmount"));
-				order.setLegalPhone(rs.getString("legalPhone"));
-				order.setNotarizeStartDate(rs.getString("notarizeStartDate"));
-				order.setNotarizeEndDate(rs.getString("notarizeEndDate"));
-				order.setNotarizeRemark(rs.getString("notarizeRemark"));
-				order.setStatus(rs.getInt("status"));
-				order.setCreateTime(rs.getDate("createTime"));
-//				order.setAccountUserName(rs.getString("accountUserName"));
-//				order.setAccountCompany(rs.getString("accountCompany"));
-//				order.setAccountType(rs.getInt("accountType"));
-			 
-				return order;
-			}
-		});
-	}
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/OrgFlowDaoImpl.java

@@ -1,67 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.OrgFlowDao;
-import me.zhengjie.application.bank.controller.vo.OrgFlow;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-@Repository
-@Transactional
-public class OrgFlowDaoImpl implements OrgFlowDao {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public OrgFlow selectByOrgFlow(Integer accountId) {
-        String sql = "select * from `org_flow` where accountId = ?";
-
-        Object[] arr = new Object[]{accountId};
-        final OrgFlow resObj = new OrgFlow();
-        this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                resObj.setId(rs.getInt("id"));
-                resObj.setAccountId(rs.getInt("accountId"));
-                resObj.setIfPutDown(rs.getInt("ifPutDown"));
-                resObj.setIfVideo(rs.getInt("ifVideo"));
-                resObj.setIfSign(rs.getInt("ifSign"));
-            }
-        });
-        return resObj;
-    }
-
-    @Override
-    public void saveOrgFlow(OrgFlow orgFlow) {
-        Integer accountId = orgFlow.getAccountId();
-        Integer ifPutDown = orgFlow.getIfPutDown();
-        Integer ifVideo = orgFlow.getIfVideo();
-        Integer ifSign = orgFlow.getIfSign();
-
-        String sql = "insert into `org_flow` (accountId, ifPutDown, ifVideo, ifSign) " +
-                "values (" + accountId + "," + ifPutDown + "," + ifVideo + "," + ifSign + ")";
-        this.jdbcTemplate.update(sql);
-    }
-
-    @Override
-    public void updateOrgFlow(OrgFlow orgFlow) {
-        Integer id = orgFlow.getId();
-        Integer accountId = orgFlow.getAccountId();
-        Integer ifPutDown = orgFlow.getIfPutDown();
-        Integer ifVideo = orgFlow.getIfVideo();
-        Integer ifSign = orgFlow.getIfSign();
-
-        String sql = "update `org_flow` set ifPutDown=" + ifPutDown + " ,ifVideo=" + ifVideo + " ,ifSign=" + ifSign + " where id=" + id ;
-        this.jdbcTemplate.update(sql);
-    }
-
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/OrgInfoDaoImpl.java

@@ -1,71 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.OrgInfoDao;
-import me.zhengjie.application.bank.controller.vo.OrgInfo;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-@Repository
-@Transactional
-public class OrgInfoDaoImpl implements OrgInfoDao {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public void saveOne(OrgInfo orgInfo) {
-        String sql = "insert into `org_info` (`accountId`,`creditCode`,`cachet`,`proveKind`,`usableBeginCode`,`usableEndCode`,`unusableBeginCode`,`unusableEndCode`) values (?,?,?,?,?,?,?,?)";
-        this.jdbcTemplate.update(sql, new Object[]{
-                orgInfo.getAccountId(),
-                orgInfo.getCreditCode(),
-                orgInfo.getCachet(),
-                orgInfo.getProveKind(),
-                orgInfo.getUsableBeginCode(),
-                orgInfo.getUsableEndCode(),
-                orgInfo.getUnusableBeginCode(),
-                orgInfo.getUnusableEndCode()
-        });
-    }
-
-
-    @Override
-    public OrgInfo selectByAccountId(Integer accountId) {
-        String sql = "select * from `org_info` where accountId = " + accountId;
-        OrgInfo orgInfo = new OrgInfo();
-        this.jdbcTemplate.query(sql, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                orgInfo.setAccountId(rs.getInt("accountId"));
-                orgInfo.setCreditCode(rs.getString("creditCode"));
-                orgInfo.setCachet(rs.getString("cachet"));
-                orgInfo.setProveKind(rs.getString("proveKind"));
-                orgInfo.setNextCode(rs.getInt("nextCode"));
-                orgInfo.setUsableBeginCode(rs.getInt("usableBeginCode"));
-                orgInfo.setUsableEndCode(rs.getInt("usableEndCode"));
-                orgInfo.setUnusableBeginCode(rs.getInt("unusableBeginCode"));
-                orgInfo.setUnusableEndCode(rs.getInt("unusableEndCode"));
-            }
-        });
-        return orgInfo;
-    }
-
-    @Override
-    public void updateUsableEndCode(Integer accountId, Integer usableEndCode) {
-        String sql = "update `org_info` set usableEndCode = " + usableEndCode + " where accountId=" + accountId;
-        this.jdbcTemplate.update(sql);
-    }
-
-    @Override
-    public void updateNextCode(Integer accountId, Integer nextCode) {
-        String sql = "update `org_info` set nextCode=" + nextCode + " where accountId=" + accountId;
-        this.jdbcTemplate.update(sql);
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/RoleDaoImpl.java

@@ -1,121 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.RoleDao;
-import me.zhengjie.application.bank.controller.vo.Role;
-
-@Repository
-@Transactional
-public class RoleDaoImpl implements RoleDao {
-	@Autowired
-	private JdbcTemplate jdbcTemplate;
-
-	/**
-	 * 根据登录账户查询账户列表
-	 *
-	 * @param accountId
-	 * @param request
-	 * @return
-	 */
-	@Override
-	public List<Role> selectRoleByAccountId(Integer accountId, HttpServletRequest request) {
-
-		String sql = "select * from `role` where `accountId`=" + accountId + " order by `sort` asc,`id` desc";
-
-		return this.jdbcTemplate.query(sql, new RowMapper<Role>() {
-			@Override
-			public Role mapRow(ResultSet rs, int rowNum) throws SQLException {
-				Role role = new Role();
-				role.setId(rs.getInt("id"));
-				role.setAccountId(rs.getInt("accountId"));
-				role.setSort(rs.getInt("sort"));
-				role.setTitle(rs.getString("title"));
-				role.setMenuId(rs.getString("menuId"));
-				role.setCreateTime(rs.getDate("createTime"));
-				role.setUpdateTime(rs.getDate("updateTime"));
-				return role;
-			}
-		});
-	}
-
-	/**
-	 * 查询角色详情
-	 *
-	 * @param id
-	 * @return
-	 */
-	@Override
-	public Role selectRoleDetailById(Integer id) {
-
-		String sql = "select * from `role` where `id`=? order by id asc";
-		Role role = new Role();
-		Object[] arr = new Object[] { id };
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			@Override
-			public void processRow(ResultSet rs) throws SQLException {
-				role.setId(rs.getInt("id"));
-				role.setTitle(rs.getString("title"));
-				role.setMenuId(rs.getString("menuId"));
-			}
-		});
-		return role;
-	}
-
-	/**
-	 * 修改角色信息
-	 *
-	 * @param role
-	 */
-	@Override
-	public void modifyRoleDetailById(Role role) {
-		String menuId = "";
-		if (role.getMenuId().equals("")) {
-			menuId = null;
-		} else {
-			menuId = "0," + role.getMenuId() + ",0";
-		}
-		String sql = "update `role` set title=? , menuId=? where id=?";
-		this.jdbcTemplate.update(sql, role.getTitle(), menuId, role.getId());
-	}
-
-	/**
-	 * 删除角色
-	 *
-	 * @param role
-	 */
-	@Override
-	public void deleteRoleDetailById(Role role) {
-		String sql = "delete from `role` where id=?";
-		this.jdbcTemplate.update(sql, role.getId());
-	}
-
-	/**
-	 * 创建角色
-	 *
-	 * @param role
-	 */
-	@Override
-	public void insertRoleDetailById(Role role) {
-		String menuId = "";
-		if (role.getMenuId().equals("")) {
-			menuId = null;
-		} else {
-			menuId = "0," + role.getMenuId() + ",0";
-		}
-		String sql = "insert into `role` (accountId,title,menuId,createTime) VALUES (?,?,?,?)";
-		this.jdbcTemplate.update(sql, role.getAccountId(), role.getTitle(), menuId, role.getCreateTime());
-	}
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/SmsLogDaoImpl.java

@@ -1,73 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-import me.zhengjie.domain.sms.CommonConstants;
-import me.zhengjie.dao.jdbc.SmsLogDao;
-import me.zhengjie.application.bank.controller.vo.Sms;
-import me.zhengjie.application.bank.controller.vo.SmsLog;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Repository
-@Transactional
-public class SmsLogDaoImpl implements SmsLogDao {
-
-	@Autowired
-	private JdbcTemplate jdbcTemplate;
-
-	@Override
-	public void insertSmsLog(SmsLog smsLog) {
-
-		String sql = "insert into `smsLog` (template,code,phone,sendContent,returnContent,ip,createTime) VALUES (?,?,?,?,?,?,?)";
-		this.jdbcTemplate.update(sql, new Object[] { smsLog.getTemplate(), smsLog.getCode(), smsLog.getPhone(),
-				smsLog.getSendContent(), smsLog.getReturnContent(), smsLog.getIp(), smsLog.getCreateTime() });
-
-	}
-
-	@Override
-	public Integer selectSendCount(String template, String sendContent) {
-
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		Date now = new Date();
-		Date beforeDate = new Date(now.getTime() - 30 * 60 * 1000); // 30分钟前
-		String sendTime = sdf.format(beforeDate);
-
-		String sql = "select count(id) as num from `smsLog`  where createTime>=? and template=? and sendContent=?";
-
-		Object[] arr = new Object[] { sendTime, template, sendContent };
-		SmsLog smsLog = new SmsLog();
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			public void processRow(ResultSet rs) throws SQLException {
-				smsLog.setCount(rs.getInt("num"));
-			}
-		});
-		return smsLog.getCount();
-	}
-
-	@Override
-	public String selectSmsLogByLoginParameter(Sms sms) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		Date now = new Date();
-		Date beforeDate = new Date(now.getTime() - CommonConstants.MSG_TIME * 60 * 1000); // 3分钟前
-		String sendTime = sdf.format(beforeDate);
-
-		sms.setCode("0");
-		String sql = "select code from `smsLog` where phone =? and createTime >= ? order by createTime desc limit 1";
-		Object[] arr = new Object[] { sms.getPhone(), sendTime };
-		this.jdbcTemplate.query(sql, arr, new RowCallbackHandler() {
-			public void processRow(ResultSet rs) throws SQLException {
-				sms.setCode(rs.getString("code"));
-			}
-		});
-		return sms.getCode();
-	}
-
-}

eladmin-system/src/main/java/me/zhengjie/dao/jdbc/impl/WorkerInfoDaoImpl.java

@@ -1,62 +0,0 @@
-package me.zhengjie.dao.jdbc.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowCallbackHandler;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import me.zhengjie.dao.jdbc.WorkerInfoDao;
-import me.zhengjie.application.bank.controller.vo.WorkerInfo;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-@Repository
-@Transactional
-public class WorkerInfoDaoImpl implements WorkerInfoDao {
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @Override
-    public void insert(WorkerInfo workerInfo) {
-        String sql = "insert into `worker_info` (phone,idNo,signPicture) values (?,?,?)";
-        this.jdbcTemplate.update(sql, new Object[]{
-                workerInfo.getPhone(),
-                workerInfo.getIdNo(),
-                workerInfo.getSignPicture()
-        });
-    }
-
-    @Override
-    public WorkerInfo selectByPhone(String phone) {
-        String sql = "select * from `worker_info` where phone ='" + phone + "'";
-        WorkerInfo workerInfo = new WorkerInfo();
-        this.jdbcTemplate.query(sql, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                workerInfo.setPhone(rs.getString("phone"));
-                workerInfo.setIdNo(rs.getString("idNo"));
-                workerInfo.setSignPicture(rs.getString("signPicture"));
-            }
-        });
-        return workerInfo;
-    }
-
-    @Override
-    public WorkerInfo selectById(Integer id) {
-        String sql = "select a.*,b.userName from `worker_info` as a left join `account` as b on a.phone=b.phone where b.id=" + id + " and b.isSys=0";
-        WorkerInfo workerInfo = new WorkerInfo();
-        this.jdbcTemplate.query(sql, new RowCallbackHandler() {
-            @Override
-            public void processRow(ResultSet rs) throws SQLException {
-                workerInfo.setName(rs.getString("userName"));
-                workerInfo.setPhone(rs.getString("phone"));
-                workerInfo.setIdNo(rs.getString("idNo"));
-                workerInfo.setSignPicture(rs.getString("signPicture"));
-            }
-        });
-        return workerInfo;
-    }
-}

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/OrderRoomIdEntity.java

@@ -39,9 +39,6 @@ public class OrderRoomIdEntity implements Serializable {
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 
-	@TableField("orderId")
-	private String orderId;
-
 	@TableField("roomId")
 	private String roomId;
 
@@ -82,6 +79,5 @@ public class OrderRoomIdEntity implements Serializable {
 	 */
 	@TableField("business_no")
 	private String businessNo;
-	
 
 }

eladmin-system/src/main/resources/config/application-nt.yml

@@ -156,19 +156,19 @@ app:
   background:
     picture: https://flowbb.show.xjrkj.com/image/logo/83d9449f4e02459da1661bafdf08b86a_8.png
   image:
-    url: https://flowbb.show.xjrkj.com/image/
+    url: https://fqgz.banknotary.cn:8000/image/
   upload:
     path: /data/fqgz/image/
   host:
-    domain: https://flowbb.show.xjrkj.com/
+    domain: https://fqgz.banknotary.cn:8000
   push:
     port: 8089
   minio:
-    accesskey: minioadmin
-    secretkey: minioadmin
-    url: http://124.222.192.60:9000
-    bucketName: mytest
-    preview: https://flowbb.show.xjrkj.com
+    accesskey: admin
+    secretkey: ntgzc123@!p
+    url: http://127.0.0.1:9000
+    bucketName: fqgz
+    preview: https://fqgz.banknotary.cn:8000
 tencent:
   client:
     webankAppId: TIDAdW8e
@@ -195,6 +195,5 @@ xxl:
       logpath: ./logs/xxl-job/
       logretentiondays: 30
 
-logging:
-  config: classpath:logback-spring.xml
+logback:
   logdir: ./logs/java-app