模块整理

@@ -19,10 +19,9 @@ import org.springframework.scheduling.annotation.EnableScheduling;
         "com.ruoyi.framework",
         "com.ruoyi.framework",
         "com.zhonglai.luhui.datasource",
         "com.zhonglai.luhui.datasource",
         "com.zhonglai.luhui.dao",
         "com.zhonglai.luhui.dao",
-        "com.zhonglai.luhui.smart.feeder.controller",
-        "com.zhonglai.luhui.smart.feeder.config",
+        "com.zhonglai.luhui.smart.feeder",
 }
 }
-        ,excludeFilters = {@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE,classes = {ResourcesConfig.class, CameraController.class, ConfigController.class})}
+        ,excludeFilters = {@ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE,classes = {ResourcesConfig.class})}
 )
 )
 @EnableScheduling
 @EnableScheduling
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class})
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class})

@@ -42,7 +42,7 @@ public class RegisterConreoller {
             register1.setName("开启小时");
             register1.setName("开启小时");
             register1.setStart_char(8);
             register1.setStart_char(8);
             register1.setChar_lenth(6);
             register1.setChar_lenth(6);
-            register1.setField_name("timer"+(register.getAddress()-22+1)+"_start_h");
+            register1.setField_name("timer"+(register1.getAddress()-22+1)+"_start_h");
 
 
             Register register2 = new Register();
             Register register2 = new Register();
             register2.setAddress(startaddress+i);
             register2.setAddress(startaddress+i);
@@ -50,7 +50,7 @@ public class RegisterConreoller {
             register2.setName("使能");
             register2.setName("使能");
             register2.setStart_char(14);
             register2.setStart_char(14);
             register2.setChar_lenth(1);
             register2.setChar_lenth(1);
-            register2.setField_name("timer"+(register.getAddress()-22+1)+"_if_start");
+            register2.setField_name("timer"+(register2.getAddress()-22+1)+"_if_start");
 
 
             Register register3 = new Register();
             Register register3 = new Register();
             register3.setAddress(startaddress+i);
             register3.setAddress(startaddress+i);
@@ -58,7 +58,7 @@ public class RegisterConreoller {
             register3.setName("有效");
             register3.setName("有效");
             register3.setStart_char(15);
             register3.setStart_char(15);
             register3.setChar_lenth(1);
             register3.setChar_lenth(1);
-            register3.setField_name("timer"+(register.getAddress()-22+1)+"_is_start");
+            register3.setField_name("timer"+(register3.getAddress()-22+1)+"_is_start");
 
 
             Register register4 = new Register();
             Register register4 = new Register();
             register4.setAddress(startaddress+i);
             register4.setAddress(startaddress+i);
@@ -66,7 +66,7 @@ public class RegisterConreoller {
             register4.setName("关闭分钟");
             register4.setName("关闭分钟");
             register4.setStart_char(0);
             register4.setStart_char(0);
             register4.setChar_lenth(8);
             register4.setChar_lenth(8);
-            register4.setField_name("timer"+(register.getAddress()-22+1)+"_close_m");
+            register4.setField_name("timer"+(register4.getAddress()-22+1)+"_close_m");
 
 
             Register register5 = new Register();
             Register register5 = new Register();
             register5.setAddress(startaddress+i);
             register5.setAddress(startaddress+i);
@@ -74,7 +74,7 @@ public class RegisterConreoller {
             register5.setName("关闭小时");
             register5.setName("关闭小时");
             register5.setStart_char(8);
             register5.setStart_char(8);
             register5.setChar_lenth(6);
             register5.setChar_lenth(6);
-            register5.setField_name("timer"+(register.getAddress()-22+1)+"_close_h");
+            register5.setField_name("timer"+(register5.getAddress()-22+1)+"_close_h");
 
 
             Register register6 = new Register();
             Register register6 = new Register();
             register6.setAddress(startaddress+i);
             register6.setAddress(startaddress+i);
@@ -82,7 +82,7 @@ public class RegisterConreoller {
             register6.setName("使能");
             register6.setName("使能");
             register6.setStart_char(14);
             register6.setStart_char(14);
             register6.setChar_lenth(1);
             register6.setChar_lenth(1);
-            register6.setField_name("timer"+(register.getAddress()-22+1)+"_if_close");
+            register6.setField_name("timer"+(register6.getAddress()-22+1)+"_if_close");
 
 
             Register register7 = new Register();
             Register register7 = new Register();
             register7.setAddress(startaddress+i);
             register7.setAddress(startaddress+i);
@@ -90,7 +90,7 @@ public class RegisterConreoller {
             register7.setName("有效");
             register7.setName("有效");
             register7.setStart_char(15);
             register7.setStart_char(15);
             register7.setChar_lenth(1);
             register7.setChar_lenth(1);
-            register7.setField_name("timer"+(register.getAddress()-22+1)+"_is_close");
+            register7.setField_name("timer"+(register7.getAddress()-22+1)+"_is_close");
 
 
             list.add(register);
             list.add(register);
             list.add(register1);
             list.add(register1);