Browse Source

深圳易用户对接

v2
蟑螂恶霸 2 years ago
parent
commit
f123b0cbd2
  1. 22
      lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java
  2. 33
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java
  3. 207
      lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java
  4. 10
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java
  5. 54
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java
  6. 3
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/logback.xml
  7. 4
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
  8. 28
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

22
lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/User.java

@ -159,6 +159,8 @@ public class User extends BaseDomain {
/** 执法证件号 */ /** 执法证件号 */
private String lawCertificateNum; private String lawCertificateNum;
/** 部门id */
private String organizationId;
/** 姓名 */ /** 姓名 */
private String fullname; private String fullname;
/** 任务ID */ /** 任务ID */
@ -168,9 +170,9 @@ public class User extends BaseDomain {
/** 作用点 (CREATE:新建;UPDATE:更新;DELETED:删除;ENABLED:启用;DISABLED:禁用) */ /** 作用点 (CREATE:新建;UPDATE:更新;DELETED:删除;ENABLED:启用;DISABLED:禁用) */
private String effectOn; private String effectOn;
/** 是否删除 (0否;1是)*/ /** 是否删除 (0否;1是)*/
private int isDeleted; private String isDeleted;
/** 是否禁用 (0否;1是)*/ /** 是否禁用 (0否;1是)*/
private int isDisabled; private String isDisabled;
/** 创建日期 */ /** 创建日期 */
private String createAt; private String createAt;
/** 更新日期 */ /** 更新日期 */
@ -225,6 +227,14 @@ public class User extends BaseDomain {
this.postList = postList; this.postList = postList;
} }
public String getOrganizationId() {
return organizationId;
}
public void setOrganizationId(String organizationId) {
this.organizationId = organizationId;
}
public User() { public User() {
} }
@ -494,19 +504,19 @@ public class User extends BaseDomain {
this.effectOn = effectOn; this.effectOn = effectOn;
} }
public int getIsDeleted() { public String getIsDeleted() {
return isDeleted; return isDeleted;
} }
public void setIsDeleted(int isDeleted) { public void setIsDeleted(String isDeleted) {
this.isDeleted = isDeleted; this.isDeleted = isDeleted;
} }
public int getIsDisabled() { public String getIsDisabled() {
return isDisabled; return isDisabled;
} }
public void setIsDisabled(int isDisabled) { public void setIsDisabled(String isDisabled) {
this.isDisabled = isDisabled; this.isDisabled = isDisabled;
} }

33
lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@ -67,26 +67,39 @@ public class AppThirdLoginController {
System.out.println(code); System.out.println(code);
System.out.println("====================== code ======================"); System.out.println("====================== code ======================");
String accessToken = ""; String accessTokenJson = "";
String userInfo = ""; String userJson = "";
try { try {
// 获取 access_token // 获取 access_token
accessToken = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/gettoken?corpid="+szyptCorpid+"&corpsecret="+szyptCorpsecret, null); accessTokenJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/gettoken?corpid="+szyptCorpid+"&corpsecret="+szyptCorpsecret, null);
System.out.println("====================== accessToken ======================"); System.out.println("====================== accessToken ======================");
System.out.println(accessToken); System.out.println(accessTokenJson);
System.out.println("====================== accessToken ======================"); System.out.println("====================== accessToken ======================");
JSONObject tokenObj = JSONObject.parseObject(accessTokenJson);
// 获取 用户信息 String token = tokenObj.getString("access_token");
userInfo = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/user/getuserinfo?access_token="+accessToken+"&code="+code, null); System.out.println("====================== token ======================");
System.out.println(token);
System.out.println("====================== token ======================");
// 获取 用户Id
userJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/user/getuserinfo?access_token="+token+"&code="+code, null);
System.out.println("====================== userInfo ======================"); System.out.println("====================== userInfo ======================");
System.out.println(userInfo); System.out.println(userJson);
System.out.println("====================== userInfo ======================"); System.out.println("====================== userInfo ======================");
JSONObject userOjb = JSONObject.parseObject(userJson);
String userId = userOjb.getString("UserId");
// 通过用户Id 读取成员信息
// userJson = HttpUtil.HttpSendGet(szyptUrl + "/cgi-bin/user/getuserinfo?access_token="+token+"&code="+code, null);
UserBean userBean = userApi.getUserByUserId(Long.valueOf(userId));
System.out.println("---> userLogin : "+userBean.getLoginName());
redisCache.setCacheObject("shiro:app:1731", new User()); // todo:这里需要将转换出来的User存redis用于做权限 redisCache.setCacheObject("shiro:app:1731", userBean); // todo:这里需要将转换出来的User存redis用于做权限
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
JSONObject jsonObject = JSONObject.parseObject(userInfo);
return ZDResponse.success(); return ZDResponse.success();
} }

207
lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/UserInfoAndDeptTask.java

@ -1,13 +1,33 @@
package com.zdxt.app.task; package com.zdxt.app.task;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.dto.UserBean;
import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.UserApi;
import com.zdxt.auth.project.system.user.service.IUserService;
import com.zdxt.code.service.ThirdLoginService;
import com.zdxt.code.utils.HttpUtil; import com.zdxt.code.utils.HttpUtil;
import com.zdxt.common.util.http.HttpUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.MessageDigest;
import java.util.*;
/** /**
* @Author: kylin * @Author: kylin
@ -18,14 +38,21 @@ import org.springframework.stereotype.Component;
@Component("userInfoAndDeptTask") @Component("userInfoAndDeptTask")
public class UserInfoAndDeptTask { public class UserInfoAndDeptTask {
@Value("${znwg.systemCode}") @Value("${srnwg.systemCode}")
private String systemCode; private String systemCode;
@Value("${znwg.integrationKey}") @Value("${srnwg.integrationKey}")
private String integrationKey; private String integrationKey;
@Value("${znwg.url}") @Value("${srnwg.url}")
private String znwgUrl; private String znwgUrl;
@Value("${srnwg.paasId}")
private String paasId;
@Value("${srnwg.paasToken}")
private String paasToken;
@Autowired private UserApi userApi; @Autowired private UserApi userApi;
@Autowired private IUserService userService;
private static final Logger log = LoggerFactory.getLogger(UserInfoAndDeptTask.class);
public void run(){ public void run(){
@ -42,41 +69,140 @@ public class UserInfoAndDeptTask {
String destroyTken = ""; String destroyTken = "";
try { try {
// 获取 access_token // 获取 access_token
token = HttpUtil.HttpSendGet(znwgUrl + "/ebus/sfrzhqxglmk/sysPullLogin?systemCode="+systemCode+"&integrationKey="+integrationKey, null); String tokenJson = connect("/ebus/sfrzhqxglmk/sysPullLogin?systemCode="+systemCode+"&integrationKey="+integrationKey);
System.out.println("====================== accessToken ======================"); JSONObject tokenObj = JSONObject.parseObject(tokenJson);
System.out.println(token); System.out.println("====================== access_token ======================");
System.out.println("====================== accessToken ======================"); System.out.println(tokenObj);
System.out.println("====================== access_token ======================");
token = tokenObj.getString("data");
// 获取 用户信息 // 获取 用户信息
userInfo = HttpUtil.HttpSendGet(znwgUrl + "/ebus/sfrzhqxglmk/sysPullTacc?token="+token+"&page=0&pageSize=20&status=0", null); int page = 0;
System.out.println("====================== userInfo ======================"); int pageSize = 20;
System.out.println(userInfo); List<Map<String, Integer>> sumMap = new ArrayList<>();
System.out.println("====================== userInfo ======================"); while (true) {
String userInfoJson = connect("/ebus/sfrzhqxglmk/sysPullTacc?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0");
JSONObject sourceObj = JSONObject.parseObject(userInfoJson);
JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
JSONArray dataArr = tmpJsonObj.getJSONArray("data");
if (null == dataArr || dataArr.size()==0) { break; }
// System.out.println("用户 : "+ page +" -----------> "+ (null == dataArr || "".equals(dataArr)));
Map<String, Integer> resMap = new HashMap<>();
resMap = userService.addSrzUser(dataArr);
sumMap.add(resMap);
page++;
}
int insertNum = 0;
int updateNum = 0;
for (Map<String, Integer> item : sumMap) {
insertNum += item.get("insertNum");
updateNum += item.get("updateNum");
}
log.info("新增用户数量 : {} / 更新用户数量 : {}", insertNum, updateNum);
// String userInfoJson = connect("/ebus/sfrzhqxglmk/sysPullTacc?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0");
// System.out.println("====================== userInfoJson ======================");
// System.out.println(userInfoJson);
// System.out.println("====================== userInfoJson ======================");
//
// String deptInfoJson = connect("/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0");
// System.out.println("====================== deptInfoJson ======================");
// System.out.println(deptInfoJson);
// System.out.println("====================== deptInfoJson ======================");
page = 0;
// 获取 部门信息 // 获取 部门信息
deptInfo = HttpUtil.HttpSendGet(znwgUrl + "/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page=0&pageSize=20&status=0", null); // while (true) {
System.out.println("====================== userInfo ======================"); // String deptInfoJson = connect("/ebus/sfrzhqxglmk/sysPullOrg?token="+token+"&page="+page+"&pageSize="+pageSize+"&status=0");
System.out.println(deptInfo); // JSONObject sourceObj = JSONObject.parseObject(deptInfoJson);
System.out.println("====================== userInfo ======================"); // JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
// JSONArray dataArr = tmpJsonObj.getJSONArray("data");
// if (null == dataArr || dataArr.size()==0) { break; }
// // 插入更新数据库
// System.out.println("部门 : "+ page +" -----------> "+ (null == dataArr || "".equals(dataArr)));
//// userService.addSrzUser(dataArr);
// page++;
// }
// 注销token // 注销token
HttpUtil.HttpSendGet(znwgUrl + "/ebus/sfrzhqxglmk/sysPullLogout?token="+token, null); destroyTken = connect("/ebus/sfrzhqxglmk/sysPullLogout?token="+token);
System.out.println("====================== destroyTken ======================"); System.out.println("====================== destroyTken ======================");
System.out.println(destroyTken); System.out.println(destroyTken);
System.out.println("====================== destroyTken ======================"); System.out.println("====================== destroyTken ======================");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
JSONObject userObj = JSONObject.parseObject(userInfo); }
JSONObject deptObj = JSONObject.parseObject(deptInfo);
System.out.println("====================== userInfo ======================");
System.out.println(userObj);
System.out.println("====================== userInfo ======================"); public void testRun() {
System.out.println("====================== userInfo ======================"); String path = "/uploadPath/userInfo.txt"; // 替换为你的JSON文件路径
System.out.println(deptObj); try {
System.out.println("====================== userInfo ======================"); int page = 0;
int pageSize = 20;
userApi.insertOrUpdateUserResId(convertUser(userObj)); List<Map<String, Integer>> sumMap = new ArrayList<>();
while (true) {
String userInfoJson = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
System.out.println(userInfoJson);
JSONObject sourceObj = JSONObject.parseObject(userInfoJson);
JSONObject tmpJsonObj = sourceObj.getJSONObject("data");
JSONArray dataArr = tmpJsonObj.getJSONArray("data");
if (null == dataArr || dataArr.size()==0 || page>0) { break; }
Map<String, Integer> resMap = new HashMap<>();
resMap = userService.addSrzUser(dataArr);
sumMap.add(resMap);
page++;
}
int insertNum = 0;
int updateNum = 0;
for (Map<String, Integer> item : sumMap) {
insertNum += item.get("insertNum");
updateNum += item.get("updateNum");
}
log.info("新增用户数量 : {} / 更新用户数量 : {}", insertNum, updateNum);
} catch (IOException e) {
e.printStackTrace();
}
}
private String connect(String apiPath) {
//各种参数
try {
// String params = "{\"uid\":\"5b07b3de672c4e999c4b04f4\"}"; //请求接⼝的参数
String params = ""; //请求接⼝的参数
long now = new Date().getTime();
String timestamp = Long.toString((long) Math.floor(now / 1000));
String nonce = Long.toHexString(now) + "-" + Long.toHexString((long) Math.floor(Math.random() * 0xFFFFFF));
String signature = toSHA256(timestamp + paasToken + nonce + timestamp);
//创建CloseableHttpClient
CloseableHttpClient client = HttpClientBuilder.create().build();
HttpPost httpPost = new HttpPost(znwgUrl + apiPath);
httpPost.setHeader("x-tif-paasid", paasId);
httpPost.setHeader("x-tif-timestamp", timestamp);
httpPost.setHeader("x-tif-signature", signature);
httpPost.setHeader("x-tif-nonce", nonce);
httpPost.setHeader("Content-Type", "application/json");
httpPost.setHeader("Cache-Control", "no-cache");
HttpEntity entity = new StringEntity(params);
httpPost.setEntity(entity);
CloseableHttpResponse response = client.execute(httpPost);
return EntityUtils.toString(response.getEntity());
} catch (Exception e) {
e.printStackTrace();
}
return null;
} }
private UserBean convertUser(JSONObject userJson) { private UserBean convertUser(JSONObject userJson) {
@ -97,4 +223,33 @@ public class UserInfoAndDeptTask {
userBean.setUnits(userJson.getString("units")); userBean.setUnits(userJson.getString("units"));
return userBean; return userBean;
} }
private String toSHA256(String str) throws Exception {
MessageDigest messageDigest;
String encodeStr = "";
try {
messageDigest = MessageDigest.getInstance("SHA-256");
messageDigest.update(str.getBytes("UTF-8"));
encodeStr = byte2Hex(messageDigest.digest());
} catch (Exception e) {
throw e;
}
return encodeStr;
}
// byte转换成16进制
private String byte2Hex(byte[] bytes) {
StringBuffer stringBuffer = new StringBuffer();
String temp = null;
for (int i = 0; i < bytes.length; i++) {
temp = Integer.toHexString(bytes[i] & 0xFF);
if (temp.length() == 1) {
stringBuffer.append("0");
}
stringBuffer.append(temp);
}
return stringBuffer.toString();
}
} }

10
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java

@ -1,12 +1,15 @@
package com.zdxt.auth.project.system.user.service; package com.zdxt.auth.project.system.user.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.dto.UserBean;
import com.zdxt.domain.auth.Dept; import com.zdxt.domain.auth.Dept;
import com.zdxt.domain.auth.SysTenant; import com.zdxt.domain.auth.SysTenant;
import com.zdxt.domain.auth.User; import com.zdxt.domain.auth.User;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 用户 业务层 * 用户 业务层
@ -213,4 +216,11 @@ public interface IUserService
User insertUserDefault(SysTenant tenant, Dept dept); User insertUserDefault(SysTenant tenant, Dept dept);
public User getAppCurrentUser(Long id); public User getAppCurrentUser(Long id);
/**
* 添加市认证
* @param dataArr
* @return
*/
Map<String, Integer> addSrzUser(JSONArray dataArr);
} }

54
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java

@ -1,6 +1,8 @@
package com.zdxt.auth.project.system.user.service; package com.zdxt.auth.project.system.user.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zdxt.auth.common.constant.UserConstants; import com.zdxt.auth.common.constant.UserConstants;
import com.zdxt.auth.common.exception.BusinessException; import com.zdxt.auth.common.exception.BusinessException;
import com.zdxt.auth.common.utils.StringUtils; import com.zdxt.auth.common.utils.StringUtils;
@ -19,6 +21,7 @@ import com.zdxt.auth.project.system.user.mapper.UserPostMapper;
import com.zdxt.auth.project.system.user.mapper.UserRoleMapper; import com.zdxt.auth.project.system.user.mapper.UserRoleMapper;
import com.zdxt.common.annotation.DataScope; import com.zdxt.common.annotation.DataScope;
import com.zdxt.domain.auth.*; import com.zdxt.domain.auth.*;
import org.apache.commons.collections.map.HashedMap;
import org.apache.shiro.crypto.hash.Md5Hash; import org.apache.shiro.crypto.hash.Md5Hash;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -603,4 +606,55 @@ public class UserServiceImpl implements IUserService {
} }
} }
@Override
public Map<String, Integer> addSrzUser(JSONArray dataArr) {
int insertNum = 0;
int updateNum = 0;
List<User> users = new ArrayList<>();
for (int i = 0; i < dataArr.size(); i++) {
JSONObject jsonObject = dataArr.getJSONObject(i);
// 通过登录名判断用户是否存在
checkLoginNameUnique(jsonObject.getString("username"));
if (StringUtils.isEmpty(jsonObject.getString("username"))) { continue; }
User user = new User();
user.setOrganizationId(jsonObject.getString("organizationId"));
user.setSrzUserid(jsonObject.getString("userId"));
user.setFullname(jsonObject.getString("fullname"));
user.setUserName(jsonObject.getString("fullname"));
user.setTaskId(jsonObject.getString("taskId"));
user.setSystemId(jsonObject.getString("systemId"));
user.setLoginName(jsonObject.getString("username"));
user.setEffectOn(jsonObject.getString("effectOn"));
user.setIsDisabled(jsonObject.getString("isDisabled"));
user.setIsDeleted(jsonObject.getString("isDeleted"));
user.setCreateAt(jsonObject.getString("createAt"));
user.setUpdateAt(jsonObject.getString("updateAt"));
user.setGuid(jsonObject.getString("guid"));
user.setMobileNumber(jsonObject.getString("mobileNumber"));
user.setCertificateNumber(jsonObject.getString("certificateNumber"));
user.setUnits(jsonObject.getString("units"));
user.randomSalt();
//新增用户默认不删除标记
user.setDelFlag("0");
User uniqueUser = userMapper.selectUserByLoginName(jsonObject.getString("username"));
if (null != uniqueUser && uniqueUser.getUserId() != null) {
// 跟新数据库
user.setUserId(uniqueUser.getUserId());
int rowNum = userMapper.updateUser(user);
updateNum += rowNum;
} else {
// 插入数据库
int rowNum = userMapper.insertUser(user);
insertNum += rowNum;
}
}
Map<String, Integer> resMap = new HashedMap();
resMap.put("insertNum", insertNum);
resMap.put("updateNum", updateNum);
return resMap;
}
} }

3
lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/logback.xml

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<!-- 日志存放路径 --> <!-- 日志存放路径 -->
<property name="log.path" value="/home/ruoyi/logs"/> <property name="log.path" value="/usr/local/ruoyi/logs"/>
<!-- <property name="log.path" value="/Users/kylin_stone/Workspaces/uploads/logs"/>-->
<!-- 日志输出格式 --> <!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/> <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>

4
lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@ -328,6 +328,7 @@
<if test="type != null and type != ''">type = #{type},</if> <if test="type != null and type != ''">type = #{type},</if>
<if test="kingdeeOrgId != null and kingdeeOrgId != ''">kingdee_org_id = #{kingdeeOrgId},</if> <if test="kingdeeOrgId != null and kingdeeOrgId != ''">kingdee_org_id = #{kingdeeOrgId},</if>
<if test="kingdeeUserId != null and kingdeeUserId != ''">kingdee_user_id = #{kingdeeUserId},</if> <if test="kingdeeUserId != null and kingdeeUserId != ''">kingdee_user_id = #{kingdeeUserId},</if>
<if test="organizationId != null and organizationId != ''">organizationId = #{organizationId},</if>
<if test="fullname != null and fullname != ''">fullname = #{fullname},</if> <if test="fullname != null and fullname != ''">fullname = #{fullname},</if>
<if test="taskId != null and taskId != ''">taskId = #{taskId},</if> <if test="taskId != null and taskId != ''">taskId = #{taskId},</if>
<if test="systemId != null and systemId != ''">systemId = #{systemId},</if> <if test="systemId != null and systemId != ''">systemId = #{systemId},</if>
@ -395,6 +396,7 @@
<if test="kingdeeOrgId != null and kingdeeOrgId != ''">kingdee_org_id,</if> <if test="kingdeeOrgId != null and kingdeeOrgId != ''">kingdee_org_id,</if>
<if test="kingdeeUserId != null and kingdeeUserId != ''">kingdee_user_id,</if> <if test="kingdeeUserId != null and kingdeeUserId != ''">kingdee_user_id,</if>
<if test="tenantCode != null and tenantCode != ''">tenant_code,</if> <if test="tenantCode != null and tenantCode != ''">tenant_code,</if>
<if test="organizationId != null and organizationId != ''">organizationId,</if>
<if test="fullname != null and fullname != ''">fullname,</if> <if test="fullname != null and fullname != ''">fullname,</if>
<if test="taskId != null and taskId != ''">taskId,</if> <if test="taskId != null and taskId != ''">taskId,</if>
<if test="systemId != null and systemId != ''">systemId,</if> <if test="systemId != null and systemId != ''">systemId,</if>
@ -429,6 +431,7 @@
<if test="kingdeeOrgId != null and kingdeeOrgId != ''">#{kingdeeOrgId},</if> <if test="kingdeeOrgId != null and kingdeeOrgId != ''">#{kingdeeOrgId},</if>
<if test="kingdeeUserId != null and kingdeeUserId != ''">#{kingdeeUserId},</if> <if test="kingdeeUserId != null and kingdeeUserId != ''">#{kingdeeUserId},</if>
<if test="tenantCode != null and tenantCode != ''">#{tenantCode},</if> <if test="tenantCode != null and tenantCode != ''">#{tenantCode},</if>
<if test="organizationId != null and organizationId != ''">#{organizationId},</if>
<if test="fullname != null and fullname != ''">#{fullname},</if> <if test="fullname != null and fullname != ''">#{fullname},</if>
<if test="taskId != null and taskId != ''">#{taskId},</if> <if test="taskId != null and taskId != ''">#{taskId},</if>
<if test="systemId != null and systemId != ''">#{systemId},</if> <if test="systemId != null and systemId != ''">#{systemId},</if>
@ -471,5 +474,4 @@
#{deptId} #{deptId}
</foreach> </foreach>
</select> </select>
</mapper> </mapper>

28
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/application.yml

@ -9,9 +9,9 @@ ruoyi:
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
profile: C:/ruoyi/uploadPath # profile: C:/ruoyi/uploadPath
profile: /usr/local/uploadPath
# profile: /Users/kylin_stone/Workspaces/uploads # profile: /Users/kylin_stone/Workspaces/uploads
# profile: /home/zfjd/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: true addressEnabled: true
@ -99,7 +99,7 @@ spring:
# redis配置 # redis配置
redis: redis:
database: 0 database: 0
host: localhost host: 10.76.108.1
port: 6379 port: 6379
password: zfjd@123 password: zfjd@123
# host: 43.136.51.161 # host: 43.136.51.161
@ -208,7 +208,7 @@ security:
allowed: allowed:
servernames: 10.132.108.3,10.76.108.1,192.168.110.36,192.168.244.1,192.168.1.101,139.186.135.156 servernames: 10.132.108.3,10.76.108.1,192.168.110.36,192.168.244.1,192.168.1.101,139.186.135.156,192.168.1.102,192.168.1.105,192.168.8.129,192.168.1.100,192.168.1.104,192.168.1.103,10.76.108.3,10.132.108.3
excel: excel:
export: true export: true
@ -222,13 +222,29 @@ yzy:
paasid: 123 paasid: 123
qr_code_url: C:\ruoyi\uploadPath\zfjd_logo.png #qr_code_url: C:\ruoyi\uploadPath\zfjd_logo.png
qr_code_url: /usr/local/uploads/logs
#qr_code_url: /Users/kylin_stone/Workspaces/uploads/zfjd_logo.png
#深i企对接密钥 测试环境 #深i企对接密钥 测试环境
siq: siq:
siqUrl: http://egbpub.siqhz.com/egb/api/thirdauth siqUrl: http://egbpub.siqhz.com/egb/api/thirdauth
code: zfjdm code: zfjdm
secretKey: eWIzY3BMRVNEQXhvUUlXMA==d secretKey: eWIzY3BMRVNEQXhvUUlXMA==
#深圳易平台对接密钥 测试环境
szypt:
url: https://szytest.sz.gov.cn:30443/
corpid: wwefa4043a6b5cf4f3
corpsecret: qYf-NIgyRKG-5eybrclvnBogATPfOhpnAVp6yBas7RU
#市认证网关
srnwg:
url: https://smartgate-test.sz.gov.cn
systemCode: sfjzfjdm
integrationKey: P@ssw0rd
paasId: szsfj_zhifajianduma_001
paasToken: e64638a4483e8bcfc33d935c3cbdf546
#短信平台 #短信平台
sms: sms:

Loading…
Cancel
Save