修改 海康数据接口

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java

@@ -31,7 +31,8 @@ public class HKConstant {
      * <p>请将地址配置正确.</p>
      * <p>默认情况下是127.0.0.1:80 ，如果地址不通请根据实际情况修改IP端口</p>
      */
-    public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
+//    public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
+    public static final String OPENAPI_IP_PORT_HTTP = "http://6wnrrtr3.wkdl.ltd";
 
     /**
      * <p>操作用户UUID，即用户UUID，首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKDigests.java

@@ -0,0 +1,137 @@
+package com.community.huiju.common.hk;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.GeneralSecurityException;
+import java.security.MessageDigest;
+import java.security.SecureRandom;
+import org.apache.commons.lang3.Validate;
+
+public class HKDigests {
+    private static final String SHA1 = "SHA-1";
+    private static final String MD5 = "MD5";
+    private static SecureRandom random = new SecureRandom();
+
+    public HKDigests() {
+    }
+
+    public static byte[] md5(byte[] input) {
+        return digest(input, "MD5", (byte[])null, 1);
+    }
+
+    public static byte[] md5(byte[] input, int iterations) {
+        return digest(input, "MD5", (byte[])null, iterations);
+    }
+
+    public static byte[] sha1(byte[] input) {
+        return digest(input, "SHA-1", (byte[])null, 1);
+    }
+
+    public static byte[] sha1(byte[] input, byte[] salt) {
+        return digest(input, "SHA-1", salt, 1);
+    }
+
+    public static byte[] sha1(byte[] input, byte[] salt, int iterations) {
+        return digest(input, "SHA-1", salt, iterations);
+    }
+
+    private static byte[] digest(byte[] input, String algorithm, byte[] salt, int iterations) {
+        try {
+            MessageDigest digest = MessageDigest.getInstance(algorithm);
+            if (salt != null) {
+                digest.update(salt);
+            }
+
+            byte[] result = digest.digest(input);
+
+            for(int i = 1; i < iterations; ++i) {
+                digest.reset();
+                result = digest.digest(result);
+            }
+
+            return result;
+        } catch (GeneralSecurityException var7) {
+            throw new RuntimeException(var7);
+        }
+    }
+
+    public static byte[] generateSalt(int numBytes) {
+        Validate.isTrue(numBytes > 0, "numBytes argument must be a positive integer (1 or larger)", (long)numBytes);
+        byte[] bytes = new byte[numBytes];
+        random.nextBytes(bytes);
+        return bytes;
+    }
+
+    public static byte[] md5(InputStream input) throws IOException {
+        return digest(input, "MD5");
+    }
+
+    public static byte[] sha1(InputStream input) throws IOException {
+        return digest(input, "SHA-1");
+    }
+
+    private static byte[] digest(InputStream input, String algorithm) throws IOException {
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance(algorithm);
+            int bufferLength = 8192;
+            byte[] buffer = new byte[bufferLength];
+
+            for(int read = input.read(buffer, 0, bufferLength); read > -1; read = input.read(buffer, 0, bufferLength)) {
+                messageDigest.update(buffer, 0, read);
+            }
+
+            return messageDigest.digest();
+        } catch (GeneralSecurityException var6) {
+            throw new RuntimeException(var6);
+        }
+    }
+
+    public static final String md5(String s) {
+        char[] hexDigits = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+        try {
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+
+            try {
+                mdTemp.update(s.getBytes("UTF-8"));
+            } catch (UnsupportedEncodingException var9) {
+                mdTemp.update(s.getBytes());
+            }
+
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char[] str = new char[j * 2];
+            int k = 0;
+
+            for(int i = 0; i < j; ++i) {
+                byte byte0 = md[i];
+                str[k++] = hexDigits[byte0 >>> 4 & 15];
+                str[k++] = hexDigits[byte0 & 15];
+            }
+
+            return (new String(str)).toUpperCase();
+        } catch (Exception var10) {
+            return null;
+        }
+    }
+
+    public static final String buildToken(String url, String paramJson, String secret) {
+        String tempUrl = null;
+        if (url.contains("https://")) {
+            tempUrl = url.substring("https://".length());
+        } else {
+            tempUrl = url.substring("http://".length());
+        }
+
+        int index = tempUrl.indexOf("/");
+        String URI = tempUrl.substring(index);
+        String[] ss = URI.split("\\?");
+        return ss.length > 1 ? md5(ss[0] + ss[1] + secret) : md5(ss[0] + paramJson + secret);
+    }
+
+    public static void main(String[] args) {
+        System.out.println(md5("abc"));
+    }
+}
+

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -2,8 +2,6 @@ package com.community.huiju.common.hk;
 
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Maps;
-import com.hikvision.cms.api.common.util.Digests;
-import com.hikvision.cms.api.common.util.HttpClientSSLUtils;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
@@ -37,7 +35,7 @@ public class HKOpenApi {
         log.info("获取 监控列表 请求参数：{}", params);
         String data = null;
         try {
-            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            data = HttpClientSSLUtils.doPost(url + "?token=" + HKDigests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
             log.info("获取 监控列表 请求返回结果：{}",data);
         } catch (Exception e) {
             e.printStackTrace();

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HttpClientSSLUtils.java

@@ -0,0 +1,162 @@
+package com.community.huiju.common.hk;
+
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.config.RequestConfig.Builder;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.ssl.SSLContextBuilder;
+
+public class HttpClientSSLUtils {
+    private static HttpClient client = null;
+    protected static final Integer DEFAULT_CONNECTION_TIME_OUT = 100000;
+    protected static final Integer DEFAULT_SOCKET_TIME_OUT = 200000;
+    protected static final String DEFAULT_CHAR_SET = "UTF-8";
+
+    public HttpClientSSLUtils() {
+    }
+
+    public static String doPost(String url, String jsonText) throws Exception {
+        HttpClient client = null;
+        HttpPost post = new HttpPost(url);
+
+        String var6;
+        try {
+            if (jsonText != null && !jsonText.isEmpty()) {
+                StringEntity entity = new StringEntity(jsonText, ContentType.APPLICATION_JSON);
+                post.setEntity(entity);
+            }
+
+            Builder customReqConf = RequestConfig.custom();
+            customReqConf.setConnectTimeout(DEFAULT_CONNECTION_TIME_OUT);
+            customReqConf.setSocketTimeout(DEFAULT_CONNECTION_TIME_OUT);
+            post.setConfig(customReqConf.build());
+            HttpResponse res = null;
+            if (url.startsWith("https")) {
+                client = createSSLInsecureClient();
+                res = ((HttpClient)client).execute(post);
+            } else {
+                client = client;
+                res = ((HttpClient)client).execute(post);
+            }
+
+            var6 = IOUtils.toString(res.getEntity().getContent(), "UTF-8");
+        } finally {
+            post.releaseConnection();
+            if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient)client).close();
+            }
+
+        }
+
+        return var6;
+    }
+
+    public static String doGet(String url) throws Exception {
+        HttpClient client = null;
+        HttpGet get = new HttpGet(url);
+        String result = "";
+
+        try {
+            Builder customReqConf = RequestConfig.custom();
+            customReqConf.setConnectTimeout(DEFAULT_CONNECTION_TIME_OUT);
+            customReqConf.setSocketTimeout(DEFAULT_CONNECTION_TIME_OUT);
+            get.setConfig(customReqConf.build());
+            HttpResponse res = null;
+            if (url.startsWith("https")) {
+                client = createSSLInsecureClient();
+                res = ((HttpClient)client).execute(get);
+            } else {
+                client = client;
+                res = ((HttpClient)client).execute(get);
+            }
+
+            result = IOUtils.toString(res.getEntity().getContent(), "UTF-8");
+        } finally {
+            get.releaseConnection();
+            if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
+                ((CloseableHttpClient)client).close();
+            }
+
+        }
+
+        return result;
+    }
+
+    private static CloseableHttpClient createSSLInsecureClient() throws GeneralSecurityException {
+        try {
+            SSLContext sslContext = (new SSLContextBuilder()).loadTrustMaterial((KeyStore)null, new TrustStrategy() {
+                @Override
+                public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+                    return true;
+                }
+            }).build();
+            SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new HostnameVerifier() {
+                @Override
+                public boolean verify(String hostname, SSLSession session) {
+                    return true;
+                }
+            });
+            return HttpClients.custom().setSSLSocketFactory(sslsf).build();
+        } catch (GeneralSecurityException var2) {
+            throw var2;
+        }
+    }
+
+    public static void main(String[] args) {
+        String url = "https://10.33.39.8/webapi/service/base/getPlatAuthSubSystemList";
+        String params = "appkey=f8524632&time=" + System.currentTimeMillis() + "&pageNo=1&pageSize=10";
+        String urlString = url + "?" + params + "&token=" + HKDigests.buildToken(url + "?" + params, (String)null, "0a5a6558a06546088da645b5f9248a3a");
+
+        try {
+            String output = new String(doGet(urlString));
+            System.out.println(output);
+        } catch (Exception var7) {
+            var7.printStackTrace();
+        }
+
+        url = "https://10.20.134.21/webapi/service/base/addPlatCard";
+        Map<String, Object> map = new HashMap();
+        map.put("appkey", "f8524632");
+        map.put("time", System.currentTimeMillis());
+        map.put("startCardNo", "16000");
+        map.put("endCardNo", "16010");
+        params = JSONObject.toJSONString(map);
+        url = url + "?token=" + HKDigests.buildToken(url + "?" + params, (String)null, "0a5a6558a06546088da645b5f9248a3a");
+
+        try {
+            System.out.println(doPost(url, params));
+        } catch (Exception var6) {
+            var6.printStackTrace();
+        }
+
+    }
+
+    static {
+        PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
+        cm.setMaxTotal(128);
+        cm.setDefaultMaxPerRoute(128);
+        client = HttpClients.custom().setConnectionManager(cm).build();
+    }
+}
+

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/AssembleController.java

@@ -32,7 +32,7 @@ import java.util.Map;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "首页聚合API", description = "首页聚合API")
-public class AssembleController {
+public class AssembleController extends BaseController {
 	
 	@Autowired
 	private MenuServiceI menuService;
@@ -51,6 +51,12 @@ public class AssembleController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		Map<String,Object> indexMap = new HashMap<>();
 		//获取菜单数据
 		List<TaSysMenu> menuList = menuService.getMenuList(communityId);

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/BaseController.java

@@ -0,0 +1,27 @@
+package com.community.huiju.controller;
+
+import com.community.huiju.model.ToCommunities;
+import com.community.huiju.service.CommunityServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 公共 controller
+ */
+public class BaseController {
+
+    @Autowired
+    private CommunityServiceI community;
+
+    /**
+     * 校验小区是否存在
+     * @return
+     */
+    protected boolean check(Integer communityId){
+        ToCommunities toCommunities = community.getByCommunityId(communityId);
+        if (null != toCommunities) {
+            return true;
+        }
+        return false;
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/BillController.java

@@ -28,7 +28,7 @@ import java.util.Map;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "缴费相关的API", description = "缴费相关的API")
-public class BillController {
+public class BillController extends BaseController {
 	
 	@Autowired
 	private BillServiceI billServiceI;
@@ -46,6 +46,12 @@ public class BillController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		List<Map<String,Object>> billsList = billServiceI.getBillsList(communityId, payType, userId, pageNum, pageSize);
 		responseBean.addSuccess(billsList);
 		return responseBean;
@@ -57,6 +63,12 @@ public class BillController {
 	@RequestMapping(value = "/bill/{communityId}/{billInvoiceId}",method = RequestMethod.GET)
 	public ResponseBean getBillInvoiceDetail(@PathVariable Integer communityId,@PathVariable Integer billInvoiceId){
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		Map<String,Object> billInvoiceMap = billServiceI.getBillInvoiceDetail(communityId,billInvoiceId);
 		responseBean.addSuccess(billInvoiceMap);
 		return responseBean;

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MenuController.java

@@ -28,7 +28,7 @@ import java.util.Map;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "菜单API", description = "菜单API")
-public class MenuController {
+public class MenuController extends BaseController {
 	
 	@Autowired
 	private MenuServiceI menuService;
@@ -38,6 +38,12 @@ public class MenuController {
 	@RequestMapping(value = "/menus/{communityId}",method = RequestMethod.GET)
 	public ResponseBean getMenuList(@PathVariable Integer communityId, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		List<TaSysMenu> list = menuService.getMenuList(communityId);
 		responseBean.addSuccess(list);
 		return responseBean;

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java

@@ -30,7 +30,7 @@ import java.util.Map;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "消息相关的API",description = "消息相关的API")
-public class MessageController {
+public class MessageController extends BaseController {
 	
 	@Autowired
 	private MessageServiceI messageService;
@@ -43,6 +43,12 @@ public class MessageController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
 		responseBean.addSuccess(totalMap);
 		return responseBean;
@@ -60,6 +66,12 @@ public class MessageController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		List<TpMessage> newsList = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userId);
 		responseBean.addSuccess(newsList);
 		return responseBean;
@@ -77,6 +89,12 @@ public class MessageController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		List<TpMessage> upcomingList = messageService.getMessages(communityId,pageNum,pageSize,Constant.MODEL_TYPE_UPCOMING, userId);
 		responseBean.addSuccess(upcomingList);
 		return responseBean;
@@ -90,6 +108,12 @@ public class MessageController {
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
+
+		if (!check(communityId)) {
+			responseBean.addError("小区不存在");
+			return responseBean;
+		}
+
 		messageService.updateMessageReadStatus(communityId, userId);
 		return responseBean;
 	}

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MonitoringController.java

@@ -23,7 +23,7 @@ import javax.servlet.http.HttpSession;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "监控 控制器", description = "监控相关的数据")
-public class MonitoringController {
+public class MonitoringController extends BaseController {
 
     @Autowired
     private IMonitoringService iMonitoringService;
@@ -34,7 +34,13 @@ public class MonitoringController {
     })
     @RequestMapping(value = "/monitoring/{communityId}",method = RequestMethod.POST)
     public ResponseBean getList(@PathVariable("communityId") Integer communityId){
-        ResponseBean response = iMonitoringService.getByCommunityId(communityId);
+        ResponseBean response = new ResponseBean();
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
+        response = iMonitoringService.getByCommunityId(communityId);
         return response;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -27,7 +27,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "app端论坛相关的API", description = "app端论坛相关的API")
-public class SocialController {
+public class SocialController extends BaseController {
 
     @Autowired
     private SocialServiceI socialServiceI;
@@ -41,6 +41,12 @@ public class SocialController {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, communityId, userId);
         responseBean.addSuccess(tpAnnouncement);
         return responseBean;
@@ -54,7 +60,15 @@ public class SocialController {
     public ResponseBean SignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId);
         return responseBean;
     }
 
@@ -68,6 +82,12 @@ public class SocialController {
                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId, title, pageNum, pageSize);
         responseBean.addSuccess(announcementList);
         return responseBean;
@@ -80,6 +100,12 @@ public class SocialController {
     @RequestMapping(value = "/announcement/Img/{communityId}", method = RequestMethod.GET)
     public ResponseBean getAnnouncement(@PathVariable(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         List<TpAnnouncement> agreement = socialServiceI.getAnnouncement(communityId);
         responseBean.addSuccess(agreement);
         return responseBean;
@@ -92,6 +118,12 @@ public class SocialController {
     @RequestMapping(value = "/activity/Img/{communityId}", method = RequestMethod.GET)
     public ResponseBean getActivity(@PathVariable(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         List<TpActivity> agreement = socialServiceI.getActivity(communityId);
         responseBean.addSuccess(agreement);
         return responseBean;
@@ -108,6 +140,12 @@ public class SocialController {
                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                      @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         List<TpActivity> activityList = socialServiceI.getActivitys(communityId, title, pageNum, pageSize);
         responseBean.addSuccess(activityList);
         return responseBean;
@@ -122,6 +160,12 @@ public class SocialController {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         TpActivity activity = socialServiceI.findActivityDetail(activityId, communityId, userId);
         responseBean.addSuccess(activity);
         return responseBean;
@@ -136,6 +180,12 @@ public class SocialController {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId, userId);
         responseBean.addSuccess(activity);
         return responseBean;
@@ -151,6 +201,12 @@ public class SocialController {
                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                     @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         List<TpTransaction> tpTransactions = socialServiceI.findAllTransaction(communityId, type, pageNum, pageSize);
         responseBean.addSuccess(tpTransactions);
         return responseBean;
@@ -216,6 +272,12 @@ public class SocialController {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         socialServiceI.accessTicket(communityId, tpTicket, ticketId, userId);
         return responseBean;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -28,7 +28,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "工单相关的API",description = "工单相关的API")
-public class TicketController {
+public class TicketController extends BaseController {
 
     @Autowired
     private ITicketService iTicketService;
@@ -39,18 +39,23 @@ public class TicketController {
     @RequestMapping(value = "/tickets/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据", notes = "根据 小区编号,第几页,一页多少行")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区编号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @Deprecated
-    public ResponseBean getService(@PathVariable(value = "communityId") String communityId,
+    public ResponseBean getService(@PathVariable(value = "communityId") Integer communityId,
                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize,
                                    HttpSession session) {
         ResponseBean response = new ResponseBean();
 
+        if (!check(communityId)) {
+            response.addError("小区不存在");
+            return response;
+        }
+
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 
         TpTicket tpTicket = new TpTicket();
@@ -63,13 +68,19 @@ public class TicketController {
 
     @ApiOperation(value = "获取报修/投诉/联系单进度详情数据", notes = "获取报修/投诉/联系单进度详情数据")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "communityId", value = "小区编号"),
             @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "ticketId", value = "报修id")
     })
     @RequestMapping(value = "/ticket/schedule/{communityId}", method = RequestMethod.GET)
-    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") String communityId, @RequestParam Integer ticketId) {
+    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") Integer communityId, @RequestParam Integer ticketId) {
         ResponseBean responseBean = new ResponseBean();
-        TpTicket ticket = iTicketService.getTicketSchedule(communityId, ticketId);
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        TpTicket ticket = iTicketService.getTicketSchedule(String.valueOf(communityId), ticketId);
         responseBean.addSuccess(ticket);
         return responseBean;
     }
@@ -77,20 +88,25 @@ public class TicketController {
     @RequestMapping(value = "/tickets/list/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取 报修/投诉/联系单 数据列表", notes = "根据 小区编号,工单类型,第几页,一页多少行")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId", value = "小区编号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
 
     })
-    public ResponseBean getServiceList(@PathVariable(value = "communityId") String communityId,
+    public ResponseBean getServiceList(@PathVariable(value = "communityId") Integer communityId,
                                        @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "type") String type,
                                        HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
 
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 
         TpTicket tpTicket = new TpTicket();
@@ -113,6 +129,12 @@ public class TicketController {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         tpTicketRecordComment.setCommunityId(communityId);
         Integer size = iTicketService.updateTicketsReply(tpTicketRecordComment, userId);
         if (size > 0){
@@ -167,7 +189,14 @@ public class TicketController {
     public ResponseBean stopTicket(@PathVariable("communityId") Integer communityId, @RequestParam("ticketId") Integer ticketId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean responseBean = iTicketService.stopTpTicketRecord(communityId, ticketId, userId);
+
+        ResponseBean responseBean = new ResponseBean();
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
+        responseBean = iTicketService.stopTpTicketRecord(communityId, ticketId, userId);
         return responseBean;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -32,7 +32,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "用户相关操作的API",description = "用户相关操作的API")
-public class UserController {
+public class UserController extends BaseController {
 
     @Autowired
     private ITaUserService iTaUserService;

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/VistorController.java

@@ -26,7 +26,7 @@ import java.util.List;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "访客相关的API", description = "访客相关的API")
-public class VistorController {
+public class VistorController extends BaseController {
 
     @Autowired
     private TaVistorServiceI vistorServiceI;
@@ -38,6 +38,12 @@ public class VistorController {
             @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id")})
     public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody TaVisitor taVisitor, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
@@ -50,6 +56,12 @@ public class VistorController {
             @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id")})
     public ResponseBean invateHis(@PathVariable("communityId")Integer communityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
+
+        if (!check(communityId)) {
+            responseBean.addError("小区不存在");
+            return responseBean;
+        }
+
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         List<TaVisitor> taVisitors = vistorServiceI.invateHis(communityId, userId);

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaAgreement.java

@@ -1,5 +1,5 @@
  package com.community.huiju.model;
-import jdk.nashorn.internal.objects.annotations.Getter;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/CommunityServiceI.java

@@ -6,4 +6,11 @@ import java.util.List;
 
 public interface CommunityServiceI {
 	List<ToCommunities> getCommunitys(String communityName);
+
+	/**
+	 * 根据小区ID获取小区信息
+	 * @param communityId
+	 * @return
+	 */
+	ToCommunities getByCommunityId(Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -22,4 +22,9 @@ public class CommunityServiceImpl implements CommunityServiceI {
 	public List<ToCommunities> getCommunitys(String communityName) {
 		return toCommunitiesMapper.selectByCommunityName(communityName);
 	}
+
+	@Override
+	public ToCommunities getByCommunityId(Integer communityId) {
+		return toCommunitiesMapper.selectByPrimaryKey(communityId);
+	}
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -125,14 +125,23 @@ public class TaUserServiceImpl implements ITaUserService {
             // TODO 这里目前定死为已录入, 后期根据人脸业务做判断
             taUserVO.setFace("register");
 
+            ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(currentUser.getCommunityId());
+            taUserVO.setCommunityName(communities.getCommunityName());
+
             response.addSuccess(taUserVO);
             return response;
         }else {
             TaUser user = new TaUser();
             user.setLoginName(loginName);
             ResponseBean result = register(user);
+
+            ToCommunities communities = toCommunitiesMapper.selectByPrimaryKey(currentUser.getCommunityId());
+            TaUserVO taUserVO = (TaUserVO) result.getData();
+            taUserVO.setCommunityName(communities.getCommunityName());
+
             response.addSuccess(result.getData());
         }
+
         return response;
     }
 

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.3.9
+version=0.0.1
+groupId=com.community
+artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,24 @@
+com\community\commom\redis\RedisTemplate.class
+com\community\commom\utils\DateUtils.class
+com\community\commom\utils\HttpClientUtils.class
+com\community\commom\constant\Constant.class
+com\community\commom\redis\RedisConfiguration.class
+com\community\commom\utils\OssUtil.class
+com\community\commom\redis\SingleRedisTemplate.class
+com\community\commom\utils\CookieUtil.class
+com\community\commom\ailiyun\AESDecode.class
+com\community\commom\utils\EnumUtils.class
+com\community\commom\redis\RedisJsonSerializer.class
+com\community\commom\utils\BeanTools.class
+com\community\commom\session\UserElement.class
+com\community\commom\utils\CommonUtils.class
+com\community\commom\redis\RedisSerializer.class
+com\community\commom\utils\StringConverter.class
+com\community\commom\utils\MD5Utils.class
+com\community\commom\mode\ResponseBean.class
+com\community\commom\redis\RedisObjectSerializer.class
+com\community\commom\utils\QRCodeGeneratorUtils.class
+com\community\commom\redis\SerializationFailedException.class
+com\community\commom\utils\DESUtils.class
+com\community\commom\utils\AccountValidatorUtil.class
+com\community\commom\redis\FastJsonSerializer.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,24 @@
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
+E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/BannerController.java

@@ -34,7 +34,7 @@ public class BannerController {
             @ApiImplicitParam(paramType = "body",dataType = "ToBanner",name = "banner",value = "title(标题)," +
                     "sort(权重),bannerCover(图片),bannerPosition(Banner位),communityId(小区)," +
                     "effTime(生效时间),expTime(失效时间),bannerType(Banner类型),externalLink(Banner的URL)," +
-                    ",bannerTitle(内容标题),bannerContent(Banner内容)"),
+                    ",bannerTitle(内容标题),bannerContent(Banner内容),bannerDescription(跳转描述)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/banner",method = RequestMethod.POST)

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TpCarouselSettingMapper.java

@@ -0,0 +1,17 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpCarouselSetting;
+
+public interface TpCarouselSettingMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpCarouselSetting record);
+
+    int insertSelective(TpCarouselSetting record);
+
+    TpCarouselSetting selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpCarouselSetting record);
+
+    int updateByPrimaryKey(TpCarouselSetting record);
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/ToBanner.java

@@ -14,6 +14,7 @@ public class ToBanner {
     @Min(value = 0,message = "小区不能为空!")
     private Integer communityId;
 
+    @NotBlank(message = "跳转描述不能为空!")
     private String bannerDescription;
 
     private Integer sort;

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TpCarouselSetting.java

@@ -0,0 +1,43 @@
+package com.community.huiju.model;
+
+public class TpCarouselSetting {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String carouselType;
+
+    private Integer carouselNum;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getCarouselType() {
+        return carouselType;
+    }
+
+    public void setCarouselType(String carouselType) {
+        this.carouselType = carouselType == null ? null : carouselType.trim();
+    }
+
+    public Integer getCarouselNum() {
+        return carouselNum;
+    }
+
+    public void setCarouselNum(Integer carouselNum) {
+        this.carouselNum = carouselNum;
+    }
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToBannerServiceImpl.java

@@ -19,6 +19,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -45,6 +46,7 @@ public class ToBannerServiceImpl implements IToBannerService {
     private SysDictionaryMapper sysDictionaryMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean addBanner(ToBanner banner,Integer currentUserId) {
 
         ResponseBean response = new ResponseBean();
@@ -96,9 +98,10 @@ public class ToBannerServiceImpl implements IToBannerService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean modifyBanner(ToBanner banner,Integer currentUserId) {
         ResponseBean response = new ResponseBean();
-        if (!Constant.BANNER_TYPE_ARTICLE.equals(banner.getBannerType())) {
+        if (Constant.BANNER_TYPE_ARTICLE.equals(banner.getBannerType())) {
             if (StringUtils.isBlank(banner.getBannerContent())) {
                 response.addError("Banner内容不能为空");
                 return response;
@@ -150,7 +153,7 @@ public class ToBannerServiceImpl implements IToBannerService {
             // TODO banner位置名称
             //SysDictionary sysDictionary = sysDictionaryMapper.selectByPrimaryKey(e.getBannerPosition());
             //toBannerVO.setBannerPositionName(sysDictionary.getName());
-            toBannerVO.setBannerPositionName("首页banner");
+            toBannerVO.setBannerPositionName(e.getBannerPosition() == 1?"首页banner":"服务banner");
 
             ToUser toUser = toUserMapper.selectByPrimaryKey(e.getUpdateUser());
             toBannerVO.setUpdateUserName(toUser.getUserName());
@@ -168,6 +171,7 @@ public class ToBannerServiceImpl implements IToBannerService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean deleteBanner(Integer bannerId) {
 
         ResponseBean response = new ResponseBean();

CODE/smart-community/operate-api/src/main/resources/mapper/ToBannerMapper.xml

@@ -267,10 +267,10 @@
     from to_banner
     <trim prefix="where" prefixOverrides="and">
       <if test="title != null and title !=''">
-       and title = #{title,jdbcType=VARCHAR}
+       and title like concat('%',#{title,jdbcType=VARCHAR},'%')
       </if>
       <if test="bannerDescription != null and bannerDescription != ''">
-       and banner_description = #{bannerDescription,jdbcType=VARCHAR}
+       and banner_description like concat('%',#{bannerDescription,jdbcType=VARCHAR},'%')
       </if>
       <if test="bannerPosition != null and bannerPosition != ''">
        and banner_position = #{bannerPosition,jdbcType=INTEGER}
@@ -279,6 +279,6 @@
        and community_id = #{communityId,jdbcType=INTEGER}
       </if>
     </trim>
-    order by create_user DESC
+    order by create_date DESC
   </select>
 </mapper>

CODE/smart-community/operate-api/src/main/resources/mapper/TpCarouselSettingMapper.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.community.huiju.dao.TpCarouselSettingMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpCarouselSetting" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="carousel_type" property="carouselType" jdbcType="VARCHAR" />
+    <result column="carousel_num" property="carouselNum" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, carousel_type, carousel_num
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_carousel_setting
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_carousel_setting
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    insert into tp_carousel_setting (id, community_id, carousel_type, 
+      carousel_num)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{carouselType,jdbcType=VARCHAR}, 
+      #{carouselNum,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    insert into tp_carousel_setting
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="carouselType != null" >
+        carousel_type,
+      </if>
+      <if test="carouselNum != null" >
+        carousel_num,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="carouselType != null" >
+        #{carouselType,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselNum != null" >
+        #{carouselNum,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    update tp_carousel_setting
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="carouselType != null" >
+        carousel_type = #{carouselType,jdbcType=VARCHAR},
+      </if>
+      <if test="carouselNum != null" >
+        carousel_num = #{carouselNum,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpCarouselSetting" >
+    update tp_carousel_setting
+    set community_id = #{communityId,jdbcType=INTEGER},
+      carousel_type = #{carouselType,jdbcType=VARCHAR},
+      carousel_num = #{carouselNum,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

VUECODE/smart-operate-manage/src/api/banner.js

@@ -21,7 +21,7 @@ export function addBanner(banner) {
 // 修改 banner
 export function updateBanner(banner) {
   return request({
-    url: '/banner/list',
+    url: '/banner',
     method: 'put',
     data: banner
   })
@@ -31,7 +31,7 @@ export function updateBanner(banner) {
 export function deleteBanner(bannerId) {
   return request({
     url: '/banner/' + bannerId,
-    method: 'delete',
+    method: 'delete'
   })
 }
 
@@ -39,7 +39,7 @@ export function deleteBanner(bannerId) {
 export function getByBannerId(bannerId) {
   return request({
     url: '/banner/' + bannerId,
-    method: 'get',
+    method: 'get'
   })
 }
 

VUECODE/smart-operate-manage/src/router/index.js

@@ -65,6 +65,20 @@ export const constantRouterMap = [
         component: () => import('@/views/banner/index'),
         name: 'banner-index',
         meta: { title: 'banner运营', icon: 'table' }
+      },
+      {
+        path: '/banner/addBanner',
+        component: () => import('@/views/banner/addBanner/index'),
+        name: 'banner-add',
+        hidden: true,
+        meta: { title: '添加banner', icon: 'table' }
+      },
+      {
+        path: '/banner/ediBanner',
+        component: () => import('@/views/banner/ediBanner/index'),
+        name: 'banner-edi',
+        hidden: true,
+        meta: { title: '修改banner', icon: 'table' }
       }
     ]
   },

VUECODE/smart-operate-manage/src/store/modules/banner.js

@@ -28,7 +28,7 @@ const banner = {
     },
 
     // 修改 banner
-    UpdateBanner({ commit }, banner ) {
+    UpdateBanner({ commit }, banner) {
       return new Promise((resolve, reject) => {
         updateBanner(banner).then(response => {
           resolve(response)
@@ -60,8 +60,6 @@ const banner = {
         })
       })
     }
-
-
   }
 }
 

VUECODE/smart-operate-manage/src/utils/request.js

@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 5000 // 请求超时时间
+  timeout: 10000 // 请求超时时间
 })
 
 // request拦截器

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -1,3 +1,231 @@
+<template>
+  <div class="app-container">
+    <el-form ref="addForm" :model="addForm">
+      <el-form-item :label-width="formLabelWidth" label="标题">
+        <el-input v-model="addForm.title"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="权重">
+        <el-input v-model="addForm.sort"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="banner图">
+        <el-input v-model="addForm.bannerCover"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="banner位">
+        <el-select v-model="addForm.bannerPosition" placeholder="请选择位置">
+          <!-- <el-option label="请选择位置" value="-1"/> -->
+          <el-option
+            v-for="item in bannerPositionArr"
+            :key="item.id"
+            :label="item.value"
+            :value="item.id"
+          />
+          <!-- <el-option v-for="item in bannerPositionArr" label="item.value" value="item.id"/> -->
+        </el-select>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="投放社区">
+        <el-select v-model="addForm.communityId" placeholder="请选择社区">
+          <!-- <el-option label="请选择社区" value="-1"/> -->
+          <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
+          <!-- <el-option label="区域一" value="shanghai"/> -->
+        </el-select>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="生效时间">
+        <el-date-picker
+          v-model="addForm.effTime"
+          type="datetime"
+          placeholder="选择日期时间"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="失效时间">
+        <el-date-picker
+          v-model="addForm.expTime"
+          type="datetime"
+          placeholder="选择日期时间"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="跳转描述">
+        <el-input
+          v-model="addForm.bannerDescription"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          type="textarea"
+          placeholder="请输入跳转描述"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="banner跳转">
+        <el-radio v-model="addForm.bannerType" label="1" @change="showContent">外部超链接</el-radio>
+        <el-radio v-model="addForm.bannerType" label="2" @change="showContent">自写文章</el-radio>
+      </el-form-item>
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="URL">
+        <el-input v-model="addForm.externalLink" placeholder="URL"/>
+      </el-form-item>
+      <div v-if="showContentVisible">
+        <el-form-item :label-width="formLabelWidth" label="内容标题">
+          <el-input v-model="addForm.bannerTitle" placeholder="内容标题"/>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="内容详情">
+          <el-input v-model="addForm.bannerContent" placeholder="内容详情"/>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogForm('0')">取 消</el-button>
+      <el-button type="primary" @click="dialogForm('1')">确 定</el-button>
+    </div>
+  </div>
+</template>
 
+<script>
+// import { updateArticle, createBanner } from '@/api/banner' // getBanner
+import { mapState, mapActions } from 'vuex'
+import waves from '@/directive/waves' // Waves directive
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+const calendarTypeOptions = [
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
+// arr to obj ,such as { CN : "China", US : "USA" }
+const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
+export default {
+  name: 'AddBanner',
+  components: { Pagination },
+  directives: { waves },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    },
+    typeFilter(type) {
+      return calendarTypeKeyValue[type]
+    }
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: null,
+      total: 0,
+      listLoading: true,
+      importanceOptions: [1, 2, 3],
+      calendarTypeOptions,
+      addForm: {
+        title: '',
+        sort: '1',
+        bannerCover: '',
+        bannerPosition: '',
+        communityId: '',
+        effTime: '',
+        expTime: '',
+        bannerType: '1',
+        externalLink: '',
+        bannerTitle: '',
+        bannerContent: '',
+        bannerDescription: ''
+      },
+      dialogStatus: '',
+      downloadLoading: false,
+      formLabelWidth: '120px',
+      showContentVisible: false,
+      showURLVisible: true,
+      bannerPositionArr: [
+        { id: 1, value: '首页banner' },
+        { id: 2, value: '服务banner' }
+      ],
+      communityArr: [
+        { id: 3, value: '智慧社区' },
+        { id: 2, value: '测试社区' }
+      ]
+    }
+  },
+  computed: {
+    ...mapState('community', {
+      communityList: s => s.list
+    })
+  },
+  methods: {
+    ...mapActions('community', [
+      'FetchCommunityList',
+      'CreateCommunity',
+      'UpdateCommunity'
+    ]),
+    dialogAddForm() {
+      this.dialogFormVisible = true
+      this.addForm.title = ''
+      this.addForm.sort = '1'
+      this.addForm.bannerCover = ''
+      this.addForm.bannerPosition = '-1'
+      this.addForm.communityId = '-1'
+      this.addForm.effTime = ''
+      this.addForm.expTime = ''
+      this.addForm.bannerType = '1'
+      this.addForm.externalLink = ''
+      this.addForm.bannerTitle = ''
+      this.addForm.bannerContent = ''
+      this.addForm.bannerDescription = ''
+    },
+    dialogForm(isVaule) {
+      if (isVaule === '0') {
+        this.$router.push({ name: 'banner-index' })
+      } else {
+        this.createData()
+        // console.log('添加banner的数据: ', this.addForm)
+      }
+    },
+    showContent() {
+      if (this.addForm.bannerType === '1') {
+        this.showContentVisible = false
+        this.showURLVisible = true
+      } else {
+        this.showContentVisible = true
+        this.showURLVisible = false
+      }
+    },
+    createData() {
+      this.$refs['addForm'].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('AddBanner', this.addForm).then((res) => {
+            if (res.code === '0') {
+              this.$notify({
+                title: '操作成功!',
+                message: res.message,
+                type: 'success'
+              })
+              this.$router.push({ name: 'banner-index' })
+            } else {
+              this.$notify({
+                title: '操作失败',
+                message: res.message,
+                type: 'warning'
+              })
+            }
+          })
+        }
+      })
+    },
+    getCommuniryList() {
+      this.listLoading = true
+      this.FetchCommunityList().then(() => {
+        this.listLoading = false
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+    }
+  }
+}
+</script>
 
+<style scoped>
+.app-container {
+  width: 50%;
+  margin: auto;
+}
+.dialog-footer {
+  text-align: center;
+}
+</style>
 

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -0,0 +1,239 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form">
+      <el-form-item :label-width="formLabelWidth" label="标题">
+        <el-input v-model="form.title"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="权重">
+        <el-input v-model="form.sort"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="banner图">
+        <el-input v-model="form.bannerCover"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="banner位">
+        <el-select v-model="form.bannerPosition" placeholder="请选择位置">
+          <el-option label="请选择位置" value="-1"/>
+          <el-option
+            v-for="item in bannerPositionArr"
+            :key="item.id"
+            :label="item.value"
+            :value="item.id"
+          />
+          <!-- <el-option v-for="item in bannerPositionArr" label="item.value" value="item.id"/> -->
+        </el-select>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="投放社区">
+        <el-select v-model="form.communityId" placeholder="请选择社区">
+          <!-- <el-option label="请选择社区" value="-1"/> -->
+          <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
+          <!-- <el-option label="区域一" value="shanghai"/> -->
+        </el-select>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="生效时间">
+        <el-date-picker
+          v-model="form.effTime"
+          type="datetime"
+          placeholder="选择日期时间"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="失效时间">
+        <el-date-picker
+          v-model="form.expTime"
+          type="datetime"
+          placeholder="选择日期时间"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="跳转描述">
+        <el-input
+          v-model="form.bannerDescription"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          type="textarea"
+          placeholder="请输入跳转描述"/>
+      </el-form-item>
+      <el-form-item :label-width="formLabelWidth" label="banner跳转">
+        <el-radio v-model="form.bannerType" label="1" @change="showContent">外部超链接</el-radio>
+        <el-radio v-model="form.bannerType" label="2" @change="showContent">自写文章</el-radio>
+      </el-form-item>
+      <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="URL">
+        <el-input v-model="form.externalLink" placeholder="URL"/>
+      </el-form-item>
+      <div v-if="showContentVisible">
+        <el-form-item :label-width="formLabelWidth" label="内容标题">
+          <el-input v-model="form.bannerTitle" placeholder="内容标题"/>
+        </el-form-item>
+        <el-form-item :label-width="formLabelWidth" label="内容详情">
+          <el-input v-model="form.bannerContent" placeholder="内容详情"/>
+        </el-form-item>
+      </div>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogForm('0')">取 消</el-button>
+      <el-button type="primary" @click="dialogForm('1')">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+// import { updateArticle, createBanner } from '@/api/banner' // getBanner
+import { mapState, mapActions } from 'vuex'
+import waves from '@/directive/waves' // Waves directive
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+const calendarTypeOptions = [
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
+// arr to obj ,such as { CN : "China", US : "USA" }
+const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
+export default {
+  name: 'UpdateBanner',
+  components: { Pagination },
+  directives: { waves },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        published: 'success',
+        draft: 'info',
+        deleted: 'danger'
+      }
+      return statusMap[status]
+    },
+    typeFilter(type) {
+      return calendarTypeKeyValue[type]
+    }
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: null,
+      total: 0,
+      listLoading: true,
+      importanceOptions: [1, 2, 3],
+      calendarTypeOptions,
+      form: {
+        title: '',
+        sort: '1',
+        bannerCover: '',
+        bannerPosition: '',
+        communityId: '',
+        effTime: '',
+        expTime: '',
+        bannerType: '1',
+        externalLink: '',
+        bannerTitle: '',
+        bannerContent: '',
+        bannerDescription: ''
+      },
+      dialogStatus: '',
+      downloadLoading: false,
+      formLabelWidth: '120px',
+      showContentVisible: false,
+      showURLVisible: true,
+      bannerPositionArr: [
+        { id: 1, value: '首页banner' },
+        { id: 2, value: '服务banner' }
+      ],
+      communityArr: [
+        { id: 3, value: '智慧社区' },
+        { id: 2, value: '测试社区' }
+      ]
+    }
+  },
+  computed: {
+    ...mapState('community', {
+      communityList: s => s.list
+    })
+  },
+  created() {
+    this.getByBannerId(this.$route.params.id)
+  },
+  methods: {
+    ...mapActions('community', [
+      'FetchCommunityList',
+      'CreateCommunity',
+      'UpdateCommunity'
+    ]),
+    dialogAddForm() {
+      this.dialogFormVisible = true
+      this.form.title = ''
+      this.form.sort = '1'
+      this.form.bannerCover = ''
+      this.form.bannerPosition = '-1'
+      this.form.communityId = '-1'
+      this.form.effTime = ''
+      this.form.expTime = ''
+      this.form.bannerType = '1'
+      this.form.externalLink = ''
+      this.form.bannerTitle = ''
+      this.form.bannerContent = ''
+      this.form.bannerDescription = ''
+    },
+    dialogForm(isVaule) {
+      if (isVaule === '0') {
+        this.$router.push({ name: 'banner-index' })
+      } else {
+        this.updateData()
+      }
+    },
+    showContent() {
+      if (this.form.bannerType === '1') {
+        this.showContentVisible = false
+        this.showURLVisible = true
+      } else {
+        this.showContentVisible = true
+        this.showURLVisible = false
+      }
+    },
+    updateData() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.$store.dispatch('UpdateBanner', this.form).then((res) => {
+            if (res.code === '0') {
+              this.$notify({
+                title: '操作成功!',
+                message: res.message,
+                type: 'success'
+              })
+              this.$router.push({ name: 'banner-index' })
+            } else {
+              this.$notify({
+                title: '操作失败',
+                message: res.message,
+                type: 'warning'
+              })
+            }
+          })
+        }
+      })
+    },
+    getByBannerId(bannerId) {
+      this.$store.dispatch('GetByBannerId', bannerId).then(res => {
+        this.form = res
+        this.showContent()
+      })
+    },
+    getCommuniryList() {
+      this.listLoading = true
+      this.FetchCommunityList().then(() => {
+        this.listLoading = false
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.app-container {
+  width: 50%;
+  margin: auto;
+}
+.dialog-footer {
+  text-align: center;
+}
+</style>
+

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -7,11 +7,11 @@
       <el-input v-model="listQuery.bannerDescription" placeholder="请输入跳转概述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"/>
       <label>选择小区</label>
       <el-select v-model="listQuery.communityId" placeholder="选择小区" clearable style="width: 200px" class="filter-item">
-        <el-option v-for="item in importanceOptions" :key="item" :value="item" label="item"/>
+        <el-option v-for="item in communityList" :key="item.id" :value="item.id" :label="item.communityName"/>
       </el-select>
       <label>位置</label>
       <el-select v-model="listQuery.bannerPosition" placeholder="banner位置" clearable class="filter-item" style="width: 200px">
-        <el-option v-for="item in calendarTypeOptions" :key="item.key" :value="item.key" label="item.display_name+'('+item.key+')'"/>
+        <el-option v-for="item in bannerPositionArr" :key="item.id" :value="item.id" :label="item.value"/>
       </el-select>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-warning" @click="handleFilter">清空</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
@@ -99,85 +99,13 @@
       layout="total, sizes, prev, pager, next, jumper"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"/>
-
-    <el-dialog :visible.sync="dialogFormVisible" title="添加">
-      <el-form ref="addForm" :model="addForm" :rules="addFormRules">
-        <el-form-item :label-width="formLabelWidth" label="标题">
-          <el-input v-model="addForm.title"/>
-        </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="权重">
-          <el-input v-model="addForm.sort"/>
-        </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="banner图">
-          <el-input v-model="addForm.bannerCover"/>
-        </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="banner位">
-          <el-select v-model="addForm.bannerPosition" placeholder="请选择位置">
-            <el-option label="请选择位置" value="-1"/>
-            <el-option
-              v-for="item in bannerPositionArr"
-              :key="item.id"
-              :label="item.value"
-              :value="item.id"
-            />
-            <!-- <el-option v-for="item in bannerPositionArr" label="item.value" value="item.id"/> -->
-          </el-select>
-        </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="投放社区">
-          <el-select v-model="addForm.communityId" placeholder="请选择社区">
-            <el-option label="请选择社区" value="-1"/>
-            <el-option
-              v-for="item in communityArr"
-              :key="item.id"
-              :label="item.value"
-              :value="item.id"
-            />
-            <!-- <el-option label="区域一" value="shanghai"/> -->
-          </el-select>
-        </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="生效时间">
-          <el-date-picker
-            v-model="addForm.effTime"
-            type="datetime"
-            placeholder="选择日期时间"/>
-        </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="失效时间">
-          <el-date-picker
-            v-model="addForm.expTime"
-            type="datetime"
-            placeholder="选择日期时间"/>
-        </el-form-item>
-        <el-form-item :label-width="formLabelWidth" label="banner跳转">
-          <el-radio v-model="addForm.bannerType" label="1" @change="showContent">外部超链接</el-radio>
-          <el-radio v-model="addForm.bannerType" label="2" @change="showContent">自写文章</el-radio>
-        </el-form-item>
-        <el-form-item v-if="showURLVisible" :label-width="formLabelWidth" label="URL">
-          <el-input v-model="addForm.externalLink" placeholder="URL"/>
-        </el-form-item>
-        <div v-if="showContentVisible">
-          <el-form-item :label-width="formLabelWidth" label="内容标题">
-            <el-input v-model="addForm.bannerTitle" placeholder="内容标题"/>
-          </el-form-item>
-          <el-form-item :label-width="formLabelWidth" label="内容详情">
-            <el-input v-model="addForm.bannerContent" placeholder="内容详情"/>
-          </el-form-item>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogForm('0')">取 消</el-button>
-        <el-button type="primary" @click="dialogForm('1')">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :visible.sync="dialogPvVisible" title="Reading statistics"/>
-
   </div>
 </template>
 
 <script>
 // import { updateArticle, createBanner } from '@/api/banner' // getBanner
+import { mapState, mapActions } from 'vuex'
 import waves from '@/directive/waves' // Waves directive
-import { isNotValue } from '@/utils/validate'
 import { parseTime } from '@/utils/index'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 const calendarTypeOptions = [
@@ -209,55 +137,6 @@ export default {
     }
   },
   data() {
-    const isTitle = (rule, value, callback) => {
-      if (!isNotValue(value)) {
-        callback(new Error('标题不能为空!'))
-      } else {
-        callback()
-      }
-    }
-    const isBannerCover = (rule, value, callback) => {
-      if (!isNotValue(value)) {
-        callback(new Error('banner图片不能为空!'))
-      } else {
-        callback()
-      }
-    }
-    const isBannerPosition = (rule, value, callback) => {
-      if (!isNotValue(value)) {
-        callback(new Error('banner位不能为空!'))
-      } else {
-        callback()
-      }
-    }
-    const isCommunityId = (rule, value, callback) => {
-      if (!isNotValue(value)) {
-        callback(new Error('小区不能为空!'))
-      } else {
-        callback()
-      }
-    }
-    const isEffTime = (rule, value, callback) => {
-      if (!isNotValue(value)) {
-        callback(new Error('生效时间不能为空'))
-      } else {
-        callback()
-      }
-    }
-    const isExpTime = (rule, value, callback) => {
-      if (!isNotValue(value)) {
-        callback(new Error('失效时间不能为空!'))
-      } else {
-        callback()
-      }
-    }
-    const isBannerType = (rule, value, callback) => {
-      if (!isNotValue(value)) {
-        callback(new Error('banner类型不能为空!'))
-      } else {
-        callback()
-      }
-    }
     return {
       tableKey: 0,
       list: null,
@@ -268,7 +147,8 @@ export default {
         pageSize: 5,
         bannerTitle: undefined,
         bannerPosition: undefined,
-        bannerDescription: undefined
+        bannerDescription: undefined,
+        communityId: undefined
       },
       importanceOptions: [1, 2, 3],
       calendarTypeOptions,
@@ -285,108 +165,63 @@ export default {
         bannerTitle: '',
         bannerContent: ''
       },
-      addFormRules: {
-        title: [{ required: true, trigger: 'blur', validator: isTitle }],
-        bannerCover: [{ required: true, trigger: 'blur', validator: isBannerCover }],
-        bannerPosition: [{ required: true, trigger: 'blur', validator: isBannerPosition }],
-        communityId: [{ required: true, trigger: 'blur', validator: isCommunityId }],
-        effTime: [{ required: true, trigger: 'blur', validator: isEffTime }],
-        expTime: [{ required: true, trigger: 'blur', validator: isExpTime }],
-        bannerType: [{ required: true, trigger: 'blur', validator: isBannerType }]
-      },
-      dialogFormVisible: false,
-      dialogStatus: '',
-      dialogPvVisible: false,
-      downloadLoading: false,
       formLabelWidth: '120px',
-      showContentVisible: false,
-      showURLVisible: true,
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
         { id: 2, value: '服务banner' }
       ],
-      communityArr: [
-        { id: 3, value: '智慧社区' },
-        { id: 2, value: '测试社区' }
-      ]
     }
   },
+  computed: {
+    ...mapState('community', {
+      communityList: s => s.list
+    })
+  },
   created() {
     this.getList()
+    this.getCommuniryList()
   },
   methods: {
+    ...mapActions('community', [
+      'FetchCommunityList',
+      'CreateCommunity',
+      'UpdateCommunity'
+    ]),
     deleteBanner(bannerId) {
       this.$confirm('您确定删除此banner吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$store.dispatch('DeleteBanner', bannerId).then((res) => {
-            console.log('删除操作: ' + res.code)
-            if (res.code === '0') {
-              this.$notify({
-                title: '操作成功!',
-                message: res.message,
-                type: 'success'
-              })
-              this.getList()
-            } else {
-              this.$notify({
-                title: '操作失败',
-                message: res.message,
-                type: 'warning'
-              })
-            }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-      
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$store.dispatch('DeleteBanner', bannerId).then((res) => {
+          console.log('删除操作: ' + res.code)
+          if (res.code === '0') {
+            this.$notify({
+              title: '操作成功!',
+              message: res.message,
+              type: 'success'
+            })
+            this.getList()
+          } else {
+            this.$notify({
+              title: '操作失败',
+              message: res.message,
+              type: 'warning'
+            })
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     dialogAddForm() {
-      this.dialogFormVisible = true
-      this.addForm.title = ''
-      this.addForm.sort = '1',
-      this.addForm.bannerCover = ''
-      this.addForm.bannerPosition = '-1'
-      this.addForm.communityId = '-1'
-      this.addForm.effTime = ''
-      this.addForm.expTime = ''
-      this.addForm.bannerType = '1'
-      this.addForm.externalLink = ''
-      this.addForm.bannerTitle = ''
-      this.addForm.bannerContent = ''
-    },
-    dialogForm(isVaule) {
-      if (isVaule === '0') {
-        this.dialogFormVisible = false
-      } else {
-        // 进行提交数据,成功后关闭dialog
-        this.createData()
-        this.dialogFormVisible = false
-        console.log('添加banner的数据: ', this.addForm)
-      }
+      this.$router.push({ name: 'banner-add' })
     },
     updateBanner(bannerId) {
-      this.getByBannerId(bannerId)
-      this.dialogPvVisible = true
-    },
-    getByBannerId(bannerId) {
-      this.$store.dispatch('GetByBannerId', bannerId).then(res => {
-        this.addForm = res
-      })
-    },
-    showContent() {
-      if (this.addForm.bannerType === '1') {
-        this.showContentVisible = false
-        this.showURLVisible = true
-      } else {
-        this.showContentVisible = true
-        this.showURLVisible = false
-      }
+      this.$router.push({ name: 'banner-edi', params: { id: bannerId }})
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -423,12 +258,22 @@ export default {
         }, 1.5 * 1000)
       })
     },
+    getCommuniryList() {
+      this.listLoading = true
+      this.FetchCommunityList().then(() => {
+        this.listLoading = false
+      }).catch(() => {
+        this.loading = false
+        console.log('get list error')
+      })
+    },
     handleFilter() {
       this.listQuery.pageNum = 1
       this.listQuery.pageSize = 5
       this.listQuery.bannerTitle = undefined
       this.listQuery.bannerPosition = undefined
       this.listQuery.bannerDescription = undefined
+      this.listQuery.communityId = undefined
       this.getList()
     },
     handleModifyStatus(row, status) {
@@ -444,107 +289,8 @@ export default {
         this.sortByID(order)
       }
     },
-    resetTemp() {
-      this.temp = {
-        id: undefined,
-        importance: 1,
-        remark: '',
-        timestamp: new Date(),
-        title: '',
-        status: 'published',
-        type: ''
-      }
-    },
     handleSearch() {
       this.getList()
-    },
-    createData() {
-      this.$refs['addForm'].validate((valid) => {
-        if (valid) {
-          this.$store.dispatch('AddBanner', this.addForm).then((res) => {
-            if (res.code === '0') {
-              this.$notify({
-                title: '操作成功!',
-                message: res.message,
-                type: 'success'
-              })
-              this.getList()
-            } else {
-              this.$notify({
-                title: '操作失败',
-                message: res.message,
-                type: 'warning'
-              })
-            }
-          })
-        }
-      })
-    },
-    handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
-      this.temp.timestamp = new Date(this.temp.timestamp)
-      this.dialogStatus = 'update'
-      this.dialogFormVisible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].clearValidate()
-      })
-    },
-    updateData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          const tempData = Object.assign({}, this.temp)
-          tempData.timestamp = +new Date(tempData.timestamp) // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
-          // updateArticle(tempData).then(() => {
-          //   for (const v of this.list) {
-          //     if (v.id === this.temp.id) {
-          //       const index = this.list.indexOf(v)
-          //       this.list.splice(index, 1, this.temp)
-          //       break
-          //     }
-          //   }
-          //   this.dialogFormVisible = false
-          //   this.$notify({
-          //     title: '成功',
-          //     message: '更新成功',
-          //     type: 'success',
-          //     duration: 2000
-          //   })
-          // })
-        }
-      })
-    },
-    handleDelete(row) {
-      this.$notify({
-        title: '成功',
-        message: '删除成功',
-        type: 'success',
-        duration: 2000
-      })
-      const index = this.list.indexOf(row)
-      this.list.splice(index, 1)
-    },
-    handleDownload() {
-      this.downloadLoading = true
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-        const data = this.formatJson(filterVal, this.list)
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: 'table-list'
-        })
-        this.downloadLoading = false
-      })
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'timestamp') {
-          return parseTime(v[j])
-        } else {
-          return v[j]
-        }
-      }))
     }
   }
 }