提交代码

pom.xml

@@ -272,12 +272,12 @@
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
 
-            <!-- 定时任务 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-job</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
+<!--            &lt;!&ndash; 定时任务 &ndash;&gt;-->
+<!--            <dependency>-->
+<!--                <groupId>com.ruoyi</groupId>-->
+<!--                <artifactId>ruoyi-job</artifactId>-->
+<!--                <version>${ruoyi-vue-plus.version}</version>-->
+<!--            </dependency>-->
 
             <!-- 代码生成-->
             <dependency>
@@ -340,7 +340,7 @@
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
         <module>ruoyi-quartz</module>
-        <module>ruoyi-job</module>
+<!--        <module>ruoyi-job</module>-->
         <module>ruoyi-generator</module>
         <module>ruoyi-common</module>
         <module>ruoyi-demo</module>

ruoyi-admin/pom.xml

@@ -47,10 +47,10 @@
 <!--            <artifactId>ruoyi-quartz</artifactId>-->
 <!--        </dependency>-->
 
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-job</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.ruoyi</groupId>-->
+<!--            <artifactId>ruoyi-job</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.ruoyi</groupId>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GAreaController.java

@@ -49,7 +49,7 @@ public class GAreaController extends BaseController {
      */
     @GetMapping("/getArea")
     public AjaxResult getArea() {
-        return AjaxResult.success(iGAreaService.getArea());
+        return AjaxResult.success(iGAreaService.getArea(null));
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MAreaController.java

@@ -48,8 +48,8 @@ public class MAreaController extends BaseController {
      * @return
      */
     @GetMapping("/getArea")
-    public AjaxResult getArea() {
-        return AjaxResult.success(iGAreaService.getArea());
+    public AjaxResult getArea(String name) {
+        return AjaxResult.success(iGAreaService.getArea(name));
     }
 
 

ruoyi-admin/src/main/resources/application-dev.yml

@@ -13,29 +13,29 @@ spring:
         username: ruoyi
         password: 123456
 
---- # xxl-job 配置
-xxl:
-  job:
-    # 执行器开关
-    enabled: true
-    # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
-    admin-addresses: http://localhost:9100/xxl-job-admin
-    # 执行器通讯TOKEN：非空时启用
-    access-token: xxl-job
-    # 执行器配置
-    executor:
-      # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
-      appname: xxl-job-executor
-      # 执行器端口号 执行器从9101开始往后写
-      port: 9101
-      # 执行器注册：默认IP:PORT
-      address:
-      # 执行器IP：默认自动获取IP
-      ip:
-      # 执行器运行日志文件存储磁盘路径
-      logpath: ./logs/xxl-job
-      # 执行器日志文件保存天数：大于3生效
-      logretentiondays: 30
+#--- # xxl-job 配置
+#xxl:
+#  job:
+#    # 执行器开关
+#    enabled: false
+#    # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
+#    admin-addresses: http://localhost:9100/xxl-job-admin
+#    # 执行器通讯TOKEN：非空时启用
+#    access-token: xxl-job
+#    # 执行器配置
+#    executor:
+#      # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
+#      appname: xxl-job-executor
+#      # 执行器端口号 执行器从9101开始往后写
+#      port: 9101
+#      # 执行器注册：默认IP:PORT
+#      address:
+#      # 执行器IP：默认自动获取IP
+#      ip:
+#      # 执行器运行日志文件存储磁盘路径
+#      logpath: ./logs/xxl-job
+#      # 执行器日志文件保存天数：大于3生效
+#      logretentiondays: 30
 
 --- # 数据源配置
 spring:

ruoyi-admin/src/main/resources/application-prod.yml

@@ -12,30 +12,30 @@ spring:
           prefer-ip: true # 注册实例时，优先使用 IP
         username: ruoyi
         password: 123456
-
---- # xxl-job 配置
-xxl:
-  job:
-    # 执行器开关
-    enabled: false
-    # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
-    admin-addresses: http://172.30.0.92:9100/xxl-job-admin
-    # 执行器通讯TOKEN：非空时启用
-    access-token: xxl-job
-    # 执行器配置
-    executor:
-      # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
-      appname: xxl-job-executor
-      # 执行器端口号 执行器从9101开始往后写
-      port: 9101
-      # 执行器注册：默认IP:PORT
-      address:
-      # 执行器IP：默认自动获取IP
-      ip:
-      # 执行器运行日志文件存储磁盘路径
-      logpath: ./logs/xxl-job
-      # 执行器日志文件保存天数：大于3生效
-      logretentiondays: 30
+#
+#--- # xxl-job 配置
+#xxl:
+#  job:
+#    # 执行器开关
+#    enabled: false
+#    # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
+#    admin-addresses: http://172.30.0.92:9100/xxl-job-admin
+#    # 执行器通讯TOKEN：非空时启用
+#    access-token: xxl-job
+#    # 执行器配置
+#    executor:
+#      # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
+#      appname: xxl-job-executor
+#      # 执行器端口号 执行器从9101开始往后写
+#      port: 9101
+#      # 执行器注册：默认IP:PORT
+#      address:
+#      # 执行器IP：默认自动获取IP
+#      ip:
+#      # 执行器运行日志文件存储磁盘路径
+#      logpath: ./logs/xxl-job
+#      # 执行器日志文件保存天数：大于3生效
+#      logretentiondays: 30
 
 --- # 数据源配置
 spring:

ruoyi-admin/src/main/resources/application.yml

@@ -25,7 +25,7 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8081
+  port: 8082
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-extend/pom.xml

@@ -13,7 +13,7 @@
 
     <modules>
         <module>ruoyi-monitor-admin</module>
-        <module>ruoyi-xxl-job-admin</module>
+<!--        <module>ruoyi-xxl-job-admin</module>-->
     </modules>
 
 </project>

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,7 +22,7 @@ import java.util.List;
 @Data
 @ApiModel("调压箱管理视图对象")
 @ExcelIgnoreUnannotated
-public class GRegulatorBoxVo {
+public class GRegulatorBoxVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -298,5 +299,4 @@ public class GRegulatorBoxVo {
 	@ApiModelProperty("备注")
 	private String remarks;
 
-
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GAreaMapper.java

@@ -15,5 +15,5 @@ import java.util.List;
 public interface GAreaMapper extends BaseMapperPlus<GArea> {
     List<String> getPhoto(Long id);
     //小区下拉
-    List<GAreaVo> getArea();
+    List<GAreaVo> getArea(String name);
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGAreaService.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface IGAreaService extends IServicePlus<GArea, GAreaVo> {
 
-    List<GAreaVo> getArea();
+    List<GAreaVo> getArea(String name);
     Boolean releaseIs(Long id);
 
     List<String> getPhoto(Long id);

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java

@@ -42,8 +42,8 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
     private IGAreaPhotoService igAreaPhotoService;
 
     @Override
-    public List<GAreaVo> getArea() {
-        return baseMapper.getArea();
+    public List<GAreaVo> getArea(String name) {
+        return baseMapper.getArea(name);
     }
 
 

ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml

@@ -32,5 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                name as name
         from g_area
         where del_flag = '0'
+
+        <if test="name != null  and name != ''">
+            and name like '%' #{name} '%'
+        </if>
+
     </select>
 </mapper>

ruoyi-gas/src/main/resources/mapper/GCourtyardNetworkManagementMapper.xml

@@ -41,8 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getById" resultType="com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo">
         select a.*,
+               b.name AS unitName,
                c.id AS buildingId,
-               d.id AS areaId
+               c.name AS buildingName,
+               d.id AS areaId,
+               d.name AS areaName
         from g_courtyard_network_management a
                  left join g_unit b on a.unit_id = b.id and b.del_flag = '0'
                  left join g_building c on b.building_id = c.id and c.del_flag = '0'

ruoyi-gas/src/main/resources/mapper/GRegulatorBoxMapper.xml

@@ -53,8 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           and del_flag = '0'
     </select>
     <select id="getById" resultType="com.ruoyi.gas.domain.vo.GRegulatorBoxVo">
-        select a.*
+        select a.*,
+               b.name AS areaName
         from g_regulator_box a
+        left join g_area b on a.area_id = b.id
         where a.id = #{id}
           and a.del_flag = '0'
     </select>