Browse Source

删除系统内多余模块,

源代码扫描,漏洞修复
v4
chenrui 2 years ago
parent
commit
7011be347e
  1. 7
      lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/http/HttpUtils.java
  2. 5
      lib/EmergencyBaseLib/EmergencyCommonmDatascope/src/main/java/com/zdxt/common/datascope/aspect/DataScopeAspect.java
  3. 32
      lib/EmergencyService/pom.xml
  4. 56
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/flow/FlowUserInfo.java
  5. 256
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/organization/OrganizationZtree.java
  6. 4
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CookieFilter.java
  7. 2
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/FileTypeFilter.java
  8. 2
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/realm/UserRealm.java
  9. 40
      lib/EmergencyService/zdxtEmergencyBootStart/pom.xml
  10. 4
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  11. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawPlanAuditServiceImpl.java
  12. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/QrCodeGenerateHistoryServiceImpl.java
  13. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java
  14. 12
      lib/ZdxtComponent/pom.xml

7
lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/http/HttpUtils.java

@ -6,6 +6,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.*; import java.net.*;
import java.nio.charset.StandardCharsets;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
@ -118,7 +119,7 @@ public class HttpUtils
out = new PrintWriter(conn.getOutputStream()); out = new PrintWriter(conn.getOutputStream());
out.print(param); out.print(param);
out.flush(); out.flush();
in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8")); in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
String line; String line;
while ((line = in.readLine()) != null) while ((line = in.readLine()) != null)
{ {
@ -192,7 +193,7 @@ public class HttpUtils
{ {
if (ret != null && !ret.trim().equals("")) if (ret != null && !ret.trim().equals(""))
{ {
result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8")); result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
} }
} }
log.info("recv - {}", result); log.info("recv - {}", result);
@ -258,7 +259,7 @@ public class HttpUtils
// 获取URLConnection对象对应的输出流 // 获取URLConnection对象对应的输出流
PrintWriter printWriter = new PrintWriter(httpURLConnection.getOutputStream()); PrintWriter printWriter = new PrintWriter(httpURLConnection.getOutputStream());
printWriter.write(paramJson.toString()); printWriter.write(String.valueOf(paramJson));
// flush输出流的缓冲 // flush输出流的缓冲
printWriter.flush(); printWriter.flush();
String contentType = httpURLConnection.getContentType(); String contentType = httpURLConnection.getContentType();

5
lib/EmergencyBaseLib/EmergencyCommonmDatascope/src/main/java/com/zdxt/common/datascope/aspect/DataScopeAspect.java

@ -98,15 +98,10 @@ public class DataScopeAspect {
}else{ }else{
String userId = ServletUtils.getRequest().getParameter("dataScopeId");//APP如果要走数据权限必须传入这个值 String userId = ServletUtils.getRequest().getParameter("dataScopeId");//APP如果要走数据权限必须传入这个值
System.out.println("APP权限userId------------:" +userId);
Object redisKeys = redisCache.getCacheObject("shiro:app:"+userId); Object redisKeys = redisCache.getCacheObject("shiro:app:"+userId);
System.out.println("111111111111111111111---------------------:" + redisKeys);
if (null != redisKeys && redisKeys instanceof User){ if (null != redisKeys && redisKeys instanceof User){
User appUser = (User) redisKeys; User appUser = (User) redisKeys;
System.out.println("2222222222----------------------------------:" + redisKeys);
System.out.println("是否是管理员:" +appUser.isAdmin());
if (!appUser.isAdmin()){ if (!appUser.isAdmin()){
System.out.println("333333333333333----------------------------------:" + appUser);
dataScopeFilter(joinPoint, appUser, controllerDataScope.deptAlias(), dataScopeFilter(joinPoint, appUser, controllerDataScope.deptAlias(),
controllerDataScope.userAlias()); controllerDataScope.userAlias());
} }

32
lib/EmergencyService/pom.xml

@ -13,7 +13,7 @@
<module>zdxtEmergencyBootStart</module> <module>zdxtEmergencyBootStart</module>
<module>zdxtEmergencyAppService</module> <module>zdxtEmergencyAppService</module>
<module>zdxtEmergencyLogService</module> <module>zdxtEmergencyLogService</module>
<module>zdxtEmergencyExcelService</module> <!-- <module>zdxtEmergencyExcelService</module>-->
<module>zdxtEmergencyMessageService</module> <module>zdxtEmergencyMessageService</module>
<module>zdxtLawEnforcementCodeService</module> <module>zdxtLawEnforcementCodeService</module>
<module>zdxtEmergencyDictService</module> <module>zdxtEmergencyDictService</module>
@ -382,22 +382,22 @@
<version>${lombok.version}</version> <version>${lombok.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>zdxtFlowComponent</groupId> <!-- <groupId>zdxtFlowComponent</groupId>-->
<artifactId>zdxtFlowComponent</artifactId> <!-- <artifactId>zdxtFlowComponent</artifactId>-->
<version>1.0</version> <!-- <version>1.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>ZdxtComponent</groupId> <!-- <groupId>ZdxtComponent</groupId>-->
<artifactId>zdxtVisualizationComponent</artifactId> <!-- <artifactId>zdxtVisualizationComponent</artifactId>-->
<version>1.0</version> <!-- <version>1.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>ZdxtComponent</groupId> <!-- <groupId>ZdxtComponent</groupId>-->
<artifactId>zdxtDynamicFormComponent</artifactId> <!-- <artifactId>zdxtDynamicFormComponent</artifactId>-->
<version>1.0</version> <!-- <version>1.0</version>-->
</dependency> <!-- </dependency>-->
<!-- <dependency> <!-- <dependency>
<groupId>EmergencyService</groupId> <groupId>EmergencyService</groupId>
<artifactId>zdxtEmergencyCommonService</artifactId> <artifactId>zdxtEmergencyCommonService</artifactId>

56
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/flow/FlowUserInfo.java

@ -1,28 +1,28 @@
package com.zdxt.auth.common.flow; //package com.zdxt.auth.common.flow;
//
import cn.hutool.core.bean.BeanUtil; //import cn.hutool.core.bean.BeanUtil;
import com.zdxt.auth.common.utils.security.ShiroUtils; //import com.zdxt.auth.common.utils.security.ShiroUtils;
import com.zdxt.domain.auth.User; //import com.zdxt.domain.auth.User;
import com.zdxt.flow.bean.FlowUserBean; //import com.zdxt.flow.bean.FlowUserBean;
import com.zdxt.flow.common.IFlowUserInfoApi; //import com.zdxt.flow.common.IFlowUserInfoApi;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
/** ///**
* 工作流用户信息接口实现类 // * 工作流用户信息接口实现类
* // *
* @author QingWang.Li // * @author QingWang.Li
* @date 2020/4/2 9:53 // * @date 2020/4/2 9:53
*/ // */
@Component //@Component
public class FlowUserInfo implements IFlowUserInfoApi { //public class FlowUserInfo implements IFlowUserInfoApi {
//
@Override // @Override
public FlowUserBean getUserInfo() { // public FlowUserBean getUserInfo() {
FlowUserBean flowUserBean = new FlowUserBean(); // FlowUserBean flowUserBean = new FlowUserBean();
User sysUser = ShiroUtils.getSysUser(); // User sysUser = ShiroUtils.getSysUser();
BeanUtil.copyProperties(sysUser, flowUserBean); // BeanUtil.copyProperties(sysUser, flowUserBean);
return flowUserBean; // return flowUserBean;
} // }
//
//
} //}

256
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/common/organization/OrganizationZtree.java

@ -1,128 +1,128 @@
package com.zdxt.auth.common.organization; //package com.zdxt.auth.common.organization;
//
import com.zdxt.auth.common.constant.UserConstants; //import com.zdxt.auth.common.constant.UserConstants;
import com.zdxt.auth.common.utils.StringUtils; //import com.zdxt.auth.common.utils.StringUtils;
import com.zdxt.auth.project.system.dept.mapper.DeptMapper; //import com.zdxt.auth.project.system.dept.mapper.DeptMapper;
import com.zdxt.auth.project.system.user.mapper.UserMapper; //import com.zdxt.auth.project.system.user.mapper.UserMapper;
import com.zdxt.auth.project.system.user.service.IUserService; //import com.zdxt.auth.project.system.user.service.IUserService;
import com.zdxt.common.Ztree; //import com.zdxt.common.Ztree;
import com.zdxt.domain.auth.Dept; //import com.zdxt.domain.auth.Dept;
import com.zdxt.domain.auth.User; //import com.zdxt.domain.auth.User;
import com.zdxt.flow.common.IOrganizationApi; //import com.zdxt.flow.common.IOrganizationApi;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.HashMap; //import java.util.HashMap;
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
//
/** ///**
* @program: EmergencyBaseLib // * @program: EmergencyBaseLib
* @description: 组织架构树 // * @description: 组织架构树
* @author: chenrui // * @author: chenrui
* @create: 2020-04-14 15:46 // * @create: 2020-04-14 15:46
**/ // **/
@Component //@Component
public class OrganizationZtree implements IOrganizationApi { //public class OrganizationZtree implements IOrganizationApi {
//
@Autowired // @Autowired
private DeptMapper deptMapper; // private DeptMapper deptMapper;
@Autowired // @Autowired
private UserMapper userMapper; // private UserMapper userMapper;
//
@Override // @Override
public List<Map<String, Object>> getOrganizationData(String deptId) { // public List<Map<String, Object>> getOrganizationData(String deptId) {
Dept dept = new Dept(); // Dept dept = new Dept();
dept.setDeptId(deptId); // dept.setDeptId(deptId);
//获取组织架构 // //获取组织架构
List<Dept> deptList = deptMapper.selectDeptList(dept); // List<Dept> deptList = deptMapper.selectDeptList(dept);
//组织机构 // //组织机构
List<Map<String, Object>> ztreeList = initZtreeDept(deptList); // List<Map<String, Object>> ztreeList = initZtreeDept(deptList);
//
return ztreeList; // return ztreeList;
} // }
//
@Override // @Override
public List<Map<String, Object>> getOrganizationUserData(String deptId) { // public List<Map<String, Object>> getOrganizationUserData(String deptId) {
User user = new User(); // User user = new User();
user.setDeptId(deptId); // user.setDeptId(deptId);
Dept dept = new Dept(); // Dept dept = new Dept();
dept.setParentId(deptId); // dept.setParentId(deptId);
List<User> list = userMapper.selectUserListByDeptId(user); // List<User> list = userMapper.selectUserListByDeptId(user);
List<Dept> deptList = deptMapper.selectDeptList(dept); // List<Dept> deptList = deptMapper.selectDeptList(dept);
//
List<Map<String, Object>> ztreeList = initZtreeUserList(list,deptList); // List<Map<String, Object>> ztreeList = initZtreeUserList(list,deptList);
return ztreeList; // return ztreeList;
} // }
//
/** // /**
* 对象转部门树 // * 对象转部门树
* // *
* @param deptList 部门列表 // * @param deptList 部门列表
* @param roleDeptList 角色已存在菜单列表 // * @param roleDeptList 角色已存在菜单列表
* @return 树结构列表 // * @return 树结构列表
*/ // */
public List<Map<String, Object>> initZtreeDept(List<Dept> deptList) // public List<Map<String, Object>> initZtreeDept(List<Dept> deptList)
{ // {
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>(); // List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
//
for (Dept dept : deptList) // for (Dept dept : deptList)
{ // {
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) // if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
{ // {
Map<String, Object> map = new HashMap<String, Object>(); // Map<String, Object> map = new HashMap<String, Object>();
map.put("id", dept.getDeptId()); // map.put("id", dept.getDeptId());
map.put("name", dept.getDeptName()); // map.put("name", dept.getDeptName());
map.put("nocheck", true); // map.put("nocheck", true);
map.put("isParent", true); // map.put("isParent", true);
list.add(map); // list.add(map);
} // }
} // }
return list; // return list;
} // }
//
/** // /**
* 用户列表 // * 用户列表
* @param userList // * @param userList
* @return // * @return
*/ // */
public List<Map<String, Object>> initZtreeUserList(List<User> userList,List<Dept> deptList) // public List<Map<String, Object>> initZtreeUserList(List<User> userList,List<Dept> deptList)
{ // {
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>(); // List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
//
for(User user : userList) { // for(User user : userList) {
Map<String, Object> map = new HashMap<String, Object>(); // Map<String, Object> map = new HashMap<String, Object>();
map.put("id", user.getUserId()); // map.put("id", user.getUserId());
map.put("name", user.getUserName()); // map.put("name", user.getUserName());
map.put("organId", user.getDeptId()); // map.put("organId", user.getDeptId());
map.put("accountName", user.getLoginName()); // map.put("accountName", user.getLoginName());
map.put("isParent", false); // map.put("isParent", false);
list.add(map); // list.add(map);
} // }
//
for (Dept dept : deptList) // for (Dept dept : deptList)
{ // {
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus())) // if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()))
{ // {
Map<String, Object> map = new HashMap<String, Object>(); // Map<String, Object> map = new HashMap<String, Object>();
map.put("id", dept.getDeptId()); // map.put("id", dept.getDeptId());
map.put("name", dept.getDeptName()); // map.put("name", dept.getDeptName());
map.put("nocheck", true); // map.put("nocheck", true);
map.put("isParent", true); // map.put("isParent", true);
list.add(map); // list.add(map);
} // }
} // }
return list; // return list;
} // }
//
@Override // @Override
public List<Map<String, Object>> getOrganizationRoleData() { // public List<Map<String, Object>> getOrganizationRoleData() {
return null; // return null;
} // }
//
@Override // @Override
public List<Map<String, Object>> getUserByRoleId(Long roleId) { // public List<Map<String, Object>> getUserByRoleId(Long roleId) {
return null; // return null;
} // }
} //}

4
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/CookieFilter.java

@ -35,8 +35,8 @@ public class CookieFilter implements Filter {
sb.append(cookieName).append("=").append(cookieValue).append(";"); sb.append(cookieName).append("=").append(cookieValue).append(";");
} }
sb.append("HttpOnly; SameSite=Lax"); sb.append("HttpOnly; SameSite=Lax");
httpResponse.addHeader(HttpHeaders.SET_COOKIE,sb.toString()); // httpResponse.addHeader(HttpHeaders.SET_COOKIE,String.valueOf(sb));
httpResponse.addHeader(HttpHeaders.COOKIE,sb.toString()); // httpResponse.addHeader(HttpHeaders.COOKIE,String.valueOf(sb));
} }
filterChain.doFilter(httpRequest,httpResponse); filterChain.doFilter(httpRequest,httpResponse);

2
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/config/FileTypeFilter.java

@ -12,8 +12,8 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
import org.springframework.messaging.handler.HandlerMethod;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;

2
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/framework/shiro/realm/UserRealm.java

@ -99,7 +99,7 @@ public class UserRealm extends AuthorizingRealm implements ZdxtUserRealm
UserToken upToken = (UserToken) token; UserToken upToken = (UserToken) token;
LoginType type = upToken.getType(); LoginType type = upToken.getType();
String username = upToken.getUsername(); String username = upToken.getUsername();
String password = ""; String password = null;
if (upToken.getPassword() != null) if (upToken.getPassword() != null)
{ {
password = new String(upToken.getPassword()); password = new String(upToken.getPassword());

40
lib/EmergencyService/zdxtEmergencyBootStart/pom.xml

@ -37,26 +37,26 @@
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>ZdxtComponent</groupId> <!-- <groupId>ZdxtComponent</groupId>-->
<artifactId>zdxtVisualizationComponent</artifactId> <!-- <artifactId>zdxtVisualizationComponent</artifactId>-->
<version>1.0</version> <!-- <version>1.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>ZdxtComponent</groupId> <!-- <groupId>ZdxtComponent</groupId>-->
<artifactId>zdxtBaiduUeditorComponent</artifactId> <!-- <artifactId>zdxtBaiduUeditorComponent</artifactId>-->
<version>1.0</version> <!-- <version>1.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>ZdxtComponent</groupId> <!-- <groupId>ZdxtComponent</groupId>-->
<artifactId>zdxtTableManagementComponent</artifactId> <!-- <artifactId>zdxtTableManagementComponent</artifactId>-->
<version>1.0</version> <!-- <version>1.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>EmergencyService</groupId> <!-- <groupId>EmergencyService</groupId>-->
<artifactId>zdxtEmergencyExcelService</artifactId> <!-- <artifactId>zdxtEmergencyExcelService</artifactId>-->
<version>1.0</version> <!-- <version>1.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>ZdxtComponent</groupId> <groupId>ZdxtComponent</groupId>

4
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@ -308,7 +308,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
zdxtFileCommon.setBusinessId(enforcementRegistration.getId()); zdxtFileCommon.setBusinessId(enforcementRegistration.getId());
zdxtFileCommon.setGuid(IdUtil.simpleUUID()); zdxtFileCommon.setGuid(IdUtil.simpleUUID());
//文件后缀 //文件后缀
// zdxtFileCommon.setFileSuffix("JPG"); // zdxtFileCommon.setFileSuffix("JPG");
zdxtFileCommon.setUploadPath(res); zdxtFileCommon.setUploadPath(res);
zdxtFileCommon.setUploadPersonId(user.getUserId().toString()); zdxtFileCommon.setUploadPersonId(user.getUserId().toString());
zdxtFileCommon.setUploadPersonName(user.getUserName()); zdxtFileCommon.setUploadPersonName(user.getUserName());
@ -726,7 +726,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
cell.setCellStyle(styleRow2); cell.setCellStyle(styleRow2);
} }
HSSFCellStyle dateStyle= workbook.createCellStyle(); HSSFCellStyle dateStyle= workbook.createCellStyle();
HSSFDataFormat cellDataFormat= workbook.createDataFormat();; HSSFDataFormat cellDataFormat= workbook.createDataFormat();
dateStyle.setDataFormat(cellDataFormat.getFormat("yyyy\"年\"m\"月\"d\"日\" h:mm:ss")); dateStyle.setDataFormat(cellDataFormat.getFormat("yyyy\"年\"m\"月\"d\"日\" h:mm:ss"));
for(int i=0;i<enforcementRegistrationList.size();i++){ for(int i=0;i<enforcementRegistrationList.size();i++){
EnforcementRegistration e=enforcementRegistrationList.get(i); EnforcementRegistration e=enforcementRegistrationList.get(i);

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LawPlanAuditServiceImpl.java

@ -95,7 +95,6 @@ public class LawPlanAuditServiceImpl implements ILawPlanAuditService
List<LawEnforcementEnterpriseExport> users = ExcelUtils.readMultipartFile(lawPlanAudit.getFile_data(), LawEnforcementEnterpriseExport.class); List<LawEnforcementEnterpriseExport> users = ExcelUtils.readMultipartFile(lawPlanAudit.getFile_data(), LawEnforcementEnterpriseExport.class);
for (LawEnforcementEnterpriseExport lawEnforcementEnterpriseExport : users) { for (LawEnforcementEnterpriseExport lawEnforcementEnterpriseExport : users) {
System.out.println(lawEnforcementEnterpriseExport.toString());
LawEnforcementEnterprise lawEnforcementEnterprise = new LawEnforcementEnterprise(); LawEnforcementEnterprise lawEnforcementEnterprise = new LawEnforcementEnterprise();
BeanUtil.copyProperties(lawEnforcementEnterpriseExport,lawEnforcementEnterprise); BeanUtil.copyProperties(lawEnforcementEnterpriseExport,lawEnforcementEnterprise);
lawEnforcementEnterprise.setRelId(lawPlanAudit.getId()); lawEnforcementEnterprise.setRelId(lawPlanAudit.getId());

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/QrCodeGenerateHistoryServiceImpl.java

@ -5,7 +5,7 @@ import java.util.List;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.DateUtils;
import com.zdxt.flow.util.DateUtil; //import com.zdxt.flow.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.zdxt.code.mapper.QrCodeGenerateHistoryMapper; import com.zdxt.code.mapper.QrCodeGenerateHistoryMapper;

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java

@ -13,7 +13,7 @@ import com.zdxt.code.service.IEnforcementRegistrationService;
import com.zdxt.code.service.IEnterpriseInformationService; import com.zdxt.code.service.IEnterpriseInformationService;
import com.zdxt.code.service.ILawEnforcementWarningListService; import com.zdxt.code.service.ILawEnforcementWarningListService;
import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.DateUtils;
import com.zdxt.flow.util.DateUtil; //import com.zdxt.flow.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

12
lib/ZdxtComponent/pom.xml

@ -9,13 +9,13 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0</version> <version>1.0</version>
<modules> <modules>
<module>zdxtFlowComponent</module> <!-- <module>zdxtFlowComponent</module>-->
<module>zdxtSystemVarComponent</module> <module>zdxtSystemVarComponent</module>
<module>zdxtVisualizationComponent</module> <!-- <module>zdxtVisualizationComponent</module>-->
<module>zdxtBaiduUeditorComponent</module> <!-- <module>zdxtBaiduUeditorComponent</module>-->
<module>zdxtTableManagementComponent</module> <!-- <module>zdxtTableManagementComponent</module>-->
<module>zdxtExcelComponent</module> <!-- <module>zdxtExcelComponent</module>-->
<module>zdxtDynamicFormComponent</module> <!-- <module>zdxtDynamicFormComponent</module>-->
<module>zdxtAutoCodeComponent</module> <module>zdxtAutoCodeComponent</module>
</modules> </modules>

Loading…
Cancel
Save