ard-work/pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ard-work/src/main/java/com/ruoyi/utils/generator/CodeGeneration.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ard-work/pom.xml
@@ -31,10 +31,6 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common</artifactId> </dependency> <!-- <dependency>--> <!-- <groupId>org.projectlombok</groupId>--> <!-- <artifactId>lombok</artifactId>--> <!-- </dependency>--> <!--海康å½åæºäºæ¬¡å¼åä¾èµjarå --> <dependency> @@ -165,7 +161,7 @@ <dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-boot-starter</artifactId> <version>3.2.0</version> <version>3.5.1</version> </dependency> <dependency> <groupId>com.github.xiaoymin</groupId> @@ -173,6 +169,30 @@ <version>3.0.3</version> <scope>compile</scope> </dependency> <!--MP代ç çæå¨ä¾èµ--> <dependency> <groupId>com.baomidou</groupId> <artifactId>mybatis-plus-generator</artifactId> <version>3.5.3.1</version> </dependency> <!--velocity模æ¿å¼æ--> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity-engine-core</artifactId> <version>2.0</version> </dependency> <!--postgresqlæ°æ®åºä¾èµ--> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> <!-- <!–mybatis-plusä¾èµ–>--> <!-- <dependency>--> <!-- <groupId>com.baomidou</groupId>--> <!-- <artifactId>mybatis-plus-boot-starter</artifactId>--> <!-- <version>3.5.1</version>--> <!-- </dependency>--> </dependencies> ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -55,7 +55,10 @@ @Override public ArdAppTask selectArdAppTaskById(String id) { ArdAppTask ardAppTask = ardAppTaskMapper.selectArdAppTaskById(id); if(StringUtils.isNull(ardAppTask)) { return null; } List<ArdAppTaskDetail> ardAppTaskDetailList = ardAppTask.getArdAppTaskDetailList(); if(ardAppTaskDetailList.size()>0) { ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java
@@ -179,7 +179,7 @@ int i = hCNetSDK.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo); if (i < 0) { int errorCode = hCNetSDK.NET_DVR_GetLastError(); log.info("ç»å½å¼å¸¸ï¼" + errorCode); log.error("ç»å½å¼å¸¸ï¼" + errorCode); } } @@ -328,7 +328,7 @@ boolean bool = hCNetSDK.NET_DVR_PTZControlWithSpeed_Other(userId, channelNum, dwPTZCommand, dwStop, speed); if (!bool) { int errorCode = hCNetSDK.NET_DVR_GetLastError(); log.info("æ§å¶å¤±è´¥,请ç¨åéè¯" + errorCode); log.error("æ§å¶å¤±è´¥,请ç¨åéè¯" + errorCode); } return bool; } @@ -356,7 +356,7 @@ boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, focusmodeCfg.size(), ibrBytesReturned); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置èç¦å¼å¤±è´¥,请ç¨åéè¯" + code); log.error("设置èç¦å¼å¤±è´¥,请ç¨åéè¯" + code); } return bool; } @@ -389,7 +389,7 @@ return map; } else { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("è·åèç¦å¼å¤±è´¥,请ç¨åéè¯" + code); log.debug("è·åèç¦å¼å¤±è´¥,请ç¨åéè¯" + code); return new HashMap<>(); } } @@ -412,7 +412,7 @@ boolean bool = hCNetSDK.NET_DVR_PTZPreset_Other(userId, channelNum, SET_PRESET, PresetIndex); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("é¢ç½®ç¹è®¾ç½®å¤±è´¥,请ç¨åéè¯" + code); log.error("é¢ç½®ç¹è®¾ç½®å¤±è´¥,请ç¨åéè¯" + code); } return bool; } @@ -435,7 +435,7 @@ boolean bool = hCNetSDK.NET_DVR_PTZPreset_Other(userId, channelNum, GOTO_PRESET, PresetIndex); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("é¢ç½®ç¹è®¾ç½®å¤±è´¥,请ç¨åéè¯" + code); log.error("é¢ç½®ç¹è®¾ç½®å¤±è´¥,请ç¨åéè¯" + code); } return bool; } @@ -537,7 +537,7 @@ } } else { int code = hCNetSDK.NET_DVR_GetLastError(); System.out.println("æ§å¶å¤±è´¥,请ç¨åéè¯" + code); log.error("æ§å¶å¤±è´¥,请ç¨åéè¯" + code); } } catch (Exception ex) { log.error(ex.getMessage()); @@ -589,7 +589,7 @@ return ptzMap; } else { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("æ§å¶å¤±è´¥,请ç¨åéè¯" + code); log.error("æ§å¶å¤±è´¥,请ç¨åéè¯" + code); return new HashMap<>(); } @@ -627,7 +627,7 @@ boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_PTZPOS, channelNum, point, m_ptzPosCurrent.size()); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置ptz失败,请ç¨åéè¯" + code); log.error("设置ptz失败,请ç¨åéè¯" + code); } return bool; } catch (Exception ex) { @@ -663,7 +663,7 @@ boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_PTZPOS, channelNum, point, m_ptzPosCurrent.size()); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置ptz失败,请ç¨åéè¯" + code); log.error("设置ptz失败,请ç¨åéè¯" + code); } return bool; } catch (Exception ex) { @@ -739,7 +739,7 @@ boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_PTZLOCKCFG, channelNum, point, netDvrPtzLockcfg.size(), ibrBytesReturned); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("è·åptzéå®ä¿¡æ¯å¤±è´¥,请ç¨åéè¯" + code); log.error("è·åptzéå®ä¿¡æ¯å¤±è´¥,请ç¨åéè¯" + code); return -1; } else { netDvrPtzLockcfg.read(); @@ -803,7 +803,7 @@ boolean bool = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_PTZSCOPE, channelNum, point, m_ptzPosCurrent.size(), ibrBytesReturned); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置ptz失败,请ç¨åéè¯" + code); log.error("设置ptz失败,请ç¨åéè¯" + code); return new HashMap<>(); } else { m_ptzPosCurrent.read(); @@ -853,7 +853,7 @@ log.error("è·ååç«¯åæ°å¤±è´¥ï¼é误ç ï¼" + hCNetSDK.NET_DVR_GetLastError()); } struCameraParam.read(); log.info("æ¯å¦å¼å¯éé¾ï¼" + struCameraParam.struDefogCfg.byMode); log.debug("æ¯å¦å¼å¯éé¾ï¼" + struCameraParam.struDefogCfg.byMode); NET_DVR_DEFOGCFG defogcfg = new NET_DVR_DEFOGCFG(); if (enable) { @@ -867,9 +867,9 @@ boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, channelNum, point, struCameraParam.size()); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置éé¾å¤±è´¥,请ç¨åéè¯" + code); log.error("设置éé¾å¤±è´¥,请ç¨åéè¯" + code); } log.info("设置é龿å"); log.debug("设置é龿å"); return bool; } @@ -899,7 +899,7 @@ log.error("è·ååç«¯åæ°å¤±è´¥ï¼é误ç ï¼" + hCNetSDK.NET_DVR_GetLastError()); } struDayNigh.read(); log.info("æ¯å¦å¼å¯å¤è§ï¼" + struDayNigh.struDayNight.byDayNightFilterType); log.debug("æ¯å¦å¼å¯å¤è§ï¼" + struDayNigh.struDayNight.byDayNightFilterType); NET_DVR_DAYNIGHT daynight = new NET_DVR_DAYNIGHT(); if (enable) { @@ -915,9 +915,9 @@ boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, channelNum, point, struDayNigh.size()); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置å¤è§å¤±è´¥,请ç¨åéè¯" + code); log.error("设置å¤è§å¤±è´¥,请ç¨åéè¯" + code); } log.info("设置å¤è§æå"); log.debug("设置å¤è§æå"); return bool; } @@ -944,10 +944,10 @@ IntByReference ibrBytesReturned = new IntByReference(0); boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, struFocusMode.size(), ibrBytesReturned); if (!b_GetCameraParam) { System.out.println("è·ååç«¯åæ°å¤±è´¥ï¼é误ç ï¼" + hCNetSDK.NET_DVR_GetLastError()); log.error("è·ååç«¯åæ°å¤±è´¥ï¼é误ç ï¼" + hCNetSDK.NET_DVR_GetLastError()); } struFocusMode.read(); log.info("å½åèç¦æ¨¡å¼ï¼" + struFocusMode.byFocusMode); log.debug("å½åèç¦æ¨¡å¼ï¼" + struFocusMode.byFocusMode); if (enable) { struFocusMode.byFocusMode = 1;//æå¨èç¦ @@ -961,9 +961,9 @@ boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_FOCUSMODECFG, channelNum, point, struFocusMode.size()); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置èç¦æ¨¡å¼å¤±è´¥,请ç¨åéè¯" + code); log.error("设置èç¦æ¨¡å¼å¤±è´¥,请ç¨åéè¯" + code); } log.info("设置èç¦æ¨¡å¼æå"); log.debug("设置èç¦æ¨¡å¼æå"); return bool; } @@ -979,10 +979,10 @@ IntByReference ibrBytesReturned = new IntByReference(0); boolean b_GetCameraParam = hCNetSDK.NET_DVR_GetDVRConfig(userId, NET_DVR_GET_FOCUSMODECFG, channelNum, point, struFocusMode.size(), ibrBytesReturned); if (!b_GetCameraParam) { System.out.println("è·ååç«¯åæ°å¤±è´¥ï¼é误ç ï¼" + hCNetSDK.NET_DVR_GetLastError()); log.error("è·ååç«¯åæ°å¤±è´¥ï¼é误ç ï¼" + hCNetSDK.NET_DVR_GetLastError()); } struFocusMode.read(); log.info("å½åèç¦æ¨¡å¼ï¼" + struFocusMode.byFocusMode); log.debug("å½åèç¦æ¨¡å¼ï¼" + struFocusMode.byFocusMode); return String.valueOf(struFocusMode.byFocusMode); } @@ -1013,9 +1013,9 @@ boolean bool = hCNetSDK.NET_DVR_PTZControl_Other(userId, channelNum, HEATER_PWRON, dwStop); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置äºå°å ç失败,请ç¨åéè¯" + code); log.error("设置äºå°å ç失败,请ç¨åéè¯" + code); } log.info("设置äºå°å çæå"); log.debug("设置äºå°å çæå"); return bool; } @@ -1045,7 +1045,7 @@ log.error("è·ååç«¯åæ°å¤±è´¥ï¼é误ç ï¼" + hCNetSDK.NET_DVR_GetLastError()); } struDeicing.read(); log.info("æ¯å¦å¼å¯é¤å°ï¼" + struDeicing.byEnableDeicing); log.debug("æ¯å¦å¼å¯é¤å°ï¼" + struDeicing.byEnableDeicing); if (enable) { struDeicing.byEnableDeicing = 1;//å¼å¯ @@ -1056,9 +1056,9 @@ boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_DEVSERVER_CFG, channelNum, point, struDeicing.size()); if (!bool) { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("设置é头é¤å°å¤±è´¥,请ç¨åéè¯" + code); log.error("设置é头é¤å°å¤±è´¥,请ç¨åéè¯" + code); } log.info("设置é头é¤å°æå"); log.debug("设置é头é¤å°æå"); return bool; } @@ -1090,13 +1090,13 @@ ByteBuffer jpegBuffer = ByteBuffer.allocate(1024 * 1024); // æå¾å°å åï¼åå¸§æ°æ®æè·å¹¶ä¿åæJPEG忾卿å®çå å空é´ä¸ boolean is = hCNetSDK.NET_DVR_CaptureJPEGPicture_NEW(userId, channelNum, jpeg, jpegBuffer, 1024 * 1024, a); log.info("-----------è¿éå¼å§å¾çåå ¥å å----------" + is); log.debug("-----------è¿éå¼å§å¾çåå ¥å å----------" + is); Base64.Encoder decoder = Base64.getEncoder(); // BASE64Encoder encoder = new BASE64Encoder(); String png_base64 = decoder.encodeToString(jpegBuffer.array());//è½¬æ¢æbase64串 png_base64 = png_base64.replaceAll("\n", "").replaceAll("\r", "");//å é¤ \r\n log.info("-----------å¤ç宿æªå¾æ°æ®----------"); log.debug("-----------å¤ç宿æªå¾æ°æ®----------"); return png_base64; } @@ -1134,11 +1134,11 @@ //设置å¾çå¤§å° ByteBuffer jpegBuffer = ByteBuffer.allocate(1024 * 1024); // æå¾å°å åï¼åå¸§æ°æ®æè·å¹¶ä¿åæJPEG忾卿å®çå å空é´ä¸ log.info("-----------è¿éå¼å§å°è£ NET_DVR_CaptureJPEGPicture_NEW---------"); log.debug("-----------è¿éå¼å§å°è£ NET_DVR_CaptureJPEGPicture_NEW---------"); boolean is = hCNetSDK.NET_DVR_CaptureJPEGPicture_NEW(userId, channelNum, jpeg, jpegBuffer, 1024 * 1024, a); log.info("-----------è¿éå¼å§å¾çåå ¥å å----------" + is); log.debug("-----------è¿éå¼å§å¾çåå ¥å å----------" + is); if (is) { log.info("hksdk(æå¾)-ç»æç¶æå¼(0表示æå):" + hCNetSDK.NET_DVR_GetLastError()); log.debug("hksdk(æå¾)-ç»æç¶æå¼(0表示æå):" + hCNetSDK.NET_DVR_GetLastError()); byte[] array = jpegBuffer.array(); //åå¨å°minio String BucketName = "pic"; @@ -1152,7 +1152,7 @@ boolean b = MinioUtils.uploadObject(BucketName, ObjectName, input, input.available(), ContentType); if (b) { url = MinioUtils.getBucketObjectUrl(BucketName, ObjectName); log.info("ä¸ä¼ æä»¶æå!" + url); log.debug("ä¸ä¼ æä»¶æå!" + url); } } catch (IOException ex) { log.error("ä¸ä¼ æä»¶å¼å¸¸ï¼" + ex.getMessage()); @@ -1160,7 +1160,7 @@ return url; } else { int code = hCNetSDK.NET_DVR_GetLastError(); log.info("æå¾å¤±è´¥,请ç¨åéè¯" + code); log.error("æå¾å¤±è´¥,请ç¨åéè¯" + code); return ""; } } @@ -1212,21 +1212,21 @@ log.error("åæµå¤±è´¥" + hCNetSDK.NET_DVR_GetLastError()); return ""; } log.info("åæµæå"); log.debug("åæµæå"); GlobalVariable.previewMap.put(cameraId, lRealHandle); } if (!hCNetSDK.NET_DVR_SaveRealData_V30(GlobalVariable.previewMap.get(cameraId), 2, path)) { log.error("ä¿åè§é¢æä»¶å°ä¸´æ¶æä»¶å¤¹å¤±è´¥ é误ç 为: " + hCNetSDK.NET_DVR_GetLastError()); return ""; } log.info("å½åå¼å§"); log.debug("å½åå¼å§"); } else { if (GlobalVariable.previewMap.containsKey(cameraId)) { Integer lRealHandle = GlobalVariable.previewMap.get(cameraId); hCNetSDK.NET_DVR_StopRealPlay(lRealHandle); GlobalVariable.previewMap.remove(cameraId); } log.info("å½å忢"); log.debug("å½å忢"); } return url; } catch (Exception ex) { ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java
@@ -1,8 +1,6 @@ package com.ruoyi.inspect.service.impl; import java.text.SimpleDateFormat; import java.util.*; import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell; import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper; import com.ruoyi.common.utils.DateUtils; @@ -10,7 +8,6 @@ import com.ruoyi.device.camera.domain.ArdCameras; import com.ruoyi.device.camera.domain.CameraCmd; import com.ruoyi.device.camera.mapper.ArdCamerasMapper; import com.ruoyi.device.hiksdk.config.MinioClientSingleton; import com.ruoyi.device.hiksdk.service.IHikClientService; import com.ruoyi.inspect.domain.ArdVideoInspectRecord; import com.ruoyi.inspect.mapper.ArdVideoInspectRecordMapper; @@ -24,7 +21,6 @@ import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper; import com.ruoyi.inspect.domain.ArdVideoInspectTask; import com.ruoyi.inspect.service.IArdVideoInspectTaskService; import javax.annotation.PostConstruct; import javax.annotation.Resource; @@ -417,7 +413,7 @@ try { String currentStepId = ardVideoInspectTask.getCurrentStepId(); if (StringUtils.isNull(currentStepId)) { log.info("å½åå¼å§å·¡æ£æ¥éª¤id为空"); log.debug("å½åå¼å§å·¡æ£æ¥éª¤id为空"); return; } log.debug("å·¡æ£æ¥éª¤ï¼" + currentStepId + "å°è¯å¼å§"); @@ -442,6 +438,11 @@ targetPositon[2] = ardAlarmpointsWell.getAltitude(); /*è·åç¸æºåæ */ ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId); if(StringUtils.isNull(cameras)) { log.debug("æ¾ä¸å°ç¸æº:"+cameraId); return; } double[] cameraPositon = new double[3]; cameraPositon[0] = cameras.getLongitude(); cameraPositon[1] = cameras.getLatitude(); @@ -474,7 +475,7 @@ try { String currentStepId = ardVideoInspectTask.getCurrentStepId(); if (StringUtils.isNull(currentStepId)) { log.info("å½åå¼å§å·¡æ£æ¥éª¤id为空"); log.debug("å½åå¼å§å·¡æ£æ¥éª¤id为空"); return; } log.debug("å·¡æ£æ£å¸¸ï¼å°è¯å¼å¯¼ï¼" + currentStepId); @@ -495,6 +496,11 @@ targetPositon[2] = ardAlarmpointsWell.getAltitude(); /*è·åç¸æºåæ */ ArdCameras cameras = ardCamerasMapper.selectArdCamerasById(cameraId); if(StringUtils.isNull(cameras)) { log.debug("æ¾ä¸å°ç¸æº:"+cameraId); return; } double[] cameraPositon = new double[3]; cameraPositon[0] = cameras.getLongitude(); cameraPositon[1] = cameras.getLatitude(); ard-work/src/main/java/com/ruoyi/utils/generator/CodeGeneration.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,118 @@ package com.ruoyi.utils.generator; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.config.*; import com.baomidou.mybatisplus.generator.config.querys.PostgreSqlQuery; import com.baomidou.mybatisplus.generator.config.rules.DateType; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import java.util.Collections; /** * @ClassName: CodeGeneration * @Description: mybatisPlus 代ç çæå·¥å · * @Author: Administrator * @Date: 2023å¹´03æ25æ¥ 14:49 * @Version: 1.0 **/ public class CodeGeneration { public static void main(String[] args) { /** * å é ç½®æ°æ®æº */ PostgreSqlQuery postgreSqlQuery = new PostgreSqlQuery() { @Override public String[] fieldCustom() { return new String[]{"Default"}; } }; DataSourceConfig dsc = new DataSourceConfig.Builder("jdbc:postgresql://192.168.1.15:5432/ry-vue?stringtype=unspecified","postgres","postgres") .dbQuery(postgreSqlQuery).build(); //éè¿datasourceConfigå建AutoGenerator AutoGenerator generator = new AutoGenerator(dsc); /** * å ¨å±é ç½® */ String projectPath = System.getProperty("user.dir"); //è·å项ç®è·¯å¾ String filePath = projectPath + "/ard-work/src/main/java"; //javaä¸çæä»¶è·¯å¾ GlobalConfig global = new GlobalConfig.Builder() .outputDir(filePath)//çæçè¾åºè·¯å¾ .author("åèä¹")//çæçä½è åå //.enableSwagger()å¼å¯swaggerï¼éè¦æ·»å swaggerä¾èµå¹¶é ç½® .dateType(DateType.TIME_PACK)//æ¶é´çç¥ .commentDate("yyyyå¹´MMæddæ¥")//æ ¼å¼åæ¶é´æ ¼å¼ .disableOpenDir()//ç¦æ¢æå¼è¾åºç®å½ï¼é»è®¤false .fileOverride()//è¦ççææä»¶ .build(); /** * å é ç½® */ PackageConfig packages = new PackageConfig.Builder() .entity("domian")//å®ä½ç±»å å .parent("com.ruoyi.test")//ç¶å åãå¦æä¸ºç©ºï¼å°ä¸é¢åå åå¿ é¡»åå ¨é¨ï¼ å¦åå°±åªéååå å .controller("controller")//æ§å¶å±å å .mapper("mapper")//mapperå±å å .xml("mapper.xml")//æ°æ®è®¿é®å±xmlå å .service("service")//serviceå±å å .serviceImpl("service.impl")//serviceå®ç°ç±»å å .pathInfo(Collections.singletonMap(OutputFile.xml, projectPath + "/ard-work/src/main/resources/mapper")) .build(); /** * çç¥é ç½®å¼å§ */ StrategyConfig strategyConfig = new StrategyConfig.Builder() .enableCapitalMode()//å¼å¯å ¨å±å¤§åå½å //.likeTable()模ç³è¡¨å¹é .addInclude("school")//æ·»å 表å¹é ï¼æå®è¦çæçæ°æ®è¡¨åï¼ä¸åé»è®¤é宿°æ®åºææè¡¨ //.disableSqlFilter()ç¦ç¨sqlè¿æ»¤:é»è®¤(ä¸ä½¿ç¨è¯¥æ¹æ³ï¼true //.enableSchema()å¯ç¨schema:é»è®¤false .entityBuilder() //å®ä½çç¥é ç½® //.disableSerialVersionUID()ç¦ç¨çæSerialVersionUIDï¼é»è®¤true .enableChainModel()//å¼å¯é¾å¼æ¨¡å .enableLombok()//å¼å¯lombok .enableRemoveIsPrefix()//å¼å¯ Boolean ç±»ååæ®µç§»é¤ is åç¼ .enableTableFieldAnnotation()//å¼å¯çæå®ä½æ¶çæå段注解 //.addTableFills()æ·»å è¡¨åæ®µå¡«å .naming(NamingStrategy.underline_to_camel)//æ°æ®è¡¨æ å°å®ä½å½åçç¥ï¼é»è®¤ä¸å线转驼峰underline_to_camel .columnNaming(NamingStrategy.underline_to_camel)//è¡¨åæ®µæ å°å®ä½å±æ§å½åè§åï¼é»è®¤nullï¼ä¸æå®æç §namingæ§è¡ .idType(IdType.AUTO)//æ·»å å ¨å±ä¸»é®ç±»å .formatFileName("%s")//æ ¼å¼åå®ä½åç§°ï¼%såæ¶é¦åæ¯I .build() .mapperBuilder()//mapperæä»¶çç¥ .enableMapperAnnotation()//å¼å¯mapper注解 .enableBaseResultMap()//å¯ç¨xmlæä»¶ä¸çBaseResultMap çæ .enableBaseColumnList()//å¯ç¨xmlæä»¶ä¸çBaseColumnList //.cache(ç¼åç±».class)设置ç¼åå®ç°ç±» .formatMapperFileName("%sMapper")//æ ¼å¼åDaoç±»åç§° .formatXmlFileName("%sMapper")//æ ¼å¼åxmlæä»¶åç§° .build() .serviceBuilder()//serviceæä»¶çç¥ .formatServiceFileName("%sService")//æ ¼å¼å service æ¥å£æä»¶åç§° .formatServiceImplFileName("%sServiceImpl")//æ ¼å¼å service æ¥å£æä»¶åç§° .build() .controllerBuilder()//æ§å¶å±çç¥ //.enableHyphenStyle()å¼å¯é©¼å³°è½¬è¿å符ï¼é»è®¤ï¼false .enableRestStyle()//å¼å¯çæ@RestController .formatFileName("%sController")//æ ¼å¼åæä»¶åç§° .build(); /*è³æ¤ï¼çç¥é ç½®æç®åºæ¬å®æï¼*/ /** * å°ææé 置项æ´åå°AutoGeneratorä¸è¿è¡æ§è¡ */ generator.global(global) .packageInfo(packages) .strategy(strategyConfig) .execute(); } } ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java
@@ -61,8 +61,9 @@ * æµè¯ */ TEST, /** * æ§å¶ */ CONTROL, CONTROL }