From c1c140874bd375e36f4efa0b45e819e7cd22aaa6 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 28 Aug 2024 16:40:05 +0800
Subject: [PATCH] 1、主键生成策略优化
---
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/JudicIdUtils.java | 20
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java | 193 ++++++++++
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseIdUtils.java | 20
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/xml/CaseInfoMapper.xml | 38 ++
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/MediateIdUtils.java | 26
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java | 79 ++++
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/JudicNoUtils.java | 2
/dev/null | 82 ----
dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CommonIdUtils.java | 18
dyh-service/dyh-utils/src/main/java/cn/huge/module/disp/utils/DispIdUtils.java | 26
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/xml/JudicInfoMapper.xml | 2
dyh-service/dyh-utils/src/main/java/cn/huge/module/cust/controller/client/CustUtilsController.java | 45 ++
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/service/JudicInfoService.java | 4
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/CaseInfoMapper.java | 19
dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzAreaEnum.java | 76 ++++
dyh-service/dyh-utils/src/main/java/cn/huge/module/cust/utils/CustIdUtils.java | 26
dyh-service/dyh-utils/src/main/java/cn/huge/module/common/controller/IdUtilsController.java | 32 -
dyh-service/dyh-utils/src/main/java/cn/huge/module/disp/controller/client/DispUtilsController.java | 45 ++
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/service/CaseInfoService.java | 54 +++
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java | 263 ++++++++++++++
dyh-service/dyh-base/src/main/java/cn/huge/base/common/utils/BaiduOcrUtils.java | 6
dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/JudicInfoMapper.java | 2
22 files changed, 883 insertions(+), 195 deletions(-)
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzAreaEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzAreaEnum.java
new file mode 100644
index 0000000..38f67cb
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/base/common/constant/GzAreaEnum.java
@@ -0,0 +1,76 @@
+package cn.huge.base.common.constant;
+
+/**
+ * @title: 广州市区枚举类
+ * @description: 广州市区枚举类
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public enum GzAreaEnum {
+ GZEnum_0("1601","广州市"),
+
+ GZAREAEnum_1("3633","天河区"),
+ GZAREAEnum_2("3634","海珠区"),
+ GZAREAEnum_3("3635","荔湾区"),
+ GZAREAEnum_4("3637","越秀区"),
+ GZAREAEnum_5("36953","番禺区"),
+ GZAREAEnum_6("50256","花都区"),
+ GZAREAEnum_7("50258","白云区"),
+ GZAREAEnum_8("50259","南沙区"),
+ GZAREAEnum_9("50283","黄埔区"),
+ GZAREAEnum_10("50284","增城区"),
+ GZAREAEnum_11("50285","从化区");
+
+ /**
+ * 代码编号
+ */
+ private String index;
+
+ /**
+ * 名称
+ */
+ private String des;
+
+ public String getIndex() {
+ return index;
+ }
+
+ public void setIndex(String index) {
+ this.index = index;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String des) {
+ this.des = des;
+ }
+
+ /**
+ * 构造方法
+ * @param index
+ * @param des
+ */
+ GzAreaEnum(String index, String des) {
+ this.index = index;
+ this.des = des;
+ }
+
+ /**
+ * 静态方法
+ * @param index
+ * @return
+ */
+ public static String getDes(String index) {
+ for (GzAreaEnum constantEnum : GzAreaEnum.values()) {
+ if (constantEnum.getIndex().equals(index)) {
+ return constantEnum.des;
+ }
+ }
+ return null;
+ }
+}
+
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/base/common/utils/BaiduOcrUtils.java b/dyh-service/dyh-base/src/main/java/cn/huge/base/common/utils/BaiduOcrUtils.java
index addf8c0..31e851f 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/base/common/utils/BaiduOcrUtils.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/base/common/utils/BaiduOcrUtils.java
@@ -1,5 +1,6 @@
package cn.huge.base.common.utils;
+
import com.baidu.aip.ocr.AipOcr;
import com.google.common.collect.Maps;
import org.json.JSONObject;
@@ -88,11 +89,6 @@
JSONObject result = json.getJSONObject("words_result");
String sex = result.getJSONObject("性别").getString("words");
map.put("sex",sex);
-// if(sex.equals(CaseBaseConstsEnum.SEX_1.getDes())){
-// map.put("sexName",CaseBaseConstsEnum.SEX_1.getIndex());
-// }else{
-// map.put("sexName",CaseBaseConstsEnum.SEX_2.getIndex());
-// }
String name = result.getJSONObject("姓名").getString("words");
map.put("trueName",name);
String address = result.getJSONObject("住址").getString("words");
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/controller/CaseNoUtilsController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/controller/CaseNoUtilsController.java
deleted file mode 100644
index 894b0da..0000000
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/controller/CaseNoUtilsController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package cn.huge.module.cases.controller;
-
-import cn.huge.base.common.utils.DateUtils;
-import cn.huge.base.common.utils.ReturnFailUtils;
-import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.cases.service.CaseInfoService;
-import cn.huge.module.common.utils.CaseIdUtils;
-import cn.huge.module.common.utils.CaseNoUtils;
-import cn.huge.module.common.utils.CommonIdUtils;
-import cn.huge.module.common.utils.JudicIdUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-
-/**
- * @title: 公共参数-案号工具接口api-web端
- * @description: 公共参数-案号工具接口api-web端
- * @company: hugeinfo
- * @author: liyj
- * @time: 2022-04-29 10:12:39
- * @version: 1.0.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/common/api/caseNoUtils")
-public class CaseNoUtilsController {
-
- @Autowired(required = false)
- private HttpServletRequest request;
-
- @Autowired
- private CaseInfoService caseInfoService;
-
-
- /**
- * 生成新的调解案号
- * @url {ctx}/common/api/caseNoUtils/createCaseNo
- * @param custId 客户编号
- * @return Object
- */
- @GetMapping("/createCaseNo")
- public Object createCaseNo(@RequestParam(value = "custId") String custId) {
- try {
- if (CaseNoUtils.CASE_NO_FALG){
- int year = DateUtils.getYear(new Date());
- String caseNoPrefix = "（" + year + "）粤云调";
- String newCaseNo = caseInfoService.getNewCaseNo(caseNoPrefix, custId);
- if(StringUtils.isBlank(newCaseNo)){
- newCaseNo = "0";
- }
- String numStr = newCaseNo.replace(caseNoPrefix, "").replace("号", "");
- int num = Integer.parseInt(numStr);
- CaseNoUtils.CASE_NO_SIGN = num;
- CaseNoUtils.CASE_NO_FALG = false;
- }
- return ReturnSucUtils.getRepInfo(CaseNoUtils.getCaseNo());
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 从startNo（包括startNo）开始生成新的调解案号
- * @url {ctx}/common/api/caseNoUtils/createByStartNo
- * @return Object
- */
- @GetMapping("/createByStartNo")
- public Object createByStartNo(@RequestParam(value = "startNo") int startNo) {
- try {
- CaseNoUtils.CASE_NO_SIGN = startNo-1;
- CaseNoUtils.CASE_NO_FALG = false;
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
-}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
deleted file mode 100644
index 738cef4..0000000
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
- * @title: 纠纷信息表
- * @description: 自定义sql，请自行实现业务逻辑
- * @company: hugeinfo
- * @author: liyj
- * @time:2023-04-04 14:10:21
- * @version 1.0.0
--->
-<mapper namespace="cn.huge.module.cases.dao.mapper.CaseInfoMapper">
-
- <!-- 表 -->
- <sql id='table-name'>dyh_case_info</sql>
-
- <!-- 获取最新的案号 -->
- <select id="getNewCaseNo" resultType="string">
- select case_no
- from
- <include refid="table-name" />
- where case_no like concat('%', #{caseNoPrefix}, '%')
- and cust_id = #{custId}
- order by isnull(create_time), create_time desc
- limit 0, 1
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
deleted file mode 100644
index 6384acc..0000000
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.huge.module.cases.service;
-
-
-import cn.huge.module.cases.dao.mapper.CaseInfoMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @title: 纠纷信息表业务逻辑处理
- * @Description JPA的单表数据查询以由BaseService完成
- * @company hugeinfo
- * @author liyj
- * @Time 2022-03-11 11:43:25
- * @version 1.0.0
- */
-@Slf4j
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class CaseInfoService {
-
- @Autowired
- private CaseInfoMapper mapper;
-
- /**
- * 查询最新的调解案号
- * @param caseNoPrefix 案号前缀
- * @param custId 客户编号
- * @return
- */
- public String getNewCaseNo(String caseNoPrefix, String custId){
- return mapper.getNewCaseNo(caseNoPrefix, custId);
- }
-}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/controller/IdUtilsController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/controller/IdUtilsController.java
index 52000c3..dc016b2 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/controller/IdUtilsController.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/controller/IdUtilsController.java
@@ -2,9 +2,7 @@
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.common.utils.CaseIdUtils;
import cn.huge.module.common.utils.CommonIdUtils;
-import cn.huge.module.common.utils.JudicIdUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,36 +26,6 @@
@Autowired(required = false)
private HttpServletRequest request;
-
-
- /**
- * 案件id-获取时间Id，后四位常量
- * @url {ctx}/common/api/idUtils/getCaseNewTimeId
- * @return Object
- */
- @GetMapping("/getCaseNewTimeId")
- public Object getCaseNewTimeId() {
- try {
- return ReturnSucUtils.getRepInfo(CaseIdUtils.getNewTimeId());
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
-
- /**
- * 司法确认id-获取时间Id，后四位常量
- * @url {ctx}/common/api/idUtils/getJudicNewTimeId
- * @return Object
- */
- @GetMapping("/getJudicNewTimeId")
- public Object getJudicNewTimeId() {
- try {
- return ReturnSucUtils.getRepInfo(JudicIdUtils.getNewTimeId());
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
/**
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CaseNoUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CaseNoUtils.java
deleted file mode 100644
index fa542c2..0000000
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CaseNoUtils.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.huge.module.common.utils;
-
-import cn.huge.base.common.utils.DateUtils;
-
-/**
- * @title: 纠纷案件案号生成工具
- * @description: 纠纷案件案号生成工具
- * @company: hugeinfo
- * @author: liyj
- * @time: 2021-11-05 16:51:48
- * @version: 1.0.0
- */
-public class CaseNoUtils {
-
- /**
- * 时间Id统计常量，常量后缀
- */
- public static int CASE_NO_SIGN = 0;
-
- /**
- * 时间Id统计常量，常量后缀
- */
- public static boolean CASE_NO_FALG = true;
-
- /**
- * 获取粤云调号
- * @return
- */
- public synchronized static String getCaseNo(){
- CASE_NO_SIGN += 1;
- int year = DateUtils.getYear(DateUtils.getNowDate());
- String cloudMediateId = "（" + year + "）粤云调" + (CASE_NO_SIGN) + "号";
- System.out.println(cloudMediateId);
- return cloudMediateId;
- }
-}
-/**
- * -------------------_ooOoo_-------------------
- * ------------------o8888888o------------------
- * ------------------88" . "88------------------
- * ------------------(| -_- |)------------------
- * ------------------O\ = /O------------------
- * ---------------____/`---'\____---------------
- * -------------.' \\| |// `.-------------
- * ------------/ \\||| : |||// \------------
- * -----------/ _||||| -:- |||||- \-----------
- * -----------| | \\\ - /// | |-----------
- * -----------| \_| ''\---/'' | |-----------
- * -----------\ .-\__ `-` ___/-. /-----------
- * ---------___`. .' /--.--\ `. . __----------
- * ------."" '< `.___\_<|>_/___.' >'"".-------
- * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
- * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
- * ======`-.____`-.___\_____/___.-`____.-'======
- * -------------------`=---='
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * ---------佛祖保佑---hugeinfo---永无BUG----------
- */
\ No newline at end of file
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CommonIdUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CommonIdUtils.java
index 00ed793..85f6089 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CommonIdUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CommonIdUtils.java
@@ -16,17 +16,17 @@
/**
* 时间Id统计常量
*/
- private static int COUNT_NUM = 1000;
+ private static int COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量前缀
*/
- private static int SIGN_COUNT_NUM = 1000;
+ private static int SIGN_COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量后缀
*/
- private static int COUNT_NUM_SIGN = 1000;
+ private static int COUNT_NUM_SIGN = 10000;
/**
* 获取时间Id，后四位常量
@@ -34,8 +34,8 @@
*/
public synchronized static String getNewTimeId(){
String timeId = getNowTime() + (COUNT_NUM++);
- if(COUNT_NUM > 9999){
- COUNT_NUM = 1000;
+ if(COUNT_NUM > 99999){
+ COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -48,8 +48,8 @@
*/
public synchronized static String getSignNewTimeId(String sign){
String timeId = getNowTime() + sign + (SIGN_COUNT_NUM++);
- if(SIGN_COUNT_NUM > 9999){
- SIGN_COUNT_NUM = 1000;
+ if(SIGN_COUNT_NUM > 99999){
+ SIGN_COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -62,8 +62,8 @@
*/
public synchronized static String getNewTimeIdSign(String sign){
String timeId = getNowTime() + (COUNT_NUM_SIGN++) + sign;
- if(COUNT_NUM_SIGN > 9999){
- COUNT_NUM_SIGN = 1000;
+ if(COUNT_NUM_SIGN > 99999){
+ COUNT_NUM_SIGN = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cust/controller/client/CustUtilsController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/cust/controller/client/CustUtilsController.java
new file mode 100644
index 0000000..e93baec
--- /dev/null
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/cust/controller/client/CustUtilsController.java
@@ -0,0 +1,45 @@
+package cn.huge.module.cust.controller.client;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.cust.utils.CustIdUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @title: 公共参数-id工具接口api-cust服务专用
+ * @description: 公共参数-id工具接口api-cust服务专用
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2022-04-29 10:12:39
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/client/custUtils")
+public class CustUtilsController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+
+ /**
+ * 公共id-获取时间Id，后四位常量
+ * @url {ctx}/api/client/custUtils/getNewTimeId
+ * @return Object
+ */
+ @GetMapping("/getNewTimeId")
+ public Object getNewTimeId() {
+ try {
+ return ReturnSucUtils.getRepInfo(CustIdUtils.getNewTimeId());
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/cust/utils/CustIdUtils.java
similarity index 83%
copy from dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java
copy to dyh-service/dyh-utils/src/main/java/cn/huge/module/cust/utils/CustIdUtils.java
index d7d9f2e..afbb2f2 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/cust/utils/CustIdUtils.java
@@ -1,32 +1,32 @@
-package cn.huge.module.common.utils;
+package cn.huge.module.cust.utils;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
- * @title: 司法确认ID生成工具
- * @description: 司法确认ID生成工具
+ * @title: 公共ID生成工具
+ * @description: 公共ID生成工具
* @company: hugeinfo
* @author: liyj
* @time: 2021-11-05 16:51:48
* @version: 1.0.0
*/
-public class JudicIdUtils {
+public class CustIdUtils {
/**
* 时间Id统计常量
*/
- private static int COUNT_NUM = 1000;
+ private static int COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量前缀
*/
- private static int SIGN_COUNT_NUM = 1000;
+ private static int SIGN_COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量后缀
*/
- private static int COUNT_NUM_SIGN = 1000;
+ private static int COUNT_NUM_SIGN = 10000;
/**
* 获取时间Id，后四位常量
@@ -34,8 +34,8 @@
*/
public synchronized static String getNewTimeId(){
String timeId = getNowTime() + (COUNT_NUM++);
- if(COUNT_NUM > 9999){
- COUNT_NUM = 1000;
+ if(COUNT_NUM > 99999){
+ COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -48,8 +48,8 @@
*/
public synchronized static String getSignNewTimeId(String sign){
String timeId = getNowTime() + sign + (SIGN_COUNT_NUM++);
- if(SIGN_COUNT_NUM > 9999){
- SIGN_COUNT_NUM = 1000;
+ if(SIGN_COUNT_NUM > 99999){
+ SIGN_COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -62,8 +62,8 @@
*/
public synchronized static String getNewTimeIdSign(String sign){
String timeId = getNowTime() + (COUNT_NUM_SIGN++) + sign;
- if(COUNT_NUM_SIGN > 9999){
- COUNT_NUM_SIGN = 1000;
+ if(COUNT_NUM_SIGN > 99999){
+ COUNT_NUM_SIGN = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/disp/controller/client/DispUtilsController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/disp/controller/client/DispUtilsController.java
new file mode 100644
index 0000000..3f421c0
--- /dev/null
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/disp/controller/client/DispUtilsController.java
@@ -0,0 +1,45 @@
+package cn.huge.module.disp.controller.client;
+
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.disp.utils.DispIdUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @title: 公共参数-id工具接口api-disp服务专用
+ * @description: 公共参数-id工具接口api-disp服务专用
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2022-04-29 10:12:39
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/client/dispUtils")
+public class DispUtilsController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+
+ /**
+ * 公共id-获取时间Id，后四位常量
+ * @url {ctx}/api/client/dispUtils/getNewTimeId
+ * @return Object
+ */
+ @GetMapping("/getNewTimeId")
+ public Object getNewTimeId() {
+ try {
+ return ReturnSucUtils.getRepInfo(DispIdUtils.getNewTimeId());
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/disp/utils/DispIdUtils.java
similarity index 83%
copy from dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java
copy to dyh-service/dyh-utils/src/main/java/cn/huge/module/disp/utils/DispIdUtils.java
index d7d9f2e..774231d 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/disp/utils/DispIdUtils.java
@@ -1,32 +1,32 @@
-package cn.huge.module.common.utils;
+package cn.huge.module.disp.utils;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
- * @title: 司法确认ID生成工具
- * @description: 司法确认ID生成工具
+ * @title: 公共ID生成工具
+ * @description: 公共ID生成工具
* @company: hugeinfo
* @author: liyj
* @time: 2021-11-05 16:51:48
* @version: 1.0.0
*/
-public class JudicIdUtils {
+public class DispIdUtils {
/**
* 时间Id统计常量
*/
- private static int COUNT_NUM = 1000;
+ private static int COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量前缀
*/
- private static int SIGN_COUNT_NUM = 1000;
+ private static int SIGN_COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量后缀
*/
- private static int COUNT_NUM_SIGN = 1000;
+ private static int COUNT_NUM_SIGN = 10000;
/**
* 获取时间Id，后四位常量
@@ -34,8 +34,8 @@
*/
public synchronized static String getNewTimeId(){
String timeId = getNowTime() + (COUNT_NUM++);
- if(COUNT_NUM > 9999){
- COUNT_NUM = 1000;
+ if(COUNT_NUM > 99999){
+ COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -48,8 +48,8 @@
*/
public synchronized static String getSignNewTimeId(String sign){
String timeId = getNowTime() + sign + (SIGN_COUNT_NUM++);
- if(SIGN_COUNT_NUM > 9999){
- SIGN_COUNT_NUM = 1000;
+ if(SIGN_COUNT_NUM > 99999){
+ SIGN_COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -62,8 +62,8 @@
*/
public synchronized static String getNewTimeIdSign(String sign){
String timeId = getNowTime() + (COUNT_NUM_SIGN++) + sign;
- if(COUNT_NUM_SIGN > 9999){
- COUNT_NUM_SIGN = 1000;
+ if(COUNT_NUM_SIGN > 99999){
+ COUNT_NUM_SIGN = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/controller/JudicNoUtilsController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/controller/JudicNoUtilsController.java
deleted file mode 100644
index d2de2ee..0000000
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/controller/JudicNoUtilsController.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package cn.huge.module.judic.controller;
-
-import cn.huge.base.common.utils.DateUtils;
-import cn.huge.base.common.utils.ReturnFailUtils;
-import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.common.utils.JudicNoUtils;
-import cn.huge.module.judic.service.JudicInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-
-/**
- * @title: 公共参数-司法确认号工具接口api-web端
- * @description: 公共参数-司法确认号工具接口api-web端
- * @company: hugeinfo
- * @author: liyj
- * @time: 2022-04-29 10:12:39
- * @version: 1.0.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/common/api/judicNoUtils")
-public class JudicNoUtilsController {
-
- @Autowired(required = false)
- private HttpServletRequest request;
-
- @Autowired
- private JudicInfoService judicInfoService;
-
-
- /**
- * 生成新的调解案号
- * @url {ctx}/common/api/judicNoUtils/createJudicNo
- * @param custId 客户编号
- * @return Object
- */
- @GetMapping("/createJudicNo")
- public Object createJudicNo(@RequestParam(value = "custId") String custId) {
- try {
- if (JudicNoUtils.JUDIC_NO_FALG){
- int year = DateUtils.getYear(new Date());
- String judicNoPrefix = "（" + year + "）司法确认";
- String newJudicNo = judicInfoService.getNewJudicNo(judicNoPrefix, custId);
- if(StringUtils.isBlank(newJudicNo)){
- newJudicNo = "0";
- }
- String numStr = newJudicNo.replace(judicNoPrefix, "").replace("号", "");
- int num = Integer.parseInt(numStr);
- JudicNoUtils.JUDIC_NO_SIGN = num;
- JudicNoUtils.JUDIC_NO_FALG = false;
- }
- return ReturnSucUtils.getRepInfo(JudicNoUtils.getJudicNo());
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 从startNo（包括startNo）开始生成新的司法确认号
- * @url {ctx}/common/api/judicNoUtils/createByStartNo
- * @return Object
- */
- @GetMapping("/createByStartNo")
- public Object createByStartNo(@RequestParam(value = "startNo") int startNo) {
- try {
- JudicNoUtils.JUDIC_NO_SIGN = startNo-1;
- JudicNoUtils.JUDIC_NO_FALG = false;
- return ReturnSucUtils.getRepInfo();
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
-}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java
new file mode 100644
index 0000000..4232d09
--- /dev/null
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/controller/client/MediateUtilsController.java
@@ -0,0 +1,193 @@
+package cn.huge.module.mediate.controller.client;
+
+import cn.huge.base.common.constant.GzAreaEnum;
+import cn.huge.base.common.utils.DateUtils;
+import cn.huge.base.common.utils.ReturnFailUtils;
+import cn.huge.base.common.utils.ReturnSucUtils;
+import cn.huge.module.mediate.service.CaseInfoService;
+import cn.huge.module.mediate.service.JudicInfoService;
+import cn.huge.module.mediate.utils.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @title: 公共参数-id工具接口api-mediate服务专用
+ * @description: 公共参数-id工具接口api-mediate服务专用
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2022-04-29 10:12:39
+ * @version: 1.0.0
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/client/mediateUtils")
+public class MediateUtilsController {
+
+ @Autowired(required = false)
+ private HttpServletRequest request;
+
+ @Autowired
+ private CaseInfoService caseInfoService;
+ @Autowired
+ private JudicInfoService judicInfoService;
+
+
+ /**
+ * 公共id-获取时间Id，后四位常量
+ * @url {ctx}/api/client/mediateUtils/getNewTimeId
+ * @return Object
+ */
+ @GetMapping("/getNewTimeId")
+ public Object getNewTimeId() {
+ try {
+ return ReturnSucUtils.getRepInfo(MediateIdUtils.getNewTimeId());
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+
+ /**
+ * 案件id-获取时间Id，后四位常量
+ * @url {ctx}/api/client/mediateUtils/getNewTimeCaseId
+ * @return Object
+ */
+ @GetMapping("/getNewTimeCaseId")
+ public Object getNewTimeCaseId() {
+ try {
+ return ReturnSucUtils.getRepInfo(CaseIdUtils.getNewTimeId());
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 生成新的调解案号
+ * @url {ctx}/api/client/mediateUtils/createCaseNo
+ * @param area 区
+ * @return Object
+ */
+ @GetMapping("/createCaseNo")
+ public Object createCaseNo(@RequestParam(value = "area") String area) {
+ try {
+ if (CaseNoUtils.getFlag(area)){
+ int year = DateUtils.getYear(new Date());
+ String caseNoLogo = caseInfoService.getCaseNoLogo(area);
+ if (StringUtils.isEmpty(caseNoLogo)){
+ caseNoLogo = caseInfoService.getCaseNoLogo(GzAreaEnum.GZEnum_0.getIndex());
+ }
+ String caseNoPrefix = "（" + year + "）"+caseNoLogo;
+ String newCaseNo = caseInfoService.getNewCaseNo(caseNoPrefix);
+ if(StringUtils.isBlank(newCaseNo)){
+ newCaseNo = "0";
+ }
+ String numStr = newCaseNo.replace(caseNoPrefix, "").replace("号", "");
+ int num = Integer.parseInt(numStr);
+
+ CaseNoUtils.setCount(area, num);
+ CaseNoUtils.setFlag(area, false);
+ }
+ return ReturnSucUtils.getRepInfo(CaseNoUtils.getCaseNo(area));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 从startNo（包括startNo）开始生成新的调解案号
+ * @url {ctx}/common/api/caseNoUtils/setCaseNoByStartNo
+ * @return Object
+ */
+ @GetMapping("/setCaseNoByStartNo")
+ public Object setCaseNoByStartNo(@RequestParam(value = "area") String area, @RequestParam(value = "startNo") int startNo) {
+ try {
+ CaseNoUtils.setCount(area, startNo-1);
+ CaseNoUtils.setFlag(area, false);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+
+ /**
+ * 生成新的事项编号
+ * @url {ctx}/common/api/caseNoUtils/createCaseRef
+ * @return Object
+ */
+ @GetMapping("/createCaseRef")
+ public Object createCaseRef() {
+ try {
+ return ReturnSucUtils.getRepInfo(CaseRefUtils.getCaseRef());
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 司法确认id-获取时间Id，后四位常量
+ * @url {ctx}/api/client/mediateUtils/getNewTimeJudicId
+ * @return Object
+ */
+ @GetMapping("/getNewTimeJudicId")
+ public Object getNewTimeJudicId() {
+ try {
+ return ReturnSucUtils.getRepInfo(JudicIdUtils.getNewTimeId());
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 生成新的调解案号
+ * @url {ctx}/api/client/mediateUtils/createJudicNo
+ * @param custId 客户编号
+ * @return Object
+ */
+ @GetMapping("/createJudicNo")
+ public Object createJudicNo(@RequestParam(value = "custId") String custId) {
+ try {
+ if (JudicNoUtils.JUDIC_NO_FALG){
+ int year = DateUtils.getYear(new Date());
+ String judicNoPrefix = "（" + year + "）司法确认";
+ String newJudicNo = judicInfoService.getNewJudicNo(judicNoPrefix, custId);
+ if(StringUtils.isBlank(newJudicNo)){
+ newJudicNo = "0";
+ }
+ String numStr = newJudicNo.replace(judicNoPrefix, "").replace("号", "");
+ int num = Integer.parseInt(numStr);
+ JudicNoUtils.JUDIC_NO_SIGN = num;
+ JudicNoUtils.JUDIC_NO_FALG = false;
+ }
+ return ReturnSucUtils.getRepInfo(JudicNoUtils.getJudicNo());
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 从startNo（包括startNo）开始生成新的司法确认号
+ * @url {ctx}/api/client/mediateUtils/setJudicByStartNo
+ * @return Object
+ */
+ @GetMapping("/setJudicByStartNo")
+ public Object setJudicByStartNo(@RequestParam(value = "startNo") int startNo) {
+ try {
+ JudicNoUtils.JUDIC_NO_SIGN = startNo-1;
+ JudicNoUtils.JUDIC_NO_FALG = false;
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoMapper.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/CaseInfoMapper.java
similarity index 60%
rename from dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoMapper.java
rename to dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/CaseInfoMapper.java
index cbf91d7..53562f1 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/cases/dao/mapper/CaseInfoMapper.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/CaseInfoMapper.java
@@ -1,4 +1,4 @@
-package cn.huge.module.cases.dao.mapper;
+package cn.huge.module.mediate.dao.mapper;
import org.apache.ibatis.annotations.Param;
@@ -18,8 +18,21 @@
/**
* 获取最新的案号
* @param caseNoPrefix 案号前缀
- * @param custId 客户编号
* @return
*/
- String getNewCaseNo(@Param("caseNoPrefix") String caseNoPrefix, @Param("custId") String custId);
+ String getNewCaseNo(@Param("caseNoPrefix") String caseNoPrefix);
+
+ /**
+ * 获取最新的事项编号
+ * @param caseRefPrefix 事项编号前缀
+ * @return
+ */
+ Integer getNewCaseRef(@Param("caseRefPrefix") String caseRefPrefix);
+
+ /**
+ * 获取各区调解案号标识
+ * @param area 区
+ * @return
+ */
+ String getCaseNoLogo(@Param("area") String area);
}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/dao/mapper/JudicInfoMapper.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/JudicInfoMapper.java
similarity index 93%
rename from dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/dao/mapper/JudicInfoMapper.java
rename to dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/JudicInfoMapper.java
index 11fbbe4..88f0e3a 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/dao/mapper/JudicInfoMapper.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/JudicInfoMapper.java
@@ -1,4 +1,4 @@
-package cn.huge.module.judic.dao.mapper;
+package cn.huge.module.mediate.dao.mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/xml/CaseInfoMapper.xml b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/xml/CaseInfoMapper.xml
new file mode 100644
index 0000000..c23eb32
--- /dev/null
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/xml/CaseInfoMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+ * @title: 纠纷信息表
+ * @description: 自定义sql，请自行实现业务逻辑
+ * @company: hugeinfo
+ * @author: liyj
+ * @time:2023-04-04 14:10:21
+ * @version 1.0.0
+-->
+<mapper namespace="cn.huge.module.mediate.dao.mapper.CaseInfoMapper">
+
+ <!-- 获取最新的案号 -->
+ <select id="getNewCaseNo" resultType="string">
+ select case_no
+ from dyh_case_info
+ where case_no like concat('%', #{caseNoPrefix}, '%')
+ and delete_status = 0
+ order by isnull(create_time), create_time desc
+ limit 0, 1
+ </select>
+
+ <!-- 获取最新的事项编号 -->
+ <select id="getNewCaseRef" resultType="Integer">
+ select count(1)
+ from dyh_case_info
+ where delete_status = 0
+ </select>
+
+ <!-- 获取各区调解案号标识 -->
+ <select id="getCaseNoLogo" resultType="string">
+ SELECT logo
+ FROM dyh_case_no_rule
+ WHERE area = #{area}
+ and delete_status = 0
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/dao/mapper/xml/JudicInfoMapper.xml b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/xml/JudicInfoMapper.xml
similarity index 91%
rename from dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/dao/mapper/xml/JudicInfoMapper.xml
rename to dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/xml/JudicInfoMapper.xml
index 06b7b71..871ae75 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/dao/mapper/xml/JudicInfoMapper.xml
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/dao/mapper/xml/JudicInfoMapper.xml
@@ -8,7 +8,7 @@
* @time:2022-11-08 15:29:20
* @version 1.0.0
-->
-<mapper namespace="cn.huge.module.judic.dao.mapper.JudicInfoMapper">
+<mapper namespace="cn.huge.module.mediate.dao.mapper.JudicInfoMapper">
<!-- 表 -->
<sql id='table-name'>dyh_judic_info</sql>
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/service/CaseInfoService.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/service/CaseInfoService.java
new file mode 100644
index 0000000..c76d56d
--- /dev/null
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/service/CaseInfoService.java
@@ -0,0 +1,54 @@
+package cn.huge.module.mediate.service;
+
+
+import cn.huge.module.mediate.dao.mapper.CaseInfoMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @title: 纠纷信息表业务逻辑处理
+ * @Description JPA的单表数据查询以由BaseService完成
+ * @company hugeinfo
+ * @author liyj
+ * @Time 2022-03-11 11:43:25
+ * @version 1.0.0
+ */
+@Slf4j
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class CaseInfoService {
+
+ @Autowired
+ private CaseInfoMapper mapper;
+
+ /**
+ * 查询最新的调解案号
+ * @param caseNoPrefix 案号前缀
+ * @return
+ */
+ public String getNewCaseNo(String caseNoPrefix){
+ return mapper.getNewCaseNo(caseNoPrefix);
+ }
+
+
+
+ /**
+ * 获取最新的事项编号
+ * @param caseRefPrefix 事项编号前缀
+ * @return
+ */
+ public Integer getNewCaseRef(String caseRefPrefix){
+ return mapper.getNewCaseRef(caseRefPrefix);
+ }
+
+ /**
+ * 获取各区调解案号标识
+ * @param area 区
+ * @return
+ */
+ public String getCaseNoLogo(String area){
+ return mapper.getCaseNoLogo(area);
+ }
+}
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/service/JudicInfoService.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/service/JudicInfoService.java
similarity index 89%
rename from dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/service/JudicInfoService.java
rename to dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/service/JudicInfoService.java
index 1a13390..245e4f4 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/judic/service/JudicInfoService.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/service/JudicInfoService.java
@@ -1,7 +1,7 @@
-package cn.huge.module.judic.service;
+package cn.huge.module.mediate.service;
-import cn.huge.module.judic.dao.mapper.JudicInfoMapper;
+import cn.huge.module.mediate.dao.mapper.JudicInfoMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CaseIdUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseIdUtils.java
similarity index 87%
rename from dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CaseIdUtils.java
rename to dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseIdUtils.java
index e8df121..8fa2ab7 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/CaseIdUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseIdUtils.java
@@ -1,4 +1,4 @@
-package cn.huge.module.common.utils;
+package cn.huge.module.mediate.utils;
import org.apache.commons.lang3.StringUtils;
@@ -21,17 +21,17 @@
/**
* 时间Id统计常量
*/
- private static int COUNT_NUM = 1000;
+ private static int COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量前缀
*/
- private static int SIGN_COUNT_NUM = 1000;
+ private static int SIGN_COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量后缀
*/
- private static int COUNT_NUM_SIGN = 1000;
+ private static int COUNT_NUM_SIGN = 10000;
/**
* 获取时间Id，后四位常量
@@ -39,8 +39,8 @@
*/
public synchronized static String getNewTimeId(){
String timeId = getNowTime() + (COUNT_NUM++);
- if(COUNT_NUM > 9999){
- COUNT_NUM = 1000;
+ if(COUNT_NUM > 99999){
+ COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -53,8 +53,8 @@
*/
public synchronized static String getSignNewTimeId(String sign){
String timeId = getNowTime() + sign + (SIGN_COUNT_NUM++);
- if(SIGN_COUNT_NUM > 9999){
- SIGN_COUNT_NUM = 1000;
+ if(SIGN_COUNT_NUM > 99999){
+ SIGN_COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -67,8 +67,8 @@
*/
public synchronized static String getNewTimeIdSign(String sign){
String timeId = getNowTime() + (COUNT_NUM_SIGN++) + sign;
- if(COUNT_NUM_SIGN > 9999){
- COUNT_NUM_SIGN = 1000;
+ if(COUNT_NUM_SIGN > 99999){
+ COUNT_NUM_SIGN = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java
new file mode 100644
index 0000000..09a0738
--- /dev/null
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseNoUtils.java
@@ -0,0 +1,263 @@
+package cn.huge.module.mediate.utils;
+
+import cn.huge.base.common.constant.GzAreaEnum;
+import cn.huge.base.common.utils.DateUtils;
+
+/**
+ * @title: 纠纷调解案号生成工具
+ * @description: 纠纷调解案号生成工具
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class CaseNoUtils {
+
+ /**
+ * 时间Id统计常量，常量后缀
+ */
+ public static int CASE_NO_COUNT_TH = 0;
+ public static int CASE_NO_COUNT_HZ = 0;
+ public static int CASE_NO_COUNT_LW = 0;
+ public static int CASE_NO_COUNT_YX = 0;
+ public static int CASE_NO_COUNT_PY = 0;
+ public static int CASE_NO_COUNT_HD = 0;
+ public static int CASE_NO_COUNT_BY = 0;
+ public static int CASE_NO_COUNT_NS = 0;
+ public static int CASE_NO_COUNT_HP = 0;
+ public static int CASE_NO_COUNT_ZC = 0;
+ public static int CASE_NO_COUNT_CH = 0;
+
+ /**
+ * 时间Id统计常量，常量后缀
+ */
+ public static String CASE_NO_SIGN_TH = "";
+ public static String CASE_NO_SIGN_HZ = "";
+ public static String CASE_NO_SIGN_LW = "";
+ public static String CASE_NO_SIGN_YX = "";
+ public static String CASE_NO_SIGN_PY = "";
+ public static String CASE_NO_SIGN_HD = "";
+ public static String CASE_NO_SIGN_BY = "";
+ public static String CASE_NO_SIGN_NS = "";
+ public static String CASE_NO_SIGN_HP = "";
+ public static String CASE_NO_SIGN_ZC = "";
+ public static String CASE_NO_SIGN_CH = "";
+
+ /**
+ * 各区调解案号是否要重新查询
+ */
+ public static boolean CASE_NO_FLAG_TH = true;
+ public static boolean CASE_NO_FLAG_HZ = true;
+ public static boolean CASE_NO_FLAG_LW = true;
+ public static boolean CASE_NO_FLAG_YX = true;
+ public static boolean CASE_NO_FLAG_PY = true;
+ public static boolean CASE_NO_FLAG_HD = true;
+ public static boolean CASE_NO_FLAG_BY = true;
+ public static boolean CASE_NO_FLAG_NS = true;
+ public static boolean CASE_NO_FLAG_HP = true;
+ public static boolean CASE_NO_FLAG_ZC = true;
+ public static boolean CASE_NO_FLAG_CH = true;
+
+ /**
+ * 匹配不到各区，公共配置
+ */
+ public static int CASE_NO_COUNT = 0;
+ public static String CASE_NO_SIGN = "穗智调";
+ public static boolean CASE_NO_FLAG = true;
+
+ /**
+ * 判断是否要重新查询
+ * @return
+ */
+ public synchronized static Boolean getFlag(String area){
+ if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ return CASE_NO_FLAG_TH;
+ }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ return CASE_NO_FLAG_HZ;
+ }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ return CASE_NO_FLAG_LW;
+ }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ return CASE_NO_FLAG_YX;
+ }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ return CASE_NO_FLAG_PY;
+ }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ return CASE_NO_FLAG_HD;
+ }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ return CASE_NO_FLAG_BY;
+ }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ return CASE_NO_FLAG_NS;
+ }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ return CASE_NO_FLAG_HP;
+ }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ return CASE_NO_FLAG_ZC;
+ }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)){
+ return CASE_NO_FLAG_CH;
+ }else {
+ return CASE_NO_FLAG;
+ }
+ }
+
+ /**
+ * 设置常量数
+ * @return
+ */
+ public synchronized static void setCount(String area, int num){
+ if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ CASE_NO_COUNT_TH = num;
+ }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ CASE_NO_COUNT_HZ = num;
+ }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ CASE_NO_COUNT_LW = num;
+ }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ CASE_NO_COUNT_YX = num;
+ }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ CASE_NO_COUNT_PY = num;
+ }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ CASE_NO_COUNT_HD = num;
+ }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ CASE_NO_COUNT_BY = num;
+ }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ CASE_NO_COUNT_NS = num;
+ }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ CASE_NO_COUNT_HP = num;
+ }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ CASE_NO_COUNT_ZC = num;
+ }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)){
+ CASE_NO_COUNT_CH = num;
+ }else {
+ CASE_NO_COUNT = num;
+ }
+ }
+
+ /**
+ * 设置是否要重新查询
+ * @return
+ */
+ public synchronized static void setFlag(String area, boolean flag){
+ if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ CASE_NO_FLAG_TH = flag;
+ }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ CASE_NO_FLAG_HZ = flag;
+ }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ CASE_NO_FLAG_LW = flag;
+ }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ CASE_NO_FLAG_YX = flag;
+ }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ CASE_NO_FLAG_PY = flag;
+ }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ CASE_NO_FLAG_HD = flag;
+ }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ CASE_NO_FLAG_BY = flag;
+ }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ CASE_NO_FLAG_NS = flag;
+ }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ CASE_NO_FLAG_HP = flag;
+ }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ CASE_NO_FLAG_ZC = flag;
+ }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)){
+ CASE_NO_FLAG_CH = flag;
+ }else {
+ CASE_NO_FLAG = flag;
+ }
+ }
+
+ /**
+ * 设置是否要重新查询
+ * @return
+ */
+ public synchronized static void setSign(String area, String logo){
+ if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ CASE_NO_SIGN_TH = logo;
+ }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ CASE_NO_SIGN_HZ = logo;
+ }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ CASE_NO_SIGN_LW = logo;
+ }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ CASE_NO_SIGN_YX = logo;
+ }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ CASE_NO_SIGN_PY = logo;
+ }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ CASE_NO_SIGN_HD = logo;
+ }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ CASE_NO_SIGN_BY = logo;
+ }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ CASE_NO_SIGN_NS = logo;
+ }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ CASE_NO_SIGN_HP = logo;
+ }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ CASE_NO_SIGN_ZC = logo;
+ }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)){
+ CASE_NO_SIGN_CH = logo;
+ }
+ }
+
+ /**
+ * 获取粤云调号
+ * @return
+ */
+ public synchronized static String getCaseNo(String area){
+ int year = DateUtils.getYear(DateUtils.getNowDate());
+ String cloudCaseNo = "";
+ if (GzAreaEnum.GZAREAEnum_1.getIndex().equals(area)){
+ CASE_NO_COUNT_TH += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_TH + (CASE_NO_COUNT_TH) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_2.getIndex().equals(area)){
+ CASE_NO_COUNT_HZ += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_HZ + (CASE_NO_COUNT_HZ) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_3.getIndex().equals(area)){
+ CASE_NO_COUNT_LW += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_LW + (CASE_NO_COUNT_LW) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_4.getIndex().equals(area)){
+ CASE_NO_COUNT_YX += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_YX + (CASE_NO_COUNT_YX) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_5.getIndex().equals(area)){
+ CASE_NO_COUNT_PY += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_PY + (CASE_NO_COUNT_PY) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_6.getIndex().equals(area)){
+ CASE_NO_COUNT_HD += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_HD + (CASE_NO_COUNT_HD) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_7.getIndex().equals(area)){
+ CASE_NO_COUNT_BY += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_BY + (CASE_NO_COUNT_BY) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_8.getIndex().equals(area)){
+ CASE_NO_COUNT_NS += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_NS + (CASE_NO_COUNT_NS) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_9.getIndex().equals(area)){
+ CASE_NO_COUNT_HP += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_HP + (CASE_NO_COUNT_HP) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_10.getIndex().equals(area)){
+ CASE_NO_COUNT_ZC += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_ZC + (CASE_NO_COUNT_ZC) + "号";
+ }else if (GzAreaEnum.GZAREAEnum_11.getIndex().equals(area)) {
+ CASE_NO_COUNT_CH += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN_CH + (CASE_NO_COUNT_CH) + "号";
+ }else {
+ CASE_NO_COUNT += 1;
+ cloudCaseNo = "（" + year + "）"+ CASE_NO_SIGN + (CASE_NO_COUNT) + "号";
+ }
+ System.out.println(cloudCaseNo);
+ return cloudCaseNo;
+ }
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
\ No newline at end of file
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java
new file mode 100644
index 0000000..26c3f93
--- /dev/null
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/CaseRefUtils.java
@@ -0,0 +1,79 @@
+package cn.huge.module.mediate.utils;
+
+import cn.huge.base.common.constant.GzAreaEnum;
+import cn.huge.base.common.utils.DateUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @title: 事项编号生成工具
+ * @description: 事项编号生成工具
+ * @company: hugeinfo
+ * @author: liyj
+ * @time: 2021-11-05 16:51:48
+ * @version: 1.0.0
+ */
+public class CaseRefUtils {
+
+ /**
+ * 时间Id统计常量，常量后缀
+ */
+ public static int CASE_REF_COUNT = 10000;
+
+ /**
+ * 时间Id统计常量，常量后缀
+ */
+ public static String CASE_REF_SIGN = "GZ";
+
+ /**
+ * 各区调解案号是否要重新查询
+ */
+ public static boolean CASE_REF_FLAG = true;
+
+ /**
+ * 获取粤云调号
+ * @return
+ */
+ public synchronized static String getCaseRef(){
+ String timeId = getNowTime() + (CASE_REF_COUNT++);
+ if(CASE_REF_COUNT > 99999){
+ CASE_REF_COUNT = 10000;
+ }
+ String cloudCaseRef = CASE_REF_SIGN + timeId.substring(2, timeId.length());
+ System.out.println(cloudCaseRef);
+ return cloudCaseRef;
+ }
+
+ /**
+ * 获取时间Id，后四位常量
+ * @return String
+ */
+ public synchronized static String getNowTime(){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+ String nowTime = sdf.format(new Date());
+ return nowTime;
+ }
+}
+/**
+ * -------------------_ooOoo_-------------------
+ * ------------------o8888888o------------------
+ * ------------------88" . "88------------------
+ * ------------------(| -_- |)------------------
+ * ------------------O\ = /O------------------
+ * ---------------____/`---'\____---------------
+ * -------------.' \\| |// `.-------------
+ * ------------/ \\||| : |||// \------------
+ * -----------/ _||||| -:- |||||- \-----------
+ * -----------| | \\\ - /// | |-----------
+ * -----------| \_| ''\---/'' | |-----------
+ * -----------\ .-\__ `-` ___/-. /-----------
+ * ---------___`. .' /--.--\ `. . __----------
+ * ------."" '< `.___\_<|>_/___.' >'"".-------
+ * -----| | : `- \`.;`\ _ /`;.`/ - ` : | |-----
+ * -----\ \ `-. \_ __\ /__ _/ .-` / /-----
+ * ======`-.____`-.___\_____/___.-`____.-'======
+ * -------------------`=---='
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * ---------佛祖保佑---hugeinfo---永无BUG----------
+ */
\ No newline at end of file
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/JudicIdUtils.java
similarity index 87%
rename from dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java
rename to dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/JudicIdUtils.java
index d7d9f2e..5fa163d 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/JudicIdUtils.java
@@ -1,4 +1,4 @@
-package cn.huge.module.common.utils;
+package cn.huge.module.mediate.utils;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -16,17 +16,17 @@
/**
* 时间Id统计常量
*/
- private static int COUNT_NUM = 1000;
+ private static int COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量前缀
*/
- private static int SIGN_COUNT_NUM = 1000;
+ private static int SIGN_COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量后缀
*/
- private static int COUNT_NUM_SIGN = 1000;
+ private static int COUNT_NUM_SIGN = 10000;
/**
* 获取时间Id，后四位常量
@@ -34,8 +34,8 @@
*/
public synchronized static String getNewTimeId(){
String timeId = getNowTime() + (COUNT_NUM++);
- if(COUNT_NUM > 9999){
- COUNT_NUM = 1000;
+ if(COUNT_NUM > 99999){
+ COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -48,8 +48,8 @@
*/
public synchronized static String getSignNewTimeId(String sign){
String timeId = getNowTime() + sign + (SIGN_COUNT_NUM++);
- if(SIGN_COUNT_NUM > 9999){
- SIGN_COUNT_NUM = 1000;
+ if(SIGN_COUNT_NUM > 99999){
+ SIGN_COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -62,8 +62,8 @@
*/
public synchronized static String getNewTimeIdSign(String sign){
String timeId = getNowTime() + (COUNT_NUM_SIGN++) + sign;
- if(COUNT_NUM_SIGN > 9999){
- COUNT_NUM_SIGN = 1000;
+ if(COUNT_NUM_SIGN > 99999){
+ COUNT_NUM_SIGN = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicNoUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/JudicNoUtils.java
similarity index 97%
rename from dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicNoUtils.java
rename to dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/JudicNoUtils.java
index 5577ae4..89d475f 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicNoUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/JudicNoUtils.java
@@ -1,4 +1,4 @@
-package cn.huge.module.common.utils;
+package cn.huge.module.mediate.utils;
import cn.huge.base.common.utils.DateUtils;
diff --git a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/MediateIdUtils.java
similarity index 83%
copy from dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java
copy to dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/MediateIdUtils.java
index d7d9f2e..8860317 100644
--- a/dyh-service/dyh-utils/src/main/java/cn/huge/module/common/utils/JudicIdUtils.java
+++ b/dyh-service/dyh-utils/src/main/java/cn/huge/module/mediate/utils/MediateIdUtils.java
@@ -1,32 +1,32 @@
-package cn.huge.module.common.utils;
+package cn.huge.module.mediate.utils;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
- * @title: 司法确认ID生成工具
- * @description: 司法确认ID生成工具
+ * @title: 公共ID生成工具
+ * @description: 公共ID生成工具
* @company: hugeinfo
* @author: liyj
* @time: 2021-11-05 16:51:48
* @version: 1.0.0
*/
-public class JudicIdUtils {
+public class MediateIdUtils {
/**
* 时间Id统计常量
*/
- private static int COUNT_NUM = 1000;
+ private static int COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量前缀
*/
- private static int SIGN_COUNT_NUM = 1000;
+ private static int SIGN_COUNT_NUM = 10000;
/**
* 时间Id统计常量，常量后缀
*/
- private static int COUNT_NUM_SIGN = 1000;
+ private static int COUNT_NUM_SIGN = 10000;
/**
* 获取时间Id，后四位常量
@@ -34,8 +34,8 @@
*/
public synchronized static String getNewTimeId(){
String timeId = getNowTime() + (COUNT_NUM++);
- if(COUNT_NUM > 9999){
- COUNT_NUM = 1000;
+ if(COUNT_NUM > 99999){
+ COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -48,8 +48,8 @@
*/
public synchronized static String getSignNewTimeId(String sign){
String timeId = getNowTime() + sign + (SIGN_COUNT_NUM++);
- if(SIGN_COUNT_NUM > 9999){
- SIGN_COUNT_NUM = 1000;
+ if(SIGN_COUNT_NUM > 99999){
+ SIGN_COUNT_NUM = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
@@ -62,8 +62,8 @@
*/
public synchronized static String getNewTimeIdSign(String sign){
String timeId = getNowTime() + (COUNT_NUM_SIGN++) + sign;
- if(COUNT_NUM_SIGN > 9999){
- COUNT_NUM_SIGN = 1000;
+ if(COUNT_NUM_SIGN > 99999){
+ COUNT_NUM_SIGN = 10000;
}
timeId=timeId.substring(2, timeId.length());
return timeId;
--
Gitblit v1.8.0