Bläddra i källkod

update document

xuxueli 6 år sedan
förälder
incheckning
d127f26264

+ 0 - 4
xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java Visa fil

@@ -16,10 +16,6 @@ public interface XxlJobGroupDao {
16 16
 
17 17
     public List<XxlJobGroup> findByAddressType(@Param("addressType") int addressType);
18 18
 
19
-    public List<XxlJobGroup> findAutoRegisterGroupByAppName(@Param("appName") String appName);
20
-
21
-    public int updateAddressListById(@Param("id") int id, @Param("addressList") String addressList);
22
-
23 19
     public int save(XxlJobGroup xxlJobGroup);
24 20
 
25 21
     public int update(XxlJobGroup xxlJobGroup);

+ 9 - 32
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java Visa fil

@@ -1,6 +1,5 @@
1 1
 package com.xxl.job.admin.service.impl;
2 2
 
3
-import com.xxl.job.admin.core.model.XxlJobGroup;
4 3
 import com.xxl.job.admin.core.model.XxlJobInfo;
5 4
 import com.xxl.job.admin.core.model.XxlJobLog;
6 5
 import com.xxl.job.admin.core.thread.JobTriggerPoolHelper;
@@ -18,8 +17,6 @@ import com.xxl.job.core.handler.IJobHandler;
18 17
 import org.slf4j.Logger;
19 18
 import org.slf4j.LoggerFactory;
20 19
 import org.springframework.stereotype.Service;
21
-import org.springframework.util.CollectionUtils;
22
-import org.springframework.util.StringUtils;
23 20
 
24 21
 import javax.annotation.Resource;
25 22
 import java.text.MessageFormat;
@@ -132,6 +129,9 @@ public class AdminBizImpl implements AdminBiz {
132 129
         int ret = xxlJobRegistryDao.registryUpdate(registryParam.getRegistGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue());
133 130
         if (ret < 1) {
134 131
             xxlJobRegistryDao.registrySave(registryParam.getRegistGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue());
132
+
133
+            // fresh
134
+            freshGroupRegistryInfo(registryParam);
135 135
         }
136 136
         return ReturnT.SUCCESS;
137 137
     }
@@ -139,39 +139,16 @@ public class AdminBizImpl implements AdminBiz {
139 139
     @Override
140 140
     public ReturnT<String> registryRemove(RegistryParam registryParam) {
141 141
         int ret = xxlJobRegistryDao.registryDelete(registryParam.getRegistGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue());
142
-        if (ret == 1) {
143
-            List<XxlJobGroup> autoRegisterGroups = xxlJobGroupDao.findAutoRegisterGroupByAppName(registryParam.getRegistryKey());
144
-            removeRegisterFromGroups(autoRegisterGroups, registryParam.getRegistryValue());
142
+        if (ret > 0) {
143
+
144
+            // fresh
145
+            freshGroupRegistryInfo(registryParam);
145 146
         }
146 147
         return ReturnT.SUCCESS;
147 148
     }
148 149
 
149
-    private void removeRegisterFromGroups(List<XxlJobGroup> groups, String address) {
150
-        if (StringUtils.isEmpty(address)) {
151
-            return;
152
-        }
153
-        if (CollectionUtils.isEmpty(groups)) {
154
-            return;
155
-        }
156
-
157
-        for (XxlJobGroup group : groups) {
158
-            List<String> addressList = group.getRegistryList();
159
-            if (addressList == null) {
160
-                continue;
161
-            }
162
-            if (!addressList.contains(address)) {
163
-                continue;
164
-            }
165
-
166
-            addressList.remove(address);
167
-            String newAddressListStr = StringUtils.collectionToCommaDelimitedString(addressList);
168
-            String oldAddressListStr = group.getAddressList();
169
-            int update = xxlJobGroupDao.updateAddressListById(group.getId(), newAddressListStr);
170
-            if (logger.isDebugEnabled()) {
171
-                logger.debug("update group name [{}] title [{}] old address list [{}] new address list [{}] update result [{}]",
172
-                        group.getAppName(), group.getTitle(), oldAddressListStr, newAddressListStr, update);
173
-            }
174
-        }
150
+    private void freshGroupRegistryInfo(RegistryParam registryParam){
151
+        // Under consideration, prevent affecting core tables
175 152
     }
176 153
 
177 154
 }

+ 0 - 13
xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml Visa fil

@@ -27,13 +27,6 @@
27 27
 		ORDER BY t.order ASC
28 28
 	</select>
29 29
 
30
-	<select id="findAutoRegisterGroupByAppName" resultMap="XxlJobGroup">
31
-		SELECT <include refid="Base_Column_List" />
32
-		FROM xxl_job_group AS t
33
-		WHERE `app_name` = #{appName}
34
-		AND `address_type` = 0
35
-	</select>
36
-
37 30
 	<select id="findByAddressType" parameterType="java.lang.Integer" resultMap="XxlJobGroup">
38 31
 		SELECT <include refid="Base_Column_List" />
39 32
 		FROM xxl_job_group AS t
@@ -56,12 +49,6 @@
56 49
 		WHERE id = #{id}
57 50
 	</update>
58 51
 
59
-	<update id="updateAddressListById">
60
-		UPDATE xxl_job_group
61
-		SET `address_list` = #{addressList}
62
-		WHERE id = #{id}
63
-	</update>
64
-
65 52
 	<delete id="remove" parameterType="java.lang.Integer" >
66 53
 		DELETE FROM xxl_job_group
67 54
 		WHERE id = #{id}