合并分支
wangxuanran
commit
3fe12ad347
|
|
@ -48,6 +48,7 @@ src/test/resources/font
|
|||
src/main/resources/WEB-INF/vm/outFile
|
||||
target/
|
||||
*.back
|
||||
!/src/main/youhong_ai_jitu_src/selfdev/util/log
|
||||
# 老项目代码
|
||||
#/lib/jitulib/
|
||||
#/lib/classbean
|
||||
|
|
|
|||
|
|
@ -161,3 +161,51 @@ class CusUtils {
|
|||
}
|
||||
|
||||
window.Utils = new CusUtils()
|
||||
|
||||
|
||||
const getLeble = function (lable, defaultStr) {
|
||||
if (!langue[lable + '']) {
|
||||
return defaultStr;
|
||||
}
|
||||
let lableMap = langue[lable + '']
|
||||
const userInfo = JSON.parse(localStorage.getItem("theme-account"))
|
||||
if (!lableMap[userInfo.userLanguage + '']) {
|
||||
return defaultStr
|
||||
}
|
||||
return lableMap[userInfo.userLanguage + '']
|
||||
}
|
||||
|
||||
|
||||
class LanguageUtil {
|
||||
|
||||
static language = {
|
||||
'1': {
|
||||
'8': '英文',
|
||||
'7': '中文',
|
||||
'15': '日语'
|
||||
}
|
||||
}
|
||||
|
||||
static getLabel(label, defaultStr) {
|
||||
if (!LanguageUtil.language[label + '']) {
|
||||
return defaultStr;
|
||||
}
|
||||
let languageMap = LanguageUtil.language[label + '']
|
||||
let userInfo = JSON.parse(localStorage.getItem("theme-account"))
|
||||
if (!userInfo) {
|
||||
userInfo = {
|
||||
userLanguage: '7'
|
||||
}
|
||||
}
|
||||
|
||||
if (!languageMap[userInfo.userLanguage + '']) {
|
||||
return defaultStr
|
||||
}
|
||||
return languageMap[userInfo.userLanguage + '']
|
||||
}
|
||||
}
|
||||
|
||||
// export default CusUtils
|
||||
ecodeSDK.exp(LanguageUtil)
|
||||
window.LanguageUtil = LanguageUtil
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,58 @@
|
|||
/* ******************* youhong.ai 转交任务提交状态修改 start ******************* */
|
||||
|
||||
$(() => {
|
||||
function api(requestOptions = {
|
||||
url: "",
|
||||
type: "GET",
|
||||
data: "",
|
||||
isAsync: true,
|
||||
success: () => {
|
||||
},
|
||||
error: () => {
|
||||
},
|
||||
complete: () => {
|
||||
},
|
||||
contentType: 'application/json',
|
||||
beforeSend: () => {
|
||||
}
|
||||
}) {
|
||||
let options = Object.assign({
|
||||
url: "",
|
||||
type: "GET",
|
||||
data: "",
|
||||
isAsync: true,
|
||||
success: () => {
|
||||
},
|
||||
error: () => {
|
||||
},
|
||||
complete: () => {
|
||||
},
|
||||
contentType: 'application/json',
|
||||
beforeSend: () => {
|
||||
}
|
||||
}, requestOptions)
|
||||
return $.ajax(options)
|
||||
}
|
||||
|
||||
WfForm.registerCheckEvent(WfForm.OPER_SUBMIT, callback => {
|
||||
let obj = {}
|
||||
obj.actionId = WfForm.getFieldValue(WfForm.convertFieldNameToId('actionid'))
|
||||
obj.userId = WfForm.getFieldValue(WfForm.convertFieldNameToId('zjr', 'detail_1') + "_0")
|
||||
api({
|
||||
url: "/api/aiyh/ihg/task/submit-task",
|
||||
type: "POST",
|
||||
data: JSON.stringify(obj),
|
||||
isAsync: false,
|
||||
success(res) {
|
||||
if (res && res.code === 200) {
|
||||
callback()
|
||||
}
|
||||
},
|
||||
complete() {
|
||||
callback()
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
/* ******************* youhong.ai 转交任务提交状态修改 end ******************* */
|
||||
|
|
@ -751,13 +751,12 @@ $(() => {
|
|||
$(() => {
|
||||
let config = {
|
||||
// 基础年假
|
||||
base: 21,
|
||||
base: 20,
|
||||
// 入职日期
|
||||
dateField: 'jrbsjjtsj',
|
||||
// 年假
|
||||
targetField: 'nj'
|
||||
}
|
||||
|
||||
runJs()
|
||||
|
||||
function runJs() {
|
||||
|
|
@ -769,20 +768,22 @@ $(() => {
|
|||
WfForm.changeFieldValue(WfForm.convertFieldNameToId(config.targetField), {value: njValue})
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
function calculateBonus(startDate, endDate, config) {
|
||||
const diffInMs = endDate.getTime() - startDate.getTime();
|
||||
const diffInYears = diffInMs / (1000 * 60 * 60 * 24 * 365);
|
||||
|
||||
if (diffInYears < 3) {
|
||||
return 0;
|
||||
} else if (diffInYears >= 3 && diffInYears < 6) {
|
||||
return config.base;
|
||||
} else if (diffInYears >= 3 && diffInYears < 6) {
|
||||
return config.base + 1;
|
||||
} else {
|
||||
const extraYears = Math.floor((diffInYears - 3) / 3);
|
||||
return config.base + extraYears * 2;
|
||||
let resultDay = config.base + extraYears * 2
|
||||
if (resultDay >= 25) {
|
||||
return 25;
|
||||
}
|
||||
return resultDay;
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -77,7 +77,6 @@ import java.util.function.Predicate;
|
|||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.zip.ZipEntry;
|
||||
|
||||
/**
|
||||
* @author EBU7-dev1-ayh
|
||||
|
|
@ -1599,126 +1598,6 @@ public class Util extends weaver.general.Util {
|
|||
return getUtilService().getApiConfigMainTree(id);
|
||||
}
|
||||
|
||||
public static <T> AZipOutputStream createZip(List<T> inputList) throws IOException {
|
||||
return createZip(inputList, File.separator);
|
||||
}
|
||||
|
||||
private static <T> AZipOutputStream createZip(List<T> inputList, String base) throws IOException {
|
||||
FileOutputStream fileOutputStream = null;
|
||||
|
||||
try {
|
||||
File file = new File(AZipOutputStream.filePath);
|
||||
if (!file.exists()) {
|
||||
// 先得到文件的上级目录，并创建上级目录，在创建文件
|
||||
file.getParentFile().mkdirs();
|
||||
try {
|
||||
// 创建文件
|
||||
file.createNewFile();
|
||||
} catch (IOException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
fileOutputStream = new FileOutputStream(file);
|
||||
} catch (FileNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (fileOutputStream == null) {
|
||||
return null;
|
||||
}
|
||||
AZipOutputStream zipOut = new AZipOutputStream(fileOutputStream);
|
||||
int catchLen = 10 * 1024;
|
||||
for (int i = 0; i < inputList.size(); i++) {
|
||||
T item = inputList.get(i);
|
||||
if (item instanceof InputStream) {
|
||||
// 属于单级文件，直接压缩并返回
|
||||
try {
|
||||
zipOut.putNextEntry(new ZipEntry(base + i));
|
||||
} catch (IOException e) {
|
||||
throw new IOException(e.toString());
|
||||
}
|
||||
byte[] buffer = new byte[catchLen];
|
||||
int len = 0;
|
||||
while ((len = ((InputStream) item).read(buffer)) != -1) {
|
||||
zipOut.write(buffer, 0, len);
|
||||
}
|
||||
zipOut.closeEntry();
|
||||
}
|
||||
if (item instanceof AInputStream) {
|
||||
try {
|
||||
zipOut.putNextEntry(new ZipEntry(((AInputStream) item).getFileName()));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
byte[] buffer = new byte[catchLen];
|
||||
int len = 0;
|
||||
while ((len = ((AInputStream) item).getInputStream().read(buffer)) != -1) {
|
||||
try {
|
||||
zipOut.write(buffer, 0, len);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
zipOut.closeEntry();
|
||||
}
|
||||
if (item instanceof ListZipEntity) {
|
||||
ListZipEntity listZipEntity = (ListZipEntity) item;
|
||||
if (listZipEntity.isDirectory()) {
|
||||
// 表示属于文件夹，循环添加处理文件夹
|
||||
handlerDirectory(listZipEntity.getFileList(), zipOut, base + listZipEntity.getDirectory() + File.separator);
|
||||
} else {
|
||||
List<AInputStream> aInputStreams = listZipEntity.getaInputStreamList();
|
||||
for (AInputStream aInputStream : aInputStreams) {
|
||||
try {
|
||||
zipOut.putNextEntry(new ZipEntry(aInputStream.getFileName()));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
byte[] buffer = new byte[catchLen];
|
||||
int len = 0;
|
||||
while ((len = (aInputStream.getInputStream()).read(buffer)) != -1) {
|
||||
try {
|
||||
zipOut.write(buffer, 0, len);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
zipOut.closeEntry();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return zipOut;
|
||||
}
|
||||
|
||||
private static void handlerDirectory(List<ListZipEntity> fileList, AZipOutputStream zipOut, String base) throws IOException {
|
||||
int catchLen = 10 * 1024;
|
||||
for (ListZipEntity listZipEntity : fileList) {
|
||||
if (listZipEntity.isDirectory()) {
|
||||
// 如果是文件夹
|
||||
handlerDirectory(listZipEntity.getFileList(), zipOut, base + listZipEntity.getDirectory() + File.separator);
|
||||
} else {
|
||||
List<AInputStream> aInputStreams = listZipEntity.getaInputStreamList();
|
||||
for (AInputStream aInputStream : aInputStreams) {
|
||||
try {
|
||||
zipOut.putNextEntry(new ZipEntry(aInputStream.getFileName()));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
byte[] buffer = new byte[catchLen];
|
||||
int len = 0;
|
||||
while ((len = (aInputStream.getInputStream()).read(buffer)) != -1) {
|
||||
try {
|
||||
zipOut.write(buffer, 0, len);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
zipOut.closeEntry();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static Map<String, String> queryLanguage(int groupId, int languageId) {
|
||||
return getUtilService().queryLanguage(groupId, languageId);
|
||||
}
|
||||
|
|
@ -2266,7 +2145,6 @@ public class Util extends weaver.general.Util {
|
|||
if (otherLog.containsKey(name)) {
|
||||
return otherLog.get(name);
|
||||
}
|
||||
if (!otherLog.containsKey(name)) {
|
||||
synchronized (Util.otherLog) {
|
||||
if (otherLog.containsKey(name)) {
|
||||
return otherLog.get(name);
|
||||
|
|
@ -2330,8 +2208,6 @@ public class Util extends weaver.general.Util {
|
|||
return cusLog;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询自定义配置参数值
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
package aiyh.utils.ecologyutil.modelutil;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import aiyh.utils.httpUtil.cushttpclasses.CusHttpSession;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.engine.common.util.ServiceUtil;
|
||||
import com.engine.cube.service.ModeAppService;
|
||||
import com.engine.cube.service.impl.ModeAppServiceImpl;
|
||||
import org.apache.log4j.Logger;
|
||||
import weaver.hrm.User;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 建模相关工具方法
|
||||
*/
|
||||
public class CusModelUtil {
|
||||
|
||||
private static Logger logger = Util.getLogger();
|
||||
public static ModeAppService modeAppService = ServiceUtil.getService(ModeAppServiceImpl.class, new User(1));
|
||||
|
||||
/**
|
||||
* 建模数据全部权限重构
|
||||
* @param modeId
|
||||
*/
|
||||
public static void rebuildRight(String modeId) {
|
||||
try{
|
||||
Map<String, Object> param = new HashMap<>();
|
||||
param.put("rebulidFlag", "1");
|
||||
param.put("righttype", "1");
|
||||
param.put("modeid", modeId);
|
||||
param.put("rebulidFlag", "1");
|
||||
param.put("showProgress", "0");
|
||||
param.put("operation", "resetAllRight");
|
||||
param.put("session", new CusHttpSession());
|
||||
Map<String, Object> stringObjectMap = modeAppService.saveModeRightList(param, new User(1));
|
||||
logger.info("CusModelUtil.rebuildRight end;result:"+new JSONObject(stringObjectMap).toJSONString() + ";param:" + modeId);
|
||||
}catch(Throwable e){
|
||||
logger.error("CusModelUtil.rebuildRight error;message:" + e.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
package aiyh.utils.ecologyutil.rightutil;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import aiyh.utils.httpUtil.cushttpclasses.CusHttpServletRequest;
|
||||
import aiyh.utils.httpUtil.cushttpclasses.CusHttpSession;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.engine.hrm.cmd.permissiontoadjust.ProcessDataCmd;
|
||||
import org.apache.log4j.Logger;
|
||||
import weaver.hrm.User;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* ecology权限相关方法
|
||||
*
|
||||
*/
|
||||
public class RightMoveUtil {
|
||||
|
||||
private static Logger logger = Util.getLogger();
|
||||
|
||||
/**
|
||||
* 触发标准权限转移 转移待办已办等信息
|
||||
* @param param 入参按需填写如下等参数
|
||||
* fromid
|
||||
* toid
|
||||
* T133All
|
||||
* T133AllNum
|
||||
* @return
|
||||
*/
|
||||
public static JSONObject moveRight(JSONObject param){
|
||||
JSONObject result = new JSONObject();
|
||||
try{
|
||||
logger.info("RightMoveUtil moveRight begin;param:" + param.toJSONString());
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
for(Object key : param.keySet()){
|
||||
params.put(key.toString(),param.get(key));
|
||||
}
|
||||
HttpServletRequest request = new CusHttpServletRequest(){
|
||||
@Override
|
||||
public String getParameter(String s) {
|
||||
return param.getString(s);
|
||||
}
|
||||
@Override
|
||||
public HttpSession getSession(boolean b) {
|
||||
HttpSession session = new CusHttpSession(){
|
||||
@Override
|
||||
public Object getAttribute(String s) {
|
||||
return new User(1);
|
||||
}
|
||||
};
|
||||
return session;
|
||||
}
|
||||
};
|
||||
ProcessDataCmd cmd = new ProcessDataCmd(params,request,new User(1));
|
||||
Map<String, Object> execute = cmd.execute(null);
|
||||
result = new JSONObject(execute);
|
||||
logger.info("RightMoveUtil moveRight end;result:" + execute.toString());
|
||||
return result;
|
||||
}catch (Throwable e){
|
||||
logger.error("RightMoveUtil moveRight error;message:" + e.getMessage());
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
package aiyh.utils.entity;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import weaver.file.FileUpload;
|
||||
import weaver.system.SystemComInfo;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.UUID;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
|
||||
/**
|
||||
* @author EBU7-dev1-ayh
|
||||
* @create 2021/10/25 0025 17:38
|
||||
* zipoutputstaream
|
||||
*/
|
||||
|
||||
|
||||
public class AZipOutputStream extends ZipOutputStream {
|
||||
|
||||
private ZipOutputStream zipOutputStream;
|
||||
public static String filePath;
|
||||
private OutputStream out;
|
||||
static {
|
||||
filePath = FileUpload.getCreateDir(new SystemComInfo().getFilesystem()) + "tempfile" + File.separator;
|
||||
filePath += "zip" + File.separator + System.currentTimeMillis() + UUID.randomUUID() + ".zip";
|
||||
}
|
||||
|
||||
public AZipOutputStream(@NotNull OutputStream out) {
|
||||
super(out);
|
||||
this.out = out;
|
||||
}
|
||||
|
||||
public AZipOutputStream(@NotNull OutputStream out, @NotNull Charset charset) {
|
||||
super(out, charset);
|
||||
this.out = out;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() throws IOException {
|
||||
try {
|
||||
Files.deleteIfExists(Paths.get(AZipOutputStream.filePath));
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}finally {
|
||||
out.flush();
|
||||
super.flush();
|
||||
super.close();
|
||||
out.close();
|
||||
}
|
||||
}
|
||||
|
||||
public ZipOutputStream getZipOutputStream() {
|
||||
return zipOutputStream;
|
||||
}
|
||||
|
||||
public void setZipOutputStream(ZipOutputStream zipOutputStream) {
|
||||
this.zipOutputStream = zipOutputStream;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package aiyh.utils.function;
|
||||
|
||||
/**
|
||||
* <h1>三个参数的function</h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 21:30</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@FunctionalInterface
|
||||
public interface Bi3Function<A, B, C, R> {
|
||||
|
||||
/**
|
||||
* Applies this function to the given arguments.
|
||||
*
|
||||
* @param a the first function argument
|
||||
* @param b the second function argument
|
||||
* @param c the second function argument
|
||||
* @return the function result
|
||||
*/
|
||||
R apply(A a, B b, C c);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
package aiyh.utils.function;
|
||||
|
||||
/**
|
||||
* <h1>三个参数的function</h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 21:30</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@FunctionalInterface
|
||||
public interface Bi4Function<A, B, C, D, R> {
|
||||
|
||||
/**
|
||||
* Applies this function to the given arguments.
|
||||
*
|
||||
* @param a the first function argument
|
||||
* @param b the second function argument
|
||||
* @param c the second function argument
|
||||
* @param d the second function argument
|
||||
* @return the function result
|
||||
*/
|
||||
R apply(A a, B b, C c, D d);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,274 @@
|
|||
package aiyh.utils.httpUtil.cushttpclasses;
|
||||
|
||||
import javax.servlet.RequestDispatcher;
|
||||
import javax.servlet.ServletInputStream;
|
||||
import javax.servlet.http.Cookie;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.security.Principal;
|
||||
import java.util.Enumeration;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
public class CusHttpServletRequest implements HttpServletRequest {
|
||||
|
||||
@Override
|
||||
public String getMethod() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRequestURI() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public StringBuffer getRequestURL() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getContextPath() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getServletPath() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPathInfo() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPathTranslated() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getQueryString() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getHeader(String s) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enumeration getHeaders(String s) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enumeration getHeaderNames() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIntHeader(String s) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getDateHeader(String s) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Cookie[] getCookies() {
|
||||
return new Cookie[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public HttpSession getSession(boolean b) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HttpSession getSession() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRequestedSessionId() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRequestedSessionIdValid() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRequestedSessionIdFromCookie() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRequestedSessionIdFromURL() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAuthType() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRemoteUser() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUserInRole(String s) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Principal getUserPrincipal() {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
public boolean isRequestedSessionIdFromUrl() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getProtocol() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getScheme() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getServerName() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getServerPort() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRemoteAddr() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRemoteHost() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCharacterEncoding(String s) throws UnsupportedEncodingException {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getParameter(String s) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getParameterValues(String s) {
|
||||
return new String[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enumeration getParameterNames() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map getParameterMap() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ServletInputStream getInputStream() throws IOException {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BufferedReader getReader() throws IOException, IllegalStateException {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCharacterEncoding() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getContentLength() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getContentType() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Locale getLocale() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enumeration getLocales() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSecure() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getAttribute(String s) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAttribute(String s, Object o) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enumeration getAttributeNames() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeAttribute(String s) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public RequestDispatcher getRequestDispatcher(String s) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param s
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
public String getRealPath(String s) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,113 @@
|
|||
package aiyh.utils.httpUtil.cushttpclasses;
|
||||
|
||||
import javax.servlet.ServletContext;
|
||||
import javax.servlet.http.HttpSession;
|
||||
import javax.servlet.http.HttpSessionContext;
|
||||
import java.util.Enumeration;
|
||||
|
||||
public class CusHttpSession implements HttpSession {
|
||||
|
||||
@Override
|
||||
public String getId() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isNew() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getCreationTime() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getLastAccessedTime() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMaxInactiveInterval(int i) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxInactiveInterval() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getAttribute(String s) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Enumeration<String> getAttributeNames() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setAttribute(String s, Object o) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeAttribute(String s) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void invalidate() {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
public HttpSessionContext getSessionContext() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ServletContext getServletContext() {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param s
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
public Object getValue(String s) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
public String[] getValueNames() {
|
||||
return new String[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param s
|
||||
* @param o
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
public void putValue(String s, Object o) {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @param s
|
||||
* @deprecated
|
||||
*/
|
||||
@Override
|
||||
public void removeValue(String s) {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -323,6 +323,16 @@ public class HttpUtils {
|
|||
return baseRequest(httpConnection, httpGet);
|
||||
}
|
||||
|
||||
/**
|
||||
* <h2>删除方法调用</h2>
|
||||
*
|
||||
* @param url 地址
|
||||
* @param params 参数
|
||||
* @param headers 请求头
|
||||
* @return 请求结果
|
||||
* @throws IOException 异常
|
||||
*/
|
||||
|
||||
public ResponeVo apiDelete(String url, Map<String, Object> params, Map<String, String> headers) throws IOException {
|
||||
Map<String, Object> paramsMap = paramsHandle(params);
|
||||
String getUrl = urlHandle(url, paramsMap);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.controller;
|
||||
|
||||
|
||||
import aiyh.utils.ApiResult;
|
||||
import aiyh.utils.Util;
|
||||
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.entity.ContractParametersEntity;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.service.PublishInformationService;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.service.impl.PublishInformationServiceImpl;
|
||||
import io.swagger.v3.oas.annotations.parameters.RequestBody;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.Context;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import java.util.Map;
|
||||
//合同系统接收单位或部门编码，根据编码整理所有下级单位及部门的合同台账详细信息，并将数据返回给调用方。
|
||||
@Path("/pubish")
|
||||
public class PublishInformationAction {
|
||||
|
||||
//日志处理
|
||||
private final Logger log = Util.getLogger();
|
||||
|
||||
//service主要的业务逻辑
|
||||
private final PublishInformationService publishInformationService = new PublishInformationServiceImpl();
|
||||
|
||||
@Path("/information/action")
|
||||
@POST
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public String getReportData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map<String,Object> param) {
|
||||
//单位编码
|
||||
String divisionCode = request.getParameter("divisionCode");
|
||||
//部门编码
|
||||
String deptCode = request.getParameter("deptCode");
|
||||
ContractParametersEntity contractParametersEntity = publishInformationService.getResponseJson(divisionCode,deptCode);
|
||||
if (contractParametersEntity!=null){
|
||||
return ApiResult.success(contractParametersEntity,200,"查询成功，结果如下");
|
||||
}
|
||||
return ApiResult.error(404,"参数为空，请重新选择单位编码和部门编码");
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.entity;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
/**
|
||||
* <h1>合同系统响应返回参数实体类</h1>
|
||||
* @Author 何朝阳
|
||||
* @Date 2023/4/21 17:59
|
||||
*/
|
||||
@Data
|
||||
public class ContractParametersEntity {
|
||||
//合同编码
|
||||
private String contractno;
|
||||
//合同名称
|
||||
private String contractname;
|
||||
//合同密级
|
||||
private String contractsecret;
|
||||
//合同类别
|
||||
private String contracttype;
|
||||
//合同审批流程
|
||||
private String contractworkflow;
|
||||
//合同性质
|
||||
private String contractproperties;
|
||||
//对应型号
|
||||
private String correspond;
|
||||
//甲方
|
||||
private String partya;
|
||||
//甲方单位属性
|
||||
private String partyaprop;
|
||||
//乙方
|
||||
private String partyb;
|
||||
//项目名称
|
||||
private String entryname;
|
||||
//订单编号
|
||||
private String orderno;
|
||||
//合同总金额
|
||||
private String totalamount;
|
||||
//价款类型
|
||||
private String pricetype;
|
||||
//已收/付金额
|
||||
private String receivedamount;
|
||||
//已开/收票金额
|
||||
private String issuedamount;
|
||||
//剩余未收/付金额
|
||||
private String remainingamount;
|
||||
//币种
|
||||
private String currency;
|
||||
//合同状态
|
||||
private String contractstatus;
|
||||
//收付款进度
|
||||
private String collectionprogress;
|
||||
//收付款方式
|
||||
private String paymentmethod;
|
||||
//签约日期
|
||||
private String signingdate;
|
||||
//签约地
|
||||
private String signingplace;
|
||||
//是否需要飞行试验
|
||||
private String flighttest;
|
||||
//二级单位名称
|
||||
private String secondaryunit;
|
||||
//承办单位名称
|
||||
private String organizername;
|
||||
//承办部门
|
||||
private String undertakedepart;
|
||||
//承办人
|
||||
private String undertakeperson;
|
||||
//签订人
|
||||
private String signedby;
|
||||
//合同用印文件
|
||||
private String contractfile;
|
||||
//其他合同附件
|
||||
private String otherattachments;
|
||||
|
||||
// getter and setter methods
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.mapper;
|
||||
|
||||
import aiyh.utils.annotation.recordset.Select;
|
||||
import aiyh.utils.annotation.recordset.SqlMapper;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.entity.ContractParametersEntity;
|
||||
|
||||
@SqlMapper
|
||||
public interface PublishInformationMapper {
|
||||
|
||||
/**
|
||||
* <h2>这里可以根据单位编码和部门编码查询uf_xyz表中的合同信息，并将结果存储到 ContractParametersEntity对象中</h2>
|
||||
* @param divisionCode 单位编码
|
||||
* @param deptCode 部门编码
|
||||
* @return ContractParametersEntity 处理DB查询返回参数的实体类
|
||||
* @author hcy
|
||||
* @Date 2023/4/23 9:47
|
||||
*/
|
||||
@Select("select * from uf_xyz where division = #{divisionCode} and deptment =#{deptCode}")
|
||||
ContractParametersEntity getDeptList(String divisionCode, String deptCode);
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.service;
|
||||
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.entity.ContractParametersEntity;
|
||||
|
||||
public interface PublishInformationService {
|
||||
ContractParametersEntity getResponseJson(String divisionCode, String deptCode);
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.service.impl;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.entity.ContractParametersEntity;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.mapper.PublishInformationMapper;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.accesscontractsystem.service.PublishInformationService;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
|
||||
|
||||
public class PublishInformationServiceImpl implements PublishInformationService {
|
||||
|
||||
//日志
|
||||
private final Logger logger = Util.getLogger();
|
||||
//处理业务的sql
|
||||
private final PublishInformationMapper publishInformationMapper = Util.getMapper(PublishInformationMapper.class);
|
||||
|
||||
|
||||
@Override
|
||||
public ContractParametersEntity getResponseJson(String divisionCode, String deptCode) {
|
||||
|
||||
if (!"".equals(divisionCode)&& !"".equals(deptCode)){
|
||||
ContractParametersEntity dataDb = publishInformationMapper.getDeptList(divisionCode,deptCode);
|
||||
if (dataDb == null){
|
||||
return dataDb;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.gmlowgroupsenddata.controller;
|
||||
|
||||
import aiyh.utils.ApiResult;
|
||||
import aiyh.utils.Util;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.gmlowgroupsenddata.service.SendContractInfoService;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.gmlowgroupsenddata.service.impl.SendContractInfoServiceImpl;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.Context;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <h1>GM集团下级单位合同台账信息上报接口</h1>
|
||||
* @author hcy
|
||||
* @date 2023/5/8 13:36
|
||||
*/
|
||||
@Path("/send")
|
||||
public class SendContractInfoController {
|
||||
|
||||
|
||||
/**
|
||||
* 日志处理
|
||||
*/
|
||||
private final Logger logger = Util.getLogger();
|
||||
|
||||
/**
|
||||
* 接口主要业务处理，service层
|
||||
*/
|
||||
private final SendContractInfoService sendContractInfoService = new SendContractInfoServiceImpl();
|
||||
|
||||
@POST
|
||||
@Path("/Contract/Info")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public String sendContractInfo(@Context HttpServletRequest request, @Context HttpServletResponse response){
|
||||
String zbzt = request.getParameter("zbzt");
|
||||
List<Map<String,Object>> contractInfo = sendContractInfoService.sendContractData(zbzt);
|
||||
if (contractInfo.size() == 0){
|
||||
return ApiResult.error("接口数据为空，请检查台账数据是否为空");
|
||||
}
|
||||
return ApiResult.success(contractInfo,200,"成功");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.gmlowgroupsenddata.mapper;
|
||||
|
||||
import aiyh.utils.annotation.recordset.ParamMapper;
|
||||
import aiyh.utils.annotation.recordset.Select;
|
||||
import aiyh.utils.annotation.recordset.SqlMapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@SqlMapper
|
||||
public interface SendContractInfoMapper {
|
||||
|
||||
@Select("select * from uf_httztb where wybs = #{uniqueIdentification} ")
|
||||
List<Map<String, Object>> selectConfigData(@ParamMapper("uniqueIdentification") String uniqueIdentification);
|
||||
|
||||
|
||||
@Select("select * from uf_httztb_dt1 where mainid = #{mainid}")
|
||||
List<Map<String, Object>> getConfigDetal1Information(@ParamMapper("mainid")String mainid);
|
||||
|
||||
@Select("select * from uf_httztb_dt2 where mainid = #{mainid}")
|
||||
List<Map<String, Object>> getConfigDetal2Information(@ParamMapper("mainid")String mainid);
|
||||
|
||||
@Select("select $t{selectKeys} from $t{tableName}")
|
||||
List<Map<String, Object>> selectAllDBData(@ParamMapper("selectKeys") String selectKeys,
|
||||
@ParamMapper("tableName") String tableName);
|
||||
|
||||
@Select("select $t{selectKeys} from $t{tableName} where LEFT(modedatacreatedate,10) = LEFT(#{yesterday},10) or LEFT(modedatamodifydatetime,10) = LEFT(#{yesterday},10)")
|
||||
List<Map<String, Object>> selectYesterdayDBData(@ParamMapper("selectKeys")String selectKeys,
|
||||
@ParamMapper("tableName")String tableName,
|
||||
@ParamMapper("yesterday")String yesterday);
|
||||
|
||||
@Select("select $t{selectDatailTableKeys} from $t{s} where mainid = #{mainid}")
|
||||
List<Map<String, Object>> selectAllDetailDBData(@ParamMapper("selectDatailTableKeys") String selectDatailTableKeys,
|
||||
@ParamMapper("s")String s,
|
||||
@ParamMapper("mainid")String mainid);
|
||||
|
||||
@Select("select imagefileid from DocImageFile where docid = #{lcqzyj} order by versionId")
|
||||
String getImageFileId(@ParamMapper("lcqzyj") String lcqzyj);
|
||||
|
||||
@Select("select imagefilename from DocImageFile where docid = #{lcqzyj} order by versionId desc")
|
||||
String getImagefilename(@ParamMapper("lcqzyj") String lcqzyj);
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.gmlowgroupsenddata.service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface SendContractInfoService {
|
||||
List<Map<String, Object>> sendContractData(String zbzt);
|
||||
}
|
||||
|
|
@ -0,0 +1,222 @@
|
|||
package com.api.chaoyang.he.hcy_hangtiankeji.gmlowgroupsenddata.service.impl;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.gmlowgroupsenddata.mapper.SendContractInfoMapper;
|
||||
import com.api.chaoyang.he.hcy_hangtiankeji.gmlowgroupsenddata.service.SendContractInfoService;
|
||||
import com.google.common.base.Joiner;
|
||||
import com.weaver.formmodel.util.DateHelper;
|
||||
import org.apache.log4j.Logger;
|
||||
import sun.misc.BASE64Decoder;
|
||||
import weaver.file.ImageFileManager;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.*;
|
||||
|
||||
public class SendContractInfoServiceImpl implements SendContractInfoService {
|
||||
|
||||
/**
|
||||
* 日志处理
|
||||
*/
|
||||
private final Logger logger = Util.getLogger();
|
||||
/**
|
||||
* deal sql
|
||||
*/
|
||||
private final SendContractInfoMapper sendContractInfoMapper = Util.getMapper(SendContractInfoMapper.class);
|
||||
|
||||
/**
|
||||
* 查询国密下级单位台账中数据并返回
|
||||
* @return 返回台账数据集合
|
||||
* @param zbzt 同步状态：0 全量同步 1 增量同步
|
||||
*/
|
||||
public List<Map<String, Object>> sendContractData(String zbzt) {
|
||||
//获取配置表主表数据
|
||||
List<Map<String,Object>> configMainTableData = sendContractInfoMapper.selectConfigData("fw002");
|
||||
if (configMainTableData.size()==0)return configMainTableData;
|
||||
String mainid = Util.null2String(configMainTableData.get(0).get("id"));
|
||||
//配置表明细表1数据：
|
||||
List<Map<String,Object>> configDetal1TableData = sendContractInfoMapper.getConfigDetal1Information(mainid);
|
||||
logger.info("配置表明细表数据---configDetal1TableData---"+configDetal1TableData);
|
||||
//明细表2数据
|
||||
List<Map<String,Object>> configDetal2TableData = sendContractInfoMapper.getConfigDetal2Information(mainid);
|
||||
|
||||
List<Map<String,Object>> configDetal2TableNewData = new ArrayList<>();//处理完大小写问题后
|
||||
filterUppercaseField(configDetal2TableData,configDetal2TableNewData);
|
||||
logger.info("配置表明细表数据---configDetal2TableNewData---"+configDetal2TableNewData);
|
||||
|
||||
|
||||
if (configDetal1TableData.size()==0) return configDetal1TableData;
|
||||
String tableName = Util.null2String(configDetal1TableData.get(0).get("ejdwtzb"));//二级单位台账表数据库名称
|
||||
String bz = Util.null2String(configDetal1TableData.get(0).get("bz")); //备注
|
||||
logger.info("二级单位台账表数据库名称===="+tableName+" 二级单位台账表数名称==="+bz);
|
||||
|
||||
if (configDetal2TableNewData.size()==0)return configDetal1TableData;
|
||||
List<String> mainTableKeys = new ArrayList<>();//用于insert和update的key
|
||||
List<String> detailTableKeys = new ArrayList<>();//用于insert和update的key
|
||||
|
||||
for (Map<String, Object> configdetal2 : configDetal2TableNewData) {
|
||||
String sfzb = Util.null2String(configdetal2.get("sfzb"));//是否主表
|
||||
if ("0".equals(sfzb)){
|
||||
mainTableKeys.add(Util.null2String(configdetal2.get("tbzd")));//添加主表key
|
||||
}else {
|
||||
detailTableKeys.add(Util.null2String(configdetal2.get("tbzd")));//添加明细表key
|
||||
}
|
||||
}
|
||||
mainTableKeys.add("id");//拼接id
|
||||
String selectMainTableKeys = Joiner.on(",").join((Iterable<?>) mainTableKeys);//拼接主表的查询条件
|
||||
String selectDatailTableKeys = Joiner.on(",").join((Iterable<?>) detailTableKeys);//拼接明细表的查询条件
|
||||
|
||||
|
||||
List<Map<String, Object>> returnDataList = new ArrayList<>();//返回一个空数组
|
||||
logger.info("selectMainTableKeys："+selectMainTableKeys+"------selectDatailTableKeys:"+selectDatailTableKeys );
|
||||
if ("0".equals(zbzt)) {//全量数据
|
||||
List<Map<String, Object>> allDBData = sendContractInfoMapper.selectAllDBData(selectMainTableKeys, tableName);
|
||||
logger.info("-------allDBData------"+allDBData);
|
||||
List<Map<String,Object>> filterUppercaseNewAllDBData = new ArrayList<>();
|
||||
filterUppercaseField(allDBData,filterUppercaseNewAllDBData);
|
||||
for (Map<String, Object> allDBDatum : filterUppercaseNewAllDBData) {
|
||||
String ejdw_mainid = Util.null2String(allDBDatum.get("id"));
|
||||
List<Map<String, Object>> detalData = sendContractInfoMapper.selectAllDetailDBData(selectDatailTableKeys, tableName + "_dt1", ejdw_mainid);//查询到主表对应的明细表数据
|
||||
logger.info("------detalData------"+detalData);
|
||||
List<Map<String, Object>> filterUppercaseFieldDetailData = new ArrayList<>();
|
||||
filterUppercaseField(detalData,filterUppercaseFieldDetailData);//处理掉大写字母的问题
|
||||
logger.info("------filterUppercaseFieldDetailData------"+filterUppercaseFieldDetailData);
|
||||
allDBDatum.put("detailData", filterUppercaseFieldDetailData);//向主表数据中放入明细表数据
|
||||
}
|
||||
logger.info("-------filterUppercaseNewAllDBData------"+filterUppercaseNewAllDBData);
|
||||
List<Map<String,Object>> newAllDBData = this.dealwithSpecialFields(filterUppercaseNewAllDBData);
|
||||
logger.info("-------newAllDBData------"+newAllDBData);
|
||||
return newAllDBData;
|
||||
}else if ("1".equals(zbzt)) {//增量数据
|
||||
List<Map<String, Object>> yesterDayDBData = sendContractInfoMapper.selectYesterdayDBData(selectMainTableKeys, tableName, DateHelper.getYesterday());
|
||||
logger.info("-------yesterDayDBData------"+yesterDayDBData);
|
||||
List<Map<String,Object>> filterUppercasenewYesterDayDBData = new ArrayList<>();
|
||||
filterUppercaseField(yesterDayDBData,filterUppercasenewYesterDayDBData);
|
||||
for (Map<String, Object> yesterDayDBDatum : filterUppercasenewYesterDayDBData) {
|
||||
String id = Util.null2String(yesterDayDBDatum.get("id"));
|
||||
List<Map<String, Object>> detalData = sendContractInfoMapper.selectAllDetailDBData(selectDatailTableKeys, tableName + "_dt1", id);//查询到主表对应的明细表数据
|
||||
logger.info("-------detalData------"+detalData);
|
||||
List<Map<String, Object>> filterUppercaseFieldDetailData = new ArrayList<>();
|
||||
filterUppercaseField(detalData,filterUppercaseFieldDetailData);//处理掉大写字母的问题
|
||||
logger.info("-------filterUppercaseFieldDetailData------"+filterUppercaseFieldDetailData);
|
||||
yesterDayDBDatum.put("detailData", filterUppercaseFieldDetailData);//向主表数据中放入明细表数据
|
||||
}
|
||||
logger.info("-------filterUppercasenewYesterDayDBData------"+filterUppercasenewYesterDayDBData);
|
||||
List<Map<String, Object>> newYesterDayDBData = this.dealwithSpecialFields(filterUppercasenewYesterDayDBData);
|
||||
logger.info("-------newYesterDayDBData------"+newYesterDayDBData);
|
||||
return newYesterDayDBData;
|
||||
}
|
||||
return returnDataList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 过滤大写字段问题
|
||||
* @param oldListMap 旧的字段
|
||||
* @param newListMap 处理完的字段
|
||||
*/
|
||||
public void filterUppercaseField(List<Map<String,Object>> oldListMap,List<Map<String,Object>> newListMap){
|
||||
for (Map<String, Object> configDetal2TableDatum : oldListMap) {
|
||||
Map<String, Object> newData = new HashMap<>();
|
||||
for (Map.Entry<String, Object> entry : configDetal2TableDatum.entrySet()) {
|
||||
String key = entry.getKey().toLowerCase();
|
||||
Object value = entry.getValue();
|
||||
newData.put(key, value);
|
||||
}
|
||||
// 创建新数据集合
|
||||
newListMap.add(newData);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理双方用印文件、其它合同附件、流程签字意见三个字段
|
||||
* @param allDBData 处理之前的数据
|
||||
* @return 处理完逻辑之后的数据
|
||||
*/
|
||||
private List<Map<String, Object>> dealwithSpecialFields(List<Map<String, Object>> allDBData) {
|
||||
for (Map<String, Object> allDBDatum : allDBData) {
|
||||
String htyywj = Util.null2String(allDBDatum.get("htyywj"));//双方用印文件
|
||||
String qthtfj = Util.null2String(allDBDatum.get("qthtfj"));//其它合同附件
|
||||
String lcqzyj = Util.null2String(allDBDatum.get("lcqzyj"));//流程签字意见:需要流程存为文档
|
||||
String ip = Util.getCusConfigValue("setIp_htkj");//获取配置表中自定义参数，用来配置ip地址、
|
||||
if (!"".equals(htyywj)){
|
||||
String newIp = ip + htyywj;
|
||||
allDBDatum.put("htyywj",newIp);//链接地址：ip://xxx--docid
|
||||
}
|
||||
if (!"".equals(qthtfj)){
|
||||
String newIp = ip +qthtfj;
|
||||
allDBDatum.put("qthtfj",newIp);//链接地址：ip:xxx--docid
|
||||
}
|
||||
if (!"".equals(lcqzyj) && !"-1".equals(lcqzyj)){
|
||||
//根据docid获取文件名称
|
||||
String imagefilename = sendContractInfoMapper.getImagefilename(lcqzyj);
|
||||
if (!"".equals(imagefilename)) {
|
||||
allDBDatum.put("imagefilename",imagefilename);
|
||||
}else{
|
||||
allDBDatum.put("imagefilename", UUID.randomUUID()+".pdf");
|
||||
}
|
||||
int imagefileid = Util.getIntValue(sendContractInfoMapper.getImageFileId(lcqzyj));//根据docid,查询到imageFileid
|
||||
InputStream inputStream = ImageFileManager.getInputStreamById(imagefileid);//根据imagefileid查询到文件流
|
||||
if (inputStream!=null){
|
||||
try {
|
||||
allDBDatum.put("lcqzyj",Util.null2String(inputStream2Base64(inputStream)));//将处理好的文件消息重新放入字段中
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.error("流转换异常===="+e);
|
||||
}
|
||||
}
|
||||
|
||||
}else{
|
||||
allDBDatum.put("lcqzyj", "");
|
||||
}
|
||||
}
|
||||
return allDBData;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将inputstream转为Base64
|
||||
* @param is 字节流
|
||||
* @return String 加密后的字符串
|
||||
*/
|
||||
private static String inputStream2Base64(InputStream is) throws Exception {
|
||||
byte[] data = null;
|
||||
try {
|
||||
ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
|
||||
byte[] buff = new byte[1024];
|
||||
int rc = 0;
|
||||
while ((rc = is.read(buff, 0, 100)) > 0) {
|
||||
swapStream.write(buff, 0, rc);
|
||||
}
|
||||
data = swapStream.toByteArray();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
if (is != null) {
|
||||
try {
|
||||
is.close();
|
||||
} catch (IOException e) {
|
||||
throw new Exception("输入流关闭异常");
|
||||
}
|
||||
}
|
||||
}
|
||||
return Base64.getEncoder().encodeToString(data);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* base64转inputStream
|
||||
* @param base64string 包含输入流的字符串
|
||||
* @return inputStream
|
||||
*/
|
||||
private static InputStream base2InputStream(String base64string) {
|
||||
ByteArrayInputStream stream = null;
|
||||
try {
|
||||
BASE64Decoder decoder = new BASE64Decoder();
|
||||
byte[] bytes1 = decoder.decodeBuffer(base64string);
|
||||
stream = new ByteArrayInputStream(bytes1);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return stream;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
package com.api.test.aiyh.controller;
|
||||
|
||||
import aiyh.utils.ApiResult;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import weaver.workflow.msg.MsgPushUtil;
|
||||
import weaver.workflow.msg.entity.MsgEntity;
|
||||
|
|
@ -11,7 +12,9 @@ import javax.ws.rs.GET;
|
|||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <h1>ceshi </h1>
|
||||
|
|
@ -36,4 +39,15 @@ public class RequestMsgNotifiyController {
|
|||
new MsgPushUtil().pushMsg(operateMsg);
|
||||
return "";
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("/test/cus-api")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public String testCusApiJiaoYan() {
|
||||
Map<String, Object> result = new HashMap<>(8);
|
||||
result.put("key", "asldfjalksd");
|
||||
result.put("name", "test");
|
||||
return ApiResult.success(result);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,14 @@ public class TaskElementController {
|
|||
|
||||
private final TaskElementService service = new TaskElementService();
|
||||
|
||||
/**
|
||||
* <h2>查询任务列表</h2>
|
||||
*
|
||||
* @param request 请求体
|
||||
* @param response 响应体
|
||||
* @param itemGroup 分组值
|
||||
* @return 任务列表
|
||||
*/
|
||||
@Path("/list-get")
|
||||
@GET
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
|
|
@ -36,13 +44,22 @@ public class TaskElementController {
|
|||
@QueryParam("itemGroup") String itemGroup) {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
try {
|
||||
return ApiResult.success(service.getList(user,itemGroup));
|
||||
return ApiResult.success(service.getList(user, itemGroup));
|
||||
} catch (Exception e) {
|
||||
log.error("get task list error!\n" + Util.getErrString(e));
|
||||
return ApiResult.error("system error!");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <h2>搜索任务信息</h2>
|
||||
*
|
||||
* @param request 请求体
|
||||
* @param response 响应体
|
||||
* @param params 请求参数
|
||||
* @param configId 配置id
|
||||
* @return 任务信息列表
|
||||
*/
|
||||
@Path("/search-list")
|
||||
@POST
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
|
|
@ -61,6 +78,13 @@ public class TaskElementController {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* <h2>查询按钮权限</h2>
|
||||
*
|
||||
* @param request 请求体
|
||||
* @param response 响应体
|
||||
* @return 按钮权限信息
|
||||
*/
|
||||
@Path("/get-btn")
|
||||
@GET
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
|
|
@ -77,6 +101,11 @@ public class TaskElementController {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* <h2>清除配置信息</h2>
|
||||
*
|
||||
* @return 是否成功
|
||||
*/
|
||||
@Path("/clear-config")
|
||||
@GET
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
|
|
@ -89,4 +118,29 @@ public class TaskElementController {
|
|||
return ApiResult.error("system error!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* <h2>提交转发任务修改状态</h2>
|
||||
*
|
||||
* @param request 请求体
|
||||
* @param response 响应体
|
||||
* @param params 请求参数
|
||||
* @return 更新状态
|
||||
*/
|
||||
@Path("/submit-task")
|
||||
@POST
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public String submitTask(@Context HttpServletRequest request,
|
||||
@Context HttpServletResponse response,
|
||||
@RequestBody Map<String, Object> params) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ApiResult.success(service.submitTask(user, params));
|
||||
} catch (Exception e) {
|
||||
log.error("提交转交任务状态写入失败！" + Util.getErrString(e));
|
||||
return ApiResult.error("system error!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -150,4 +150,22 @@ public interface TaskElementMapper {
|
|||
String selectConvert(@SqlString String sql, @ParamMapper("value") String o);
|
||||
|
||||
|
||||
/**
|
||||
* <h2>查询主表ID</h2>
|
||||
*
|
||||
* @param actionId actionId
|
||||
* @return 主表id
|
||||
*/
|
||||
@Select("select id from uf_rwtzeq where touchpointbh = #{actionId}")
|
||||
String selectTaskMainId(String actionId);
|
||||
|
||||
/**
|
||||
* <h2>更新被转交任务状态</h2>
|
||||
*
|
||||
* @param userId 当前用户
|
||||
* @param mainId 主表ID
|
||||
* @return 更新状态
|
||||
*/
|
||||
@Update("update uf_rwtzeq_dt1 set zjwczt = 0 where zjr = #{userId} and mainid = #{mainId}")
|
||||
boolean updateTaskHandoverStatus(@ParamMapper("userId") String userId, @ParamMapper("mainId") String mainId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import aiyh.utils.excention.CustomerException;
|
|||
import aiyh.utils.tool.cn.hutool.core.collection.CollectionUtil;
|
||||
import aiyh.utils.tool.cn.hutool.core.lang.Assert;
|
||||
import aiyh.utils.tool.cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.api.youhong.ai.ihgzhouji.taskele.entity.IhgTaskElementConfigItem;
|
||||
import com.api.youhong.ai.ihgzhouji.taskele.mapper.TaskElementMapper;
|
||||
import com.api.youhong.ai.ihgzhouji.taskele.mapstruct.TaskElementMapstruct;
|
||||
|
|
@ -48,11 +49,11 @@ public class TaskElementService {
|
|||
return config;
|
||||
}
|
||||
|
||||
public List<IhgTaskElementVo> getList(User user,String itemGroup) {
|
||||
public List<IhgTaskElementVo> getList(User user, String itemGroup) {
|
||||
List<IhgTaskElementConfigItem> ihgTaskElementConfItemList = null;
|
||||
if (StrUtil.isBlank(itemGroup)) {
|
||||
ihgTaskElementConfItemList = mapper.selectConfig();
|
||||
}else {
|
||||
} else {
|
||||
ihgTaskElementConfItemList = mapper.selectConfigByGroup(itemGroup);
|
||||
}
|
||||
if (CollectionUtil.isEmpty(ihgTaskElementConfItemList)) {
|
||||
|
|
@ -243,4 +244,29 @@ public class TaskElementService {
|
|||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* <h2>提交转交任务修改转交任务状态</h2>
|
||||
*
|
||||
* @param user 当前登录用户
|
||||
* @param params 请求参数
|
||||
* @return 是否更新成功
|
||||
*/
|
||||
public Object submitTask(User user, Map<String, Object> params) {
|
||||
String actionId = Util.null2String(params.get("actionId"));
|
||||
String userId = Util.null2String(params.get("userId"));
|
||||
if (!userId.equals(Util.null2String(user.getUID()))) {
|
||||
throw new CustomerException("被转交人和当前登录人不一致！");
|
||||
}
|
||||
String mainId = mapper.selectTaskMainId(actionId);
|
||||
if (StrUtil.isBlank(mainId)) {
|
||||
throw new CustomerException("无法查询到对应的任务信息！");
|
||||
}
|
||||
// 更新被转交人转交任务状态
|
||||
boolean flag = mapper.updateTaskHandoverStatus(userId, mainId);
|
||||
if (!flag) {
|
||||
log.error("更新被转交任务状态失败！当前用户信息以及请求参数：" + JSON.toJSONString(params));
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
package com.api.youhong.ai.ihgzhouji.userinfoel.controller;
|
||||
|
||||
import aiyh.utils.ApiResult;
|
||||
import aiyh.utils.Util;
|
||||
import com.api.youhong.ai.ihgzhouji.userinfoel.service.UserInfoService;
|
||||
import org.apache.log4j.Logger;
|
||||
import weaver.hrm.HrmUserVarify;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.ws.rs.GET;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import javax.ws.rs.core.Context;
|
||||
import javax.ws.rs.core.MediaType;
|
||||
|
||||
/**
|
||||
* <h1>获取用户信息</h1>
|
||||
*
|
||||
* <p>create: 2023/6/11 22:11</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@Path("/aiyh/user-info")
|
||||
public class UserInfoController {
|
||||
|
||||
private final Logger log = Util.getLogger();
|
||||
|
||||
private final UserInfoService service = new UserInfoService();
|
||||
|
||||
|
||||
@GET
|
||||
@Path("/get")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
public String getUserInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
|
||||
try {
|
||||
User user = HrmUserVarify.getUser(request, response);
|
||||
return ApiResult.success(service.getUserInfo(user));
|
||||
} catch (Exception e) {
|
||||
log.error("获取用户信息失败！" + Util.getErrString(e));
|
||||
return ApiResult.error("system error!");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,150 @@
|
|||
package com.api.youhong.ai.ihgzhouji.userinfoel.mapper;
|
||||
|
||||
import aiyh.utils.annotation.recordset.ParamMapper;
|
||||
import aiyh.utils.annotation.recordset.Select;
|
||||
import aiyh.utils.annotation.recordset.SqlMapper;
|
||||
import aiyh.utils.annotation.recordset.SqlString;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <h1></h1>
|
||||
*
|
||||
* <p>create: 2023/6/11 22:25</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@SqlMapper
|
||||
public interface UserInfoMapper {
|
||||
|
||||
/**
|
||||
* <h2>查询按钮权限</h2>
|
||||
*
|
||||
* @param sql 按钮权限sql
|
||||
* @param user 当前用户
|
||||
* @return 查询到的数据
|
||||
*/
|
||||
@Select(custom = true)
|
||||
Map<String, Object> selectAuthoritySql(@SqlString String sql, User user);
|
||||
|
||||
/**
|
||||
* <h2>查询是否是酒店人员</h2>
|
||||
*
|
||||
* @param uid 当前人员
|
||||
* @return 酒店数量
|
||||
*/
|
||||
/*@Select("select count(id)\n" +
|
||||
"from uf_hotelinfo\n" +
|
||||
"where\n" +
|
||||
" concat(',',salesmarketingleader,',') like concat(',',#{uID},',')\n" +
|
||||
"or concat(',',revenueleader,',') like concat(',',#{uID},',')\n" +
|
||||
"or concat(',',financeleader,',') like concat(',',#{uID},',')\n" +
|
||||
"or concat(',',fbleader,',') like concat(',',#{uID},',')\n" +
|
||||
"or concat(',',hrleader,',') like concat(',',#{uID},',')\n" +
|
||||
"or concat(',',generalmanager,',') like concat(',', #{uID},',')")*/
|
||||
@Select("select count(id) from uf_hotelinfo where\n" +
|
||||
"concat(',',olt,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',vpo,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',opsconsultant,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',humanresources,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',commercialperformance,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',revenuemanagement,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',financebusinesssupport,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',rbeoperations,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',engineering,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofopsconsultant,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofhumanresources,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofcommercialperformance,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofrevenuemanagement,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headoffinancebusinesssupport,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofrbeoperations,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofengineering,',') like concat(',',#{userId},',')")
|
||||
Integer selectIsHotel(int uid);
|
||||
|
||||
/**
|
||||
* <h2>查询酒店信息</h2>
|
||||
*
|
||||
* @param hotelIndex 酒店编码
|
||||
* @return 酒店信息
|
||||
*/
|
||||
@Select("select * from v_commercial \n" +
|
||||
" where holidex = #{hotelIndex}")
|
||||
Map<String, Object> selectHotelInfo(String hotelIndex);
|
||||
|
||||
/**
|
||||
* <h2>查询人员信息</h2>
|
||||
*
|
||||
* @param uid 当前人员
|
||||
* @return 人员信息
|
||||
*/
|
||||
@Select("select id,lastname,messagerurl,departmentid from hrmresource where id = #{userId}")
|
||||
Map<String, Object> selectHrmInfo(int uid);
|
||||
|
||||
/**
|
||||
* <h2>查询角色信息</h2>
|
||||
*
|
||||
* @param uid 当前人员
|
||||
* @param hotelIndex 酒店编码
|
||||
* @return 角色信息
|
||||
*/
|
||||
@Select("select * from uf_hotelinfo where\n" +
|
||||
"(concat(',',olt,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',vpo,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',subregionadmin,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',opsconsultant,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',humanresources,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',commercialperformance,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',revenuemanagement,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',financebusinesssupport,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',rbeoperations,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',engineering,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofopsconsultant,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofhumanresources,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofcommercialperformance,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofrevenuemanagement,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headoffinancebusinesssupport,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofrbeoperations,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',headofengineering,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',generalmanager,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',salesmarketingleader,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',revenueleader,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',financeleader,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',fbleader,',') like concat(',',#{userId},',')\n" +
|
||||
"or concat(',',hrleader,',') like concat(',',#{userId},',')) " +
|
||||
"and holidex = #{hotelIndex}")
|
||||
List<Map<String, Object>> selectRoles(@ParamMapper("userId") int uid, @ParamMapper("hotelIndex") String hotelIndex);
|
||||
|
||||
/**
|
||||
* <h2>查询部门信息</h2>
|
||||
*
|
||||
* @param departmentId 部门id
|
||||
* @return 部门信息
|
||||
*/
|
||||
@Select("select id,departmentname,departmentcode,departmentmark from hrmdepartment where id = #{departmentId}")
|
||||
Map<String, Object> selectDepartmentInfo(String departmentId);
|
||||
|
||||
/**
|
||||
* <h2>查询所有下级部门信息</h2>
|
||||
*
|
||||
* @param gCSupportCenterId 支持中心部门
|
||||
* @return 所有部门信息
|
||||
*/
|
||||
@Select("select *\n" +
|
||||
"from (\n" +
|
||||
"WITH RECURSIVE subdepts AS (\n" +
|
||||
"SELECT id, DEPARTMENTNAME, SUPDEPID\n" +
|
||||
"FROM HrmDepartment\n" +
|
||||
"WHERE id = #{gCSupportCenterId}\n" +
|
||||
"UNION ALL\n" +
|
||||
"SELECT\n" +
|
||||
" d.id, \n" +
|
||||
" d.DEPARTMENTNAME,\n" +
|
||||
" d.SUPDEPID\n" +
|
||||
"FROM HrmDepartment d\n" +
|
||||
"JOIN subdepts sd ON d.SUPDEPID = sd.id)\n" +
|
||||
" SELECT *\n" +
|
||||
" FROM subdepts) temp;")
|
||||
List<Map<String, Object>> selectGCSupportCenterDep(String gCSupportCenterId);
|
||||
}
|
||||
|
|
@ -0,0 +1,153 @@
|
|||
package com.api.youhong.ai.ihgzhouji.userinfoel.service;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import aiyh.utils.excention.CustomerException;
|
||||
import aiyh.utils.tool.cn.hutool.core.collection.CollectionUtil;
|
||||
import aiyh.utils.tool.cn.hutool.core.util.StrUtil;
|
||||
import com.api.youhong.ai.ihgzhouji.userinfoel.mapper.UserInfoMapper;
|
||||
import com.api.youhong.ai.ihgzhouji.userinfoel.vo.UserInfoVo;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* @author youhong.ai
|
||||
*/
|
||||
public class UserInfoService {
|
||||
private final UserInfoMapper mapper = Util.getMapper(UserInfoMapper.class);
|
||||
private final static Map<String, String> ROLES_MAP = new HashMap<>();
|
||||
|
||||
|
||||
/**
|
||||
* <h2>获取用户信息</h2>
|
||||
*
|
||||
* @param user 当前登录用户
|
||||
* @return 用户信息
|
||||
*/
|
||||
public UserInfoVo getUserInfo(User user) {
|
||||
UserInfoVo userInfoVo = new UserInfoVo();
|
||||
String taskDispatchAuthority = Util.getCusConfigValue("TaskDispatchAuthority");
|
||||
String taskAcceptanceAuthority = Util.getCusConfigValue("TaskAcceptanceAuthority");
|
||||
String gCSupportCenterId = Util.getCusConfigValue("GCSupportCenterId");
|
||||
// 查询任务下发
|
||||
if (StrUtil.isNotBlank(taskDispatchAuthority)) {
|
||||
Map<String, Object> map = this.mapper.selectAuthoritySql(taskDispatchAuthority, user);
|
||||
if (CollectionUtil.isNotEmpty(map)) {
|
||||
userInfoVo.setTaskDispatch(true);
|
||||
}
|
||||
}
|
||||
// 查询任务清单
|
||||
if (StrUtil.isNotBlank(taskAcceptanceAuthority)) {
|
||||
Map<String, Object> map = this.mapper.selectAuthoritySql(taskAcceptanceAuthority, user);
|
||||
if (CollectionUtil.isNotEmpty(map)) {
|
||||
userInfoVo.setTaskAcceptance(true);
|
||||
}
|
||||
}
|
||||
|
||||
// 查询用户信息
|
||||
Map<String, Object> userInfo = this.mapper.selectHrmInfo(user.getUID());
|
||||
if (CollectionUtil.isNotEmpty(userInfo)) {
|
||||
userInfoVo.setUserInfo(userInfo);
|
||||
// 查询支持中心所有部门
|
||||
List<Map<String, Object>> depList = mapper.selectGCSupportCenterDep(gCSupportCenterId);
|
||||
Map<String, Object> department = findMapById(depList, user.getUserDepartment());
|
||||
String hotelIndex = null;
|
||||
if (CollectionUtil.isEmpty(department)) {
|
||||
// 不属于支持中心人，查询对应酒店信息
|
||||
String lastname = Util.null2String(userInfo.get("lastname"));
|
||||
if (StrUtil.isBlank(lastname)) {
|
||||
throw new CustomerException("获取酒店人员信息失败！未查询到人员姓名");
|
||||
}
|
||||
|
||||
String[] split = lastname.split("-");
|
||||
if (split.length <= 1) {
|
||||
throw new CustomerException("获取酒店人员信息失败！lastName中不存在酒店代码");
|
||||
}
|
||||
hotelIndex = split[split.length - 1];
|
||||
Map<String, Object> hotelInfo = this.mapper.selectHotelInfo(hotelIndex);
|
||||
userInfoVo.setHotelInfo(hotelInfo);
|
||||
} else {
|
||||
// 支持中心，显示部门信息
|
||||
userInfoVo.setDepartmentInfo(department);
|
||||
}
|
||||
// 如果存在酒店信息
|
||||
if (StrUtil.isNotBlank(hotelIndex)) {
|
||||
List<Map<String, Object>> hotelRoles = this.mapper.selectRoles(user.getUID(), hotelIndex);
|
||||
if (CollectionUtil.isEmpty(hotelRoles)) {
|
||||
return userInfoVo;
|
||||
}
|
||||
Set<String> roleNames = new HashSet<>();
|
||||
// 循环酒店角色信息
|
||||
for (Map<String, Object> hotelRole : hotelRoles) {
|
||||
// 循环酒店角色名称
|
||||
for (Map.Entry<String, String> entry : ROLES_MAP.entrySet()) {
|
||||
String key = entry.getKey();
|
||||
if (!hotelRole.containsKey(key)) {
|
||||
continue;
|
||||
}
|
||||
String value = Util.null2String(hotelRole.get(key));
|
||||
// 如果在酒店名称中找到对应的人，则为角色名
|
||||
if (StrUtil.isBlank(value)) {
|
||||
continue;
|
||||
}
|
||||
String[] split = value.split(",");
|
||||
List<String> strings = Arrays.asList(split);
|
||||
if (strings.contains(Util.null2String(user.getUID()))) {
|
||||
roleNames.add(entry.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
userInfoVo.setRoleNames(roleNames);
|
||||
}
|
||||
}
|
||||
return userInfoVo;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* <h2>查找对应的部门</h2>
|
||||
*
|
||||
* @param dataList 部门列表
|
||||
* @param id 部门id
|
||||
* @return 部门信息
|
||||
*/
|
||||
public static Map<String, Object> findMapById(List<Map<String, Object>> dataList, int id) {
|
||||
for (Map<String, Object> map : dataList) {
|
||||
if (map.containsKey("id") && Integer.parseInt(Util.null2String(map.get("id"))) == id) {
|
||||
return map;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/*
|
||||
* <h2>获取酒店角色信息</h2>
|
||||
*
|
||||
* @return 酒店角色信息
|
||||
*/
|
||||
static {
|
||||
ROLES_MAP.put("olt", "OLT");
|
||||
ROLES_MAP.put("vpo", "VPO");
|
||||
ROLES_MAP.put("subregionadmin", "Sub Region Admin");
|
||||
ROLES_MAP.put("opsconsultant", "Ops Consultant");
|
||||
ROLES_MAP.put("humanresources", "Human Resources");
|
||||
ROLES_MAP.put("commercialperformance", "Commercial Performance");
|
||||
ROLES_MAP.put("revenuemanagement", "Revenue Management");
|
||||
ROLES_MAP.put("financebusinesssupport", "Finance & Business Support");
|
||||
ROLES_MAP.put("rbeoperations", "RB&E Operations");
|
||||
ROLES_MAP.put("engineering", "Engineering");
|
||||
ROLES_MAP.put("headofopsconsultant", "Head of Ops Consultant");
|
||||
ROLES_MAP.put("headofhumanresources", "Head of Human Resources");
|
||||
ROLES_MAP.put("headofcommercialperformance", "Head of Commercial Performance");
|
||||
ROLES_MAP.put("headofrevenuemanagement", "Head of Revenue Management");
|
||||
ROLES_MAP.put("headoffinancebusinesssupport", "Head of Finance & Business Support");
|
||||
ROLES_MAP.put("headofrbeoperations", "Head of RB&E Operations");
|
||||
ROLES_MAP.put("headofengineering", "Head of Engineering");
|
||||
ROLES_MAP.put("generalmanager", "General Manager");
|
||||
ROLES_MAP.put("salesmarketingleader", "Sales & Marketing leader");
|
||||
ROLES_MAP.put("revenueleader", "Revenue Leader");
|
||||
ROLES_MAP.put("financeleader", "Finance Leader");
|
||||
ROLES_MAP.put("fbleader", "F&B Leader");
|
||||
ROLES_MAP.put("hrleader", "HR Leader");
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package com.api.youhong.ai.ihgzhouji.userinfoel.vo;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* <h1>用户信息</h1>
|
||||
*
|
||||
* <p>create: 2023/6/11 22:16</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class UserInfoVo {
|
||||
|
||||
/** 任务下发权限 */
|
||||
private boolean taskDispatch;
|
||||
|
||||
/** 任务接收权限 */
|
||||
private boolean taskAcceptance;
|
||||
|
||||
/** 酒店信息 */
|
||||
Map<String, Object> hotelInfo;
|
||||
|
||||
/** 用户信息 */
|
||||
Map<String, Object> userInfo;
|
||||
|
||||
/** 角色 */
|
||||
Set<String> roleNames;
|
||||
|
||||
/** 部门信息 */
|
||||
Map<String, Object> departmentInfo;
|
||||
|
||||
}
|
||||
|
|
@ -42,15 +42,15 @@ public interface OrgChartMapper {
|
|||
" job.JOBTITLENAME job_title_name, " +
|
||||
" uftb.$t{parentField} type_of_employment " +
|
||||
"from hrmresource hrm " +
|
||||
" left join hrmjobtitles job on hrm.JOBTITLE = job.id " +
|
||||
" left join cus_fielddata cus on cus.ID = hrm.ID " +
|
||||
" inner join hrmjobtitles job on hrm.JOBTITLE = job.id " +
|
||||
" inner join cus_fielddata cus on cus.ID = hrm.ID " +
|
||||
" and cus.SCOPE = 'HrmCustomFieldByInfoType' " +
|
||||
" and cus.SCOPEID = 1 " +
|
||||
" left join cus_fielddata cus1 on cus1.id = hrm.id" +
|
||||
" inner join cus_fielddata cus1 on cus1.id = hrm.id" +
|
||||
" and cus1.scope = 'HrmCustomFieldByInfoType' " +
|
||||
" and cus1.scopeid = -1" +
|
||||
" left join hrmdepartment dept on dept.id = hrm.DEPARTMENTID " +
|
||||
" left join $t{typeOfEmploymentTable} uftb on uftb.$t{typeOfEmploymentIdField} = cus1.$t{typeOfEmploymentFiled} " +
|
||||
" inner join hrmdepartment dept on dept.id = hrm.DEPARTMENTID " +
|
||||
" inner join $t{typeOfEmploymentTable} uftb on uftb.$t{typeOfEmploymentIdField} = cus1.$t{typeOfEmploymentFiled} " +
|
||||
"where hrm.status in (0, 1)")
|
||||
List<HrmResource> selectAll(@ParamMapper("typeOfEmploymentFiled") String typeOfEmploymentField,
|
||||
@ParamMapper("lastNameEnField") String lastNameEnField,
|
||||
|
|
|
|||
|
|
@ -47,6 +47,11 @@ public class OrgChartService {
|
|||
if (userId == 1) {
|
||||
return systemAdminTree(hrmResourceDtoList);
|
||||
}
|
||||
/* ******************* 次账号处理逻辑 ******************* */
|
||||
String accountType = logInUser.getAccount_type();
|
||||
if ("1".equals(accountType)) {
|
||||
return secondaryAccountTree(hrmResourceDtoList);
|
||||
}
|
||||
filterCurrentSubCom(hrmResourceDtoList, currentUser, logInUser);
|
||||
/* ******************* 查询当前用户的是否全部展示或显示小红点的配置信息 ******************* */
|
||||
ShowPointOrAll showPointOrAll = mapper.selectShowPointOrAll(userId);
|
||||
|
|
@ -111,6 +116,7 @@ public class OrgChartService {
|
|||
if (userId == 1) {
|
||||
return systemAdminTree(hrmResourceDtoList);
|
||||
}
|
||||
|
||||
filterCurrentSubCom(hrmResourceDtoList, currentUser, logInUser);
|
||||
List<OrgChartNodeVo> orgChartNodeVoList = null;
|
||||
/* ******************* 转换dto为Vo并且设置根节点标识 ******************* */
|
||||
|
|
@ -145,6 +151,8 @@ public class OrgChartService {
|
|||
* @param logInUser 当前登陆用户
|
||||
* @author youHong.ai ******************************************
|
||||
*/
|
||||
|
||||
|
||||
private void filterCurrentSubCom(List<HrmResourceDto> hrmResourceDtoList,
|
||||
AtomicReference<HrmResourceDto> currentUser,
|
||||
User logInUser) {
|
||||
|
|
@ -192,7 +200,7 @@ public class OrgChartService {
|
|||
.with(OrgChartNodeVo::setCurrent, true)
|
||||
.endSet())
|
||||
.collect(Collectors.toList());
|
||||
return Util.listToTree(collect, OrgChartNodeVo::getId, OrgChartNodeVo::getManagerId,
|
||||
List<OrgChartNodeVo> orgChartNodeVoList = Util.listToTree(collect, OrgChartNodeVo::getId, OrgChartNodeVo::getManagerId,
|
||||
OrgChartNodeVo::getChildren, OrgChartNodeVo::setChildren,
|
||||
parentId -> parentId == null || parentId <= 0)
|
||||
.stream().peek(item -> Builder.startSet(item)
|
||||
|
|
@ -201,6 +209,40 @@ public class OrgChartService {
|
|||
.endSet())
|
||||
.peek(item -> recursionChildrenNums(item, 0))
|
||||
.collect(Collectors.toList());
|
||||
sortByNameFirstLetter(orgChartNodeVoList);
|
||||
return orgChartNodeVoList;
|
||||
}
|
||||
|
||||
/**
|
||||
* <h2>次账号返回数据数据</h2>
|
||||
* <i>2023/06/13 17:15</i>
|
||||
* ************************************************************
|
||||
*
|
||||
* @param hrmResourceDtoList 人力资源dtolist
|
||||
* @return List<OrgChartNodeVo> 树型list
|
||||
* @author youHong.ai ******************************************
|
||||
*/
|
||||
private List<OrgChartNodeVo> secondaryAccountTree(List<HrmResourceDto> hrmResourceDtoList) {
|
||||
List<OrgChartNodeVo> collect = hrmResourceDtoList.stream()
|
||||
.map(struct::hrmResourceDtoToVo)
|
||||
.peek(item -> Builder.startSet(item)
|
||||
.with(OrgChartNodeVo::setShow, 1)
|
||||
.with(OrgChartNodeVo::setShowBrother, 1)
|
||||
.with(OrgChartNodeVo::setShowChildren, 1)
|
||||
.with(OrgChartNodeVo::setCurrent, true)
|
||||
.endSet())
|
||||
.collect(Collectors.toList());
|
||||
List<OrgChartNodeVo> orgChartNodeVoList = Util.listToTree(collect, OrgChartNodeVo::getId, OrgChartNodeVo::getManagerId,
|
||||
OrgChartNodeVo::getChildren, OrgChartNodeVo::setChildren,
|
||||
parentId -> parentId == null || parentId <= 0)
|
||||
.stream().peek(item -> Builder.startSet(item)
|
||||
.with(OrgChartNodeVo::setIsRoot, true)
|
||||
.with(OrgChartNodeVo::setCurrent, true)
|
||||
.endSet())
|
||||
.peek(item -> recursionChildrenNums(item, 0))
|
||||
.collect(Collectors.toList());
|
||||
sortByNameFirstLetter(orgChartNodeVoList);
|
||||
return orgChartNodeVoList;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
package com.customization.youhong.pcn.createrworkflow;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import com.engine.workflow.constant.PAResponseCode;
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
/**
|
||||
* <h1>创建流程参数校验异常信息</h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 15:22</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
public class CreateRequestException extends RuntimeException {
|
||||
private final Logger logger = Util.getLogger();
|
||||
private final String msg;
|
||||
private Throwable throwable;
|
||||
private Integer code = -1;
|
||||
|
||||
private PAResponseCode responseCode;
|
||||
|
||||
public CreateRequestException(Throwable throwable) {
|
||||
super(throwable);
|
||||
this.msg = throwable.getMessage();
|
||||
}
|
||||
|
||||
public CreateRequestException(String msg) {
|
||||
super(msg);
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
|
||||
public CreateRequestException(String msg, PAResponseCode responseCode) {
|
||||
super(msg);
|
||||
this.msg = msg;
|
||||
this.responseCode = responseCode;
|
||||
}
|
||||
|
||||
public CreateRequestException(String msg, String... obj) {
|
||||
super(Util.logStr(msg, obj));
|
||||
this.msg = Util.logStr(msg, obj);
|
||||
}
|
||||
|
||||
public CreateRequestException(String msg, Integer code) {
|
||||
super(msg);
|
||||
this.code = code;
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public CreateRequestException(String msg, Integer code, Throwable throwable) {
|
||||
super(msg, throwable);
|
||||
this.code = code;
|
||||
this.msg = msg;
|
||||
}
|
||||
|
||||
public CreateRequestException(String msg, Throwable throwable) {
|
||||
super(msg, throwable);
|
||||
this.msg = msg;
|
||||
this.throwable = throwable;
|
||||
}
|
||||
|
||||
public String getMsg() {
|
||||
return msg;
|
||||
}
|
||||
|
||||
public Integer getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public PAResponseCode getResponseCode() {
|
||||
return responseCode;
|
||||
}
|
||||
|
||||
public String getMessage() {
|
||||
return this.msg;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,126 @@
|
|||
package com.customization.youhong.pcn.createrworkflow.impl;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import com.customization.youhong.pcn.createrworkflow.CreateRequestException;
|
||||
import com.customization.youhong.pcn.createrworkflow.mapper.CheckWorkflowRequestParamsMapper;
|
||||
import com.customization.youhong.pcn.createrworkflow.util.CheckWorkflowRequestParamsUtil;
|
||||
import com.engine.core.cfg.annotation.ServiceDynamicProxy;
|
||||
import com.engine.core.cfg.annotation.ServiceMethodDynamicProxy;
|
||||
import com.engine.core.impl.aop.AbstractServiceProxy;
|
||||
import com.engine.workflow.constant.PAResponseCode;
|
||||
import com.engine.workflow.entity.publicApi.PAResponseEntity;
|
||||
import com.engine.workflow.entity.publicApi.ReqOperateRequestEntity;
|
||||
import com.engine.workflow.publicApi.WorkflowRequestOperatePA;
|
||||
import com.engine.workflow.publicApi.impl.WorkflowRequestOperatePAImpl;
|
||||
import org.apache.log4j.Logger;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <h1>检查流程创建流程参数</h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 14:14</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
|
||||
@ServiceDynamicProxy(target = WorkflowRequestOperatePAImpl.class, desc = "公共接口创建流程对流程参数校验")
|
||||
public class CheckWorkflowRequestParamsImpl extends AbstractServiceProxy implements WorkflowRequestOperatePA {
|
||||
|
||||
private final Logger log = Util.getLogger("workflow");
|
||||
|
||||
private final CheckWorkflowRequestParamsMapper mapper = Util.getMapper(CheckWorkflowRequestParamsMapper.class);
|
||||
|
||||
private final CheckWorkflowRequestParamsUtil checkUtil = new CheckWorkflowRequestParamsUtil();
|
||||
|
||||
@Override
|
||||
@ServiceMethodDynamicProxy(desc = "子流程触发时，做流程转数据")
|
||||
public PAResponseEntity doCreateRequest(User user, ReqOperateRequestEntity requestParam) {
|
||||
try {
|
||||
try {
|
||||
checkUtil.checkRequestParam(user, requestParam);
|
||||
return (PAResponseEntity) executeMethod(user, requestParam);
|
||||
} catch (CreateRequestException e) {
|
||||
PAResponseEntity paResponseEntity = new PAResponseEntity();
|
||||
paResponseEntity.setCode(e.getResponseCode());
|
||||
Map<String, Object> errorMsg = new HashMap<>(8);
|
||||
errorMsg.put("msg", e.getMsg());
|
||||
paResponseEntity.setErrMsg(errorMsg);
|
||||
return paResponseEntity;
|
||||
} catch (Exception e) {
|
||||
log.error("自定义流程创建校验请求参数出错：" + Util.getErrString(e));
|
||||
PAResponseEntity paResponseEntity = new PAResponseEntity();
|
||||
paResponseEntity.setCode(PAResponseCode.SYSTEM_INNER_ERROR);
|
||||
Map<String, Object> errorMsg = new HashMap<>(8);
|
||||
errorMsg.put("msg", "system error!");
|
||||
paResponseEntity.setErrMsg(errorMsg);
|
||||
return paResponseEntity;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("自定义流程创建校验请求参数出错：" + Util.getErrString(e));
|
||||
return (PAResponseEntity) executeMethod(user, requestParam);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity withdrawRequest(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity submitRequest(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity forwardRequest(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity rejectRequest(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity doForceDrawBack(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity doForceOver(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity deleteRequest(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity saveRequestLog(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity doIntervenor(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity getNodeOperator(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity getNodeMenu(User user, ReqOperateRequestEntity requestParam) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PAResponseEntity getCanRejectNodes(User user, ReqOperateRequestEntity request2Entity) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
package com.customization.youhong.pcn.createrworkflow.mapper;
|
||||
|
||||
import aiyh.utils.annotation.recordset.*;
|
||||
import com.customization.youhong.pcn.createrworkflow.pojo.CheckConditionItem;
|
||||
import com.customization.youhong.pcn.createrworkflow.pojo.CheckCreateConfig;
|
||||
import com.customization.youhong.pcn.createrworkflow.pojo.CheckCreateConfigDetail;
|
||||
import weaver.hrm.User;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <h1>mapper</h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 14:20</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@SqlMapper
|
||||
public interface CheckWorkflowRequestParamsMapper {
|
||||
|
||||
|
||||
@Select("select * from table where workflow_type = #{workflowId}")
|
||||
@CollectionMappings({
|
||||
@CollectionMapping(
|
||||
property = "detailList",
|
||||
column = "id",
|
||||
id = @Id(value = String.class, methodId = 1)
|
||||
),
|
||||
@CollectionMapping(
|
||||
property = "conditionGroupItems",
|
||||
column = "id",
|
||||
id = @Id(value = String.class, methodId = 2)
|
||||
),
|
||||
})
|
||||
CheckCreateConfig selectCheckConfig(int workflowId);
|
||||
|
||||
|
||||
@Select("select * from table_dt1 where mainid = #{mainId}")
|
||||
@Associations({
|
||||
@Association(
|
||||
property = "workflowField",
|
||||
column = "workflow_field",
|
||||
select = "aiyh.utils.mapper.UtilMapper.selectFieldInfo",
|
||||
id = @Id(Integer.class)
|
||||
)
|
||||
})
|
||||
@CollectionMethod(value = 1, desc = "查询明细表1，参数校验配置")
|
||||
List<CheckCreateConfigDetail> selectCheckDetail(String mainId);
|
||||
|
||||
|
||||
@Select("select * from table_dt2 where mainid = #{mainId}")
|
||||
@CollectionMethod(value = 2, desc = "查询明细表2，条件配置参数")
|
||||
List<CheckConditionItem> selectConditionDetail(String mainId);
|
||||
|
||||
|
||||
@Select(custom = true)
|
||||
Map<String, Object> selectCustomerSql(@SqlString String sql,
|
||||
@ParamMapper("value") String value,
|
||||
@ParamMapper("user") User user);
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package com.customization.youhong.pcn.createrworkflow.pojo;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
/**
|
||||
* <h1></h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 17:52</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class CheckConditionItem {
|
||||
|
||||
/** id */
|
||||
private Integer id;
|
||||
|
||||
/** 条件名称 */
|
||||
private String conditionName;
|
||||
|
||||
/** 条件规则 */
|
||||
private Integer conditionRule;
|
||||
|
||||
/** 条件自定义 */
|
||||
private String customerValue;
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
package com.customization.youhong.pcn.createrworkflow.pojo;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <h1>检查流程请求参数校验配置信息</h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 17:21</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class CheckCreateConfig {
|
||||
/** 流程id */
|
||||
private Integer workflowId;
|
||||
|
||||
/** 描述 */
|
||||
private String desc;
|
||||
|
||||
/** 检查配置明细 */
|
||||
private List<CheckCreateConfigDetail> detailList;
|
||||
|
||||
/** 条件分组配置 */
|
||||
private List<CheckConditionItem> conditionGroupItems;
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
package com.customization.youhong.pcn.createrworkflow.pojo;
|
||||
|
||||
import aiyh.utils.entity.FieldViewInfo;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
/**
|
||||
* <h1></h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 17:24</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
public class CheckCreateConfigDetail {
|
||||
|
||||
/** id */
|
||||
private Integer id;
|
||||
|
||||
/** 流程字段 */
|
||||
private FieldViewInfo workflowField;
|
||||
|
||||
/** 是否允许为null */
|
||||
private String allowNull;
|
||||
|
||||
/** 校验规则 */
|
||||
private String checkRule;
|
||||
|
||||
/** 自定义值 */
|
||||
private String customerValue;
|
||||
|
||||
/** 校验表达式 */
|
||||
private String checkExpression;
|
||||
}
|
||||
|
|
@ -0,0 +1,139 @@
|
|||
package com.customization.youhong.pcn.createrworkflow.util;
|
||||
|
||||
import aiyh.utils.ScriptUtil;
|
||||
import aiyh.utils.Util;
|
||||
import aiyh.utils.annotation.MethodRuleNo;
|
||||
import aiyh.utils.function.Bi4Function;
|
||||
import aiyh.utils.tool.cn.hutool.core.collection.CollectionUtil;
|
||||
import aiyh.utils.tool.cn.hutool.core.util.StrUtil;
|
||||
import com.customization.youhong.pcn.createrworkflow.mapper.CheckWorkflowRequestParamsMapper;
|
||||
import com.customization.youhong.pcn.createrworkflow.pojo.CheckConditionItem;
|
||||
import com.customization.youhong.pcn.createrworkflow.pojo.CheckCreateConfigDetail;
|
||||
import org.apache.log4j.Logger;
|
||||
import weaver.hrm.User;
|
||||
import weaver.workflow.webservices.WorkflowRequestTableField;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* <h1>检查方法校验工具</h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 18:30</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
public class CheckRuleMethodUtil {
|
||||
|
||||
private static final Logger log = Util.getLogger();
|
||||
|
||||
private static final CheckWorkflowRequestParamsMapper MAPPER = Util.getMapper(CheckWorkflowRequestParamsMapper.class);
|
||||
public static final Map<Integer,
|
||||
Bi4Function<
|
||||
WorkflowRequestTableField,
|
||||
CheckCreateConfigDetail,
|
||||
CheckConditionItem,
|
||||
User,
|
||||
Boolean
|
||||
>
|
||||
> CHECK_RULE_MAP = new HashMap<>(8);
|
||||
|
||||
static {
|
||||
try {
|
||||
Class<CheckRuleMethodUtil> checkRuleMethodUtilClass = CheckRuleMethodUtil.class;
|
||||
Method[] methods = checkRuleMethodUtilClass.getDeclaredMethods();
|
||||
for (Method method : methods) {
|
||||
|
||||
if (method.isAnnotationPresent(MethodRuleNo.class)) {
|
||||
MethodRuleNo annotation = method.getAnnotation(MethodRuleNo.class);
|
||||
int value = annotation.value();
|
||||
CHECK_RULE_MAP.put(value, (workflowRequestTableField, checkCreateConfigDetail, checkConditionItem, user) -> {
|
||||
try {
|
||||
return (Boolean) method.invoke(null, workflowRequestTableField, checkCreateConfigDetail, checkConditionItem, user);
|
||||
} catch (IllegalAccessException | InvocationTargetException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("初始化CheckRuleMethodUtil失败！" + Util.getErrString(e));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@MethodRuleNo(value = 0, desc = "不为null")
|
||||
public static boolean noNull(WorkflowRequestTableField workflowRequestTableField,
|
||||
CheckCreateConfigDetail checkCreateConfigDetail,
|
||||
CheckConditionItem checkConditionItem, User user) {
|
||||
return StrUtil.isNotBlank(workflowRequestTableField.getFieldValue());
|
||||
}
|
||||
|
||||
@MethodRuleNo(value = 1, desc = "整数类型")
|
||||
public static boolean isNumber(WorkflowRequestTableField workflowRequestTableField,
|
||||
CheckCreateConfigDetail checkCreateConfigDetail,
|
||||
CheckConditionItem checkConditionItem, User user) {
|
||||
try {
|
||||
Integer.parseInt(workflowRequestTableField.getFieldValue());
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@MethodRuleNo(value = 2, desc = "小数类型")
|
||||
public static boolean isDouble(WorkflowRequestTableField workflowRequestTableField,
|
||||
CheckCreateConfigDetail checkCreateConfigDetail,
|
||||
CheckConditionItem checkConditionItem, User user) {
|
||||
try {
|
||||
Double.parseDouble(workflowRequestTableField.getFieldValue());
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@MethodRuleNo(value = 3, desc = "枚举值")
|
||||
public static boolean isEnumerate(WorkflowRequestTableField workflowRequestTableField,
|
||||
CheckCreateConfigDetail checkCreateConfigDetail,
|
||||
CheckConditionItem checkConditionItem, User user) {
|
||||
String fieldValue = workflowRequestTableField.getFieldValue();
|
||||
String customerValue = checkCreateConfigDetail.getCustomerValue();
|
||||
if (StrUtil.isNotBlank(customerValue)) {
|
||||
String[] split = customerValue.split(",");
|
||||
return Arrays.asList(split).contains(fieldValue);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@MethodRuleNo(value = 4, desc = "自定义sql存在值")
|
||||
public static boolean customerSqlHasValue(WorkflowRequestTableField workflowRequestTableField,
|
||||
CheckCreateConfigDetail checkCreateConfigDetail,
|
||||
CheckConditionItem checkConditionItem, User user) {
|
||||
String fieldValue = workflowRequestTableField.getFieldValue();
|
||||
String customerValue = checkCreateConfigDetail.getCustomerValue();
|
||||
Map<String, Object> map = MAPPER.selectCustomerSql(customerValue, fieldValue, user);
|
||||
return CollectionUtil.isNotEmpty(map);
|
||||
}
|
||||
|
||||
@MethodRuleNo(value = 5, desc = "自定义sql校验表达式")
|
||||
public static boolean customerSqlCheck(WorkflowRequestTableField workflowRequestTableField,
|
||||
CheckCreateConfigDetail checkCreateConfigDetail,
|
||||
CheckConditionItem checkConditionItem, User user) {
|
||||
String fieldValue = workflowRequestTableField.getFieldValue();
|
||||
String customerValue = checkCreateConfigDetail.getCustomerValue();
|
||||
Map<String, Object> map = MAPPER.selectCustomerSql(customerValue, fieldValue, user);
|
||||
if (CollectionUtil.isNotEmpty(map)) {
|
||||
String checkExpression = checkCreateConfigDetail.getCheckExpression();
|
||||
if (StrUtil.isNotBlank(checkExpression)) {
|
||||
return (Boolean) ScriptUtil.invokeScript(checkExpression, map);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
package com.customization.youhong.pcn.createrworkflow.util;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import aiyh.utils.tool.cn.hutool.core.collection.CollectionUtil;
|
||||
import com.customization.youhong.pcn.createrworkflow.CreateRequestException;
|
||||
import com.customization.youhong.pcn.createrworkflow.mapper.CheckWorkflowRequestParamsMapper;
|
||||
import com.customization.youhong.pcn.createrworkflow.pojo.CheckConditionItem;
|
||||
import com.customization.youhong.pcn.createrworkflow.pojo.CheckCreateConfig;
|
||||
import com.customization.youhong.pcn.createrworkflow.pojo.CheckCreateConfigDetail;
|
||||
import com.engine.workflow.entity.publicApi.ReqOperateRequestEntity;
|
||||
import weaver.hrm.User;
|
||||
import weaver.workflow.webservices.WorkflowRequestTableField;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* <h1>工具</h1>
|
||||
*
|
||||
* <p>create: 2023/6/14 14:20</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
public class CheckWorkflowRequestParamsUtil {
|
||||
|
||||
private final CheckWorkflowRequestParamsMapper mapper = Util.getMapper(CheckWorkflowRequestParamsMapper.class);
|
||||
|
||||
|
||||
/**
|
||||
* ************************************************************
|
||||
* <h2>checkRequestParam 自定义参数校验</h2>
|
||||
* <i>2023/6/14 15:31</i>
|
||||
*
|
||||
* @param user: 当前用户
|
||||
* @param requestParam: 请求参数
|
||||
* @author youHong.ai
|
||||
* ************************************************************
|
||||
*/
|
||||
public void checkRequestParam(User user, ReqOperateRequestEntity requestParam) throws CreateRequestException {
|
||||
int workflowId = requestParam.getWorkflowId();
|
||||
CheckCreateConfig checkCreateConfig = mapper.selectCheckConfig(workflowId);
|
||||
if (Objects.isNull(checkCreateConfig)) {
|
||||
return;
|
||||
}
|
||||
List<CheckCreateConfigDetail> detailList = checkCreateConfig.getDetailList();
|
||||
if (CollectionUtil.isEmpty(detailList)) {
|
||||
return;
|
||||
}
|
||||
Map<String, CheckConditionItem> checkConditionItemMap;
|
||||
List<CheckConditionItem> conditionGroupItems = checkCreateConfig.getConditionGroupItems();
|
||||
if (CollectionUtil.isNotEmpty(conditionGroupItems)) {
|
||||
checkConditionItemMap =
|
||||
conditionGroupItems.stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
CheckConditionItem::getConditionName,
|
||||
value -> value
|
||||
));
|
||||
} else {
|
||||
checkConditionItemMap = new HashMap<>(8);
|
||||
}
|
||||
Map<String, CheckCreateConfigDetail> checkDetailMap =
|
||||
detailList.stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
item -> item.getWorkflowField().getFieldName(),
|
||||
value -> value
|
||||
)
|
||||
);
|
||||
checkMainData(checkDetailMap, checkConditionItemMap, requestParam);
|
||||
}
|
||||
|
||||
private void checkMainData(Map<String, CheckCreateConfigDetail> checkDetailMap,
|
||||
Map<String, CheckConditionItem> checkConditionItemMap,
|
||||
ReqOperateRequestEntity requestParam) {
|
||||
List<WorkflowRequestTableField> mainData = requestParam.getMainData();
|
||||
for (WorkflowRequestTableField mainDatum : mainData) {
|
||||
String fieldName = mainDatum.getFieldName();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
package weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.controller;
|
||||
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import org.apache.log4j.Logger;
|
||||
import weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.service.GMGatherOtherSystemInfoService;
|
||||
|
|
@ -33,6 +32,7 @@ public class GMGatherOtherSystemInfoController extends BaseCronJob {
|
|||
boolean insertDataBool = gmgatherOtherSystemInfoService.insertDataIntoGM(syncStandard,URL,formTableNameGM);
|
||||
if (insertDataBool){
|
||||
logger.info("GM集团获取GM集团下级单位合同台账信息执行成功！");
|
||||
logger.info("");
|
||||
}else {
|
||||
logger.error("GM集团获取GM集团下级单位合同台账信息执行失败！");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
package weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.controller;
|
||||
|
||||
import weaver.interfaces.schedule.BaseCronJob;
|
||||
|
||||
/**
|
||||
* <h1>GM集团获取商密集团合同台账信息</h1>
|
||||
* @author hcy
|
||||
* @date 2023/5/9 18:20
|
||||
*/
|
||||
public class GMGatherSMInfoController extends BaseCronJob {
|
||||
|
||||
public void execute() {
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -14,10 +14,8 @@ import weaver.interfaces.schedule.BaseCronJob;
|
|||
*/
|
||||
public class GMGatherSameSystemInfoController extends BaseCronJob {
|
||||
|
||||
|
||||
//业务主要逻辑
|
||||
private final GMGatherSameSystemInfoService gmgatherSameSystemInfoService = new GMGatherSameSystemInfoServiceImpl();
|
||||
|
||||
private final GMGatherSameSystemInfoService gmCountLowGroupData = new GMGatherSameSystemInfoServiceImpl();
|
||||
//日志处理
|
||||
private final Logger logger = Util.getLogger();
|
||||
|
||||
|
|
@ -33,7 +31,43 @@ public class GMGatherSameSystemInfoController extends BaseCronJob {
|
|||
//唯一标识
|
||||
public String uniqueIdentification;
|
||||
|
||||
|
||||
|
||||
public void execute() {
|
||||
gmgatherSameSystemInfoService.dealMainLogic(configurationMainTableName,configurationDetailTableName1,configurationDetailTableName2,uniqueIdentification);
|
||||
gmCountLowGroupData.dealMainLogic(configurationMainTableName,configurationDetailTableName1,configurationDetailTableName2,uniqueIdentification);//处理业务主要逻辑
|
||||
}
|
||||
|
||||
public String getConfigurationDetailTableName1() {
|
||||
return configurationDetailTableName1;
|
||||
}
|
||||
|
||||
public void setConfigurationDetailTableName1(String configurationDetailTableName1) {
|
||||
this.configurationDetailTableName1 = configurationDetailTableName1;
|
||||
}
|
||||
|
||||
public String getConfigurationDetailTableName2() {
|
||||
return configurationDetailTableName2;
|
||||
}
|
||||
|
||||
public void setConfigurationDetailTableName2(String configurationDetailTableName2) {
|
||||
this.configurationDetailTableName2 = configurationDetailTableName2;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public String getConfigurationMainTableName() {
|
||||
return configurationMainTableName;
|
||||
}
|
||||
|
||||
public void setConfigurationMainTableName(String configurationMainTableName) {
|
||||
this.configurationMainTableName = configurationMainTableName;
|
||||
}
|
||||
|
||||
public String getUniqueIdentification() {
|
||||
return uniqueIdentification;
|
||||
}
|
||||
|
||||
public void setUniqueIdentification(String uniqueIdentification) {
|
||||
this.uniqueIdentification = uniqueIdentification;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
package weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.mapper;
|
||||
|
||||
import aiyh.utils.annotation.recordset.SqlMapper;
|
||||
|
||||
@SqlMapper
|
||||
public class GMGatherSMInfoMapper {
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
package weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.mapper;
|
||||
|
||||
import aiyh.utils.annotation.recordset.Delete;
|
||||
import aiyh.utils.annotation.recordset.ParamMapper;
|
||||
import aiyh.utils.annotation.recordset.Select;
|
||||
import aiyh.utils.annotation.recordset.SqlMapper;
|
||||
|
|
@ -9,29 +10,50 @@ import java.util.Map;
|
|||
|
||||
@SqlMapper
|
||||
public interface GMGatherSameSystemInfoMapper {
|
||||
|
||||
|
||||
@Select("select * from #{configurationMainTableName} where wybs = #{uniqueIdentification}")
|
||||
@Select("select * from $t{configurationMainTableName} where wybs = #{uniqueIdentification}")
|
||||
List<Map<String, Object>> getConfigInformation(@ParamMapper("configurationMainTableName") String configurationMainTableName,
|
||||
@ParamMapper("uniqueIdentification") String uniqueIdentification);
|
||||
|
||||
@Select("select * from #{configurationDetailTableName1} where mainid = #{mainid}")
|
||||
@Select("select * from $t{configurationDetailTableName1} where mainid = #{mainid}")
|
||||
List<Map<String, Object>> getConfigDetal1Information(@ParamMapper("configurationDetailTableName1")String configurationDetailTableName1,
|
||||
@ParamMapper("mainid")String mainid);
|
||||
|
||||
@Select("select * from #{configurationDetailTableName2} where mainid = #{mainid}")
|
||||
@Select("select * from $t{configurationDetailTableName2} where mainid = #{mainid}")
|
||||
List<Map<String, Object>> getConfigDetal2Information(@ParamMapper("configurationDetailTableName2")String configurationDetailTableName2,
|
||||
@ParamMapper("mainid")String mainid);
|
||||
|
||||
@Select("select * from #{ejdwtzb_name} where LEFT(modedatacreatedate,7) = LEFT(#{yesterday},7)")
|
||||
@Select("select * from $t{ejdwtzb_name} where LEFT(modedatacreatedate,7) = LEFT(#{yesterday},7) ")
|
||||
List<Map<String, Object>> getSMCountLowGroupdata(@ParamMapper("ejdwtzb_name")String ejdwtzb_name,
|
||||
@ParamMapper("yesterday")String yesterday);
|
||||
|
||||
@Select("select * from #{ejdwtzb_name} where LEFT(modedatacreatedate,7) = LEFT(#{yesterday},7)")
|
||||
@Select("select * from $t{ejdwtzb_name} where LEFT(modedatamodifydatetime,7) = LEFT(#{yesterday},7)")
|
||||
List<Map<String, Object>> getSMCountLowGroupDataUpdate(@ParamMapper("ejdwtzb_name")String ejdwtzb_name,
|
||||
@ParamMapper("yesterday")String yesterday);
|
||||
|
||||
@Select("select * from #{jttzbd} where htbm = #{htbm}")
|
||||
@Select("select * from $t{jttzbd} where htbm = #{htbm}")
|
||||
List<Map<String, Object>> selectHtbmData(@ParamMapper("jttzbd")String jttzbd,
|
||||
@ParamMapper("htbm")String htbm);
|
||||
|
||||
@Select("select * from $t{ejdwtzb_name}")
|
||||
List<Map<String, Object>> getSMCountLowGroupTotalData(@ParamMapper("ejdwtzb_name") String ejdwtzb_name);
|
||||
|
||||
@Select("select id from $t{jttzbd} where htbm = #{htbm}")
|
||||
String selectIdByHtbm(@ParamMapper("jttzbd")String jttzbd,
|
||||
@ParamMapper("htbm")String htbm);
|
||||
|
||||
|
||||
@Delete("delete from $t{s} where mainid = #{id}")
|
||||
boolean deleteDetalDataByMainId(@ParamMapper("s")String s,
|
||||
@ParamMapper("id")String id);
|
||||
|
||||
|
||||
@Select("select id from $t{ejdwtzb_name} where htbm = #{htbm1}")
|
||||
String selectDetailTableSouceId(@ParamMapper("ejdwtzb_name")String ejdwtzb_name,
|
||||
@ParamMapper("htbm1")String htbm1);
|
||||
|
||||
|
||||
@Select("select * from $t{s} where mainid = #{ejdw_id}")
|
||||
List<Map<String, Object>> selectDetailTableSouceData(@ParamMapper("s")String s,
|
||||
@ParamMapper("ejdw_id")String ejdw_id);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
package weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.service;
|
||||
|
||||
public interface GMGatherSMInfoService {
|
||||
}
|
||||
|
|
@ -7,13 +7,17 @@ import aiyh.utils.sqlUtil.builderSql.impl.BuilderSqlImpl;
|
|||
import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
|
||||
import aiyh.utils.sqlUtil.whereUtil.impl.PrepWhereImpl;
|
||||
import org.apache.log4j.Logger;
|
||||
import sun.misc.BASE64Decoder;
|
||||
import weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.mapper.GMGatherOtherSystemInfoMapper;
|
||||
import weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.service.GMGatherOtherSystemInfoService;
|
||||
import weaver.conn.RecordSet;
|
||||
import weaver.formmode.setup.ModeRightInfo;
|
||||
import weaver.general.TimeUtil;
|
||||
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
|
@ -37,10 +41,11 @@ public class GMGatherOtherSystemInfoServiceImpl implements GMGatherOtherSystemIn
|
|||
//连接GM下级单位暴露的接口获取台账所有的数据
|
||||
this.getEntityInsertDB(syncStandard,URL,formTableNameGM);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
logger.error("执行数据插入逻辑异常,e:"+e.getMessage());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 向台账中同步数据
|
||||
|
|
@ -59,18 +64,28 @@ public class GMGatherOtherSystemInfoServiceImpl implements GMGatherOtherSystemIn
|
|||
}
|
||||
Map<String, Object> entityMap = responeVo.getResponseMap();
|
||||
List<Map<String,Object>> datas = (List<Map<String,Object>>) entityMap.get("data");
|
||||
logger.info("从异构系统的台账中获取的一次数据datas==="+datas);
|
||||
if (datas.isEmpty()) return false;//数据为空返回：数据为空
|
||||
logger.info("同步标准，syncStandard为："+syncStandard+"]");
|
||||
if ("1".equals(syncStandard)) {
|
||||
int failNum = 0;//失败的次数
|
||||
for (Map<String,Object> totalDataMap : datas) {
|
||||
String imagefilename = Util.null2String(totalDataMap.get("imagefilename"));
|
||||
//用于存放全部主表数据，排除所有明细表数据
|
||||
Map<String, Object> newDataMap = new HashMap<>(totalDataMap.entrySet().stream()
|
||||
.filter(entry -> !("detailData".equals(entry.getKey()) || "id".equals(entry.getKey())))
|
||||
.filter(entry -> !("detailData".equals(entry.getKey()) || "id".equals(entry.getKey()) || "imagefilename".equals(entry.getKey())))
|
||||
.collect(Collectors.toMap(
|
||||
Map.Entry::getKey,
|
||||
Map.Entry::getValue)));
|
||||
String htbm = Util.null2String(totalDataMap.get("htbm"));
|
||||
logger.info("合同编号，htbm:["+htbm+"]");
|
||||
//处理主表中特定字段的逻辑处理
|
||||
this.dealwithLcqzyj(newDataMap,imagefilename);
|
||||
if ("".equals(htbm)){//合同编号不能为空
|
||||
continue;
|
||||
}
|
||||
int countHtbm = gmGatherOtherSystemInfoMapper.selectCountHtbm(formTableNameGM,htbm);
|
||||
logger.info("合同编号的数量，countHtbm:["+countHtbm+"]");
|
||||
RecordSet recordSet = new RecordSet();
|
||||
if (countHtbm == 0){
|
||||
int mainid = this.createmodedata(formTableNameGM, 1, newDataMap);//先插入数据id,在根据数据id,插入所有明细数据
|
||||
|
|
@ -95,29 +110,35 @@ public class GMGatherOtherSystemInfoServiceImpl implements GMGatherOtherSystemIn
|
|||
}else {
|
||||
//先删明细数据
|
||||
String mainid = gmGatherOtherSystemInfoMapper.selectId(formTableNameGM,htbm);
|
||||
//开始插入明细表
|
||||
List<Map<String, Object>> detailData = (List<Map<String, Object>>) totalDataMap.get("detailData");
|
||||
for (Map<String, Object> detailDatum : detailData) {
|
||||
logger.info("mainid=="+mainid);
|
||||
//先删明细数据
|
||||
boolean deleteBool = gmGatherOtherSystemInfoMapper.deleteByMainId(formTableNameGM+"_dt1",Util.null2String(mainid));
|
||||
if (deleteBool){
|
||||
logger.info("deleteBool==="+deleteBool);
|
||||
//开始插入明细表
|
||||
List<Map<String, Object>> detailData = (List<Map<String, Object>>) totalDataMap.get("detailData");
|
||||
logger.info("detailData==="+detailData);
|
||||
if (deleteBool) {
|
||||
for (Map<String, Object> detailDatum : detailData) {
|
||||
logger.info("处理完明细表之前==="+detailDatum);
|
||||
detailDatum.put("mainid",mainid);
|
||||
logger.info("处理完明细表之前==="+detailDatum);
|
||||
insertSql(formTableNameGM,detailDatum);//插入明细表
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
logger.info("数据更新失败"+failNum+"次");
|
||||
} else if ("0".equals(syncStandard)){
|
||||
for (Map<String,Object> totalDataMap : datas) {
|
||||
String imagefilename = Util.null2String(totalDataMap.get("imagefilename"));
|
||||
//用于存放全部主表数据，排除所有明细表数据
|
||||
Map<String, Object> newDataMap = new HashMap<>(totalDataMap.entrySet().stream()
|
||||
.filter(entry -> !("detailData".equals(entry.getKey()) || "id".equals(entry.getKey())))
|
||||
.filter(entry -> !("detailData".equals(entry.getKey()) || "id".equals(entry.getKey()) || "imagefilename".equals(entry.getKey())))
|
||||
.collect(Collectors.toMap(
|
||||
Map.Entry::getKey,
|
||||
Map.Entry::getValue)));
|
||||
this.dealwithLcqzyj(newDataMap, imagefilename);
|
||||
int createmodedata = createmodedata(formTableNameGM, 1, newDataMap);
|
||||
if (createmodedata>0){
|
||||
List<Map<String, Object>> detailData = (List<Map<String, Object>>) totalDataMap.get("detailData");
|
||||
|
|
@ -130,10 +151,11 @@ public class GMGatherOtherSystemInfoServiceImpl implements GMGatherOtherSystemIn
|
|||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
logger.error("异常e:"+e.getMessage());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 访问国密下级单位暴露的接口，获取ResponeVo
|
||||
|
|
@ -180,7 +202,7 @@ public class GMGatherOtherSystemInfoServiceImpl implements GMGatherOtherSystemIn
|
|||
StringBuilder updatesql = new StringBuilder("update " + tablename + " set ");
|
||||
Set<String> keySet = map.keySet();
|
||||
for (String key : keySet) {
|
||||
updatesql.append(key).append("='").append(map.get(key).toString()).append("',");
|
||||
updatesql.append(key).append("='").append(Util.null2String(map.get(key))).append("',");
|
||||
}
|
||||
if (updatesql.toString().endsWith(",")) {
|
||||
updatesql = new StringBuilder(updatesql.substring(0, updatesql.length() - 1));
|
||||
|
|
@ -202,9 +224,9 @@ public class GMGatherOtherSystemInfoServiceImpl implements GMGatherOtherSystemIn
|
|||
}
|
||||
|
||||
/**
|
||||
* 获取没一张表的modeid
|
||||
* 获取每一张表的modeid
|
||||
* @param tablename 表名称
|
||||
* @return
|
||||
* @return modeid
|
||||
*/
|
||||
public Integer getModeidByTableName(String tablename) {
|
||||
RecordSet rs = new RecordSet();
|
||||
|
|
@ -225,8 +247,57 @@ public class GMGatherOtherSystemInfoServiceImpl implements GMGatherOtherSystemIn
|
|||
PrepSqlResultImpl prepSqlResult = builderSql.insertSql(tableName + "_dt1", datas);
|
||||
RecordSet recordSet1 = new RecordSet();
|
||||
boolean insertBool = recordSet1.executeUpdate(prepSqlResult.getSqlStr(), prepSqlResult.getArgs());
|
||||
logger.info("明细表是否插入成功---insertBool===="+insertBool);
|
||||
if (!insertBool){
|
||||
logger.error("数据插入失败，失败SQL:["+prepSqlResult+"]");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* base64转inputStream
|
||||
* @param base64string 包含输入流的字符串
|
||||
* @return inputStream
|
||||
*/
|
||||
private static InputStream base2InputStream(String base64string) {
|
||||
ByteArrayInputStream stream = null;
|
||||
try {
|
||||
BASE64Decoder decoder = new BASE64Decoder();
|
||||
byte[] bytes1 = decoder.decodeBuffer(base64string);
|
||||
stream = new ByteArrayInputStream(bytes1);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return stream;
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理流程签字意见字段
|
||||
* @param newDataMap 一条数据
|
||||
* @param imagefilename
|
||||
*/
|
||||
public void dealwithLcqzyj(Map<String, Object> newDataMap, String imagefilename){
|
||||
String lcqzyj = Util.null2String(newDataMap.get("lcqzyj"));//流程签字意见:需要流程存为文档
|
||||
logger.info("文件名称==="+imagefilename);
|
||||
// logger.info("流程签字意见字段，处理之前==="+lcqzyj);
|
||||
if (!"".equals(lcqzyj)&&!"-1".equals(lcqzyj)){
|
||||
InputStream inputStream = base2InputStream(lcqzyj);
|
||||
if (inputStream!=null){
|
||||
int fileByInputSteam = Util.createFileByInputSteam(inputStream, imagefilename);
|
||||
logger.info("fileByInputSteam:"+fileByInputSteam);
|
||||
int docByImageFileId;
|
||||
try {
|
||||
String path = Util.getCusConfigValue("pathKey");//配置文档存放路径
|
||||
logger.info("文档存放路径，path:["+path+"]");
|
||||
docByImageFileId = Util.createDocByImageFileId(Util.getIntValue(path), fileByInputSteam, 1);
|
||||
if (docByImageFileId>0){
|
||||
newDataMap.put("lcqzyj",docByImageFileId);
|
||||
logger.info("流程签字意见字段，docid存放成功,docid为：["+docByImageFileId+"]");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.error("流程签字一键字段，docid存放失败，失败原因：["+e+"]");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
package weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.service.impl;
|
||||
|
||||
|
||||
import weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.service.GMGatherSMInfoService;
|
||||
|
||||
public class GMGatherSMInfoServiceImpl implements GMGatherSMInfoService {
|
||||
}
|
||||
|
|
@ -1,33 +1,32 @@
|
|||
package weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.service.impl;
|
||||
|
||||
import aiyh.utils.Util;
|
||||
import com.google.common.base.Joiner;
|
||||
import aiyh.utils.sqlUtil.builderSql.impl.BuilderSqlImpl;
|
||||
import aiyh.utils.sqlUtil.sqlResult.impl.PrepSqlResultImpl;
|
||||
import aiyh.utils.sqlUtil.whereUtil.impl.PrepWhereImpl;
|
||||
import com.weaver.formmodel.util.DateHelper;
|
||||
import org.apache.log4j.Logger;
|
||||
import weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.mapper.GMGatherSameSystemInfoMapper;
|
||||
import weaver.chaoyang.he.hcy_hangtiankeji.gmgetdatafromlowgroup.service.GMGatherSameSystemInfoService;
|
||||
import weaver.conn.RecordSet;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import weaver.formmode.setup.ModeRightInfo;
|
||||
import weaver.general.TimeUtil;
|
||||
import java.util.*;
|
||||
|
||||
public class GMGatherSameSystemInfoServiceImpl implements GMGatherSameSystemInfoService {
|
||||
/**
|
||||
* 日志
|
||||
*/
|
||||
private final Logger logger = Util.getLogger();
|
||||
|
||||
//sql
|
||||
//处理sql
|
||||
private final GMGatherSameSystemInfoMapper gmGatherSameSystemInfoMapper = Util.getMapper(GMGatherSameSystemInfoMapper.class);
|
||||
|
||||
/**
|
||||
* 处理从国密集团下级单位台账数据库查询数据向国密集团总台账数据库中插入或者更新数据
|
||||
* @param configurationMainTableName 配置表主表名称
|
||||
* @param configurationDetailTableName1 配置表明细表1名称
|
||||
* @param configurationDetailTableName2 配置表明细表2名称
|
||||
* @param uniqueIdentification 唯一标识
|
||||
*/
|
||||
|
||||
|
||||
//构建inser、update 的sql语句
|
||||
private final BuilderSqlImpl builderSqlImpl = new BuilderSqlImpl();
|
||||
|
||||
//日志
|
||||
private final Logger logger = Util.getLogger();
|
||||
|
||||
@Override
|
||||
public void dealMainLogic(String configurationMainTableName, String configurationDetailTableName1, String configurationDetailTableName2, String uniqueIdentification) {
|
||||
//第一步获取配置表中数据
|
||||
if (configurationMainTableName.equals("") && configurationDetailTableName1.equals("") && uniqueIdentification.equals("")) return;
|
||||
|
|
@ -37,9 +36,9 @@ public class GMGatherSameSystemInfoServiceImpl implements GMGatherSameSystemInfo
|
|||
if (configMainTableData.isEmpty()) return;
|
||||
|
||||
String jttzbd = Util.null2String(configMainTableData.get(0).get("jttzbd"));//集团台账表单
|
||||
String mainid = Util.null2String(configMainTableData.get(0).get("mainid"));
|
||||
String mainid = Util.null2String(configMainTableData.get(0).get("id"));
|
||||
logger.info("配置表主表数据---mainid---"+mainid);
|
||||
if (mainid.equals("")) return;
|
||||
if (mainid.equals("") && "".equals(jttzbd)) return;
|
||||
|
||||
//配置表明细表1数据：用来统计商密下级单位台账名称
|
||||
List<Map<String,Object>> configDetal1TableData = gmGatherSameSystemInfoMapper.getConfigDetal1Information(configurationDetailTableName1,mainid);
|
||||
|
|
@ -47,9 +46,15 @@ public class GMGatherSameSystemInfoServiceImpl implements GMGatherSameSystemInfo
|
|||
//明细表2数据
|
||||
List<Map<String,Object>> configDetal2TableData = gmGatherSameSystemInfoMapper.getConfigDetal2Information(configurationDetailTableName2,mainid);
|
||||
logger.info("配置表明细表数据---configDetal2TableData---"+configDetal2TableData);
|
||||
List<String> keys = new ArrayList<>();//用于insert和update的key
|
||||
List<String> mainTablekeys = new ArrayList<>();//用于存放主表中insert和update的key
|
||||
List<String> detalTablekeys = new ArrayList<>();//用于存放主表中insert和update的key
|
||||
for (Map<String, Object> configdetal2 : configDetal2TableData) {
|
||||
keys.add(Util.null2String(configdetal2.get("tbzd")));
|
||||
String sfzb = Util.null2String(configdetal2.get("sfzb"));
|
||||
if ("0".equals(sfzb)){
|
||||
mainTablekeys.add(Util.null2String(configdetal2.get("tbzd")));
|
||||
}else if ("1".equals(sfzb)){
|
||||
detalTablekeys.add(Util.null2String(configdetal2.get("tbzd")));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -58,9 +63,19 @@ public class GMGatherSameSystemInfoServiceImpl implements GMGatherSameSystemInfo
|
|||
for (Map<String, Object> config1 : configDetal1TableData) {
|
||||
String ejdwtzb_name = Util.null2String(config1.get("ejdwtzb")); //二级单位台账表数据库名称
|
||||
String bz = Util.null2String(config1.get("bz")); //备注
|
||||
logger.info("二级单位台账表数据库名称===="+ejdwtzb_name+" 二级单位台账表数名称==="+bz);
|
||||
String tbzt = Util.null2String(config1.get("tbzt"));
|
||||
logger.info("二级单位台账表数据库名称===="+ejdwtzb_name+" 二级单位台账表数名称==="+bz+" 同步状态==="+tbzt);
|
||||
|
||||
if ("0".equals(tbzt)){
|
||||
//查询全量数据
|
||||
List<Map<String,Object>> smCountLowGroupTotalData = gmGatherSameSystemInfoMapper.getSMCountLowGroupTotalData(ejdwtzb_name);//第一次同步数据
|
||||
logger.info("全量数据---smCountLowGroupTotalData==="+smCountLowGroupTotalData);
|
||||
if (smCountLowGroupTotalData.size()>0){
|
||||
this.insertData(smCountLowGroupTotalData,jttzbd,ejdwtzb_name,mainTablekeys,detalTablekeys,tbzt);//全增量主表数据执行插入 并且包含明细表的删除，和再次添加
|
||||
}
|
||||
}else if ("1".equals(tbzt)){ //非第一次同步数据
|
||||
//获取当天日期的前一天，如果和创建时间吻合，并且满足修改时间为空那么，这条数据就是纯插入的数据
|
||||
List<Map<String,Object>> smCountLowGroupDataInsert = gmGatherSameSystemInfoMapper.getSMCountLowGroupdata(ejdwtzb_name, DateHelper.getYesterday());
|
||||
List<Map<String,Object>> smCountLowGroupDataInsert = gmGatherSameSystemInfoMapper.getSMCountLowGroupdata(ejdwtzb_name,DateHelper.getYesterday());
|
||||
logger.info("smCountLowGroupDataInsert===="+smCountLowGroupDataInsert);
|
||||
|
||||
//获取当天日期的前一天，如果和修改时间吻合，那么这条数据就是更新操作的数据
|
||||
|
|
@ -69,48 +84,73 @@ public class GMGatherSameSystemInfoServiceImpl implements GMGatherSameSystemInfo
|
|||
|
||||
//数据插入商密集团总台账
|
||||
if (smCountLowGroupDataInsert.size()>0){
|
||||
this.insertData(smCountLowGroupDataInsert,jttzbd,keys);
|
||||
this.insertData(smCountLowGroupDataInsert,jttzbd,ejdwtzb_name,mainTablekeys,detalTablekeys, tbzt);
|
||||
}
|
||||
//数据更新商密集团总台账
|
||||
if (smCountLowGroupDataupdate.size()>0){
|
||||
this.updateData(smCountLowGroupDataupdate,jttzbd,keys);
|
||||
}
|
||||
this.updateData(smCountLowGroupDataupdate,jttzbd,ejdwtzb_name,mainTablekeys,detalTablekeys);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <h2>插入数据</h2>
|
||||
* @param smCountLowGroupDataInsert 插入数据集合
|
||||
* @param jttzbd 集团台账数据库名
|
||||
* @param ejdwtzb_name 二级单位数据库名
|
||||
* @param keys 需要insert的字段key
|
||||
* @param detalTablekeys 需要插入的明细表字段数据库名组成的list
|
||||
* @param tbzt 同步状态用来判断是第一次同步还是非首次同步
|
||||
* @author hcy
|
||||
* 2023/5/6 17:41
|
||||
*/
|
||||
private void insertData(List<Map<String, Object>> smCountLowGroupDataInsert, String jttzbd,List<String> keys) {
|
||||
private void insertData(List<Map<String, Object>> smCountLowGroupDataInsert, String jttzbd, String ejdwtzb_name, List<String> keys, List<String> detalTablekeys, String tbzt) {
|
||||
|
||||
RecordSet recordSet = new RecordSet();
|
||||
int successNum = 0;
|
||||
int failNum = 0;
|
||||
for (Map<String, Object> insertDatas : smCountLowGroupDataInsert) {
|
||||
String htbm = Util.null2String(insertDatas.get("htbm"));
|
||||
List<Map<String,Object>> selectHtbmData = gmGatherSameSystemInfoMapper.selectHtbmData(jttzbd,htbm);
|
||||
if (selectHtbmData.size()==0){
|
||||
|
||||
String insertKey = Joiner.on(",").join((Iterable<?>) keys);//key
|
||||
ArrayList<String> valueList = new ArrayList<>();
|
||||
// String insertKey = Joiner.on(",").join((Iterable<?>) keys);//key
|
||||
Map<String, Object> keyValueMap = new HashMap<>();
|
||||
for (String key : keys) {
|
||||
String v = Util.null2String(insertDatas.get(key));
|
||||
valueList.add(v);
|
||||
// if("htzje".equals(key) || "htjrrmb".equals(key)){
|
||||
// String o = Util.null2String(insertDatas.get(key));
|
||||
// if ("".equals(o)){
|
||||
// keyValueMap.put(key, null);
|
||||
// }else {
|
||||
// keyValueMap.put(key, o);
|
||||
// }
|
||||
// }else {
|
||||
// Object o = insertDatas.get(key);
|
||||
// keyValueMap.put(key, o);
|
||||
// }
|
||||
Object o = insertDatas.get(key);
|
||||
keyValueMap.put(key, o);
|
||||
}
|
||||
// PrepSqlResultImpl prepSqlResult = builderSqlImpl.insertSql(jttzbd, keyValueMap);
|
||||
// boolean insertBool = recordSet.executeUpdate(prepSqlResult.getSqlStr(), prepSqlResult.getArgs());
|
||||
|
||||
String insertValue = Joiner.on(",").join((Iterable<?>) valueList);//value
|
||||
|
||||
String insertSql = "insert into "+jttzbd + "(" +insertKey + ")"+ "value " +"("+insertValue+")";//拼接插入的sql语句
|
||||
boolean insertBool = recordSet.executeQuery(insertSql);
|
||||
if (insertBool){
|
||||
logger.info("数据插入成功");
|
||||
}else{
|
||||
logger.info("数据插入失败");
|
||||
int createmodedata = createmodedata(jttzbd, 1, keyValueMap);
|
||||
if (createmodedata>0){
|
||||
String htbm1 = Util.null2String(keyValueMap.get("htbm"));
|
||||
deleteAndInsertDetailTable(htbm1,jttzbd,ejdwtzb_name,detalTablekeys);
|
||||
}
|
||||
// if(insertBool){
|
||||
// successNum++;
|
||||
// String htbm1 = Util.null2String(keyValueMap.get("htbm"));
|
||||
// //执行明细表的数据删除和数据插入
|
||||
// deleteAndInsertDetailTable(htbm1,jttzbd,ejdwtzb_name,detalTablekeys);
|
||||
// }else{
|
||||
// failNum++;
|
||||
// logger.error("台账数据插入失败，失败SQL:["+ prepSqlResult +"----失败次数："+failNum+"]");
|
||||
// }
|
||||
logger.info("台账数据插入成功 "+successNum+"次");
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -119,44 +159,161 @@ public class GMGatherSameSystemInfoServiceImpl implements GMGatherSameSystemInfo
|
|||
* <h2>更新数据</h2>
|
||||
* @param smCountLowGroupDataupdate 更新语句集合
|
||||
* @param jttzbd 集团台账数据库名
|
||||
* @param ejdwtzb_name 二级单位数据库名
|
||||
* @param keys 数据更新的key组成的集合
|
||||
* @param detalTablekeys 需要插入的明细表字段数据库名组成的list
|
||||
* @author hcy
|
||||
* 2023/5/6 17:40
|
||||
*/
|
||||
|
||||
private void updateData(List<Map<String, Object>> smCountLowGroupDataupdate, String jttzbd, List<String> keys) {
|
||||
try {
|
||||
|
||||
private void updateData(List<Map<String, Object>> smCountLowGroupDataupdate, String jttzbd, String ejdwtzb_name, List<String> keys, List<String> detalTablekeys) {
|
||||
RecordSet recordSet = new RecordSet();
|
||||
int failNum = 0;
|
||||
int successNum = 0;
|
||||
for (Map<String, Object> updateDates : smCountLowGroupDataupdate) {
|
||||
String htbm = Util.null2String(updateDates.get("htbm"));
|
||||
List<Map<String, Object>> updateDatas = gmGatherSameSystemInfoMapper.selectHtbmData(jttzbd, htbm);
|
||||
if (updateDatas.size()>0){
|
||||
//拼接sql
|
||||
List<String> updateValueList = new ArrayList<>();
|
||||
for (String key : keys) {
|
||||
String value = Util.null2String(updateDates.get(key));
|
||||
updateValueList.add(value);
|
||||
}
|
||||
StringBuilder builder = new StringBuilder();
|
||||
|
||||
Joiner.on(", ").appendTo(builder, keys);
|
||||
builder.append(" = ");
|
||||
Joiner.on(", ").appendTo(builder, updateValueList);
|
||||
|
||||
|
||||
String updateSql = "update "+jttzbd + "set " + builder + " where htbm = ?";
|
||||
boolean updateBool = recordSet.executeQuery(updateSql, htbm);
|
||||
if (updateBool){
|
||||
logger.info("======数据更新成功======");
|
||||
List<Map<String, Object>> selecthtbmData = gmGatherSameSystemInfoMapper.selectHtbmData(jttzbd, htbm);
|
||||
if (selecthtbmData.size()>0){
|
||||
Map<String, Object> keyValueMap = getKeyValueMap(updateDates, keys);
|
||||
PrepWhereImpl prepWhere = new PrepWhereImpl();
|
||||
prepWhere.whereAnd("htbm = ?");
|
||||
prepWhere.addArgs(htbm);
|
||||
PrepSqlResultImpl prepSqlResult = builderSqlImpl.updateSql(jttzbd, keyValueMap, prepWhere);
|
||||
boolean insertBool = recordSet.executeUpdate(prepSqlResult.getSqlStr(), prepSqlResult.getArgs());
|
||||
if (insertBool){
|
||||
String htbm1 = Util.null2String(keyValueMap.get("htbm"));
|
||||
//执行明细表的数据删除和数据插入
|
||||
deleteAndInsertDetailTable(htbm1,jttzbd,ejdwtzb_name,detalTablekeys);
|
||||
successNum++;
|
||||
}else {
|
||||
logger.info("======数据更新失败======");
|
||||
failNum++;
|
||||
logger.error("台账数据更新失败，SQL：["+ prepSqlResult +"------失败次数："+failNum+"]");
|
||||
}
|
||||
logger.info("台账数据更新成功 "+successNum + "次");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 用于封装insert或者update的key,value的map集合
|
||||
* @param datas 数据源
|
||||
* @param keys 需要更新或者插入的keys
|
||||
* @return 预期的key,value对应的map集合
|
||||
*/
|
||||
public Map<String, Object> getKeyValueMap(Map<String, Object> datas ,List<String> keys){
|
||||
Map<String, Object> keyValueMap = new HashMap<>();
|
||||
for (String key : keys) {
|
||||
String v = Util.null2String(datas.get(key));
|
||||
keyValueMap.put(key, v);
|
||||
}
|
||||
return keyValueMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除并插入明细表中的数据
|
||||
* @param htbm1 合同编号用来作为唯一标识
|
||||
* @param jttzbd 商密集团台账数据库名称
|
||||
* @param ejdwtzb_name 二级单位名称
|
||||
* @param detalTablekeys 需要插入的明细表字段数据库名组成的list
|
||||
*/
|
||||
public void deleteAndInsertDetailTable(String htbm1,String jttzbd,String ejdwtzb_name,List<String> detalTablekeys){
|
||||
|
||||
try {
|
||||
RecordSet insertDatailRS = new RecordSet();
|
||||
//执行明细表的插入语句
|
||||
String id = gmGatherSameSystemInfoMapper.selectIdByHtbm(jttzbd,htbm1);
|
||||
int successNum = 0;
|
||||
int failNum = 0;
|
||||
if (!"".equals(id)){
|
||||
boolean deleteBool = gmGatherSameSystemInfoMapper.deleteDetalDataByMainId(jttzbd+"_dt1",id);//明细表插入数据之前，先执行删除语句
|
||||
if (deleteBool){
|
||||
//执行明细表插入逻辑
|
||||
String ejdw_id = gmGatherSameSystemInfoMapper.selectDetailTableSouceId(ejdwtzb_name,htbm1);
|
||||
List<Map<String,Object>> souceDetailDatas = gmGatherSameSystemInfoMapper.selectDetailTableSouceData(ejdwtzb_name+"_dt1",ejdw_id);
|
||||
if (souceDetailDatas.size()==0) return;
|
||||
for (Map<String, Object> souceDetailData : souceDetailDatas) {
|
||||
Map<String, Object> dealwithData = new HashMap<>();//根据配置表处理完需要字段后的数据Map
|
||||
for (String key : detalTablekeys) {
|
||||
dealwithData.put(key,souceDetailData.get(key));
|
||||
}
|
||||
//将mainid拼进去
|
||||
dealwithData.put("mainid",id);
|
||||
//开始插入明细表数据
|
||||
PrepSqlResultImpl prepSqlResult = builderSqlImpl.insertSql(jttzbd+"_dt1", dealwithData);
|
||||
boolean detailInsertBool = insertDatailRS.executeUpdate(prepSqlResult.getSqlStr(), prepSqlResult.getArgs());
|
||||
if (detailInsertBool){
|
||||
successNum++;
|
||||
}else {
|
||||
failNum++;
|
||||
logger.error("明细表数据插入失败，SQL:["+prepSqlResult+"------失败次数："+failNum+"]");
|
||||
}
|
||||
logger.info("明细表数据插入成功数量："+successNum);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.info("----GMGatherSameSystemInfoServiceImpl----smCountLowGroupDataupdate----异常如下===="+e);
|
||||
logger.error("报错=="+e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 方法描述 : 将数据插入表单建模
|
||||
* @param tablename 建模表明
|
||||
* @param userid 创建人id
|
||||
* @param map 数据map
|
||||
* @return int 返回数据id
|
||||
*/
|
||||
public int createmodedata(String tablename, int userid, Map<String, Object> map) {
|
||||
Integer modeid = getModeidByTableName(tablename);
|
||||
int dataid = 0;
|
||||
RecordSet rs = new RecordSet();
|
||||
|
||||
String uuid = map.containsKey("modeuuid") ? map.get("modeuuid").toString() : UUID.randomUUID().toString();
|
||||
boolean flag = rs.execute("insert into " + tablename
|
||||
+ "(modeuuid,modedatacreater,modedatacreatedate,modedatacreatetime,formmodeid) values('" + uuid + "',"
|
||||
+ userid + ",'" + TimeUtil.getCurrentDateString() + "','" + TimeUtil.getOnlyCurrentTimeString() + "',"
|
||||
+ modeid + ")");
|
||||
if (flag) {
|
||||
rs.execute("select id from " + tablename + " where modeuuid='" + uuid + "'");
|
||||
rs.next();
|
||||
dataid = weaver.general.Util.getIntValue(rs.getString("id"));
|
||||
|
||||
if (dataid > 0) {
|
||||
// 遍历数据 进行update
|
||||
String updatesql = "update " + tablename + " set ";
|
||||
Set<String> keySet = map.keySet();
|
||||
for (String key : keySet) {
|
||||
updatesql += key + "='" + map.get(key).toString() + "',";
|
||||
}
|
||||
if (updatesql.endsWith(",")) {
|
||||
updatesql = updatesql.substring(0, updatesql.length() - 1);
|
||||
|
||||
updatesql += " where id=" + dataid;
|
||||
boolean execute = rs.execute(updatesql);
|
||||
if(!execute){
|
||||
logger.info("出错的sql==="+updatesql);
|
||||
}
|
||||
}
|
||||
/*
|
||||
* 进行权限重构
|
||||
*/
|
||||
ModeRightInfo moderight = new ModeRightInfo();
|
||||
moderight.editModeDataShare(userid, modeid, dataid);
|
||||
}
|
||||
}
|
||||
|
||||
return dataid;
|
||||
}
|
||||
|
||||
|
||||
public static Integer getModeidByTableName(String tablename) {
|
||||
RecordSet rs = new RecordSet();
|
||||
String sql = "select b.TABLENAME,a.FORMID,a.id modeid from modeinfo a left join workflow_bill b on a.FORMID=b.id where b.TABLENAME= '"
|
||||
+ tablename + "'";
|
||||
rs.execute(sql);
|
||||
rs.next();
|
||||
return Math.abs(rs.getInt("modeid"));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ public interface SMCountLowGroupDataMapper {
|
|||
List<Map<String, Object>> getConfigDetal2Information(@ParamMapper("configurationDetailTableName2")String configurationDetailTableName2,
|
||||
@ParamMapper("mainid")String mainid);
|
||||
|
||||
@Select("select * from $t{ejdwtzb_name} where LEFT(modedatacreatedate,7) = LEFT(#{yesterday},7) ")
|
||||
@Select("select * from $t{ejdwtzb_name} where LEFT(modedatacreatedate,10) = LEFT(#{yesterday},10) ")
|
||||
List<Map<String, Object>> getSMCountLowGroupdata(@ParamMapper("ejdwtzb_name")String ejdwtzb_name,
|
||||
@ParamMapper("yesterday")String yesterday);
|
||||
|
||||
@Select("select * from $t{ejdwtzb_name} where LEFT(modedatamodifydatetime,7) = LEFT(#{yesterday},7)")
|
||||
@Select("select * from $t{ejdwtzb_name} where LEFT(modedatamodifydatetime,10) = #{yesterday}")
|
||||
List<Map<String, Object>> getSMCountLowGroupDataUpdate(@ParamMapper("ejdwtzb_name")String ejdwtzb_name,
|
||||
@ParamMapper("yesterday")String yesterday);
|
||||
|
||||
|
|
|
|||
|
|
@ -77,16 +77,21 @@ public class SMCountLowGroupDataServiceImpl implements SMCountLowGroupDataServic
|
|||
if ("0".equals(tbzt)){
|
||||
//查询全量数据
|
||||
List<Map<String,Object>> smCountLowGroupTotalData = smCountLowGroupDataMapper.getSMCountLowGroupTotalData(ejdwtzb_name);//第一次同步数据
|
||||
logger.info("查询到的全量数据，smCountLowGroupTotalData：["+smCountLowGroupTotalData+"]");
|
||||
if (smCountLowGroupTotalData.size()>0){
|
||||
this.insertData(smCountLowGroupTotalData,jttzbd,ejdwtzb_name,mainTablekeys,detalTablekeys,tbzt);//全增量主表数据执行插入 并且包含明细表的删除，和再次添加
|
||||
}
|
||||
}else if ("1".equals(tbzt)){ //非第一次同步数据
|
||||
//获取当天日期的前一天，如果和创建时间吻合，并且满足修改时间为空那么，这条数据就是纯插入的数据
|
||||
String yesterday = DateHelper.getYesterday();
|
||||
List<Map<String,Object>> smCountLowGroupDataInsert = smCountLowGroupDataMapper.getSMCountLowGroupdata(ejdwtzb_name,DateHelper.getYesterday());
|
||||
logger.info("smCountLowGroupDataInsert===="+smCountLowGroupDataInsert);
|
||||
|
||||
//获取当天日期的前一天，如果和修改时间吻合，那么这条数据就是更新操作的数据
|
||||
|
||||
logger.info("yesterday:"+yesterday);
|
||||
List<Map<String,Object>> smCountLowGroupDataupdate = smCountLowGroupDataMapper.getSMCountLowGroupDataUpdate(ejdwtzb_name,DateHelper.getYesterday());
|
||||
|
||||
logger.info("smCountLowGroupDataupdate===="+smCountLowGroupDataupdate);
|
||||
|
||||
//数据插入商密集团总台账
|
||||
|
|
@ -116,47 +121,27 @@ public class SMCountLowGroupDataServiceImpl implements SMCountLowGroupDataServic
|
|||
*/
|
||||
private void insertData(List<Map<String, Object>> smCountLowGroupDataInsert, String jttzbd, String ejdwtzb_name, List<String> keys, List<String> detalTablekeys, String tbzt) {
|
||||
|
||||
RecordSet recordSet = new RecordSet();
|
||||
int successNum = 0;
|
||||
int failNum = 0;
|
||||
for (Map<String, Object> insertDatas : smCountLowGroupDataInsert) {
|
||||
String htbm = Util.null2String(insertDatas.get("htbm"));
|
||||
logger.info("htbm:["+htbm+"]");
|
||||
List<Map<String,Object>> selectHtbmData = smCountLowGroupDataMapper.selectHtbmData(jttzbd,htbm);
|
||||
logger.info("selectHtbmData:["+selectHtbmData+"]");
|
||||
if (selectHtbmData.size()==0){
|
||||
// String insertKey = Joiner.on(",").join((Iterable<?>) keys);//key
|
||||
Map<String, Object> keyValueMap = new HashMap<>();
|
||||
for (String key : keys) {
|
||||
// if("htzje".equals(key) || "htjrrmb".equals(key)){
|
||||
// String o = Util.null2String(insertDatas.get(key));
|
||||
// if ("".equals(o)){
|
||||
// keyValueMap.put(key, null);
|
||||
// }else {
|
||||
// keyValueMap.put(key, o);
|
||||
// }
|
||||
// }else {
|
||||
// Object o = insertDatas.get(key);
|
||||
// keyValueMap.put(key, o);
|
||||
// }
|
||||
Object o = insertDatas.get(key);
|
||||
keyValueMap.put(key, o);
|
||||
}
|
||||
// PrepSqlResultImpl prepSqlResult = builderSqlImpl.insertSql(jttzbd, keyValueMap);
|
||||
// boolean insertBool = recordSet.executeUpdate(prepSqlResult.getSqlStr(), prepSqlResult.getArgs());
|
||||
|
||||
logger.info("keyValueMap:["+keyValueMap+"]"+"jttzbd:["+jttzbd+"]");
|
||||
int createmodedata = createmodedata(jttzbd, 1, keyValueMap);
|
||||
logger.info("createmodedata:["+createmodedata+"]");
|
||||
if (createmodedata>0){
|
||||
String htbm1 = Util.null2String(keyValueMap.get("htbm"));
|
||||
logger.info("htbm1:["+htbm1+"]");
|
||||
deleteAndInsertDetailTable(htbm1,jttzbd,ejdwtzb_name,detalTablekeys);
|
||||
successNum++;
|
||||
}
|
||||
// if(insertBool){
|
||||
// successNum++;
|
||||
// String htbm1 = Util.null2String(keyValueMap.get("htbm"));
|
||||
// //执行明细表的数据删除和数据插入
|
||||
// deleteAndInsertDetailTable(htbm1,jttzbd,ejdwtzb_name,detalTablekeys);
|
||||
// }else{
|
||||
// failNum++;
|
||||
// logger.error("台账数据插入失败，失败SQL:["+ prepSqlResult +"----失败次数："+failNum+"]");
|
||||
// }
|
||||
logger.info("台账数据插入成功 "+successNum+"次");
|
||||
|
||||
}
|
||||
|
|
@ -173,7 +158,6 @@ public class SMCountLowGroupDataServiceImpl implements SMCountLowGroupDataServic
|
|||
* @author hcy
|
||||
* 2023/5/6 17:40
|
||||
*/
|
||||
|
||||
private void updateData(List<Map<String, Object>> smCountLowGroupDataupdate, String jttzbd, String ejdwtzb_name, List<String> keys, List<String> detalTablekeys) {
|
||||
RecordSet recordSet = new RecordSet();
|
||||
int failNum = 0;
|
||||
|
|
@ -229,15 +213,20 @@ public class SMCountLowGroupDataServiceImpl implements SMCountLowGroupDataServic
|
|||
try {
|
||||
RecordSet insertDatailRS = new RecordSet();
|
||||
//执行明细表的插入语句
|
||||
logger.info("htbm1:["+htbm1+"] jttzbd:["+jttzbd+"] ejdwtzb_name:["+ejdwtzb_name+"] detalTablekeys:["+detalTablekeys+"]");
|
||||
String id = smCountLowGroupDataMapper.selectIdByHtbm(jttzbd,htbm1);
|
||||
logger.info("id:["+id+"]");
|
||||
int successNum = 0;
|
||||
int failNum = 0;
|
||||
if (!"".equals(id)){
|
||||
boolean deleteBool = smCountLowGroupDataMapper.deleteDetalDataByMainId(jttzbd+"_dt1",id);//明细表插入数据之前，先执行删除语句
|
||||
logger.info("是否删除成功deleteBool:["+deleteBool+"]");
|
||||
if (deleteBool){
|
||||
//执行明细表插入逻辑
|
||||
String ejdw_id = smCountLowGroupDataMapper.selectDetailTableSouceId(ejdwtzb_name,htbm1);
|
||||
logger.info("ejdw_id:["+ejdw_id+"]");
|
||||
List<Map<String,Object>> souceDetailDatas = smCountLowGroupDataMapper.selectDetailTableSouceData(ejdwtzb_name+"_dt1",ejdw_id);
|
||||
logger.info("souceDetailDatas:["+souceDetailDatas+"]");
|
||||
if (souceDetailDatas.size()==0) return;
|
||||
for (Map<String, Object> souceDetailData : souceDetailDatas) {
|
||||
Map<String, Object> dealwithData = new HashMap<>();//根据配置表处理完需要字段后的数据Map
|
||||
|
|
@ -246,9 +235,11 @@ public class SMCountLowGroupDataServiceImpl implements SMCountLowGroupDataServic
|
|||
}
|
||||
//将mainid拼进去
|
||||
dealwithData.put("mainid",id);
|
||||
logger.info("dealwithData:["+dealwithData+"]");
|
||||
//开始插入明细表数据
|
||||
PrepSqlResultImpl prepSqlResult = builderSqlImpl.insertSql(jttzbd+"_dt1", dealwithData);
|
||||
boolean detailInsertBool = insertDatailRS.executeUpdate(prepSqlResult.getSqlStr(), prepSqlResult.getArgs());
|
||||
logger.info("detailInsertBool：["+detailInsertBool+"]");
|
||||
if (detailInsertBool){
|
||||
successNum++;
|
||||
}else {
|
||||
|
|
@ -274,32 +265,42 @@ public class SMCountLowGroupDataServiceImpl implements SMCountLowGroupDataServic
|
|||
* @return int 返回数据id
|
||||
*/
|
||||
public int createmodedata(String tablename, int userid, Map<String, Object> map) {
|
||||
try {
|
||||
Integer modeid = getModeidByTableName(tablename);
|
||||
logger.info("modeid:["+modeid+"]");
|
||||
int dataid = 0;
|
||||
RecordSet rs = new RecordSet();
|
||||
|
||||
String uuid = map.containsKey("modeuuid") ? map.get("modeuuid").toString() : UUID.randomUUID().toString();
|
||||
boolean flag = rs.execute("insert into " + tablename
|
||||
logger.info("uuid:["+uuid+"]");
|
||||
String insertSql = "insert into " + tablename
|
||||
+ "(modeuuid,modedatacreater,modedatacreatedate,modedatacreatetime,formmodeid) values('" + uuid + "',"
|
||||
+ userid + ",'" + TimeUtil.getCurrentDateString() + "','" + TimeUtil.getOnlyCurrentTimeString() + "',"
|
||||
+ modeid + ")");
|
||||
+ modeid + ")";
|
||||
logger.info("insertSql:["+insertSql+"]");
|
||||
boolean flag = rs.execute(insertSql);
|
||||
logger.info("flag:["+flag+"]");
|
||||
if (flag) {
|
||||
rs.execute("select id from " + tablename + " where modeuuid='" + uuid + "'");
|
||||
rs.next();
|
||||
dataid = weaver.general.Util.getIntValue(rs.getString("id"));
|
||||
logger.info("dataid:["+dataid+"]");
|
||||
|
||||
if (dataid > 0) {
|
||||
// 遍历数据 进行update
|
||||
String updatesql = "update " + tablename + " set ";
|
||||
logger.info("updatesql:["+updatesql+"]");
|
||||
Set<String> keySet = map.keySet();
|
||||
for (String key : keySet) {
|
||||
updatesql += key + "='" + map.get(key).toString() + "',";
|
||||
updatesql += key + "='" + Util.null2String(map.get(key)) + "',";
|
||||
}
|
||||
logger.info("updatesql:["+updatesql+"]");
|
||||
if (updatesql.endsWith(",")) {
|
||||
updatesql = updatesql.substring(0, updatesql.length() - 1);
|
||||
|
||||
updatesql += " where id=" + dataid;
|
||||
logger.info("updatesql:["+updatesql+"]");
|
||||
boolean execute = rs.execute(updatesql);
|
||||
logger.info("execute:["+execute+"]");
|
||||
if(!execute){
|
||||
logger.info("出错的sql==="+updatesql);
|
||||
}
|
||||
|
|
@ -313,6 +314,11 @@ public class SMCountLowGroupDataServiceImpl implements SMCountLowGroupDataServic
|
|||
}
|
||||
|
||||
return dataid;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.error("更新报错，e:["+e+"]");
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,111 @@
|
|||
package selfdev.util.log;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.File;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
import weaver.general.BaseBean;
|
||||
import weaver.general.GCONST;
|
||||
|
||||
/**
|
||||
* 日志工具类
|
||||
* @author KangMD
|
||||
* 1、2019-01-29 add by KangMD
|
||||
*/
|
||||
|
||||
public class LogTool {
|
||||
private BufferedWriter logPrint;
|
||||
private String logFile = "";
|
||||
private String logPath="";
|
||||
private boolean systemlog=false;//是否写系统日记
|
||||
static SimpleDateFormat newDf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
static SimpleDateFormat df =new SimpleDateFormat("yyyy-MM-dd");
|
||||
static BaseBean log=new BaseBean();
|
||||
public LogTool(){
|
||||
//if(logFile == null || logFile.trim().equals("") || !logFile.equals(getLogFile())){
|
||||
// newLog();
|
||||
//}
|
||||
}
|
||||
public LogTool(String logPath,boolean systemlog){
|
||||
this.logPath=logPath;
|
||||
this.systemlog=systemlog;
|
||||
}
|
||||
private String getLogFile(){
|
||||
//获取当前系统路径
|
||||
String sysPath=GCONST.getRootPath();
|
||||
if(sysPath==null){
|
||||
sysPath=System.getProperty("user.dir");
|
||||
}
|
||||
if(!"".equals(logPath)){
|
||||
if(logPath.endsWith("/")){
|
||||
sysPath += logPath+df.format(new Date())+".log";
|
||||
}else{
|
||||
sysPath += logPath+"/"+df.format(new Date())+".log";
|
||||
}
|
||||
}else {
|
||||
sysPath += "/log/dev/"+df.format(new Date())+".log";
|
||||
}
|
||||
return sysPath;
|
||||
}
|
||||
|
||||
private void newLog(){
|
||||
logFile = getLogFile();
|
||||
try{
|
||||
//logPrint = new PrintWriter(new FileWriter(logFile, true), true);
|
||||
logPrint = new BufferedWriter (new OutputStreamWriter (new FileOutputStream (logFile,true),"UTF-8"));
|
||||
}catch(IOException e){
|
||||
try{
|
||||
File file=new File(logFile);
|
||||
if(!file.getParentFile().exists()) {
|
||||
//如果目标文件所在的目录不存在，则创建父目录
|
||||
if(file.getParentFile().mkdirs()){
|
||||
file.createNewFile();
|
||||
}
|
||||
}
|
||||
//logPrint = new PrintWriter(new FileWriter(logFile, true), true);
|
||||
logPrint = new BufferedWriter (new OutputStreamWriter (new FileOutputStream (logFile,true),"UTF-8"));
|
||||
}catch(IOException ex){
|
||||
log.writeLog("Log记录出错了",ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void writeLog(Object msg) {
|
||||
if(systemlog){
|
||||
log.writeLog(msg);
|
||||
}
|
||||
newLog();
|
||||
try {
|
||||
logPrint.write(newDf.format(new Date()) + ": " + msg);
|
||||
logPrint.newLine();//每次换行
|
||||
logPrint.flush();
|
||||
logPrint.close();
|
||||
} catch (IOException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void writeLog(String msg,Throwable e) {
|
||||
if(systemlog){
|
||||
log.writeLog(msg,e);
|
||||
}
|
||||
newLog();
|
||||
try {
|
||||
logPrint.write(newDf.format(new Date()) + ": " + msg);
|
||||
logPrint.newLine();//每次换行
|
||||
//e.printStackTrace(logPrint);
|
||||
logPrint.flush();
|
||||
logPrint.close();
|
||||
} catch (IOException e1) {
|
||||
// TODO Auto-generated catch block
|
||||
e1.printStackTrace();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ import aiyh.utils.Util;
|
|||
import basetest.BaseTest;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.api.doc.detail.util.DocDownloadCheckUtil;
|
||||
import com.api.youhong.ai.taibao.fcuntionlist.service.FunctionListService;
|
||||
import com.api.youhong.ai.taibao.qikan.service.PeriodicalService;
|
||||
import com.cloudstore.dev.api.util.Util_DataCache;
|
||||
|
|
@ -193,4 +194,10 @@ public class TestTaiBao extends BaseTest {
|
|||
System.out.println(JSON.toJSONString(subRequestEntities));
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testjlsdfj() {
|
||||
System.out.println(DocDownloadCheckUtil.DncodeFileid("a1c0c56773deeff8d8f7f235f3eb3db0d2b34cbedb9ff32262414a3c6c4b9a393fc01656cc42ddaf07cd9319d68901a734f710fbddd167603"));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,153 @@
|
|||
package youhong.ai.utiltest;
|
||||
|
||||
import aiyh.utils.httpUtil.ResponeVo;
|
||||
import aiyh.utils.httpUtil.util.HttpUtils;
|
||||
import basetest.BaseTest;
|
||||
import cn.hutool.core.util.CharsetUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.crypto.asymmetric.KeyType;
|
||||
import cn.hutool.crypto.asymmetric.RSA;
|
||||
import cn.hutool.http.HttpRequest;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* <h1>测试调用api</h1>
|
||||
*
|
||||
* <p>create: 2023/6/13 20:04</p>
|
||||
*
|
||||
* @author youHong.ai
|
||||
*/
|
||||
public class TestApi extends BaseTest {
|
||||
|
||||
Map<String, String> SYSTEM_CACHE = new HashMap<>();
|
||||
|
||||
String APPID = "c6d2b3f5-5c1c-4b90-bad7-4a9b3b2c4bca";
|
||||
|
||||
@Test
|
||||
public void testApi() {
|
||||
String api = "https://ecology.yeyaguitu.cn/api/aiyh/test/req-msg/test/cus-api";
|
||||
String token = (String) testGetoken("https://ecology.yeyaguitu.cn").get("token");
|
||||
String spk = SYSTEM_CACHE.get("SERVER_PUBLIC_KEY");
|
||||
// 封装请求头参数
|
||||
RSA rsa = new RSA(null, spk);
|
||||
// 对用户信息进行加密传输,暂仅支持传输OA用户ID
|
||||
String encryptUserid = rsa.encryptBase64("1", CharsetUtil.CHARSET_UTF_8, KeyType.PublicKey);
|
||||
Map<String, String> head = new HashMap<>();
|
||||
head.put("appid", APPID);
|
||||
head.put("token", token);
|
||||
head.put("userid", encryptUserid);
|
||||
HttpUtils httpUtils = new HttpUtils();
|
||||
ResponeVo responeVo = null;
|
||||
try {
|
||||
responeVo = httpUtils.apiGet(api, head);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
System.out.println(JSON.toJSONString(responeVo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 第一步：
|
||||
* <p>
|
||||
* 调用ecology注册接口,根据appid进行注册,将返回服务端公钥和Secret信息
|
||||
*/
|
||||
public Map<String, Object> testRegist(String address) {
|
||||
// 获取当前系统RSA加密的公钥
|
||||
RSA rsa = new RSA();
|
||||
String publicKey = rsa.getPublicKeyBase64();
|
||||
String privateKey = rsa.getPrivateKeyBase64();
|
||||
// 客户端RSA私钥
|
||||
SYSTEM_CACHE.put("LOCAL_PRIVATE_KEY", privateKey);
|
||||
// 客户端RSA公钥
|
||||
SYSTEM_CACHE.put("LOCAL_PUBLIC_KEY", publicKey);
|
||||
// 调用ECOLOGY系统接口进行注册
|
||||
String data = HttpRequest.post(address + "/api/ec/dev/auth/regist")
|
||||
.header("appid", APPID)
|
||||
.header("cpk", publicKey)
|
||||
.timeout(2000)
|
||||
.execute().body();
|
||||
// 打印ECOLOGY响应信息
|
||||
System.out.println("testRegist()：" + data);
|
||||
Map<String, Object> datas = JSONUtil.parseObj(data);
|
||||
// ECOLOGY返回的系统公钥
|
||||
SYSTEM_CACHE.put("SERVER_PUBLIC_KEY", StrUtil.nullToEmpty((String) datas.get("spk")));
|
||||
// ECOLOGY返回的系统密钥
|
||||
SYSTEM_CACHE.put("SERVER_SECRET", StrUtil.nullToEmpty((String) datas.get("secrit")));
|
||||
return datas;
|
||||
}
|
||||
|
||||
/**
|
||||
* 第二步：
|
||||
* <p>
|
||||
* 通过第一步中注册系统返回信息进行获取token信息
|
||||
*/
|
||||
public Map<String, Object> testGetoken(String address) {
|
||||
// 从系统缓存或者数据库中获取ECOLOGY系统公钥和Secret信息
|
||||
String secret = SYSTEM_CACHE.get("SERVER_SECRET");
|
||||
String spk = SYSTEM_CACHE.get("SERVER_PUBLIC_KEY");
|
||||
// 如果为空,说明还未进行注册,调用注册接口进行注册认证与数据更新
|
||||
if (Objects.isNull(secret) || Objects.isNull(spk)) {
|
||||
testRegist(address);
|
||||
// 重新获取最新ECOLOGY系统公钥和Secret信息
|
||||
secret = SYSTEM_CACHE.get("SERVER_SECRET");
|
||||
spk = SYSTEM_CACHE.get("SERVER_PUBLIC_KEY");
|
||||
}
|
||||
// 公钥加密,所以RSA对象私钥为null
|
||||
RSA rsa = new RSA(null, spk);
|
||||
// 对秘钥进行加密传输，防止篡改数据
|
||||
String encryptSecret = rsa.encryptBase64(secret, CharsetUtil.CHARSET_UTF_8, KeyType.PublicKey);
|
||||
// 调用ECOLOGY系统接口进行注册
|
||||
String data = HttpRequest.post(address + "/api/ec/dev/auth/applytoken")
|
||||
.header("appid", APPID)
|
||||
.header("secret", encryptSecret)
|
||||
.header("time", "3600")
|
||||
.execute().body();
|
||||
System.out.println("testGetoken()：" + data);
|
||||
Map<String, Object> datas = JSONUtil.parseObj(data);
|
||||
// ECOLOGY返回的token
|
||||
// TODO 为Token缓存设置过期时间
|
||||
SYSTEM_CACHE.put("SERVER_TOKEN", StrUtil.nullToEmpty((String) datas.get("token")));
|
||||
return datas;
|
||||
}
|
||||
|
||||
/**
|
||||
* 第三步：
|
||||
* <p>
|
||||
* 调用ecology系统的rest接口，请求头部带上token和用户标识认证信息
|
||||
*
|
||||
* @param address ecology系统地址
|
||||
* @param api rest api 接口地址(该测试代码仅支持GET请求)
|
||||
* @param jsonParams 请求参数json串
|
||||
* <p>
|
||||
* 注意：ECOLOGY系统所有POST接口调用请求头请设置 "Content-Type","application/x-www-form-urlencoded; charset=utf-8"
|
||||
*/
|
||||
public String testRestful(String address, String api, String jsonParams) {
|
||||
// ECOLOGY返回的token
|
||||
String token = SYSTEM_CACHE.get("SERVER_TOKEN");
|
||||
if (StrUtil.isEmpty(token)) {
|
||||
token = (String) testGetoken(address).get("token");
|
||||
}
|
||||
String spk = SYSTEM_CACHE.get("SERVER_PUBLIC_KEY");
|
||||
// 封装请求头参数
|
||||
RSA rsa = new RSA(null, spk);
|
||||
// 对用户信息进行加密传输,暂仅支持传输OA用户ID
|
||||
String encryptUserid = rsa.encryptBase64("1", CharsetUtil.CHARSET_UTF_8, KeyType.PublicKey);
|
||||
// 调用ECOLOGY系统接口，注意此处的disableCookie，可翻阅hutool的文档查看
|
||||
String data = HttpRequest
|
||||
.get(address + api)
|
||||
.header("appid", APPID)
|
||||
.header("token", token)
|
||||
.header("userid", encryptUserid)
|
||||
.body(jsonParams)
|
||||
.execute().body();
|
||||
System.out.println("testRestful()：" + data);
|
||||
return data;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue