兼容邮储产品

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

@@ -1,30 +1,28 @@
 package me.zhengjie.application.admin.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.application.bank.controller.vo.FileUploadVo;
+import me.zhengjie.application.bank.controller.vo.FileVo;
+import me.zhengjie.application.bank.service.FileInfoService;
+import me.zhengjie.base.ResponseDTO;
+import me.zhengjie.base.ResultCode;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import static me.zhengjie.base.util.Constants.*;
-import com.alibaba.fastjson.JSONObject;
 
-import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.application.bank.service.BankLoginService;
-import me.zhengjie.application.bank.service.FileInfoService;
-import me.zhengjie.base.util.FileUploadUtil;
-import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
-import me.zhengjie.application.bank.controller.vo.FileUploadVo;
-import me.zhengjie.application.bank.controller.vo.FileVo;
-import me.zhengjie.base.ResponseDTO;
-import me.zhengjie.base.ResultCode;
+import static me.zhengjie.base.util.Constants.UploadFileType;
 
 @Validated
 @RestController
 @RequestMapping("/api/file")
 @Slf4j
 public class FileInfoController {
-	BankLoginService bankLoginService;
 	@Autowired
 	FileInfoService fileInfoService;
 	/**

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

@@ -1,36 +1,33 @@
 package me.zhengjie.application.admin.controller;
 
-import java.util.List;
-
-import me.zhengjie.base.util.ApplicationContextUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
 import me.zhengjie.base.AppBaseResponse;
-import me.zhengjie.application.bank.service.OrderRoomIdService;
-import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.ResultCode;
+import me.zhengjie.base.util.ApplicationContextUtil;
+import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.WebSocketMap;
+import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
+import me.zhengjie.dao.mybatis.mapper.OrderRoomIdMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 @RestController
 @Validated
 @RequestMapping("/orderRoom")
 @Slf4j
+@RequiredArgsConstructor
 public class OrderRoomIdController {
-	@Autowired
-	OrderRoomIdService orderRoomService;
-	@Autowired
-	ApplicationContextUtil contextUtil;
+	private final OrderRoomIdMapper orderRoomIdMapper;
+	private final ApplicationContextUtil contextUtil;
 
 	/**
 	 * 查询 借款人信息
@@ -44,7 +41,7 @@ public class OrderRoomIdController {
 		QueryWrapper<OrderRoomIdEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("business_no", jsonObj.getString("businessNo"));
 		queryWrapper.orderByDesc("update_time");
-		List<OrderRoomIdEntity> orderRoomList = orderRoomService.list(queryWrapper);
+		List<OrderRoomIdEntity> orderRoomList = orderRoomIdMapper.selectList(queryWrapper);
 		if (orderRoomList != null && orderRoomList.size() > 0) {
 			OrderRoomIdEntity orderRoomId = orderRoomList.get(0);
 			// 处理

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

@@ -1,38 +1,34 @@
 package me.zhengjie.application.admin.controller;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
+import me.zhengjie.base.util.DownloadUtils;
 import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
 import me.zhengjie.dao.mybatis.entity.PushDataEntity;
-import me.zhengjie.application.bank.service.OrderRoomIdService;
-import me.zhengjie.application.bank.service.TencentPushService;
-import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
-import me.zhengjie.base.util.DownloadUtils;
+import me.zhengjie.dao.mybatis.mapper.OrderRoomIdMapper;
+import me.zhengjie.dao.mybatis.mapper.PushDataMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-//"stream_id":"1400574616_166123743_2222_aux"    这个是app的
-//"stream_id":"1400574616_166123743_share_45_main"     这个是PC的
 @Controller
+@RequiredArgsConstructor
 public class TencentPushController {
 
 	private static final Logger log = LoggerFactory.getLogger(TencentPushController.class);
-
-	@Autowired
-	TencentPushService pushService;
-	@Autowired
-	OrderRoomIdService orderRoomIdService;
+	private final PushDataMapper pushDataMapper;
+	private final OrderRoomIdMapper orderRoomIdMapper;
 
 	@AnonymousPostMapping("/tencentpush")
 	@ResponseBody
@@ -50,14 +46,14 @@ public class TencentPushController {
 			pushData.setTypeName(json.get("appname"));
 			pushData.setData(JSON.toJSONString(json));
 			pushData.setPath(json.get("video_url"));
-			pushService.save(pushData);
+			pushDataMapper.insert(pushData);
 			log.info("pc端的推送信息：" + 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);
+			List<OrderRoomIdEntity> orderRoomId = orderRoomIdMapper.selectList(orderRoomQuery);
 			// 这里通过订单查询相关信息
 			if (orderRoomId != null && orderRoomId.size() > 0) {
 				OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
@@ -68,7 +64,7 @@ public class TencentPushController {
 				update.setPcFileId(fileId);
 				update.setPcVideoUrl(fileName);
 				update.setId(orderRoomIdEntity.getId());
-				orderRoomIdService.updateById(update);
+				orderRoomIdMapper.updateById(update);
 			}
 		}
 		if (channelId.contains("aux")) {
@@ -80,14 +76,14 @@ public class TencentPushController {
 			pushData.setTypeName(json.get("appname"));
 			pushData.setData(JSON.toJSONString(json));
 			pushData.setPath(json.get("video_url"));
-			pushService.save(pushData);
+			pushDataMapper.insert(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);
+			List<OrderRoomIdEntity> orderRoomId = orderRoomIdMapper.selectList(orderRoomQuery);
 			// 这里通过订单查询相关信息
 			if (orderRoomId != null && orderRoomId.size() > 0) {
 				OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
@@ -98,7 +94,7 @@ public class TencentPushController {
 				update.setAppFileId(fileId);
 				update.setAppVideoUrl(fileName);
 				update.setId(orderRoomIdEntity.getId());
-				orderRoomIdService.updateById(update);
+				orderRoomIdMapper.updateById(update);
 			}
 		}
 		Map<String, Object> result = new HashMap<>();
@@ -131,7 +127,7 @@ public class TencentPushController {
 						query.eq("file_id", fileId);
 						query.eq("push_type", "app");
 						query.eq("type_name", "live");
-						List<PushDataEntity> file = pushService.list(query);
+						List<PushDataEntity> file = pushDataMapper.selectList(query);
 						if (file != null && file.size() > 0) {
 							String pushData = file.get(0).getData();
 							JSONObject jsonObj = JSONObject.parseObject(pushData);
@@ -146,14 +142,16 @@ public class TencentPushController {
 							DownloadUtils.downloadFile(videoUrl.get("Url").toString(), fileName);
 							orderRoomId.setAppVideoUrl(fileName);
 							//
-							orderRoomIdService.update(orderRoomId, "roomId", roomId);
+							UpdateWrapper<OrderRoomIdEntity> updateQw = new UpdateWrapper<>();
+							updateQw.eq("roomId", roomId);
+							orderRoomIdMapper.update(orderRoomId, updateQw);
 							PushDataEntity pushDataEntity = new PushDataEntity();
 							pushDataEntity.setFileId(fileId);
 							pushDataEntity.setPushType("app");
 							pushDataEntity.setData(JSON.toJSONString(json));
 							pushDataEntity.setPath(videoUrl.get("Url").toString());
 							pushDataEntity.setTypeName("ProcedureStateChangeEvent");
-							pushService.save(pushDataEntity);
+							pushDataMapper.insert(pushDataEntity);
 						} else {
 							Map<String, Object> result = new HashMap<>();
 							result.put("success", false);
@@ -179,7 +177,7 @@ public class TencentPushController {
 				QueryWrapper<OrderRoomIdEntity> orderRoomQuery = new QueryWrapper<>();
 				orderRoomQuery.eq("roomId", roomId);
 				orderRoomQuery.orderByDesc("create_time");
-				List<OrderRoomIdEntity> orderRoomId = orderRoomIdService.list(orderRoomQuery);
+				List<OrderRoomIdEntity> orderRoomId = orderRoomIdMapper.selectList(orderRoomQuery);
 
 				if (orderRoomId != null && orderRoomId.size() > 0) {
 					OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
@@ -191,7 +189,7 @@ public class TencentPushController {
 					update.setPcFileId(fileId);
 					update.setAppVideoUrl(fileName);
 					update.setId(orderRoomIdEntity.getId());
-					orderRoomIdService.updateById(update);
+					orderRoomIdMapper.updateById(update);
 				}
 			}
 
@@ -202,7 +200,7 @@ public class TencentPushController {
 			PushDataEntity.setData(JSON.toJSONString(json));
 			PushDataEntity.setPath(path);
 			PushDataEntity.setTypeName(eventType);
-			pushService.save(PushDataEntity);
+			pushDataMapper.insert(PushDataEntity);
 			// 保存推送过来的视频
 
 		} else {
@@ -215,14 +213,14 @@ public class TencentPushController {
 				pushDataEntity.setData(JSON.toJSONString(json));
 				pushDataEntity.setPath(json.getString("video_url"));
 				pushDataEntity.setTypeName(json.getString("appname"));
-				pushService.save(pushDataEntity);
+				pushDataMapper.insert(pushDataEntity);
 			} else {
 				PushDataEntity pushDataEntity = new PushDataEntity();
 				pushDataEntity.setFileId("");
 				pushDataEntity.setPushType("app");
 				pushDataEntity.setData(JSON.toJSONString(json));
 				pushDataEntity.setPath("");
-				pushService.save(pushDataEntity);
+				pushDataMapper.insert(pushDataEntity);
 			}
 
 		}

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AreaServiceImpl.java

@@ -1,22 +1,22 @@
 package me.zhengjie.application.admin.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
+import lombok.RequiredArgsConstructor;
+import me.zhengjie.application.admin.service.AreaService;
 import me.zhengjie.base.util.AreaDto;
+import me.zhengjie.base.util.TreeUtil;
 import me.zhengjie.dao.mybatis.entity.AreaEntity;
 import me.zhengjie.dao.mybatis.entity.CityEntity;
 import me.zhengjie.dao.mybatis.entity.ProvinceEntity;
+import me.zhengjie.dao.mybatis.mapper.CityMapper;
 import me.zhengjie.dao.mybatis.mapper.IAreaDao;
-import me.zhengjie.application.admin.service.AreaService;
-import me.zhengjie.application.bank.service.CityService;
-import me.zhengjie.application.bank.service.ProvinceService;
-import me.zhengjie.base.util.TreeUtil;
+import me.zhengjie.dao.mybatis.mapper.ProvinceMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -27,15 +27,13 @@ import me.zhengjie.base.util.TreeUtil;
  * @since 2022-03-28
  */
 @Service
+@RequiredArgsConstructor
 public class AreaServiceImpl extends ServiceImpl<IAreaDao, AreaEntity> implements AreaService {
-	@Autowired
-	ProvinceService provinceService;
-
-	@Autowired
-	CityService cityService;
+	private final ProvinceMapper provinceMapper;
+	private final CityMapper cityMapper;
 
 	public List<AreaDto> area() {
-		List<ProvinceEntity> province = provinceService.list();
+		List<ProvinceEntity> province = provinceMapper.selectList(new QueryWrapper<>());
 		List<AreaDto> list = new ArrayList<AreaDto>();
 		for (ProvinceEntity p : province) {
 			AreaDto t = new AreaDto();
@@ -44,7 +42,7 @@ public class AreaServiceImpl extends ServiceImpl<IAreaDao, AreaEntity> implement
 			t.setValue(p.getCode());
 			list.add(t);
 		}
-		List<CityEntity> city = cityService.list();
+		List<CityEntity> city = cityMapper.selectList(new QueryWrapper<>());
 		for (CityEntity c : city) {
 			AreaDto t = new AreaDto();
 			t.setParentId(c.getProvinceCode());

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/CochainLogServiceImpl.java

@@ -1,37 +1,29 @@
 package me.zhengjie.application.admin.service.impl;
 
-import java.io.File;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.FileUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xxl.job.core.handler.annotation.XxlJob;
-
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.application.admin.service.AdminOrderService;
 import me.zhengjie.application.admin.service.CochainLogService;
 import me.zhengjie.application.admin.service.OrderCochainService;
 import me.zhengjie.application.bank.service.BankOrderService;
-import me.zhengjie.application.bank.service.OrderRoomIdService;
-import me.zhengjie.application.bank.service.SysDictService;
 import me.zhengjie.base.chain.CochainService;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.dao.mybatis.entity.BorrowerEntity;
 import me.zhengjie.dao.mybatis.entity.CochainLogEntity;
 import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
 import me.zhengjie.dao.mybatis.entity.OrderCochainEntity;
-import me.zhengjie.dao.mybatis.mapper.BorrowerMapper;
-import me.zhengjie.dao.mybatis.mapper.GuaranteeMapper;
-import me.zhengjie.dao.mybatis.mapper.ICochainLogDao;
-import me.zhengjie.dao.mybatis.mapper.MortgageMapper;
-import me.zhengjie.dao.mybatis.mapper.OrderFileMapper;
+import me.zhengjie.dao.mybatis.mapper.*;
+import org.apache.commons.io.FileUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
 
 /**
  * TODO 这个需要去掉抵押人，可以有联合借款，联合抵押，现在都是按照单个处理，
@@ -67,9 +59,7 @@ public class CochainLogServiceImpl extends ServiceImpl<ICochainLogDao, CochainLo
 	@Autowired
 	OrderFileMapper orderFileMapper;
 	@Autowired
-	OrderRoomIdService orderRoomService;
-	@Autowired
-	SysDictService sysDictService;
+	OrderRoomIdMapper orderRoomIdMapper;
 
 //	@PostConstruct
 	public void init() {
@@ -160,7 +150,7 @@ public class CochainLogServiceImpl extends ServiceImpl<ICochainLogDao, CochainLo
 //			QueryWrapper<OrderRoomIdEntity> queryWrapper = new QueryWrapper<>();
 //			queryWrapper.eq("orderId", obj.getId());
 //			queryWrapper.orderByDesc("create_time");
-//			List<OrderRoomIdEntity> orderRoomList = orderRoomService.list(queryWrapper);
+//			List<OrderRoomIdEntity> orderRoomList = orderRoomIdMapper.selectList(queryWrapper);
 //			if (orderRoomList != null && orderRoomList.size() > 0) {
 //				OrderRoomIdEntity orderRoomId = orderRoomList.get(0);
 //				recordCochain(businessNo, obj.getId(), orderRoomId.getAppVideoUrl(), logs, cochainLogs, "APP视频",
@@ -219,7 +209,7 @@ public class CochainLogServiceImpl extends ServiceImpl<ICochainLogDao, CochainLo
 //			QueryWrapper<OrderRoomIdEntity> queryWrapper = new QueryWrapper<>();
 //			queryWrapper.eq("orderId", obj.getId());
 //			queryWrapper.orderByDesc("create_time");
-//			List<OrderRoomIdEntity> orderRoomList = orderRoomService.list(queryWrapper);
+//			List<OrderRoomIdEntity> orderRoomList = orderRoomIdMapper.selectList(queryWrapper);
 //			if (orderRoomList != null && orderRoomList.size() > 0) {
 //				OrderRoomIdEntity orderRoomId = orderRoomList.get(0);
 //				recordCochain(businessNo, obj.getId(), orderRoomId.getAppVideoUrl(), logs, cochainLogs, "APP视频",
@@ -277,7 +267,7 @@ public class CochainLogServiceImpl extends ServiceImpl<ICochainLogDao, CochainLo
 //			QueryWrapper<OrderRoomIdEntity> queryWrapper = new QueryWrapper<>();
 //			queryWrapper.eq("orderId", obj.getId());
 //			queryWrapper.orderByDesc("create_time");
-//			List<OrderRoomIdEntity> orderRoomList = orderRoomService.list(queryWrapper);
+//			List<OrderRoomIdEntity> orderRoomList = orderRoomIdMapper.selectList(queryWrapper);
 //			if (orderRoomList != null && orderRoomList.size() > 0) {
 //				OrderRoomIdEntity orderRoomId = orderRoomList.get(0);
 //				recordCochain(businessNo, obj.getId(), orderRoomId.getAppVideoUrl(), logs, cochainLogs, "APP视频",

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

@@ -1,17 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import me.zhengjie.dao.mybatis.entity.CityEntity;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-28
- */
-public interface CityService extends IService<CityEntity> {
-
-}

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

@@ -1,16 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import me.zhengjie.dao.mybatis.entity.ExecuteInfoEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 执行证书-基本信息 服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-public interface ExecuteInfoService extends IService<ExecuteInfoEntity> {
-
-}

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

@@ -1,16 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import me.zhengjie.dao.mybatis.entity.ModelEntity;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-public interface ModelService extends IService<ModelEntity> {
-
-}

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

@@ -1,8 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
-import me.zhengjie.base.plus.AbstractService;
-
-public interface OrderRoomIdService extends AbstractService<OrderRoomIdEntity> {
-
-}

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

@@ -1,17 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import me.zhengjie.dao.mybatis.entity.ProvinceEntity;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-28
- */
-public interface ProvinceService extends IService<ProvinceEntity> {
-
-}

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

@@ -1,16 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import me.zhengjie.dao.mybatis.entity.SysDictEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 数据字典 服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-public interface SysDictService extends IService<SysDictEntity> {
-
-}

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

@@ -1,21 +0,0 @@
-package me.zhengjie.application.bank.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import me.zhengjie.dao.mybatis.entity.PushDataEntity;
-
-
-/**
- * 腾讯推送
- * 
- * @author auas
- *
- */
-public interface TencentPushService extends IService<PushDataEntity>{
-	/**
-	 * 保存orderroom的数据
-	 * @param orderRoomId
-	 */
-	
-
-}

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

@@ -1,17 +1,18 @@
 package me.zhengjie.application.bank.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.application.bank.controller.vo.FileInfoDto;
 import me.zhengjie.application.bank.service.BankNotarizeService;
-import me.zhengjie.application.bank.service.OrderRoomIdService;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.mq.RedisCacheConfig;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
 import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
 import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
+import me.zhengjie.dao.mybatis.mapper.OrderRoomIdMapper;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -23,7 +24,7 @@ import java.util.List;
 @Slf4j
 @RequiredArgsConstructor
 public class BankNotarizeServiceImpl implements BankNotarizeService {
-    private final OrderRoomIdService orderRoomIdService;
+    private final OrderRoomIdMapper orderRoomIdMapper;
     private final RedisTemplate<String, String> redisTemplate;
     private final OrderFileRepository orderFileRepository;
 
@@ -49,14 +50,12 @@ public class BankNotarizeServiceImpl implements BankNotarizeService {
         // 修改时间
         orderRoomId.setUpdateTime(LocalDateTime.now());
         // 这里先判断是否存在，不存在就插入数据
-        OrderRoomIdEntity orderQuery = new OrderRoomIdEntity();
-
-        orderQuery.setRoomId(roomId);
-        // 业务流水
-        orderQuery.setBusinessNo(businessNo);
-        long orderSize = orderRoomIdService.count(orderQuery);
+        QueryWrapper<OrderRoomIdEntity> qw = new QueryWrapper<>();
+        qw.eq("roomId",roomId);
+        qw.eq("business_no",businessNo);
+        long orderSize = orderRoomIdMapper.selectCount(qw);
         if (orderSize == 0) {
-            orderRoomIdService.save(orderRoomId);
+            orderRoomIdMapper.insert(orderRoomId);
         }
         // 这里保存推送的数据
         redisTemplate.convertAndSend(RedisCacheConfig.CHANNEL_WEB_SOCKET, json);

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

@@ -1,22 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import me.zhengjie.dao.mybatis.entity.CityEntity;
-import me.zhengjie.dao.mybatis.mapper.CityMapper;
-import me.zhengjie.application.bank.service.CityService;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-28
- */
-@Service
-public class CityServiceImpl extends ServiceImpl<CityMapper, CityEntity> implements CityService {
-
-}

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

@@ -1,22 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import me.zhengjie.dao.mybatis.entity.ExecuteInfoEntity;
-import me.zhengjie.dao.mybatis.mapper.IExecuteInfoDao;
-import me.zhengjie.application.bank.service.ExecuteInfoService;
-
-/**
- * <p>
- * 执行证书-基本信息 服务实现类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-@Service
-public class ExecuteInfoServiceImpl extends ServiceImpl<IExecuteInfoDao, ExecuteInfoEntity> implements ExecuteInfoService {
-
-}

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

@@ -1,22 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import me.zhengjie.dao.mybatis.entity.ModelEntity;
-import me.zhengjie.dao.mybatis.mapper.ModelMapper;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import me.zhengjie.application.bank.service.ModelService;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-@Service
-public class ModelServiceImpl extends ServiceImpl<ModelMapper, ModelEntity> implements ModelService {
-
-}

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

@@ -1,13 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
-import me.zhengjie.dao.mybatis.mapper.IOrderRoomIdDao;
-import me.zhengjie.base.plus.AbstractServiceImpl;
-import me.zhengjie.application.bank.service.OrderRoomIdService;
-
-@Service
-public class OrderRoomIdServiceImpl extends AbstractServiceImpl<IOrderRoomIdDao, OrderRoomIdEntity> implements OrderRoomIdService  {
-
-}

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

@@ -1,22 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import me.zhengjie.dao.mybatis.entity.ProvinceEntity;
-import me.zhengjie.dao.mybatis.mapper.ProvinceMapper;
-import me.zhengjie.application.bank.service.ProvinceService;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-28
- */
-@Service
-public class ProvinceServiceImpl extends ServiceImpl<ProvinceMapper, ProvinceEntity> implements ProvinceService {
-
-}

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

@@ -1,22 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import me.zhengjie.dao.mybatis.entity.SysDictEntity;
-import me.zhengjie.dao.mybatis.mapper.ISysDictDao;
-import me.zhengjie.application.bank.service.SysDictService;
-
-/**
- * <p>
- * 数据字典 服务实现类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-@Service
-public class SysDictServiceImpl extends ServiceImpl<ISysDictDao, SysDictEntity> implements SysDictService {
-
-}

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

@@ -1,14 +0,0 @@
-package me.zhengjie.application.bank.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import me.zhengjie.dao.mybatis.entity.PushDataEntity;
-import me.zhengjie.dao.mybatis.mapper.IPushDataDao;
-import me.zhengjie.application.bank.service.TencentPushService;
-
-@Service
-public class TencentPushServiceImpl extends ServiceImpl<IPushDataDao, PushDataEntity>implements TencentPushService {
-
-}

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

@@ -1,9 +1,13 @@
 package me.zhengjie.application.user.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.application.bank.controller.vo.*;
-import me.zhengjie.application.bank.service.*;
+import me.zhengjie.application.bank.controller.vo.BankOrderVO;
+import me.zhengjie.application.bank.controller.vo.FileInfoDto;
+import me.zhengjie.application.bank.controller.vo.Sms;
+import me.zhengjie.application.bank.service.BankOrderService;
+import me.zhengjie.application.bank.service.SmsService;
 import me.zhengjie.application.user.service.ApiService;
 import me.zhengjie.application.user.service.UserOrderService;
 import me.zhengjie.application.user.vo.SmsVo;
@@ -14,11 +18,11 @@ 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.mybatis.OrderFileRepository;
 import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
 import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
 import me.zhengjie.dao.mybatis.mapper.ContractOrderMapper;
+import me.zhengjie.dao.mybatis.mapper.OrderRoomIdMapper;
 import me.zhengjie.domain.model.ModelConstant;
 import me.zhengjie.security.security.TokenProvider;
 import org.apache.commons.lang3.StringUtils;
@@ -46,13 +50,10 @@ public class ApiServiceImpl implements ApiService {
 
 	@Autowired
 	private TokenProvider tokenProvider;
-
-	@Autowired
-	ModelService modelService;
 	@Autowired
 	private RedisTemplate<String, String> redisTemplate;
 	@Autowired
-	OrderRoomIdService orderRoomIdService;
+	OrderRoomIdMapper orderRoomIdMapper;
 	@Autowired
     ContractOrderMapper contractOrderMapper;
 	@Autowired
@@ -141,13 +142,12 @@ public class ApiServiceImpl implements ApiService {
 		// 修改时间
 		orderRoomId.setUpdateTime(LocalDateTime.now());
 		// 这里先判断是否存在，不存在就插入数据
-		OrderRoomIdEntity orderQuery = new OrderRoomIdEntity();
-		orderQuery.setRoomId(roomId);
-		// 业务流水
-		orderQuery.setBusinessNo(businessNo);
-		long orderSize = orderRoomIdService.count(orderQuery);
+		QueryWrapper<OrderRoomIdEntity> qw = new QueryWrapper<>();
+		qw.eq("roomId",roomId);
+		qw.eq("business_no",businessNo);
+		long orderSize = orderRoomIdMapper.selectCount(qw);
 		if (orderSize == 0) {
-			orderRoomIdService.save(orderRoomId);
+			orderRoomIdMapper.insert(orderRoomId);
 		}
 		// 这里保存推送的数据
 		redisTemplate.convertAndSend(RedisCacheConfig.CHANNEL_WEB_SOCKET, json);

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/IOrderRoomIdDao.java

@@ -7,6 +7,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
 
 @Mapper
-public interface IOrderRoomIdDao extends BaseMapper<OrderRoomIdEntity> {
+public interface OrderRoomIdMapper extends BaseMapper<OrderRoomIdEntity> {
 
 }

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/IPushDataDao.java

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2022-03-10
  */
 @Mapper
-public interface IPushDataDao extends BaseMapper<PushDataEntity> {
+public interface PushDataMapper extends BaseMapper<PushDataEntity> {
 
 }