Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_bg

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsElecBoxEqptIndex.java

@@ -75,6 +75,8 @@ public class AdmEmsElecBoxEqptIndex extends BaseEntity {
 
     private String eqptSpec;
 
+    private String ratedCurrent;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -155,6 +157,15 @@ public class AdmEmsElecBoxEqptIndex extends BaseEntity {
         this.eqptSpec = eqptSpec;
     }
 
+
+    public String getRatedCurrent() {
+        return ratedCurrent;
+    }
+
+    public void setRatedCurrent(String ratedCurrent) {
+        this.ratedCurrent = ratedCurrent;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("boxCode", getBoxCode()).append("eqptCode", getEqptCode()).append("areaCode", getAreaCode()).append("date", getDate()).append("time", getTime()).append("voltage", getVoltage()).append("current", getCurrent()).append("power", getPower()).toString();

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsElecBoxEqptIndexMapper.xml

@@ -24,7 +24,8 @@
                           WHERE box_code = #{boxCode})
         SELECT
             latestIndex.*,
-            elecEqpt.eqpt_spec
+            elecEqpt.eqpt_spec,
+            elecEqpt.rated_current
         FROM
             rowIndex latestIndex
                 INNER JOIN adm_box_elec_eqpt elecEqpt ON latestIndex.eqpt_code = elecEqpt.eqpt_code

ems-cloud/sql/ems_sys.sql

@@ -1001,9 +1001,7 @@ create table sys_job (
   primary key (job_id, job_name, job_group)
 ) engine=innodb auto_increment=100 comment = '定时任务调度表';
 
-insert into sys_job values(1, '系统默认（无参）', 'DEFAULT', 'ryTask.ryNoParams',        '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
-insert into sys_job values(2, '系统默认（有参）', 'DEFAULT', 'ryTask.ryParams(\'ry\')',  '0/15 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
-insert into sys_job values(3, '系统默认（多参）', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)',  '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+INSERT INTO sys_job VALUES (100, '设施自动巡检', 'EMS_AUTO_TASK', 'facInspectionTask.execute()', '* 0/4 * * * ?', '1', '1', '1', 'admin', '2024-09-02 14:59:06', '', '2024-09-04 10:21:43', '');
 
 
 -- ----------------------------