后台调整

src/main/java/com/jpsoft/smart/SmartCommunityServerApplication.java

@@ -6,28 +6,21 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication
 @EnableTransactionManagement
 @MapperScan("com.jpsoft.smart.**.dao")
-public class SmartCommunityServerApplication implements CommandLineRunner {
-	@Autowired
-	private TcpServer tcpServer;
+public class SmartCommunityServerApplication extends SpringBootServletInitializer {
 
 	public static void main(String[] args) {
 		SpringApplication.run(SmartCommunityServerApplication.class, args);
 	}
 
 	@Override
-	public void run(String... args) throws Exception {
-		tcpServer.start();
-
-		Runtime.getRuntime().addShutdownHook(new Thread(){
-			@Override
-			public void run() {
-				tcpServer.stop();
-			}
-		});
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+		return builder.sources(SmartCommunityServerApplication.class);
 	}
 }

src/main/java/com/jpsoft/smart/listener/WebStateListener.java

@@ -0,0 +1,32 @@
+package com.jpsoft.smart.listener;
+
+import com.jpsoft.smart.modules.communication.server.TcpServer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+@WebListener
+@Component
+public class WebStateListener implements ServletContextListener {
+    @Autowired
+    private TcpServer tcpServer;
+
+    @Override
+    public void contextDestroyed(ServletContextEvent arg0) {
+        // TODO Auto-generated method stub
+        System.out.println("web应用销毁");
+
+        tcpServer.stop();
+    }
+
+    @Override
+    public void contextInitialized(ServletContextEvent arg0) {
+        // TODO Auto-generated method stub
+        System.out.println("web应用初始化");
+
+        tcpServer.start();
+    }
+}

src/main/java/com/jpsoft/smart/modules/sys/controller/DataDictionaryController.java

@@ -6,6 +6,7 @@ import com.jpsoft.smart.modules.common.dto.Sort;
 import com.jpsoft.smart.modules.common.utils.PojoUtils;
 import com.jpsoft.smart.modules.sys.entity.DataDictionary;
 import com.jpsoft.smart.modules.sys.service.DataDictionaryService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -17,6 +18,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/sys/dataDictionary")
+@Api(description = "数据字典")
 public class DataDictionaryController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -35,7 +37,7 @@ public class DataDictionaryController {
 
         return msgResult;
     }
-    
+
     @ApiOperation(value="添加信息")
     @PostMapping("add")
     public MessageResult<DataDictionary> add(@RequestBody DataDictionary dataDictionary,@RequestAttribute String subject){
@@ -46,7 +48,7 @@ public class DataDictionaryController {
             dataDictionary.setDelFlag(false);
             dataDictionary.setCreateBy(subject);
             dataDictionary.setCreateDate(new Date());
-            
+
             int affectCount = dataDictionaryService.insert(dataDictionary);
 
             if (affectCount > 0) {
@@ -101,7 +103,7 @@ public class DataDictionaryController {
         try {
             dataDictionary.setUpdateBy(subject);
             dataDictionary.setUpdateDate(new Date());
-            
+
             int affectCount = dataDictionaryService.update(dataDictionary);
 
             if (affectCount > 0) {
@@ -122,7 +124,7 @@ public class DataDictionaryController {
         return msgResult;
     }
 
-	@ApiOperation(value="删除")
+    @ApiOperation(value="删除")
     @PostMapping("delete/{id}")
     public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
         MessageResult<Integer> msgResult = new MessageResult<>();
@@ -164,7 +166,7 @@ public class DataDictionaryController {
 
             for (String id : idList) {
                 DataDictionary dataDictionary = dataDictionaryService.get(id);
-                //dataDictionary.setDelFlag(true);
+                dataDictionary.setDelFlag(true);
                 dataDictionary.setUpdateBy(subject);
                 dataDictionary.setUpdateDate(new Date());
 
@@ -194,6 +196,7 @@ public class DataDictionaryController {
     public MessageResult<Map> pageList(
             String id,
             String name,
+            String parentId,
             @RequestParam(name="pageIndex",defaultValue = "1") int pageIndex,
             @RequestParam(name="pageSize",defaultValue = "10") int pageSize,
             @RequestAttribute String subject){
@@ -208,6 +211,10 @@ public class DataDictionaryController {
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("sort_no","asc"));
 
+        if (StringUtils.isNotEmpty(parentId)) {
+            searchParams.put("parentId",parentId);
+        }
+
         if (StringUtils.isNotEmpty(id)) {
             searchParams.put("id",id);
         }

src/main/java/com/jpsoft/smart/modules/sys/controller/MenuController.java

@@ -189,14 +189,14 @@ public class MenuController {
     public MessageResult<List> query(
             String keywords,
             String excludeId,
-            @RequestParam(value = "length", defaultValue = "20") int limit,
+            @RequestParam(value = "limit", defaultValue = "20") int limit,
             @RequestAttribute String subject) {
         MessageResult<List> msgResult = new MessageResult<>();
 
         Map<String, Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time", "asc"));
+        sortList.add(new Sort("a.sort_no", "asc"));
 
         if (StringUtils.isNotEmpty(keywords)) {
             searchParams.put("menuName", "%" + keywords + "%");

src/main/resources/application-dev.yml

@@ -5,9 +5,9 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: smart
-    password: smart
+    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: root
   devtools:
     add-properties: false
     restart: