diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/http/HttpUtils.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/http/HttpUtils.java index 59d553b0..60fb6896 100644 --- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/http/HttpUtils.java +++ b/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.PrintWriter; import java.net.*; +import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; @@ -118,7 +119,7 @@ public class HttpUtils out = new PrintWriter(conn.getOutputStream()); out.print(param); out.flush(); - in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8")); + in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8)); String line; while ((line = in.readLine()) != null) { @@ -192,7 +193,7 @@ public class HttpUtils { 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); @@ -258,7 +259,7 @@ public class HttpUtils // 获取URLConnection对象对应的输出流 PrintWriter printWriter = new PrintWriter(httpURLConnection.getOutputStream()); - printWriter.write(paramJson.toString()); + printWriter.write(String.valueOf(paramJson)); // flush输出流的缓冲 printWriter.flush(); String contentType = httpURLConnection.getContentType(); diff --git a/lib/EmergencyBaseLib/EmergencyCommonmDatascope/src/main/java/com/zdxt/common/datascope/aspect/DataScopeAspect.java b/lib/EmergencyBaseLib/EmergencyCommonmDatascope/src/main/java/com/zdxt/common/datascope/aspect/DataScopeAspect.java index 54050c94..23f7ddc5 100644 --- a/lib/EmergencyBaseLib/EmergencyCommonmDatascope/src/main/java/com/zdxt/common/datascope/aspect/DataScopeAspect.java +++ b/lib/EmergencyBaseLib/EmergencyCommonmDatascope/src/main/java/com/zdxt/common/datascope/aspect/DataScopeAspect.java @@ -98,15 +98,10 @@ public class DataScopeAspect { }else{ String userId = ServletUtils.getRequest().getParameter("dataScopeId");//APP如果要走数据权限必须传入这个值 - System.out.println("APP权限userId------------:" +userId); Object redisKeys = redisCache.getCacheObject("shiro:app:"+userId); - System.out.println("111111111111111111111---------------------:" + redisKeys); if (null != redisKeys && redisKeys instanceof User){ User appUser = (User) redisKeys; - System.out.println("2222222222----------------------------------:" + redisKeys); - System.out.println("是否是管理员:" +appUser.isAdmin()); if (!appUser.isAdmin()){ - System.out.println("333333333333333----------------------------------:" + appUser); dataScopeFilter(joinPoint, appUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias()); } diff --git a/lib/EmergencyService/pom.xml b/lib/EmergencyService/pom.xml index 05fb62ef..cf69105d 100644 --- a/lib/EmergencyService/pom.xml +++ b/lib/EmergencyService/pom.xml @@ -13,7 +13,7 @@ zdxtEmergencyBootStart zdxtEmergencyAppService zdxtEmergencyLogService - zdxtEmergencyExcelService + zdxtEmergencyMessageService zdxtLawEnforcementCodeService zdxtEmergencyDictService @@ -382,22 +382,22 @@ ${lombok.version} - - zdxtFlowComponent - zdxtFlowComponent - 1.0 - + + + + + - - ZdxtComponent - zdxtVisualizationComponent - 1.0 - - - ZdxtComponent - zdxtDynamicFormComponent - 1.0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ZdxtComponent diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index fc038b61..e2f38f18 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/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.setGuid(IdUtil.simpleUUID()); //文件后缀 - // zdxtFileCommon.setFileSuffix("JPG"); + // zdxtFileCommon.setFileSuffix("JPG"); zdxtFileCommon.setUploadPath(res); zdxtFileCommon.setUploadPersonId(user.getUserId().toString()); zdxtFileCommon.setUploadPersonName(user.getUserName()); @@ -726,7 +726,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat cell.setCellStyle(styleRow2); } HSSFCellStyle dateStyle= workbook.createCellStyle(); - HSSFDataFormat cellDataFormat= workbook.createDataFormat();; + HSSFDataFormat cellDataFormat= workbook.createDataFormat(); dateStyle.setDataFormat(cellDataFormat.getFormat("yyyy\"年\"m\"月\"d\"日\" h:mm:ss")); for(int i=0;i users = ExcelUtils.readMultipartFile(lawPlanAudit.getFile_data(), LawEnforcementEnterpriseExport.class); for (LawEnforcementEnterpriseExport lawEnforcementEnterpriseExport : users) { - System.out.println(lawEnforcementEnterpriseExport.toString()); LawEnforcementEnterprise lawEnforcementEnterprise = new LawEnforcementEnterprise(); BeanUtil.copyProperties(lawEnforcementEnterpriseExport,lawEnforcementEnterprise); lawEnforcementEnterprise.setRelId(lawPlanAudit.getId()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/QrCodeGenerateHistoryServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/QrCodeGenerateHistoryServiceImpl.java index 71f94417..9cf0ef69 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/QrCodeGenerateHistoryServiceImpl.java +++ b/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.util.IdUtil; 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.stereotype.Service; import com.zdxt.code.mapper.QrCodeGenerateHistoryMapper; diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java index a696763d..9ed6d867 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java +++ b/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.ILawEnforcementWarningListService; 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.stereotype.Component; diff --git a/lib/ZdxtComponent/pom.xml b/lib/ZdxtComponent/pom.xml index 053671fe..34ca0486 100644 --- a/lib/ZdxtComponent/pom.xml +++ b/lib/ZdxtComponent/pom.xml @@ -9,13 +9,13 @@ pom 1.0 - zdxtFlowComponent + zdxtSystemVarComponent - zdxtVisualizationComponent - zdxtBaiduUeditorComponent - zdxtTableManagementComponent - zdxtExcelComponent - zdxtDynamicFormComponent + + + + + zdxtAutoCodeComponent