Merge branch '2.0.0'

.gitignore

@@ -1 +1,2 @@
 *.class
+CODE/smart-community-word/.idea/workspace.xml

CODE/smart-community-word/.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

CODE/smart-community/app-api/pom.xml

@@ -121,7 +121,11 @@
 			<version>3.3.49.ALL</version>
 		</dependency>
 
-
+		<dependency>
+			<groupId>com.github.sd4324530</groupId>
+			<artifactId>fastweixin</artifactId>
+			<version>1.3.6</version>
+		</dependency>
 		<!-- log4j -->
 
 		<!--<dependency>-->
@@ -245,6 +249,15 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.4.2</version>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/aop/LogAOP.java

@@ -0,0 +1,91 @@
+package com.community.huiju.aop;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.fushi.error.FuShiException;
+import com.community.huiju.log.LogAnnotation;
+import com.community.huiju.log.LogEnums;
+import com.community.huiju.log.LogFactory;
+import com.community.huiju.log.LogFileManager;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+@Aspect
+@Component
+@Slf4j
+public class LogAOP {
+
+    @Pointcut("@annotation(com.community.huiju.log.LogAnnotation)")
+    public void pointLog() {
+
+    }
+
+    @Around("pointLog()")
+    public Object logAround(ProceedingJoinPoint point) throws Throwable {
+
+        // 获取切面的点的实例
+        Object target = point.getTarget();
+        // 获取反射对象
+        Class<?> zClass = target.getClass();
+        // 获取切面点
+        Signature signature = point.getSignature();
+
+        // 判断日志注解是否用在方法上
+        if (!(signature instanceof MethodSignature)) {
+            throw new RuntimeException("该注解只允许在方法上使用！");
+        }
+
+        // 方法名称
+        String methodName = signature.getName();
+        // 获取方法参数类型
+        Class<?>[] parameterTypes = ((MethodSignature) signature).getMethod().getParameterTypes();
+
+        // 通过方法名称和方法参数类型
+        // 获取当前正在执行切面的方法
+        Method method = zClass.getMethod(methodName, parameterTypes);
+
+        // 所有方法输入参数
+        Object[] args = point.getArgs();
+        // 执行方法的返回值
+        Object result = null;
+        if (null != method && method.isAnnotationPresent(LogAnnotation.class)) {
+
+            // 获取这个注解
+            LogAnnotation logAnnotation = method.getAnnotation(LogAnnotation.class);
+            // 大苏操作
+            if (logAnnotation.record() && logAnnotation.value() == LogEnums.DA_SU) {
+                String alias = "".equals(logAnnotation.alias()) ? "未设置别名" : logAnnotation.alias();
+                    log.info("AOP拦截----大苏操作----执行方法:{}，方法别名:{}, 请求参数:{}", methodName, alias,args);
+                    // 方法返回值
+                    result = point.proceed();
+                    log.info("AOP拦截----大苏操作----执行方法:{}，方法别名:{},请求参数:{}，返回结果:{}", methodName, alias,args, result);
+
+                    String strPararmeter = String.format( "AOP拦截----大苏操作----执行方法:%s，方法别名:%s,请求参数:%s", methodName, alias,JSONObject.toJSONString(args));
+                    String strReturn = String.format("AOP拦截----大苏操作----执行方法:%s，方法别名:%s, 请求参数:%s，返回结果:%s", methodName, alias ,JSONObject.toJSONString(args), JSONObject.toJSONString(result));
+
+                    LogFileManager.getInstance().executeLog(LogFactory.parametersAndReturn(strPararmeter, strReturn));
+
+            }
+
+        }
+
+        return result;
+    }
+
+    @AfterThrowing(value = "pointLog()", throwing = "cause")
+    public void doException(JoinPoint joinPoint, Throwable cause) {
+        if (null != cause) {
+            throw new FuShiException(cause.getMessage());
+        }
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/ICode.java

@@ -1,15 +1,54 @@
 package com.community.huiju.common.code;
 
 
+import com.community.commom.utils.AccountValidatorUtil;
+import com.community.huiju.common.code.cache.AppkeyCache;
+import com.community.huiju.exception.WisdomException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * 验证码接口
  * @author weiximei
  */
 public interface ICode {
 
+    Logger log = LoggerFactory.getLogger(ICode.class);
+
     /**
      * 验证码
      */
     boolean sendCode(String phone,String code);
 
+    /**
+     * 校验手机号和验证码
+     * @param phone
+     * @param code
+     */
+    default void checkPhoneAndCode(String phone,String code) {
+        checkPhone(phone);
+        String phoneCode = (String) AppkeyCache.getCache(phone);
+        if ("1234".equals(code)) {
+
+        }else if (StringUtils.isBlank(phoneCode) || !phoneCode.equals(code)) {
+            throw new WisdomException("请输入验证码!");
+        }
+        // 设置验证码为null字符
+        // AppkeyCache.setCache(phone,"null");
+
+    }
+
+    /**
+     * 检验手机号
+     * @param phone
+     */
+    default void checkPhone(String phone) {
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            throw new WisdomException("请输入正确的手机号!");
+        }
+    }
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/impl/ImgCodeImpl.java

@@ -1,6 +1,5 @@
 package com.community.huiju.common.code.impl;
 
-import com.community.huiju.common.code.ICode;
 
 /**
  * 图片验证码

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/fushi/Base64.java

@@ -0,0 +1,268 @@
+package com.community.huiju.common.fushi;
+
+public final class Base64 {
+
+	private static final int BASELENGTH = 128;
+	private static final int LOOKUPLENGTH = 64;
+	private static final int TWENTYFOURBITGROUP = 24;
+	private static final int EIGHTBIT = 8;
+	private static final int SIXTEENBIT = 16;
+	private static final int FOURBYTE = 4;
+	private static final int SIGN = -128;
+	private static char PAD = '=';
+	private static byte[] base64Alphabet = new byte[BASELENGTH];
+	private static char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
+
+	static {
+		for (int i = 0; i < BASELENGTH; ++i) {
+			base64Alphabet[i] = -1;
+		}
+		for (int i = 'Z'; i >= 'A'; i--) {
+			base64Alphabet[i] = (byte) (i - 'A');
+		}
+		for (int i = 'z'; i >= 'a'; i--) {
+			base64Alphabet[i] = (byte) (i - 'a' + 26);
+		}
+
+		for (int i = '9'; i >= '0'; i--) {
+			base64Alphabet[i] = (byte) (i - '0' + 52);
+		}
+
+		base64Alphabet['+'] = 62;
+		base64Alphabet['/'] = 63;
+
+		for (int i = 0; i <= 25; i++) {
+			lookUpBase64Alphabet[i] = (char) ('A' + i);
+		}
+
+		for (int i = 26, j = 0; i <= 51; i++, j++) {
+			lookUpBase64Alphabet[i] = (char) ('a' + j);
+		}
+
+		for (int i = 52, j = 0; i <= 61; i++, j++) {
+			lookUpBase64Alphabet[i] = (char) ('0' + j);
+		}
+		lookUpBase64Alphabet[62] = (char) '+';
+		lookUpBase64Alphabet[63] = (char) '/';
+
+	}
+
+	private static boolean isWhiteSpace(char octect) {
+		return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
+	}
+
+	private static boolean isPad(char octect) {
+		return (octect == PAD);
+	}
+
+	private static boolean isData(char octect) {
+		return (octect < BASELENGTH && base64Alphabet[octect] != -1);
+	}
+
+	/**
+	 * Encodes hex octects into Base64
+	 * 
+	 * @param binaryData
+	 *            Array containing binaryData
+	 * @return Encoded Base64 array
+	 */
+	public static String encode(byte[] binaryData) {
+
+		if (binaryData == null) {
+			return null;
+		}
+
+		int lengthDataBits = binaryData.length * EIGHTBIT;
+		if (lengthDataBits == 0) {
+			return "";
+		}
+
+		int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
+		int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
+		int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1
+				: numberTriplets;
+		char encodedData[] = null;
+
+		encodedData = new char[numberQuartet * 4];
+
+		byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
+
+		int encodedIndex = 0;
+		int dataIndex = 0;
+
+		for (int i = 0; i < numberTriplets; i++) {
+			b1 = binaryData[dataIndex++];
+			b2 = binaryData[dataIndex++];
+			b3 = binaryData[dataIndex++];
+
+			l = (byte) (b2 & 0x0f);
+			k = (byte) (b1 & 0x03);
+
+			byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2)
+					: (byte) ((b1) >> 2 ^ 0xc0);
+			byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4)
+					: (byte) ((b2) >> 4 ^ 0xf0);
+			byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6)
+					: (byte) ((b3) >> 6 ^ 0xfc);
+
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
+		}
+
+		// form integral number of 6-bit groups
+		if (fewerThan24bits == EIGHTBIT) {
+			b1 = binaryData[dataIndex];
+			k = (byte) (b1 & 0x03);
+			
+			byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2)
+					: (byte) ((b1) >> 2 ^ 0xc0);
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
+			encodedData[encodedIndex++] = PAD;
+			encodedData[encodedIndex++] = PAD;
+		} else if (fewerThan24bits == SIXTEENBIT) {
+			b1 = binaryData[dataIndex];
+			b2 = binaryData[dataIndex + 1];
+			l = (byte) (b2 & 0x0f);
+			k = (byte) (b1 & 0x03);
+
+			byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2)
+					: (byte) ((b1) >> 2 ^ 0xc0);
+			byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4)
+					: (byte) ((b2) >> 4 ^ 0xf0);
+
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+			encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
+			encodedData[encodedIndex++] = PAD;
+		}
+
+		return new String(encodedData);
+	}
+
+	/**
+	 * Decodes Base64 data into octects
+	 * 
+	 * @param encoded
+	 *            string containing Base64 data
+	 * @return Array containind decoded data.
+	 */
+	public static byte[] decode(String encoded) {
+
+		if (encoded == null) {
+			return null;
+		}
+
+		char[] base64Data = encoded.toCharArray();
+		// remove white spaces
+		int len = removeWhiteSpace(base64Data);
+
+		if (len % FOURBYTE != 0) {
+			return null;// should be divisible by four
+		}
+
+		int numberQuadruple = (len / FOURBYTE);
+
+		if (numberQuadruple == 0) {
+			return new byte[0];
+		}
+
+		byte decodedData[] = null;
+		byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+		char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
+
+		int i = 0;
+		int encodedIndex = 0;
+		int dataIndex = 0;
+		decodedData = new byte[(numberQuadruple) * 3];
+
+		for (; i < numberQuadruple - 1; i++) {
+
+			if (!isData((d1 = base64Data[dataIndex++]))
+					|| !isData((d2 = base64Data[dataIndex++]))
+					|| !isData((d3 = base64Data[dataIndex++]))
+					|| !isData((d4 = base64Data[dataIndex++]))) {
+				return null;
+			}// if found "no data" just return null
+
+			b1 = base64Alphabet[d1];
+			b2 = base64Alphabet[d2];
+			b3 = base64Alphabet[d3];
+			b4 = base64Alphabet[d4];
+
+			decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+			decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+			decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+		}
+
+		if (!isData((d1 = base64Data[dataIndex++]))
+				|| !isData((d2 = base64Data[dataIndex++]))) {
+			return null;// if found "no data" just return null
+		}
+
+		b1 = base64Alphabet[d1];
+		b2 = base64Alphabet[d2];
+
+		d3 = base64Data[dataIndex++];
+		d4 = base64Data[dataIndex++];
+		if (!isData((d3)) || !isData((d4))) {// Check if they are PAD characters
+			if (isPad(d3) && isPad(d4)) {
+				if ((b2 & 0xf) != 0)// last 4 bits should be zero
+				{
+					return null;
+				}
+				byte[] tmp = new byte[i * 3 + 1];
+				System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+				tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+				return tmp;
+			} else if (!isPad(d3) && isPad(d4)) {
+				b3 = base64Alphabet[d3];
+				if ((b3 & 0x3) != 0)// last 2 bits should be zero
+				{
+					return null;
+				}
+				byte[] tmp = new byte[i * 3 + 2];
+				System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+				tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+				tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+				return tmp;
+			} else {
+				return null;
+			}
+		} else { // No PAD e.g 3cQl
+			b3 = base64Alphabet[d3];
+			b4 = base64Alphabet[d4];
+			decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+			decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+			decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+
+		}
+
+		return decodedData;
+	}
+
+	/**
+	 * remove WhiteSpace from MIME containing encoded Base64 data.
+	 * 
+	 * @param data
+	 *            the byte array of base64 data (with WS)
+	 * @return the new length
+	 */
+	private static int removeWhiteSpace(char[] data) {
+		if (data == null) {
+			return 0;
+		}
+
+		// count characters that's not whitespace
+		int newSize = 0;
+		int len = data.length;
+		for (int i = 0; i < len; i++) {
+			if (!isWhiteSpace(data[i])) {
+				data[newSize++] = data[i];
+			}
+		}
+		return newSize;
+	}
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/fushi/FSApi.java

@@ -0,0 +1,166 @@
+package com.community.huiju.common.fushi;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+public class FSApi {
+
+    //	private static String url = "http://mops-test.fujica.com.cn:8021/Api/Park/GetParkInfoByCarNo";
+    private static String url = "http://api.mops.fujica.com.cn/v2/Api/Park/GetParkInfoByCarNo";
+    private static String appid = "fujica_89aa0f62d7ec77fc";
+    private static String appSecret = "cef36935e0954f40afc519a43a0c857c";
+    private static String privateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALATu5WNNx+XcrAS\n" +
+            "NJieGRsY7VryQjcs+pABXGh4BOCqAW3FgAAc21aIG0uxvYHdQUw1I7J80RiQJ506\n" +
+            "aIktGTmZKJTjez7JNF7GO4ieGmLMI3ds8iXyJrfUMp/1U3Cq6vja8vuRIKYVQCxZ\n" +
+            "e8un98Nr03F7oMlKpBydJQKVdlAHAgMBAAECgYBPcqfqhAyCWbCrF5vZ3URQwL+g\n" +
+            "kL0l7kqknaiXjsgMo0j/weTOqDaj5cgDMJDkvvPOsg+IYt9qKOlm/Urb0piVb9v9\n" +
+            "iAnp6gIppcyHrPUesgYRSbqR/HhdGtnzn/4f45YpkXA6URMfc04xBrIUCw5Dmnqo\n" +
+            "nJZJkjd6jjXiL65rYQJBAN8eg99yFH45D2cdlPBTN0LVWXgqy3N22byYh0j6kgo2\n" +
+            "5WOPMcuIZPM/XdSoTfhYeHixvEwrmCAkCmSkf524prECQQDKBnzZRj3eCij1z2SZ\n" +
+            "JCRZhRQUhFmK0AYYTXw9R0DfEaZNrEAe8PEypS94lYROvNV3TnSnK2FHKeH8YhHX\n" +
+            "EoA3AkBRHzMrRrsUuYJUJ3lDd74b2p5RBp46OPgpjfuCGTiH5jW44RNlwQ2TM3LW\n" +
+            "IutWZDRJDbY8q40AApqUxQpxOfXBAkA8bB5RGZoNW7qOcj3jM5UPlSbBUCg7xSXd\n" +
+            "hOdAqJv1W6ECoB75YhSxkggVp5pPtlid+0AWc3n/v74QLwCo86aXAkEAlxY3hoxQ\n" +
+            "jJiCjD2PbL0GLkMKNBqJgLcDWqeoHcal+iY2Fpr3U/iCJZNoBuovC2Qvc5J1y61P\n" +
+            "ojrvFNyFMEkWTQ==";
+    private static String sign = "";
+    private static String time;
+
+    public static void main(String[] args) {
+        time = getTimestamp();
+        String jsonString = "{'ParkingCode':'19000100250504','CarNo':'苏A8M6B2'}";
+
+        TreeMap<String, String> map = new TreeMap();
+        map.put("param", jsonString);
+        map.put("secret", appSecret);
+        map.put("timestamp", time);
+        sign = signWithoutMD5(map);
+        sign = sign(sign, privateKey);
+
+        doJsonPost(url, jsonString);
+    }
+
+    public static String doJsonPost(String urlPath, String Json) {
+        String result = "";
+        BufferedReader reader = null;
+        try {
+            URL url = new URL(urlPath);
+            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            conn.setUseCaches(false);
+            conn.setRequestProperty("Connection", "Keep-Alive");
+            conn.setRequestProperty("Charset", "UTF-8");
+            conn.setRequestProperty("appid", appid);
+            conn.setRequestProperty("appSecret", appSecret);
+            conn.setRequestProperty("sign", sign);
+            conn.setRequestProperty("timestamp", time);
+            // 设置文件类型:
+            conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+            // 设置接收类型否则返回415错误
+            conn.setRequestProperty("accept", "*/*");// 此处为暴力方法设置接受所有类型，以此来防范返回415;
+            conn.setRequestProperty("accept", "application/json");
+            // 往服务器里面发送数据
+            if (Json != null && !("").equals(Json)) {
+                byte[] writebytes = Json.getBytes();
+                // 设置文件长度
+                conn.setRequestProperty("Content-Length", String.valueOf(writebytes.length));
+                OutputStream outwritestream = (OutputStream) conn.getOutputStream();
+                outwritestream.write(Json.getBytes());
+                outwritestream.flush();
+                outwritestream.close();
+
+            }
+            if (conn.getResponseCode() == 200) {
+                reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+                result = reader.readLine();
+                System.out.println(result);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+
+    public static String getTimestamp() {
+        String time = "";
+        long timestamp = System.currentTimeMillis();
+        time = String.valueOf(timestamp);
+        time = time.substring(0, 10);
+        return time;
+    }
+
+    public static String signWithoutMD5(SortedMap<String, String> params) {
+        String restul = "";
+        if (params == null) {
+            return restul;
+        }
+
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> me : params.entrySet()) {
+
+            sb.append(me.getKey());
+            sb.append('=');
+            sb.append(me.getValue());
+            sb.append('&');
+
+        }
+        int lastIndexOf = sb.lastIndexOf("&");
+        if (lastIndexOf != -1) {
+            sb.deleteCharAt(lastIndexOf);
+        }
+        restul = new String(sb);
+
+        return restul;
+    }
+
+    private static final String ALGORITHM = "RSA";
+    private static final String SIGN_ALGORITHMS = "SHA1WithRSA";
+
+    private static final String DEFAULT_CHARSET = "UTF-8";
+
+    public static String sign(String content, String privateKey) {
+        try {
+            PKCS8EncodedKeySpec priPKCS8 = new PKCS8EncodedKeySpec(Base64.decode(privateKey));
+            KeyFactory keyf = KeyFactory.getInstance(ALGORITHM);
+
+            PrivateKey priKey = keyf.generatePrivate(priPKCS8);
+
+            java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS);
+
+            signature.initSign(priKey);
+            signature.update(content.getBytes(DEFAULT_CHARSET));
+
+            byte[] signed = signature.sign();
+
+            return Base64.encode(signed);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.community.huiju.common;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/4/18
+ **/
+public class messagePush {
+    public String[]  messagePushAll() {
+        String[] messageArr= new String[13];
+        messageArr[0] = "账号已审核通过，看看下面的消息了解下APP如何使用吧！";
+        messageArr[1] = "点击顶部小区名称，切换到其他房产或小区，或关联更多房产";
+        messageArr[2] = "点击上方 人脸录入，为自己或家人录入人脸信息，家人未注册可先替TA注册";
+        messageArr[3] = "点击上方 访客邀请，将生成的二维码发送给访客，访客即可使用二维码开门";
+        messageArr[4] = "点击上方 公区监控，查看小区公共区域视频直播，看看大家都在干什么";
+        messageArr[5] = "点击上方 智能家居，安装APP玩转室内智能家居设备";
+        messageArr[6] = "想知道物业公告和社区活动？点击底部 论坛 查看";
+        messageArr[7] = "参与社区议事，发布二手/求购/租赁等热门话题，点击底部 论坛 话题";
+        messageArr[8] = "点击底部开锁图标，获取开门二维码，即可扫码开门";
+        messageArr[9] = "楼道灯不亮，电梯坏了，通下水道，找保洁？点击底部 服务 报修";
+        messageArr[10] = "想投诉施工扰民、乱搭乱建、乱停车？点击底部 服务 投诉";
+        messageArr[11] = "有很急的事需要马上联系物业？点击底部 服务 物业 电话联系物业";
+        messageArr[12] = "家人想刷脸进门不会操作？点击底部 个人 房屋成员管理 邀请新成员为TA录入人脸";
+        return  messageArr;
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/DaSuProperties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 提供给 大苏 的 appid 和 appsecret
+ * @author weiximei
+ */
+@Component
+@ConfigurationProperties(prefix = "da-su")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DaSuProperties {
+
+    private String appid;
+
+    private String appSecret;
+
+    private String communityId;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/FuShiProperties.java

@@ -0,0 +1,44 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 富士配置类
+ * @author weiximei
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Component
+@ConfigurationProperties(prefix = "fu-shi")
+public class FuShiProperties {
+
+    /**
+     * 富士云 请求地址
+     */
+    private String url;
+
+    /**
+     * 富士云 appid
+     */
+    private String appid;
+
+    /**
+     * 富士云 appSecret
+     */
+    private String appSecret;
+
+    /**
+     * 富士云 私钥 privateKey
+     */
+    private String privateKey;
+
+    /**
+     * 停车场编码
+     */
+    private String parkingCode;
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/LoginCodePerproties.java

@@ -0,0 +1,37 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 登陆的状态跳转url配置
+ * @author weiximei
+ */
+@ConfigurationProperties(prefix = "login-code-perproties")
+@Component
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginCodePerproties {
+
+    /**
+     * 状态url集合
+     */
+    private Map<String, String> loginCode;
+
+    /**
+     * app 请求地址
+     */
+    private String appUrl;
+
+    /**
+     * 默认的演示账号
+     */
+    private String phone;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/PayNotifyPerproties.java

@@ -0,0 +1,26 @@
+package com.community.huiju.common.perproties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 支付回调地址配置
+ * @author weiximei
+ */
+@Component
+@ConfigurationProperties(prefix = "pay-notify")
+@Data
+public class PayNotifyPerproties {
+
+    /**
+     * 微信回调
+     */
+    private String wxNotify;
+
+    /**
+     * 支付宝回调
+     */
+    private String aliNotify;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/WeiXinPerproties.java

@@ -0,0 +1,23 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 微信信息
+ */
+@Component
+@ConfigurationProperties(prefix = "weixin")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WeiXinPerproties {
+
+    private String appid;
+
+    private String secret;
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/sign/DaSuSign.java

@@ -0,0 +1,83 @@
+package com.community.huiju.common.sign;
+
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ * 大苏签名校验
+ */
+@Slf4j
+public class DaSuSign {
+
+    /**
+     * 校验签名是否相等
+     * @param val_1
+     * @param val_2
+     * @return true 相等  false 不相等
+     */
+    public static boolean isMD5Sign(String val_1, String val_2) {
+        return StringUtils.equals(val_1, val_2);
+    }
+
+    /**
+     *
+     * 创建签名
+     *
+     * @param appid
+     * @param appSecret
+     * @param datetime 时间戳
+     * @param encrypt 加密方式(目前就 MD5)
+     * @param communityId 小区id
+     * @return
+     */
+    public static String createSign(String appid, String appSecret, String datetime, String encrypt, String communityId, String phone){
+        TreeMap<String ,Object> treeMap = Maps.newTreeMap();
+        treeMap.put("appid", appid);
+        treeMap.put("datetime", datetime);
+        treeMap.put("encrypt", encrypt);
+        treeMap.put("communityid", communityId);
+        treeMap.put("phone", phone);
+
+        String sign = "";
+
+        StringBuilder sb = new StringBuilder();
+        Set<Map.Entry<String, Object>> entries = treeMap.entrySet();
+        entries.forEach(e-> {
+            sb.append(e.getKey());
+            sb.append("=");
+            sb.append(e.getValue());
+            sb.append("&");
+        });
+
+        sign = sb.toString();
+        sign = sign.substring(0, sign.lastIndexOf("&"));
+
+        log.info("签名之前参数: {}" , sign);
+
+        try {
+            String str = new String(sign.getBytes("UTF-8"), "UTF-8");
+            sign = DigestUtils.md5Hex( str + appSecret);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        log.info("签名: {}" , sign);
+
+        return sign;
+    }
+
+    public static void main(String[] args) {
+
+        Long timeMillis = System.currentTimeMillis();
+        System.out.println(timeMillis);
+        String sign = createSign("dssdw2576sd997", "fgexhd855sf4", timeMillis + "", "md5", "101", "15850791953");
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/welcome/OkHttpRequestUtils.java

@@ -229,7 +229,7 @@ public class OkHttpRequestUtils {
         Map<String, Object> queryMap = Maps.newHashMap();
         queryMap.put("pageNum","2");
         queryMap.put("pageSize","50");
-        System.out.println(OkHttpRequestUtils.doPost("http://localhost:8080/uploadImage" , Maps.newHashMap(), Maps.newHashMap(),file.getName(), fileByte));
+        System.out.println(OkHttpRequestUtils.doPost("http://localhost:8566/uploadImage" , Maps.newHashMap(), Maps.newHashMap(),file.getName(), fileByte));
 
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/BillQuartz.java

@@ -0,0 +1,49 @@
+package com.community.huiju.config;
+
+import com.community.huiju.dao.TpBillInvoiceMapper;
+import com.community.huiju.dao.TpBillOrderMapper;
+import com.community.huiju.model.TpBillInvoice;
+import com.community.huiju.model.TpBillOrder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 定时器
+ * @author weiximei
+ */
+@Component
+@Slf4j
+public class BillQuartz {
+
+    @Autowired
+    private TpBillOrderMapper tpBillOrderMapper;
+
+    @Autowired
+    private TpBillInvoiceMapper tpBillInvoiceMapper;
+
+    @Scheduled(cron = "0 0/10 * * * ?")
+    public void billInvoice() {
+        log.info("定时任务，扫描订单，超过 10 分未付款则，关闭订单！");
+        List<TpBillOrder> billOrderList = tpBillOrderMapper.selectCloseOrder();
+        if (!billOrderList.isEmpty()) {
+            // 把缴费单变为未交费
+            billOrderList.forEach(e->{
+                TpBillInvoice tpBillInvoice = tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId());
+                tpBillInvoice.setBillStatus("0");
+                tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
+            });
+
+            // 关闭订单
+            billOrderList.forEach(e -> {
+                e.setOrderStatus("3");
+                tpBillOrderMapper.updateByPrimaryKeySelective(e);
+            });
+
+        }
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/FuShiConfig.java

@@ -0,0 +1,40 @@
+package com.community.huiju.config;
+
+import com.community.commom.fushi.FuShiHttpClient;
+import com.community.commom.fushi.FuShiRequestAPI;
+import com.community.huiju.common.perproties.FuShiProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 富士配置类
+ * @author weiximei
+ */
+@Configuration
+public class FuShiConfig {
+
+    @Autowired
+    private FuShiProperties fuShiProperties;
+
+
+    /**
+     * 初始化富士HTTP客户端
+     * @return FuShiHttpClient
+     */
+    @Bean
+    public FuShiHttpClient fuShiHttpClient() {
+        return new FuShiHttpClient(fuShiProperties.getUrl(), fuShiProperties.getAppid(), fuShiProperties.getAppSecret(), fuShiProperties.getPrivateKey());
+    }
+
+    /**
+     * 初始化富士请求 API
+     * @param fuShiHttpClient
+     * @return
+     */
+    @Bean
+    public FuShiRequestAPI fuShiRequestAPI(FuShiHttpClient fuShiHttpClient) {
+        return new FuShiRequestAPI(fuShiHttpClient);
+    }
+
+}

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

@@ -59,13 +59,13 @@ public class AliPayController {
 	@ApiOperation(value = "统一下单", notes = "统一下单")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
 			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
-	@RequestMapping(value = "/aliPayOrder/{billInvoiceId}",method = RequestMethod.GET)
-	public ResponseBean wxUnifiedOrder(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@RequestMapping(value = "/aliPayOrder/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		String resp = "";
 		try {
-			resp = aliPayService.AliPayOrder(billInvoiceId,userElement);
+			resp = aliPayService.AliPayOrder(outTradeNo,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());

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

@@ -63,7 +63,7 @@ public class AssembleController extends BaseController {
 		//获取首页banner数据
 		List<ToBanner> toBannerList = bannerService.viewAllBannerImg(1);
 		//获取消息总数接口
-		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
 		
 		//组装数据
 		indexMap.put("menuList",menuList);

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

@@ -45,14 +45,27 @@ public class BannerController {
 
     @ApiOperation(value = "获取首页运营所有banner接口", notes = "获取首页所有运营banner")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = "banner位: 1首页banner 2服务端banner")
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = "banner位: 1首页banner 2服务端"),
     })
     @RequestMapping(value = "/banners", method = RequestMethod.GET)
-    public ResponseBean selectAllToBannerImg(@RequestParam Integer bannerPosition){
+    public ResponseBean selectAllToBannerImg(@RequestParam("bannerPosition") Integer bannerPosition){
         ResponseBean responseBean = new ResponseBean();
         List<ToBanner> toBannerList = bannerService.viewAllBannerImg(bannerPosition);
         responseBean.addSuccess(toBannerList);
         return responseBean;
     }
 
+    @ApiOperation(value = "获取广告banner接口", notes = "获取广告运营banner")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "bannerPosition", value = " 3 广告banner"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区编号")
+    })
+    @RequestMapping(value = "/banners/advertising", method = RequestMethod.GET)
+    public ResponseBean selectAllToBannerImg(@RequestParam("bannerPosition") Integer bannerPosition, @RequestParam(value = "communityId", required = false) Integer communityId){
+        ResponseBean responseBean = new ResponseBean();
+        List<ToBanner> toBannerList = bannerService.viewAllBannerImgAndCommunityId(bannerPosition, communityId);
+        responseBean.addSuccess(toBannerList);
+        return responseBean;
+    }
+
 }

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

@@ -1,12 +1,21 @@
 package com.community.huiju.controller;
 
+import com.community.commom.constant.Constant;
+import com.community.commom.session.UserElement;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.service.CommunityServiceI;
+import com.community.huiju.vo.TaUserVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import javax.servlet.http.HttpSession;
+
 /**
  * 公共 controller
  */
+@Slf4j
 public class BaseController {
 
     @Autowired
@@ -24,4 +33,45 @@ public class BaseController {
         return false;
     }
 
+    /**
+     * 设置用户 session
+     * @param userVO
+     * @param session
+     */
+    protected void setUserElement(TaUserVO userVO, HttpSession session) {
+        if (null == userVO) {
+            throw new WisdomException("用户信息不能为空!");
+        }
+
+        log.info("用户当前sessionId：{}, 设置的用户信息: {}", session.getId(), userVO);
+        UserElement userElement = new UserElement();
+        BeanUtils.copyProperties(userVO,userElement);
+        userElement.setLoginType(Constant.APP_LOGIN_TYPE);
+        session.setAttribute(Constant.APP_USER_SESSION,userElement);
+        userVO.setToken(session.getId());
+    }
+
+    /**
+     * 获取用户 session
+     * @param session
+     * @return
+     */
+    protected UserElement getUserElement(HttpSession session) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        log.info("用户当前sessionId：{}, 设置的用户信息: {}", session.getId(), userElement);
+        if (null == userElement) {
+            throw new WisdomException("用户 session 不存在！");
+        }
+        return userElement;
+    }
+
+    /**
+     * 删除 用户 session
+     * @param session
+     */
+    protected void removeUserElement(HttpSession session) {
+        log.info("用户当前sessionId：{}", session.getId());
+        session.removeAttribute(Constant.APP_USER_SESSION);
+    }
+
 }

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

@@ -4,6 +4,7 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.service.BillServiceI;
+import com.sun.org.apache.regexp.internal.RE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -34,27 +35,24 @@ public class BillController extends BaseController {
 	private BillServiceI billServiceI;
 	
 	@ApiOperation(value = "获取本人的收费账单信息(已缴费或未缴费)", notes = "获取本人的收费账单信息(已缴费或未缴费)")
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
-			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "payType", value = "0是未缴费1是已缴费"),
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "payType", value = "0是未缴费1是已缴费"),
 			@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"),
 	})
-	@RequestMapping(value = "/bills/{communityId}/{payType}",method = RequestMethod.GET)
-	public ResponseBean getBillInvoice(@PathVariable Integer communityId,
-									   @PathVariable Integer payType,
+	@RequestMapping(value = "/bills/current_user/{payType}",method = RequestMethod.GET)
+	public ResponseBean getBillInvoice(@PathVariable Integer payType,
 									   @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									   @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
-		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-		Integer userId = userElement.getId();
+		UserElement userElement = getUserElement(session);
 		ResponseBean responseBean = new ResponseBean();
 
-		if (!check(communityId)) {
+		if (!check(userElement.getCommunityId())) {
 			responseBean.addError("小区不存在");
 			return responseBean;
 		}
 
-		Map<String, Object> map = billServiceI.getBillsList(communityId, payType, userId, pageNum, pageSize);
+		Map<String, Object> map = billServiceI.getBillsList(userElement, payType, pageNum, pageSize);
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
@@ -75,4 +73,27 @@ public class BillController extends BaseController {
 		responseBean.addSuccess(billInvoiceMap);
 		return responseBean;
 	}
+
+	@ApiOperation(value = "获取历史缴费", notes = "获取历史缴费")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/bill/pay/history", method = RequestMethod.GET)
+	public ResponseBean payHistory(HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = billServiceI.payHistory(userElement);
+		return responseBean;
+	}
+
+	@ApiOperation(value = "获取订单详情", notes = "获取订单详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "orderNumber", value = "订单号")
+	})
+	@RequestMapping(value = "/bill/order/info/{orderNumber}", method = RequestMethod.GET)
+	public ResponseBean getOrderInfo(HttpSession session, @PathVariable("orderNumber") String orderNumber) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = billServiceI.getOrderInfo(orderNumber);
+		return responseBean;
+	}
 }

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

@@ -37,7 +37,7 @@ public class CodeController {
 
     @ApiOperation(value = "获取手机验证码", notes = "根据手机号发送验证码")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "手机号")})
-    @RequestMapping(value = "/code/sendCode",method = RequestMethod.POST)
+    @RequestMapping(value = "/code/sendCode",method = {RequestMethod.POST, RequestMethod.GET})
     public ResponseBean sendCode(@RequestParam String phone, HttpSession session) {
         ResponseBean response = new ResponseBean();
 

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

@@ -0,0 +1,95 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.service.IFuShiService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "车辆操作API", description = "车辆操作API")
+public class FSController extends BaseController {
+
+    @Autowired
+    private IFuShiService iFuShiService;
+
+    @RequestMapping(value = "/car/getParkInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.getParkInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyMonthCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "月卡续费", notes = "月卡续费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Phone手机号;RenewDayType续费日期类型( 3:年 2:月 1:日, 选入对应的数字);" +
+                    "RenewDay续费日期数目;" +
+                    "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "RechargeAmt充值续费金额;")
+    })
+    public ResponseBean apiThirdPartyMonthCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iFuShiService.apiThirdPartyMonthCardPay(jsonObject.getString("Phone"),
+                jsonObject.getString("RenewDayType"),
+                jsonObject.getString("RenewDay"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("RechargeAmt"));
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/apiThirdPartyTemporaryCardPay", method = RequestMethod.POST)
+    @ApiOperation(value = "第三方临时卡上发缴费", notes = "第三方临时卡上发缴费")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Amount应缴金额（单位元）;" +
+                    "ActualAmount实缴金额（单位元）;" +
+                    "DeductionAmount抵扣金额（单位元）;" +
+                    "Reason抵扣原因;" +
+                    "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
+                    "CarNo车牌号;" +
+                    "CardNo停车卡号;" +
+                    "CouponList使用的优惠券列表")
+    })
+    public ResponseBean apiThirdPartyTemporaryCardPay(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(jsonObject.getString("Amount"),
+                jsonObject.getString("ActualAmount"),
+                jsonObject.getString("DeductionAmount"),
+                jsonObject.getString("Reason"),
+                jsonObject.getString("PayStyle"),
+                jsonObject.getString("CarNo"),
+                jsonObject.getString("CardNo"),
+                jsonObject.getString("CouponList"));
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/car/apiGetOfflineFee/{carNoOrCardNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取线下算费结果", notes = "获取线下算费结果")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号")
+    })
+    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo);
+        return responseBean;
+    }
+
+}

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

@@ -19,7 +19,7 @@ import javax.servlet.http.HttpSession;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "人脸相关API", description = "人脸相关API")
-public class FaceController {
+public class FaceController extends BaseController {
     @Autowired
     private FaceServiceI faceServicel;
 
@@ -28,22 +28,21 @@ public class FaceController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
     })
-    
+
     @RequestMapping(value = "/addFace",method = RequestMethod.POST)
     public Object getTaFace(HttpSession session,
                             @ApiParam(value = "file" ,required = true) MultipartFile uploadFile,
                             @RequestParam(required = false) Integer otherUserId){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        responseBean = faceServicel.addFace(userId ,uploadFile,otherUserId);
+        UserElement userElement = getUserElement(session);
+        responseBean = faceServicel.addFace(userElement ,uploadFile,otherUserId);
         return responseBean;
     }
 
     @ApiOperation(value = "修改人脸图片", notes = "修改人脸图片")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
     })
     @RequestMapping(value = "/upDateFace",method = RequestMethod.POST)
     public Object upDateTaFace(HttpSession session,
@@ -51,22 +50,33 @@ public class FaceController {
                                @RequestParam(required = false) Integer otherUserId
                                ){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-         responseBean = faceServicel.upDateFace(userId,uploadFile,otherUserId);
+        UserElement userElement = getUserElement(session);
+         responseBean = faceServicel.upDateFace(userElement,uploadFile,otherUserId);
         return responseBean;
     }
 
     @ApiOperation(value = "获取当前已录入人脸信息", notes = "获取当前已录入人脸信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人")
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
     })
     @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
     public Object getTaFaceByUserId(HttpSession session, @RequestParam(required = false) Integer otherUserId){
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userId,otherUserId);
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userElement,otherUserId);
+        return responseBean;
+    }
+    @ApiOperation(value = "删除当前人脸信息", notes = "删除当前人脸信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "otherUserId",value = "家属或租户ID,不填为本人"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "verifyId",value = "审核ID"),
+    })
+    @RequestMapping(value = "/deleteFace",method = RequestMethod.GET)
+    public Object deleteFace(HttpSession session, @RequestParam(required = false) Integer otherUserId,
+                            @RequestParam(required = false) Integer verifyId){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = faceServicel.deleteFace(userElement,otherUserId,verifyId);
         return responseBean;
     }
 

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

@@ -5,16 +5,14 @@ import com.community.commom.mode.HkResponseBean;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.HkVisitorBill;
+import com.community.huiju.service.IHKService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
 
@@ -27,7 +25,10 @@ import javax.servlet.http.HttpSession;
 @RequestMapping("/")
 @Api(value = "海康相关的API",description = "海康相关的API")
 public class HkController {
-	
+
+	@Autowired
+	private IHKService ihkService;
+
 	@ApiOperation(value = "发送访客账单", notes = "发送访客账单")
 	@ApiImplicitParams({ @ApiImplicitParam(paramType = "body", name = "hkVisitorBill", dataType = "String",value = "billNum: 账单号,reservationNum:预约单号,plateNum:出场车牌号,leaveTime:出场时间,billFee:账单金额")})
 	@RequestMapping(value = "/sendVisitorBill",method = RequestMethod.POST)
@@ -41,4 +42,18 @@ public class HkController {
 		hkResponseBean.addSuccess("账单发送成功","");
 		return hkResponseBean;
 	}
+
+	@RequestMapping(value = "/pushHKPerson/{appUserId}", method = RequestMethod.POST)
+	public ResponseBean pushHKPerson(@PathVariable("appUserId") String appUserId, @RequestParam("userVerifyId") Integer userVerifyId) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.pushPerson(appUserId, userVerifyId);
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/downloadAuthorityByDeviceUuids", method = RequestMethod.POST)
+	public ResponseBean pushHKPerson() {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.downloadAuthorityByDeviceUuids();
+		return responseBean;
+	}
 }

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

@@ -0,0 +1,80 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.IBuildingOwnerInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2019/3/28
+ **/
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "楼栋资料库API",description = "楼栋资料库API")
+public class IBuildingOwnerInfoController extends BaseController {
+
+    @Autowired
+    private IBuildingOwnerInfo iBuildingOwnerInfo;
+
+    @RequestMapping(value = "/building/select/address", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 小区/期/楼栋/单元/楼层/户号 (申请注册绑定)", notes = "根据 小区/期/楼栋/单元/楼层/户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层")
+    })
+    public ResponseBean selectByAddress(@RequestParam("communityId") Integer communityId,
+                                        @RequestParam(value = "phaseId", required = false) Integer phaseId,
+                                        @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                        @RequestParam(value = "unitId", required = false) Integer unitId,
+                                        @RequestParam(value = "levelId", required = false) Integer levelId) {
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfo.selectBuildList(communityId, phaseId, buildingId, unitId, levelId);
+        return responseBean;
+
+    }
+
+    @RequestMapping(value = "/building/has", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号 （并校验这个用户，是否绑定了这个房产）", notes = "根据 小区、期、楼栋、单元、楼层、户号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "levelId", value = "楼层"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNoId", value = "户号"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean hasBuilding(@RequestParam(value = "communityId", required = false) Integer communityId,
+                                    @RequestParam(value = "phaseId", required = false) Integer phaseId,
+                                   @RequestParam(value = "buildingId",required = false) Integer buildingId,
+                                   @RequestParam(value = "unitId", required = false) Integer unitId,
+                                   @RequestParam(value = "levelId", required = false) Integer levelId,
+                                   @RequestParam(value = "roomNoId", required = false) Integer roomNoId,
+                                   HttpSession session){
+
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfo.hasBuild(userElement, communityId ,phaseId, buildingId, unitId, levelId, roomNoId);
+        return responseBean;
+    }
+
+}

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

@@ -0,0 +1,38 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.perproties.LoginCodePerproties;
+import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author weiximei
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "根据code获取url API", description = "根据code获取url API")
+public class LoginCodeController {
+
+    @Autowired
+    private LoginCodePerproties loginCodePerproties;
+
+    @RequestMapping(value = "/url", method = RequestMethod.GET)
+    public ResponseBean getUrl(@RequestParam String code) {
+        ResponseBean responseBean = new ResponseBean();
+        String url = loginCodePerproties.getLoginCode().get(code);
+        Map<String, String> map = Maps.newHashMap();
+        map.put("url", url);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+}

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

@@ -38,7 +38,6 @@ public class MessageController extends BaseController {
 	@RequestMapping(value = "/message/{communityId}/total",method = RequestMethod.GET)
 	public ResponseBean getMessageTotal(@PathVariable Integer communityId, HttpSession session){
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
 
 		if (!check(communityId)) {
@@ -46,7 +45,7 @@ public class MessageController extends BaseController {
 			return responseBean;
 		}
 
-		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
 		responseBean.addSuccess(totalMap);
 		return responseBean;
 	}
@@ -61,13 +60,12 @@ public class MessageController extends BaseController {
 	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 	                            @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
 		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> map = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userId);
+		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userElement.getUserVerifyId());
 		responseBean.addSuccess(map);
 		return responseBean;
 	}

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

@@ -64,9 +64,7 @@ public class SocialController extends BaseController {
                                      @RequestParam(value = "remark", required = false) String remark,
                                      @RequestParam("activityId") Integer activityId,
                                      HttpSession session) {
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-
+        UserElement userElement = getUserElement(session);
         ResponseBean responseBean = new ResponseBean();
 
         if (!check(communityId)) {
@@ -74,7 +72,7 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId,remark);
+        responseBean = socialServiceI.findTaUserInfo(userElement, activityId, communityId ,remark);
         return responseBean;
     }
     
@@ -248,7 +246,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "二手租赁详情", notes = "二手租赁详情")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "帖子id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
     @RequestMapping(value = "/getTransaction/{communityId}", method = RequestMethod.GET)
     public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
@@ -269,7 +267,8 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "查询二手租赁回复", notes = "查询二手租赁回复")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "transactionId", value = "活动帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "transactionId", value = "帖子id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "0:和我相关，1:楼主，2:物业"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "一页多少行"),
@@ -278,6 +277,7 @@ public class SocialController extends BaseController {
     @RequestMapping(value = "/getTransactionReply", method = RequestMethod.GET)
     public ResponseBean findUsedDetailsReply(@RequestParam("transactionId") Integer transactionId,
                                              @RequestParam(value = "order", defaultValue = "asc") String order,
+                                             @RequestParam(value = "type",required = false) Integer type,
                                              @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                              @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
                                              HttpSession session) {
@@ -289,7 +289,7 @@ public class SocialController extends BaseController {
             return responseBean;
         }
 
-        responseBean = socialServiceI.findUsedDetailsReply(transactionId, userElement, order, pageNum, pageSize);
+        responseBean = socialServiceI.findUsedDetailsReply(transactionId, userElement, order, pageNum, pageSize,type);
         return responseBean;
     }
 
@@ -297,7 +297,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型0 代表 议事大厅 1 是邻里互助 2 是二手/租赁 3 是其他话题"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "帖子标题"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")}
@@ -309,7 +309,6 @@ public class SocialController extends BaseController {
                                     @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;
@@ -321,7 +320,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0二手,1求购,2租赁"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0议事大厅,1是邻里互助 ,2是二手/租赁,3其它话题,status:"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
@@ -330,8 +329,7 @@ public class SocialController extends BaseController {
 
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
+        ResponseBean response = socialServiceI.addAllTransaction(userElement, paramets);
         return response;
     }
     
@@ -366,8 +364,7 @@ public class SocialController extends BaseController {
                                              @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize,type);
+        ResponseBean response = socialServiceI.selectAllTransaction(userElement, pageNum, pageSize,type);
         return response;
     }
 
@@ -434,7 +431,7 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "二手帖子对话", notes = "二手帖子对话")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "transactionId:当前帖子ID,replyContent:回复内容，replyTaUserId：被回复的用户ID"),
+                    "transactionId:当前帖子ID,replyContent:回复内容，replyTaUserId：被回复的用户ID，imgArr:可多张[]"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransactionReply", method = RequestMethod.POST)
@@ -451,11 +448,66 @@ public class SocialController extends BaseController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransactionLike", method = RequestMethod.POST)
-    public ResponseBean addTransactionLike(HttpSession session, @RequestBody String paramets) {
+    public ResponseBean  addTransactionLike(HttpSession session, @RequestBody String paramets) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         ResponseBean response = socialServiceI.addTransactionLike(paramets,userElement);
         return response;
     }
 
+    @ApiOperation(value = "我参加的所有活动", notes = "我参加的所有活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/user/activitlist", method = RequestMethod.GET)
+    public ResponseBean  userActivityList(HttpSession session,
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.userActivityList(userElement,pageNum,pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "我参加的话题", notes = "我参加的话题")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+    })
+    @RequestMapping(value = "/user/transactionList", method = RequestMethod.GET)
+    public ResponseBean  userTransactionList(HttpSession session,
+                                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.userTransactionList(userElement,pageNum,pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "签到扫码", notes = "签到扫码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value = "activityId:活动id"),
+    })
+
+    @RequestMapping(value = "/tpactivitysignin/add", method = RequestMethod.POST)
+    public ResponseBean  tpActivitySignInAdd(HttpSession session,@RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean response = socialServiceI.tpActivitySignInAdd(paramets,userElement);
+        return response;
+    }
+
+    @ApiOperation(value = "回复对话", notes = "回复对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "transactionId:帖子ID,replyContent:回复内容，replyUserId：被回复的用户ID，imgArr:可多张[]"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/replyAdd", method = RequestMethod.POST)
+    public ResponseBean replyAdd(HttpSession session, @RequestBody String paramets) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        ResponseBean replyAdd = socialServiceI.replyAdd(paramets,userElement);
+        return replyAdd;
+    }
 
 }

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

@@ -116,7 +116,7 @@ public class TicketController extends BaseController {
 
         TpTicket tpTicket = new TpTicket();
         tpTicket.setCommunityId(Integer.valueOf(communityId));
-        tpTicket.setTaUserId(userElement.getId());
+        tpTicket.setTaUserId(userElement.getUserVerifyId());
         tpTicket.setType(type);
 
         responseBean = iTicketService.getByTypeList(tpTicket, pageNum, pageSize);
@@ -161,8 +161,7 @@ public class TicketController extends BaseController {
     public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) throws IOException {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        ResponseBean response = iTicketService.addAiTicketService(userId, paramets);
+        ResponseBean response = iTicketService.addAiTicketService(userElement, paramets);
         return response;
     }
 
@@ -216,7 +215,7 @@ public class TicketController extends BaseController {
     @RequestMapping(value = "/addRecordComment", method = RequestMethod.POST)
     public ResponseBean addRecordComment(@RequestBody String parameter, HttpSession session){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        ResponseBean  responseBean = iTicketService.addRecordComment(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName());
+        ResponseBean  responseBean = iTicketService.addRecordComment(parameter,userElement.getUserVerifyId(),userElement.getCommunityId(),userElement.getUserName());
         return responseBean;
     }
 }

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

@@ -17,6 +17,7 @@ import org.apache.catalina.User;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -40,74 +41,86 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "登录", notes = "根据登录名和验证码")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区"),
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)")
     })
-    @RequestMapping(value = "/user/login/{communityId}",method = RequestMethod.POST)
+    @RequestMapping(value = "/user/login",method = RequestMethod.POST)
     public ResponseBean login(@RequestBody String parameter,
-                              @PathVariable(value = "communityId") String communityId,
                               HttpSession session){
         JSONObject jsonObject = JSONObject.parseObject(parameter);
-        ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),communityId, jsonObject.getString("code"));
+        ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),jsonObject.getString("code"), session);
         TaUserVO userVO = (TaUserVO) responseBean.getData();
+        if (null != userVO) {
+            setUserElement(userVO, session);
+        }
+        return responseBean;
+
+    }
 
+    @ApiOperation(value = "注册", notes = "注册")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码")
+    })
+    @RequestMapping(value = "/user/register",method = RequestMethod.POST)
+    public ResponseBean register(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.register(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "登录 绑定 房产", notes = "绑定选中的当前房产，进行登录 (在APP登录后，选择房产的时候)，还可以用于切换房产登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataTypeClass = String.class, name = "userVerifyId",value = "审核 id"),
+            @ApiImplicitParam(paramType = "header",dataTypeClass = String.class, name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/user/binding/login/{userVerifyId}",method = RequestMethod.POST)
+    public ResponseBean login(@PathVariable("userVerifyId") Integer userVerifyId,
+                              HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserService.bindingLoginAndHouse(userElement, userVerifyId);
+        TaUserVO userVO = (TaUserVO) responseBean.getData();
         if (null != userVO) {
-            UserElement userElement = new UserElement();
-            BeanUtils.copyProperties(userVO,userElement);
-            userElement.setLoginType(Constant.APP_LOGIN_TYPE);
-            session.setAttribute(Constant.APP_USER_SESSION,userElement);
-            userVO.setToken(session.getId());
+            setUserElement(userVO, session);
         }
         return responseBean;
 
     }
+
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码),otherUserId:(租客或者家属ID，空为业主本人)"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String paramets, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId=userElement.getId();
-        ResponseBean response=iTaUserService.upDateloginName(userId,paramets,userElement.getCommunityId());
+        UserElement userElement = getUserElement(session);
+        ResponseBean response=iTaUserService.updateLoginName(userElement, paramets);
         return response;
     }
 
     @ApiOperation(value = "查看房屋成员列表", notes = "查看房屋成员列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/roomUserList", method = RequestMethod.GET)
     public ResponseBean accessTicket(HttpSession session){
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
-        List<TaUser> taUserList = iTaUserService.getAllRoomUserList(userId);
-        responseBean.addSuccess(taUserList);
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.getAllRoomUserList(userElement);
         return responseBean;
     }
+
     @ApiOperation(value = "修改用户名和性别和身份证", notes = "修改用户名和性别和身份证")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别和idCard身份证"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/user/update/info",method = RequestMethod.PUT)
     public ResponseBean updateUserNameAndGender(@RequestBody String parameter,
                                                 HttpSession session){
         ResponseBean response = new ResponseBean();
-
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-
-        TaUser user = JSONObject.parseObject(parameter,TaUser.class);
-        user.setId(userElement.getId());
-
-        response = iTaUserService.modifyUser(user);
+        UserElement userElement = getUserElement(session);
+        response = iTaUserService.modifyUser(userElement, parameter);
         return response;
 
     }
@@ -115,16 +128,15 @@ public class UserController extends BaseController {
     @ApiOperation(value = "租客或家属 启用或者停用", notes = "租客或家属 启用或者停用")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userId(租客或者家属) type(1启用 0停用)"),
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/user/dependentsOrTenants",method = RequestMethod.PUT)
+    @Deprecated
     public ResponseBean updateDependentsOrTenants(@RequestBody String parameter,
                                                 HttpSession session){
         ResponseBean response = new ResponseBean();
 
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         response = iTaUserService.startOrEndUsingUser(userElement.getId(),jsonObject.getInteger("userId"),jsonObject.getInteger("type"));
 
@@ -136,11 +148,11 @@ public class UserController extends BaseController {
     @ApiOperation(value = "业主添加 租客或家属", notes = "业主添加 租客或家属")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName(租客或者家属 姓名) " +
-                    "phone(租客或者家属 手机号) " +
+                    "loginName(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
-                    "type(2租客 3家属)" +
-                    "idCard(身份证号)"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
+                    "roleName(TENANT 租客 RELATION 家属)" +
+                    "idCard(身份证号)" +
+                    "code(验证码)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/addTenantsOrDependents",method = RequestMethod.POST)
@@ -148,13 +160,8 @@ public class UserController extends BaseController {
                                                HttpSession session){
         ResponseBean response = new ResponseBean();
 
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        JSONObject jsonObject = JSONObject.parseObject(parameter);
-        response = iTaUserService.addTenantsOrDependents(jsonObject.getString("userName"),
-                jsonObject.getString("phone"),jsonObject.getString("gender"),
-                userElement.getId(),
-                jsonObject.getInteger("type"), jsonObject.getString("idCard"));
-
+        UserElement userElement = getUserElement(session);
+        response = iTaUserService.addTenantsOrDependents(userElement, parameter);
         return response;
 
     }
@@ -167,10 +174,10 @@ public class UserController extends BaseController {
                     "gender(租客或者家属 性别 1男 2女) " +
                     "type(2租客 3家属)" +
                     "idCard(身份证号)"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/updateTenantsOrDependents",method = RequestMethod.POST)
+    @Deprecated
     public ResponseBean updateTenantsOrDependents(@RequestBody String parameter,
                                                HttpSession session){
         ResponseBean response = new ResponseBean();
@@ -193,7 +200,6 @@ public class UserController extends BaseController {
     @ApiOperation(value = "修改用户头像", notes = "修改用户头像")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "headPortrait(用户头像)"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/modifyUserHeadPortrait",method = RequestMethod.PUT)
@@ -211,19 +217,25 @@ public class UserController extends BaseController {
     @ApiOperation(value = "获取用户信息", notes = "获取用户信息, 携带userId表示查询租客或者家属")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "userId",value = "租客或者家属的ID(可选值)"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userVerifyId",value = "审核id，只有在 userId 参数生效才有效")
     })
     @RequestMapping(value = "/user/info",method = RequestMethod.GET)
-    public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId,
+    public ResponseBean getUserInfo(@RequestParam(value = "userId",required = false) Integer userId, @RequestParam(value = "userVerifyId", required = false) Integer userVerifyId,
                                     HttpSession session){
         ResponseBean response = new ResponseBean();
-
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer id =  userElement.getId();
-
-        response = iTaUserService.getUserInfo(id,userId);
-        TaUserVO userVO = (TaUserVO) response.getData();
+        UserElement userElement = getUserElement(session);
+        response = iTaUserService.getUserInfo(userElement,userId, userVerifyId, session);
+        Object data = response.getData();
+        if ("1".equals(response.getCode()) && null == data) {
+            // 清空 session
+            removeUserElement(session);
+            return response;
+        }
+        if (null == userId && null != data && data instanceof TaUserVO) {
+            setUserElement((TaUserVO) data, session);
+        }
+        TaUserVO userVO = (TaUserVO) data;
         userVO.setToken(session.getId());
 
         return response;
@@ -232,39 +244,85 @@ public class UserController extends BaseController {
 
 
     @ApiOperation(value = "游客登录", notes = "游客登录")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
-    })
     @RequestMapping(value = "/user/temporary/{communityId}", method = RequestMethod.POST)
-    public ResponseBean temporaryLogin(@PathVariable Integer communityId, HttpSession session) {
+    public ResponseBean temporaryLogin(HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTaUserService.temporaryLogin(communityId);
+        responseBean = iTaUserService.temporaryLogin(session);
         TaUserVO userVO = (TaUserVO) responseBean.getData();
         if (null != userVO) {
-            UserElement userElement = new UserElement();
-            BeanUtils.copyProperties(userVO,userElement);
-            userElement.setLoginType(Constant.APP_LOGIN_TYPE);
-            session.setAttribute(Constant.APP_USER_SESSION,userElement);
-            userVO.setToken(session.getId());
+            setUserElement(userVO, session);
         }
-        userVO.setToken(session.getId());
         return responseBean;
     }
 
     @ApiOperation(value = "迎宾系统添加人员", notes = "迎宾系统添加人员")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "form", dataTypeClass = String.class, value = "userName人员名称"),
-            @ApiImplicitParam(paramType = "form", dataTypeClass = MultipartFile.class, name = "file", value = "图片"),
-            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/welcome/add", method = RequestMethod.POST)
-    public ResponseBean welcomeAddUser(@RequestParam("userName") String userName, @RequestParam("file") MultipartFile file, HttpSession session) {
+    public ResponseBean welcomeAddUser(@RequestParam("userName") String userName, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         TaUser user = new TaUser();
         user.setUserName(userName);
-        responseBean = iTaUserService.welcomeFace(userElement, file, user);
+        responseBean = iTaUserService.addWelcomeUser(userElement, user);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/has/phone", method = RequestMethod.GET)
+    @ApiOperation(value = "校验 手机号是否注册", notes = "校验 手机号是否注册")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "phone", value = "手机号"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean hasUserPhone(HttpSession session, @RequestParam("phone") String phone) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.hasUserPhoneVerify(phone, userElement);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/tenantAndRelation/delete/{userVerifyId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "业主删除 家属或者租客", notes = "业主删除 家属或者租客")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核 id"),
+            @ApiImplicitParam(paramType = "header",dataTypeClass = String.class,name = "X-Auth-Token",value = "Token")
+    })
+    public ResponseBean deleteTenantAndRelation(HttpSession session, @PathVariable("userVerifyId") Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserService.deleteTenantAndRelation(userElement, userVerifyId);
         return responseBean;
     }
+
+    @ApiOperation(value = "获取令牌", notes = "获取令牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "提供的appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "encrypt加密方式(目前值为md5)"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "phone", value = "手机号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "communityId", value = "提供的小区编号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "生成的签名"),
+    })
+    @RequestMapping(value = "/user/token", method = RequestMethod.GET)
+    public ResponseBean daSuToken(@RequestParam("appid") String appid,
+                                  @RequestParam("datetime") String datetime,
+                                  @RequestParam("encrypt") String encrypt,
+                                  @RequestParam("phone") String phone,
+                                  @RequestParam("communityId") String communityId,
+                                  @RequestParam("sign") String sign,
+                                  HttpSession session){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserService.daSuToken(appid, datetime, encrypt, communityId, phone, sign, session);
+        Object object = responseBean.getData();
+        if (null != object) {
+            TaUserVO userVO = (TaUserVO) responseBean.getData();
+            if (userVO != null) {
+                setUserElement(userVO, session);
+            }
+        }
+        return responseBean;
+    }
+
 }

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

@@ -0,0 +1,119 @@
+package com.community.huiju.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.ITaUserService;
+import com.community.huiju.service.TaUserVerifyServicel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * app端用户审核
+ *
+ * @author weiximei
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "app端用户审核表", description = "app端用户审核表")
+public class UserVerifyController extends BaseController {
+
+    @Autowired
+    private TaUserVerifyServicel taUserVerifyServicel;
+
+    @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 一个房产信息", notes = "获取 一个房产信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
+    })
+    public ResponseBean getUserVerify(HttpSession session, @PathVariable("userVerifyId") Integer userVerifyId) {
+        ResponseBean responseBean = taUserVerifyServicel.getToAuditNotApproved(userVerifyId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/add", method = RequestMethod.POST)
+    @ApiOperation(value = "添加一个审核的房产", notes = "添加一个审核的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "communityId小区编号;roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
+    })
+    public ResponseBean addUserVerify(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.addUserVerify(userElement, parameter);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除一个审核的房产", notes = "删除一个审核的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id")
+    })
+    public ResponseBean deleteUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = taUserVerifyServicel.deleteUserVerify(userVerifyId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/current_user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除当前用户 关联的房产", notes = "删除当前用户 关联的房产")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    public ResponseBean deleteCurrentUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.deleteCurrentUserVerify(userElement, userVerifyId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/verify/list", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 当前用户关联的房产列表", notes = "获取 当前用户关联的房产列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+    })
+    public ResponseBean getByCurrentUser(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = taUserVerifyServicel.getByCurrentUser(userElement);
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.PUT)
+    @ApiOperation(value = "业主审核用户", notes = "业主审核用户")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "userVerifyStatus审核 1是审核通过   2是审核不通过;remark备注"),
+    })
+    public ResponseBean verifyUser(HttpSession session,
+                                   @PathVariable("userVerifyId") Integer userVerifyId,
+                                   @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        responseBean = taUserVerifyServicel.verifyUser(userElement, userVerifyId, jsonObject.getString("userVerifyStatus"), jsonObject.getString("remark"));
+        return responseBean;
+    }
+
+
+    @RequestMapping(value = "/user_verify/add", method = RequestMethod.POST)
+    @ApiOperation(value = "添加一个审核的房产 大苏", notes = "添加一个审核的房产 大苏")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "userId用户编号;communityId小区编号;roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
+    })
+    public ResponseBean addDaSuUserVerify(@RequestBody String parameter, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = taUserVerifyServicel.addDaSuUserVerify(parameter);
+        return responseBean;
+    }
+
+}

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

@@ -47,10 +47,9 @@ public class VistorController extends BaseController {
             return responseBean;
         }
 
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
+        UserElement userElement = getUserElement(session);
         TaVisitor taVisitor = JSONObject.parseObject(parameter,TaVisitor.class);
-        responseBean = vistorServiceI.insertTaVistor(taVisitor, communityId, userId);
+        responseBean = vistorServiceI.insertTaVistor(taVisitor, userElement);
         return  responseBean;
     }
 

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

@@ -0,0 +1,108 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.WxLoginServiceI;
+import com.community.huiju.vo.TaUserVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * @author FXF
+ * @date 2019-03-29
+ */
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "微信登录 API", description = "微信登录 API")
+public class WxLoginController extends BaseController {
+	
+	@Autowired
+	private WxLoginServiceI wxLoginService;
+	
+	/**
+	 * 微信登录
+	 */
+	@RequestMapping(value = "/wxLogin/{wxcode}", method = RequestMethod.POST)
+	public ResponseBean autoLogin(@PathVariable String wxcode, HttpServletRequest request) {
+		ResponseBean responseBean = new ResponseBean();
+		if (StringUtils.isEmpty(wxcode)){
+			responseBean.addError("fail");
+			return responseBean;
+		}
+		//根据wxcode获取openid
+		responseBean = wxLoginService.getOpenidByWxcode(wxcode, request.getSession());
+		Object data = responseBean.getData();
+		if (null != data && data instanceof TaUserVO) {
+			setUserElement((TaUserVO) data, request.getSession());
+		}
+		return responseBean;
+	}
+
+	/**
+	 * 关联微信账号
+	 * @return
+	 */
+	@RequestMapping(value = "/wx/associated", method = RequestMethod.POST)
+	@ApiOperation(value = "手机号和验证码 关联微信账号", notes = "手机号和验证码 关联微信账号")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码;openid微信标识;nickname微信用户名称;headimgurl微信头像")
+	})
+	public ResponseBean associatedWX(@RequestBody String parameter, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = wxLoginService.associatedWX(parameter);
+		TaUserVO userVO = (TaUserVO) responseBean.getData();
+		if (null != userVO) {
+			setUserElement(userVO, session);
+		}
+		return responseBean;
+	}
+
+	@ApiOperation(value = "注册", notes = "注册")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码;openid微信标识;nickname微信用户名称;headimgurl微信头像")
+	})
+	@RequestMapping(value = "/wx/register",method = RequestMethod.POST)
+	public ResponseBean register(@RequestBody String parameter, HttpServletRequest request ,HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = wxLoginService.register(parameter, request);
+		TaUserVO userVO = (TaUserVO) responseBean.getData();
+		if (null != userVO) {
+			setUserElement(userVO, session);
+		}
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/unbundlingWX", method = RequestMethod.PUT)
+	@ApiOperation(value = "解绑微信", notes = "解绑微信")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	public ResponseBean unbundlingWX(HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = wxLoginService.unbundlingWX(userElement);
+		return responseBean;
+	}
+
+	@RequestMapping(value = "/bundlingWX/{wxcode}", method = RequestMethod.POST)
+	@ApiOperation(value = "绑定微信", notes = "绑定微信")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	public ResponseBean bundlingWX(HttpSession session, @PathVariable("wxcode") String wxcode) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = wxLoginService.bundlingWX(userElement, wxcode);
+		return responseBean;
+	}
+}

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

@@ -1,5 +1,6 @@
 package com.community.huiju.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.redis.RedisTemplate;
@@ -19,18 +20,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
+import java.lang.reflect.Type;
+import java.util.*;
 
 /**
  * @author FXF
@@ -47,16 +45,18 @@ public class WxPayController {
 	private WxPayServiceI wxPayService;
 	
 	@ApiOperation(value = "统一下单", notes = "统一下单")
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
-			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
-	@RequestMapping(value = "/wxUnifiedOrder/{billInvoiceId}",method = RequestMethod.GET)
-	public ResponseBean wxUnifiedOrder(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wxUnifiedOrder/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxUnifiedOrder(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 		
 		Map<String, String> resp = Maps.newHashMap();
 		try {
-			resp = wxPayService.wxUnifiedOrder(billInvoiceId,userElement);
+			resp = wxPayService.wxUnifiedOrder(outTradeNo,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());
@@ -114,12 +114,15 @@ public class WxPayController {
 	}
 	
 	@ApiOperation(value = "订单查询", notes = "订单查询")
-	@RequestMapping(value = "/wxOrderQuery",method = RequestMethod.GET)
-	public ResponseBean wxOrderQuery(){
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号")
+	})
+	@RequestMapping(value = "/wxOrderQuery/{outTradeNo}",method = RequestMethod.GET)
+	public ResponseBean wxOrderQuery(@PathVariable("outTradeNo") String outTradeNo){
 		ResponseBean responseBean = new ResponseBean();
 		Map<String, String> resp = Maps.newHashMap();
 		try {
-			resp = wxPayService.wxOrderQuery();
+			resp = wxPayService.wxOrderQuery(outTradeNo);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError("查询失败");
@@ -130,14 +133,21 @@ public class WxPayController {
 	}
 	
 	@ApiOperation(value = "准备开始支付", notes = "准备开始支付")
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
-			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
-	@RequestMapping(value = "/wxStartPay/{billInvoiceId}",method = RequestMethod.POST)
-	public ResponseBean wxStartPay(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "Integer", name = "billInvoiceIdList", value = "账单Id集合"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wxStartPay",method = RequestMethod.POST)
+	public ResponseBean wxStartPay(@RequestBody String billInvoiceIdList, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		try {
 			UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-			wxPayService.wxStartPay(billInvoiceId,userElement);
+			 Integer[] integers = JSONObject.parseArray(billInvoiceIdList).toArray(new Integer[]{});
+
+			String outTradeNo = wxPayService.wxStartPay( Arrays.asList(integers), userElement);
+			Map<String,Object> resultMap = Maps.newHashMap();
+			resultMap.put("outTradeNo", outTradeNo);
+			responseBean.addSuccess(resultMap);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());
@@ -147,14 +157,16 @@ public class WxPayController {
 	}
 	
 	@ApiOperation(value = "取消支付", notes = "取消支付")
-	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单Id"),
-			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token") })
-	@RequestMapping(value = "/wxCancelPay/{billInvoiceId}",method = RequestMethod.POST)
-	public ResponseBean wxCancelPay(@PathVariable("billInvoiceId") Integer billInvoiceId, HttpSession session){
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "outTradeNo", value = "订单号"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+	})
+	@RequestMapping(value = "/wxCancelPay/{outTradeNo}",method = RequestMethod.POST)
+	public ResponseBean wxCancelPay(@PathVariable("outTradeNo") String outTradeNo, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		try {
 			UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-			wxPayService.wxCancelPay(billInvoiceId,userElement);
+			wxPayService.wxCancelPay(outTradeNo,userElement);
 		} catch (Exception e) {
 			e.printStackTrace();
 			responseBean.addError(e.getMessage());

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaFaceMapper.java

@@ -19,10 +19,10 @@ public interface TaFaceMapper{
 
     /**
      * 查看当前用户信息
-     * @param userid
+     * @param userVerifyId
      * @return
      */
-    TaFace getByUserId(@Param("userid") Integer userid);
+    TaFace getByUserVerifyId(@Param("userVerifyId") Integer userVerifyId);
 
     /**
      * 查看当前信息
@@ -30,4 +30,10 @@ public interface TaFaceMapper{
      * @return
      */
     TaFace getById(@Param("id")Integer id);
+
+    /**
+     * 根据审核ID删除人脸信息
+     * @param verifyId
+     */
+    void deleteFace(@Param("verifyId") Integer verifyId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaSysRoleMapper.java

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TaSysRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -22,4 +24,13 @@ public interface TaSysRoleMapper {
 
     TaSysRole findRoleByUserId(Integer userId);
 
+    /**
+     * 根据 角色名称 查询
+     * @param roleName
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_sys_role where role_name=#{roleName}")
+    TaSysRole selectByRoleName(String roleName);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -33,7 +33,7 @@ public interface TaUserMapper {
      * @param map
      * @return 用户
      */
-    TaUser selectByLoginName(Map<String, Object> map);
+    TaUser selectByLoginName(@Param("map") Map<String, Object> map);
 
     /**
      * 更新当前用户电话
@@ -44,10 +44,15 @@ public interface TaUserMapper {
 
     /**
      * 查询房屋成员列表
-     * @param parentId
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
      * @return
      */
-    List<TaUser> selectUserListByParentId(Integer parentId);
+    List<TaUser> selectHouseUserList(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("userId") Integer userId);
 
     /**
      * 判断当前用户的关联关系
@@ -64,4 +69,13 @@ public interface TaUserMapper {
      * @return
      */
     TaUser getByLoginName(@Param("communityId")Integer communityId, @Param("phone")String phone);
+
+    /**
+     * 根据手机号码查询多套房产
+     * @param loginName
+     * @return
+     */
+    List<TaUser> getByLoginNameList(@Param("loginName") String loginName);
+	
+	TaUser getByOpenId(@Param("openid") String openid);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java

@@ -0,0 +1,101 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TaUserVerify;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TaUserVerifyMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUserVerify record);
+
+    int insertSelective(TaUserVerify record);
+
+    TaUserVerify selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUserVerify record);
+
+    int updateByPrimaryKey(TaUserVerify record);
+
+    /**
+     * 根据 用户id 查询房产
+     * @param userId
+     * @return
+     */
+    List<TaUserVerify> selectByUserId(@Param("userId") Integer userId);
+
+    /**
+     * 根据 用户id、小区id 、 期、栋、单元、楼层、户号、审核状态  进行条件查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param verifyStatus
+     * @return
+     */
+    List<TaUserVerify> selectCommunityAndAddress(@Param("userId") Integer userId,
+                                           @Param("communityId") Integer communityId,
+                                           @Param("phaseId") Integer phaseId,
+                                           @Param("buildingId") Integer buildingId,
+                                           @Param("unitId") Integer unitId,
+                                           @Param("levelId") Integer levelId,
+                                           @Param("roomNoId") Integer roomNoId,
+                                           @Param("verifyStatus") Integer verifyStatus);
+
+
+
+    /**
+     * 根据 小区id 、 期、栋、单元、楼层、户号, 角色id(业主), 审核通过(值为1) 进行条件查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_verify where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId}" +
+            " and unit_id=#{unitId} and level_id=#{levelId}" +
+            " and room_no_id=#{roomNoId} and role_id=1 and verify_status=1")
+    TaUserVerify selectCommunityAndAddressAndRoleId(@Param("communityId") Integer communityId,
+                                                    @Param("phaseId") Integer phaseId,
+                                                    @Param("buildingId") Integer buildingId,
+                                                    @Param("unitId") Integer unitId,
+                                                    @Param("levelId") Integer levelId,
+                                                    @Param("roomNoId") Integer roomNoId);
+
+
+    /**
+     * 根据 用户id、小区id 、 期、栋、单元、楼层、户号、审核状态(不等于2)  进行条件查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_verify where user_id=#{userId} and community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId}" +
+            " and unit_id=#{unitId} and level_id=#{levelId}" +
+            " and room_no_id=#{roomNoId} and verify_status != 2")
+    List<TaUserVerify> selectCommunityAndAddressAndNotVerifyStatus2(@Param("userId") Integer userId,
+                                           @Param("communityId") Integer communityId,
+                                           @Param("phaseId") Integer phaseId,
+                                           @Param("buildingId") Integer buildingId,
+                                           @Param("unitId") Integer unitId,
+                                           @Param("levelId") Integer levelId,
+                                           @Param("roomNoId") Integer roomNoId);
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TdImagesMapper.java

@@ -44,4 +44,12 @@ public interface TdImagesMapper {
      * @param type
      */
     void deleteTdImages(@Param("uuid") Integer uuid, @Param("type") String type);
+
+    /**
+     *
+     * @param uuid
+     * @param object
+     * @return
+     */
+    List<TdImages> selectImages(@Param("uuid") Integer uuid, @Param("object") String object);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/ToBannerMapper.java

@@ -13,5 +13,5 @@ public interface ToBannerMapper {
 
     ToBanner selectByCommunityId(@Param("bannerId") Integer bannerId);
 
-    List<ToBanner> selectAllByNum(@Param("nowTime") String nowTime, @Param("num")Integer num, @Param("bannerPosition") Integer bannerPosition);
+    List<ToBanner> selectAllByNum(@Param("nowTime") String nowTime, @Param("num")Integer num, @Param("bannerPosition") Integer bannerPosition, @Param("communityId") Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java

@@ -31,4 +31,11 @@ public interface TpActivityMapper {
      * @return
      */
     List<TpActivity> getActivity(@Param("communityId")Integer communityId, @Param("num")Integer num);
+
+    /**
+     * 根据活动ID查询我参与过的活动
+     * @param communityId
+     * @return
+     */
+    List<TpActivity> selecttpActivity(@Param("id") Integer id, @Param("communityId") Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignInMapper.java

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpActivitySignIn;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface TpActivitySignInMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpActivitySignIn record);
+
+    int insertSelective(TpActivitySignIn record);
+
+    TpActivitySignIn selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpActivitySignIn record);
+
+    int updateByPrimaryKey(TpActivitySignIn record);
+
+    /**
+     * 查询当前人员是否已签到
+     *
+     */
+    TpActivitySignIn selectSing(@Param("activityId") Integer activityId,@Param("userID") Integer userID);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivitySignupMapper.java

@@ -5,6 +5,8 @@ import com.community.huiju.model.TpActivitySignup;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface TpActivitySignupMapper {
     int deleteByPrimaryKey(Integer id);
@@ -45,5 +47,4 @@ public interface TpActivitySignupMapper {
      * @return
      */
     TpActivitySignup selectTpActivetitySignByUserId(@Param("activityId") Integer activityId, @Param("communityId")Integer communityId, @Param("userId")Integer userId);
-
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillInvoiceMapper.java

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpBillInvoice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -24,11 +26,11 @@ public interface TpBillInvoiceMapper {
     /**
      * 分页获取缴费和未缴费的数据
      * @param communityId
-     * @param userId
+     * @param roomNoId 房间id
      * @param payType
      * @return
      */
-    List<Map<String, Object>> getBillsList(@Param("communityId") Integer communityId,@Param("userId") Integer userId,@Param("payType") Integer payType);
+    List<Map<String, Object>> getBillsList(@Param("communityId") Integer communityId,@Param("roomNoId") Integer roomNoId,@Param("payType") Integer payType);
     
     /**
      * 获取账单的详细信息
@@ -40,15 +42,30 @@ public interface TpBillInvoiceMapper {
     /**
      * 获取需要支付的金额
      * @param billInvoiceId
-     * @param userId
+     * @param buildingOwnerInfoId
      * @param communityId
      * @return
      */
-	TpBillInvoice selectByIdAndUserId(@Param("id") Integer billInvoiceId,@Param("userId") Integer userId,@Param("communityId") Integer communityId);
+	TpBillInvoice selectByIdAndroomNoId(@Param("id") Integer billInvoiceId,@Param("roomNoId") Integer buildingOwnerInfoId,@Param("communityId") Integer communityId);
     
     TpBillInvoice selectByOutTradeNo(@Param("outTradeNo") String outTradeNo);
 
     List<TpBillInvoice> selectByBuildingOwnerInfoId(@Param("buildingOwnerInfoId") Integer buildingOwnerInfoId);
 
     int updateBeach(Map<String, Object> map);
+
+    /**
+     * 根据 id 查询缴费单
+     * @param billId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "t.* ," +
+            "b.bill_name as billName " +
+            "from " +
+            "tp_bill_invoice t " +
+            "LEFT JOIN tp_bill b ON t.bill_id = b.id " +
+            "where t.id = #{billId}")
+    TpBillInvoice selectByIdBillInvoiceInfo(Integer billId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillMapper.java

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpBill;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface TpBillMapper {
@@ -19,4 +22,6 @@ public interface TpBillMapper {
     int updateByPrimaryKey(TpBill record);
 
     TpBill selectById(@Param("id") Integer id);
+
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillOrderMapper.java

@@ -0,0 +1,75 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpBillOrder;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+@Mapper
+public interface TpBillOrderMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpBillOrder record);
+
+    int insertSelective(TpBillOrder record);
+
+    TpBillOrder selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpBillOrder record);
+
+    int updateByPrimaryKey(TpBillOrder record);
+
+    /**
+     * 批量插入
+     * @param list
+     * @return
+     */
+    int batchInsertSelective(List<TpBillOrder> list);
+
+    /**
+     * 根据订单查询， 所有数据
+     * @param orderNumber
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "tbo.* from tp_bill_order tbo where tbo.order_bumber=#{orderNumber}")
+    List<TpBillOrder> selectByOrderBumber(@Param("orderNumber") String orderNumber);
+
+    /**
+     * 根据房间号查询订单
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT tbo.* FROM tp_bill_order tbo LEFT JOIN tp_bill_invoice tbi on tbo.tp_bill_invoice_id = tbi.id " +
+            "WHERE tbi.room_no_id = #{roomNoId} and tbo.order_status = 1 GROUP BY tbo.order_bumber")
+    List<TpBillOrder> selectByRoomNoId(@Param("roomNoId") Integer roomNoId);
+
+    /**
+     * 根据订单号 查询缴费组
+     * @param orderBumber
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT * FROM tp_bill_order WHERE order_bumber = #{orderBumber} GROUP BY tp_bill_id")
+    List<TpBillOrder> selectByOrderNumberBill(@Param("orderBumber") String orderBumber);
+
+    /**
+     * 可关闭的订单
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT t.* from tp_bill_order t where TIMESTAMPDIFF(MINUTE,create_date,now()) >= 10 and t.order_status in (0,2)")
+    List<TpBillOrder> selectCloseOrder();
+
+    /**
+     * 根据收费组id 和 订单号 查询出这个订单号内该收费组所有的数据
+     * @param tpBillId
+     * @param orderNumber
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT * FROM tp_bill_order WHERE order_bumber = #{orderNumber} and tp_bill_id = #{tpBillId}")
+    List<TpBillOrder> selectByBillIdAndOrderNumber(@Param("tpBillId") Integer tpBillId, @Param("orderNumber") String orderNumber);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillStatementMapper.java

@@ -2,6 +2,8 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TpBillStatement;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TpBillStatementMapper {
@@ -16,4 +18,14 @@ public interface TpBillStatementMapper {
     int updateByPrimaryKeySelective(TpBillStatement record);
 
     int updateByPrimaryKey(TpBillStatement record);
+
+    /**
+     * 根据小区id，缴费单id 查询
+     * @param communityId
+     * @param tpBillInvoiceId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select *  from tp_bill_statement where community_id = #{communityId} and bill_invoice_id = #{tpBillInvoiceId}")
+    TpBillStatement selectByCommunityIdAndBillInvoiceId(Integer communityId, Integer tpBillInvoiceId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingMapper.java

@@ -0,0 +1,36 @@
+package com.community.huiju.dao;
+
+
+import com.community.huiju.model.TpBuilding;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpBuildingMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpBuilding record);
+
+    int insertSelective(TpBuilding record);
+
+    TpBuilding selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpBuilding record);
+
+    int updateByPrimaryKey(TpBuilding record);
+
+    /**
+     * 根据小区id，期id
+     * @param communityId
+     * @param phaseId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building where community_id=#{communityId} and phase_id=#{phaseId}")
+    List<TpBuilding> selectByAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId);
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java

@@ -30,4 +30,50 @@ public interface TpBuildingOwnerInfoMapper {
 
     //根据手机号查询当前信息
     TpBuildingOwnerInfo selectOwnerTel(@Param("ownerTel")String ownerTel);
+
+    /*
+     * 根据 小区，期，楼栋，单元，楼层，户号
+     * @param communityId
+     * @param phase
+     * @param building
+     * @param unit
+     * @param level
+     * @param roomNo
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
+            " and level_id=#{levelId} and room_no_id=#{roomNoId}")
+    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
+                                                    @Param("buildingId") Integer building, @Param("unitId") Integer unitId,
+                                                    @Param("levelId") Integer level, @Param("roomNoId") Integer roomNoId);
+
+    /*
+     * 根据 小区，期，楼栋，单元，楼层，户号, 手机号
+     * @param communityId
+     * @param phase
+     * @param building
+     * @param unit
+     * @param level
+     * @param roomNo
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building_owner_info where community_id=#{communityId}" +
+            " and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}" +
+            " and level_id=#{levelId} and room_no_id=#{roomNoId} and owner_tel=#{phone}")
+    TpBuildingOwnerInfo selectCommunityAndAddressAndPhone(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId,
+                                                          @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId,
+                                                          @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId,
+                                                          @Param("phone") String phone);
+
+    /**
+     * 根据 审核id 查询楼栋资料信息
+     * @param userVerifyId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building_owner_info where ta_user_verify_id = #{userVerifyId}")
+    TpBuildingOwnerInfo selectByUserVerifyId(@Param("userVerifyId") Integer userVerifyId);
 }

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

@@ -20,6 +20,6 @@ public interface TpCarouselSettingMapper {
 
      Integer getcarouselNum(@Param("lease") String lease, @Param("communityId") Integer communityId);
 
-    Integer selectCarouselNum(String carouselType);
+    Integer selectCarouselNum(@Param("carouselType") String carouselType, @Param("communityId") Integer communityId);
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpConfigurationMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpConfiguration;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpConfigurationMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpConfiguration record);
+
+    int insertSelective(TpConfiguration record);
+
+    TpConfiguration selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpConfiguration record);
+
+    int updateByPrimaryKey(TpConfiguration record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpEquipmentMapper.java

@@ -0,0 +1,68 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpEquipment;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+@Mapper
+public interface TpEquipmentMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpEquipment record);
+
+    int insertSelective(TpEquipment record);
+
+    TpEquipment selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpEquipment record);
+
+    int updateByPrimaryKey(TpEquipment record);
+
+    /**
+     * 根据小区获取 监控列表
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "tm.*, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.url_id) as monitoringUrl, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as monitoringAddress " +
+            "FROM " +
+            "tp_equipment tm " +
+            "where tm.community_id = #{communityId} and tm.equipment_type = 1")
+    List<TpEquipment> selectByCommunityId(@Param("communityId") Integer communityId);
+
+    /**
+     * 根据小区 和 房间号 查询所有设备
+     * @param communityId
+     * @param roomNoId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "te.* " +
+            "from tp_room_no_equipment trne left join tp_equipment te " +
+            "on trne.equipment_id = te.id " +
+            "where trne.community_id=#{communityId} and trne.room_no_id=#{roomNoId} and te.equipment_type=#{equipmentType}")
+    List<TpEquipment> selectByCommunityIdAndRoomNoId(@Param("communityId") Integer communityId, @Param("roomNoId") Integer roomNoId, @Param("equipmentType") Integer equipmentType);
+
+
+    /**
+     * 根据小区 和 单元号 查询所有设备
+     * @param communityId
+     * @param unitId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select " +
+            "te.* " +
+            "from tp_unit_equipment trne left join tp_equipment te " +
+            "on trne.equipment_id = te.id " +
+            "where trne.community_id=#{communityId} and trne.unit_id=#{unitId} and te.equipment_type=#{equipmentType}")
+    List<TpEquipment> selectByCommunityIdAndUnitId(@Param("communityId") Integer communityId, @Param("unitId") Integer unitId, @Param("equipmentType") Integer equipmentType);
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpEquipmentTreeMapper.java

@@ -0,0 +1,30 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpEquipmentTree;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TpEquipmentTreeMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpEquipmentTree record);
+
+    int insertSelective(TpEquipmentTree record);
+
+    TpEquipmentTree selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpEquipmentTree record);
+
+    int updateByPrimaryKey(TpEquipmentTree record);
+
+    /**
+     * 根据小区查询
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_equipment_tree where community_id = #{communityId}")
+    TpEquipmentTree selectByCommunityId(Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpLevelMapper.java

@@ -0,0 +1,35 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpLevel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpLevelMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpLevel record);
+
+    int insertSelective(TpLevel record);
+
+    TpLevel selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpLevel record);
+
+    int updateByPrimaryKey(TpLevel record);
+
+    /**
+     * 根据 小区id，期id，楼栋id，单元id 进行查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_level where community_id=#{communityId} and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}")
+    List<TpLevel> selectByAddress(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java

@@ -52,7 +52,7 @@ public interface TpMessageMapper {
      * @param map
      * @return
      */
-    TpMessage selectConditionsTpMessage(Map<String, Object> map);
+    TpMessage selectConditionsTpMessage(@Param("map")Map<String, Object> map);
 
     /**
      * 根据条件查询 消息代办

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpPhaseMapper.java

@@ -0,0 +1,33 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpPhase;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpPhaseMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpPhase record);
+
+    int insertSelective(TpPhase record);
+
+    TpPhase selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpPhase record);
+
+    int updateByPrimaryKey(TpPhase record);
+
+    /**
+     * 根据小区查询 期
+     * @param communityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_phase where community_id = #{communityId}")
+    List<TpPhase> selectByAddress(@Param("communityId") Integer communityId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpRoomNoEquipmentMapper.java

@@ -0,0 +1,22 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpRoomNoEquipment;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface TpRoomNoEquipmentMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpRoomNoEquipment record);
+
+    int insertSelective(TpRoomNoEquipment record);
+
+    TpRoomNoEquipment selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpRoomNoEquipment record);
+
+    int updateByPrimaryKey(TpRoomNoEquipment record);
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpRoomNoMapper.java

@@ -0,0 +1,31 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpRoomNo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpRoomNoMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpRoomNo record);
+
+    int insertSelective(TpRoomNo record);
+
+    TpRoomNo selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpRoomNo record);
+
+    int updateByPrimaryKey(TpRoomNo record);
+
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_room_no where community_id=#{communityId} " +
+            "and phase_id=#{phaseId} " +
+            "and building_id=#{buildingId} " +
+            "and unit_id=#{unitId} " +
+            "and level_id=#{levelId}")
+    List<TpRoomNo> selectByAddress(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketMapper.java

@@ -47,4 +47,6 @@ public interface TpTicketMapper {
     TpTicket getTicketTpUserId(@Param("ticketId") Integer ticketId, @Param("communityId") Integer communityId);
 
     Integer selectRecordStatus(@Param("communityId") Integer communityId, @Param("ticketId")Integer ticketId);
+
+    TpTicket selectTpTicketName(@Param("communityId")Integer communityId, @Param("type")String type, @Param("ticketTitle")String ticketTitle);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -4,6 +4,7 @@ import com.community.huiju.model.TpTransaction;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +24,7 @@ public interface TpTransactionMapper {
 
     List<TpTransaction> findAllTransaction(@Param("communityId") Integer communityId, @Param("transactionTitle") String transactionTitle, @Param("type") String type);
 
-    List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId,@Param("type") Integer type);
+    List<TpTransaction> selectTransaction(@Param("id")Integer userId, @Param("communityId")Integer communityId,@Param("type") Integer type);
 
     void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId);
 
@@ -31,5 +32,13 @@ public interface TpTransactionMapper {
 	
 	List<Map<String, Object>> getReportReasons();
     
-    int saveReportReason(@Param("userId") Integer userId,@Param("communityId") Integer communityId,@Param("transactionId") Integer transactionId,@Param("reportReasonId") String reportReasonId);
+    int saveReportReason(@Param("userId") Integer userId, @Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId, @Param("reportReasonId") String reportReasonId, @Param("createDate") Date createDate);
+
+    /**
+     * 查询的当前用户自己的所有帖子
+     * @param id
+     * @param communityId
+     * @return
+     */
+    List<TpTransaction> getUserTransactionList(@Param("id") Integer id, @Param("communityId")Integer communityId);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionReplyMapper.java

@@ -21,10 +21,19 @@ public interface TpTransactionReplyMapper {
     int updateByPrimaryKey(TpTransactionReply record);
 
     /**
-     * 根据 小区id 和 帖子id
+     * 当前帖子评论列表
      * @param communityId
      * @param transactionId
+     * @param userID
+     * @param founderUserID
      * @return
      */
-    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId);
+    List<TpTransactionReply> getCommunityIdAndTransactionId(@Param("communityId") Integer communityId, @Param("transactionId") Integer transactionId,@Param("userID") Integer userID,@Param("founderUserID") Integer founderUserID,@Param("type")Integer type, @Param("roomNoName")String roomNoName);
+
+    /**
+     * 查询我回复别人的帖子
+     * @param id
+     * @return
+     */
+    List<TpTransactionReply> selectUserTransactionReply(Integer id);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpUnitEquipmentMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpUnitEquipment;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpUnitEquipmentMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpUnitEquipment record);
+
+    int insertSelective(TpUnitEquipment record);
+
+    TpUnitEquipment selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpUnitEquipment record);
+
+    int updateByPrimaryKey(TpUnitEquipment record);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpUnitMapper.java

@@ -0,0 +1,34 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpUnit;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TpUnitMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpUnit record);
+
+    int insertSelective(TpUnit record);
+
+    TpUnit selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpUnit record);
+
+    int updateByPrimaryKey(TpUnit record);
+
+    /**
+     * 根据 小区id，期id，楼栋id 查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_unit where community_id=#{communityId} and phase_id=#{phaseId} and building_id=#{buildingId}")
+    List<TpUnit> selectByAddress(Integer communityId, Integer phaseId, Integer buildingId);
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/enums/UserVerifyEnum.java

@@ -0,0 +1,75 @@
+package com.community.huiju.enums;
+
+
+/**
+ * 楼栋资料库 枚举
+ * @author weiximei
+ */
+public enum UserVerifyEnum {
+
+    NO_AUDIT_REAL_ESTATE("1000", "无关联房产"),
+
+    A_AUDIT_REAL_ESTATE("1001", "关联一个审核通过的房产"),
+
+    A_TO_AUDIT_REAL_ESTATE("1002", "关联一个待审核房产"),
+
+    A_AUDIT_FAILED_REAL_ESTATE("1003", "关联一个审核未通过房产"),
+
+    A_MULTIPLE_REAL_ESTATE("1004", "有多个关联房产"),
+
+    /** 关联房产的时候，验证是否可以选择业主进行绑定 **/
+    NO_OWNER("1005", "该房产，暂无审核通过的业主！"),
+
+    /** 社交授权登录的时候 **/
+    NO_ACCOUNT("1006", "无关联账号!"),
+
+    /** 社交授权登录 关联手机号账号未注册 **/
+    NO_UNREGISTERED("1007", "未注册!"),
+    ;
+
+    UserVerifyEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    private String code;
+
+    private String msg;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+
+    public static String getMsg(String code) {
+        String message = "";
+        if ("1000".equals(code)) {
+            message = NO_AUDIT_REAL_ESTATE.getMsg();
+        } else if ("1001".equals(code)) {
+            message = A_AUDIT_REAL_ESTATE.getMsg();
+        } else if ("1002".equals(code)) {
+            message = A_TO_AUDIT_REAL_ESTATE.getMsg();
+        } else if ("1003".equals(code)) {
+            message = A_AUDIT_FAILED_REAL_ESTATE.getMsg();
+        } else if ("1004".equals(code)) {
+            message = A_MULTIPLE_REAL_ESTATE.getMsg();
+        }
+
+        return message;
+    }
+
+}
+
+

CODE/smart-community/app-api/src/main/java/com/community/huiju/log/LogAnnotation.java

@@ -0,0 +1,32 @@
+package com.community.huiju.log;
+
+import java.lang.annotation.*;
+
+/**
+ * 日志注解
+ * @author weiximei
+ */
+@Retention(RetentionPolicy.RUNTIME) // 在运行时使用
+@Target({ ElementType.METHOD }) // 在方法上使用
+@Documented
+public @interface LogAnnotation {
+
+    /**
+     * 日志类型
+     * @return
+     */
+    LogEnums value() default LogEnums.NOT;
+
+    /**
+     * 是否记录
+     * @return
+     */
+    boolean record() default true;
+
+    /**
+     * 别名, 作为注释用
+     * @return
+     */
+    String alias() default "";
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/log/LogEnums.java

@@ -0,0 +1,43 @@
+package com.community.huiju.log;
+
+/**
+ * 日志类型
+ *
+ * @author weiximei
+ */
+public enum LogEnums {
+
+    NOT(8000, "无类型"),
+
+    DA_SU(8001, "大苏")
+
+    ;
+
+    private Integer code;
+
+    private String value;
+
+
+    LogEnums(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/log/LogFactory.java

@@ -0,0 +1,101 @@
+package com.community.huiju.log;
+
+import java.io.File;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.TimerTask;
+
+/**
+ * 日志工厂
+ * @author weiximei
+ */
+public class LogFactory {
+
+    public static File getFile() {
+        LocalDate localDate = LocalDate.now();
+        String pathMkdir = "";
+
+        String os = System.getProperty("os.name");
+        if(os.toLowerCase().startsWith("win")){
+            pathMkdir = "E:" + File.separator + "log" + File.separator + "app-log" + File.separator + localDate.getYear() + "-" + localDate.getMonthValue() + "-" + localDate.getDayOfMonth();
+        } else {
+            pathMkdir = "/home/fxf/smart-community" + File.separator + "log" + File.separator + "app-log" + File.separator + localDate.getYear() + "-" + localDate.getMonthValue() + "-" + localDate.getDayOfMonth();
+        }
+
+        File file = new File(pathMkdir);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        file = new File(pathMkdir + File.separator + "app-log.log");
+
+        return file;
+    }
+
+    /**
+     * 记录请求参数和返回值
+     * @param parameters
+     * @param returnValue
+     * @return
+     */
+    public static TimerTask parametersAndReturn(String parameters, String returnValue){
+        return new TimerTask() {
+            @Override
+            public void run() {
+
+                RandomAccessFile accessFile = null;
+                FileChannel fileChannel = null;
+                FileLock fileLock = null;
+                try {
+                    // 获取这个文件的读和写的权限
+                    accessFile = new RandomAccessFile(getFile(), "rw");
+                    // 文件通道
+                    fileChannel = accessFile.getChannel();
+                    fileLock = null;
+                    while (true) {
+                        try {
+                            // 获取锁，如果失败，继续尝试
+                            fileLock = fileChannel.tryLock();
+                            break;
+                        } catch (Exception e) {
+                            Thread.sleep(100);
+                        }
+                    }
+
+                    // 获取当前这个文件的大小
+                    long length = accessFile.length();
+                    // 设置写入的指针, 设置到这个文件的末尾
+                    accessFile.seek(length);
+                    // 开始写入文件
+                    LocalDateTime localDateTime = LocalDateTime.now();
+                    DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
+                    String str = dateTimeFormatter.format(localDateTime) + " === " + Thread.currentThread().getName() + "  : " + parameters + "\n";
+                    fileChannel.write(ByteBuffer.wrap(str.getBytes()));
+                    str = dateTimeFormatter.format(localDateTime) + " === " + Thread.currentThread().getName() + "  : " + returnValue + "\n";
+                    fileChannel.write(ByteBuffer.wrap(str.getBytes()));
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                } finally {
+                    if (fileLock != null && fileChannel != null && accessFile != null) {
+                        // 释放锁
+                        try {
+                            fileLock.release();
+                            fileChannel.close();
+                            accessFile.close();
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+
+            }
+        };
+    }
+
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/log/LogFileManager.java

@@ -0,0 +1,46 @@
+package com.community.huiju.log;
+
+import java.util.TimerTask;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
+/**
+ * 日志文件记录
+ * @author weiximei
+ */
+public class LogFileManager {
+
+    // 记录日志的线程池
+    private ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(10);
+
+    private LogFileManager() {}
+
+    public static LogFileManager getInstance() {
+        return LogSingleton.INSTANCE.getInstance();
+    }
+
+    /**
+     * 记录日志
+     * @param timerTask 任务
+     */
+    public void executeLog(TimerTask timerTask){
+        // 日志记录
+        scheduledThreadPoolExecutor.execute(timerTask);
+    }
+
+    /**
+     * 枚举
+     */
+    private static enum LogSingleton {
+        INSTANCE;
+
+        private LogFileManager logFileManager;
+        private LogSingleton() {
+            logFileManager = new LogFileManager();
+        }
+
+        public LogFileManager getInstance() {
+            return logFileManager;
+        }
+
+    }
+}

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

@@ -19,9 +19,9 @@ public class TaFace {
     private Integer communityId;
 
     /**
-     * 用户ID
+     * 用户审核 ID
      */
-    private Integer taUserId;
+    private Integer taUserVerifyId;
 
     /**
      *图片

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TaUser {
     private Integer id;
@@ -29,6 +30,9 @@ public class TaUser {
 
     private String acceptAgreementStatus;
 
+    /**
+     * 0 是未认证    1是认证通过   2是已作废 3 已被拉黑
+     */
     private String verifyStatus;
 
     private Integer createUser;
@@ -60,6 +64,27 @@ public class TaUser {
     // 海康人员编号
     private Long hkPersonNo;
 
+    private String openid;
+
+    private String nickname;
+
+    // 当前用户下的多套房产
+    private List<TpBuildingOwnerInfo> houseList;
+
+    /** 审核id **/
+    private Integer userVerifyId;
+
+    /** 审核 状态 **/
+    private String userVerifyStatus;
+
+    public void setHouseList(List<TpBuildingOwnerInfo> houseList) {
+        this.houseList = houseList;
+    }
+
+    public List<TpBuildingOwnerInfo> getHouseList() {
+        return houseList;
+    }
+
     public Integer getId() {
         return id;
     }
@@ -259,4 +284,36 @@ public class TaUser {
     public void setIdCard(String idCard) {
         this.idCard = idCard;
     }
+
+    public String getOpenid() {
+        return openid;
+    }
+
+    public void setOpenid(String openid) {
+        this.openid = openid == null ? null : openid.trim();
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname == null ? null : nickname.trim();
+    }
+
+    public Integer getUserVerifyId() {
+        return userVerifyId;
+    }
+
+    public void setUserVerifyId(Integer userVerifyId) {
+        this.userVerifyId = userVerifyId;
+    }
+
+    public String getUserVerifyStatus() {
+        return userVerifyStatus;
+    }
+
+    public void setUserVerifyStatus(String userVerifyStatus) {
+        this.userVerifyStatus = userVerifyStatus;
+    }
 }

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

@@ -0,0 +1,254 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaUserVerify {
+    private Integer id;
+
+    private Integer userId;
+
+    private Integer communityId;
+
+    private Integer roleId;
+
+    private Integer phaseId;
+
+    private String phaseName;
+
+    private Integer buildingId;
+
+    private String buildingName;
+
+    private Integer unitId;
+
+    private String unitName;
+
+    private Integer levelId;
+
+    private String levelName;
+
+    /** 就是楼栋资料库的id **/
+    private Integer roomNoId;
+
+    private String roomNoName;
+
+    private String verifyStatus;
+
+    private Date createDate;
+
+    private String verifyName;
+
+    private String remark;
+
+    //  ------------------
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 业主名称
+     */
+    private String ownerName;
+
+    /**
+     * 小区名称
+     */
+    private String communityName;
+
+    /**
+     * 小区 省市区
+     */
+
+    private String communityAddress;
+
+    /**
+     * 审核结果的url
+     */
+    private String verifyUrl;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName;
+    }
+
+    public Integer getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName;
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public Integer getLevelId() {
+        return levelId;
+    }
+
+    public void setLevelId(Integer levelId) {
+        this.levelId = levelId;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
+
+    public Integer getRoomNoId() {
+        return roomNoId;
+    }
+
+    public void setRoomNoId(Integer roomNoId) {
+        this.roomNoId = roomNoId;
+    }
+
+    public String getRoomNoName() {
+        return roomNoName;
+    }
+
+    public void setRoomNoName(String roomNoName) {
+        this.roomNoName = roomNoName;
+    }
+
+    public String getVerifyStatus() {
+        return verifyStatus;
+    }
+
+    public void setVerifyStatus(String verifyStatus) {
+        this.verifyStatus = verifyStatus;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getVerifyName() {
+        return verifyName;
+    }
+
+    public void setVerifyName(String verifyName) {
+        this.verifyName = verifyName;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getCommunityName() {
+        return communityName;
+    }
+
+    public void setCommunityName(String communityName) {
+        this.communityName = communityName;
+    }
+
+    public String getCommunityAddress() {
+        return communityAddress;
+    }
+
+    public void setCommunityAddress(String communityAddress) {
+        this.communityAddress = communityAddress;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getVerifyUrl() {
+        return verifyUrl;
+    }
+
+    public void setVerifyUrl(String verifyUrl) {
+        this.verifyUrl = verifyUrl;
+    }
+}

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

@@ -163,4 +163,5 @@ public class TaVisitor {
     public void setCarLicense(List<String> carLicense) {
         this.carLicense = carLicense;
     }
+
 }

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

@@ -17,6 +17,11 @@ public class ToCommunities {
 
     private String latitude;
 
+    /**
+     * 小区地址
+     */
+    private String communityAddress;
+
     public Integer getId() {
         return id;
     }
@@ -80,4 +85,12 @@ public class ToCommunities {
     public void setLatitude(String latitude) {
         this.latitude = latitude == null ? null : latitude.trim();
     }
+
+    public String getCommunityAddress() {
+        return communityAddress;
+    }
+
+    public void setCommunityAddress(String communityAddress) {
+        this.communityAddress = communityAddress;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -46,6 +47,19 @@ public class TpActivity {
      * 报名状态
      */
     private String signStatus;
+    /**
+     * 签到状态
+     * 0已签到，1未签到
+     */
+    private  Integer signType;
+
+    public void setSignType(Integer signType) {
+        this.signType = signType;
+    }
+
+    public Integer getSignType() {
+        return signType;
+    }
 
     private List<String> imgList;
 

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

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+
+import java.util.Date;
+public class TpActivitySignIn {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer activityId;
+
+    private String userName;
+
+    private String userRole;
+
+    private String buildingInfo;
+
+    private Integer taUserId;
+
+    private String userTel;
+
+    private Date createDate;
+
+    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 Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public String getUserRole() {
+        return userRole;
+    }
+
+    public void setUserRole(String userRole) {
+        this.userRole = userRole == null ? null : userRole.trim();
+    }
+
+    public String getBuildingInfo() {
+        return buildingInfo;
+    }
+
+    public void setBuildingInfo(String buildingInfo) {
+        this.buildingInfo = buildingInfo == null ? null : buildingInfo.trim();
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel == null ? null : userTel.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpActivitySignup {
     private Integer id;
@@ -15,6 +16,16 @@ public class TpActivitySignup {
 
     private String remark;
 
+    /**
+     * 住户地址
+     */
+    private String address;
+
+    /**
+     * 用户角色名称
+     */
+    private String userRole;
+
     public Integer getId() {
         return id;
     }
@@ -62,4 +73,20 @@ public class TpActivitySignup {
     public void setRemark(String remark) {
         this.remark = remark == null ? null : remark.trim();
     }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getUserRole() {
+        return userRole;
+    }
+
+    public void setUserRole(String userRole) {
+        this.userRole = userRole;
+    }
 }

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

@@ -42,6 +42,13 @@ public class TpBillInvoice {
      */
     private String payType;
 
+    // =================================
+
+    /**
+     * 转换后金额，用于支付
+     */
+    private Double sumPayPrice;
+
     public Integer getId() {
         return id;
     }
@@ -185,4 +192,12 @@ public class TpBillInvoice {
     public void setPayType(String payType) {
         this.payType = payType;
     }
+
+    public Double getSumPayPrice() {
+        return sumPayPrice;
+    }
+
+    public void setSumPayPrice(Double sumPayPrice) {
+        this.sumPayPrice = sumPayPrice;
+    }
 }

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

@@ -0,0 +1,148 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+import java.util.List;
+
+public class TpBillOrder {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer tpBillId;
+
+    private Integer tpBillInvoiceId;
+
+    private String orderBumber;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    /**
+     *  0：未支付  1: 已支付 2: 正在支付中
+     */
+    private String orderStatus;
+
+    /**
+     * 缴费人手机号
+     */
+    private String payPhone;
+
+    /**
+     * 订单总额
+     */
+    private Double sumPrice;
+
+    /**
+     * 缴费单集合
+     */
+    private List<TpBillInvoice> billList;
+
+    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 Integer getTpBillId() {
+        return tpBillId;
+    }
+
+    public void setTpBillId(Integer tpBillId) {
+        this.tpBillId = tpBillId;
+    }
+
+    public Integer getTpBillInvoiceId() {
+        return tpBillInvoiceId;
+    }
+
+    public void setTpBillInvoiceId(Integer tpBillInvoiceId) {
+        this.tpBillInvoiceId = tpBillInvoiceId;
+    }
+
+    public String getOrderBumber() {
+        return orderBumber;
+    }
+
+    public void setOrderBumber(String orderBumber) {
+        this.orderBumber = orderBumber == null ? null : orderBumber.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getPayPhone() {
+        return payPhone;
+    }
+
+    public void setPayPhone(String payPhone) {
+        this.payPhone = payPhone;
+    }
+
+    public Double getSumPrice() {
+        return sumPrice;
+    }
+
+    public void setSumPrice(Double sumPrice) {
+        this.sumPrice = sumPrice;
+    }
+
+    public List<TpBillInvoice> getBillList() {
+        return billList;
+    }
+
+    public void setBillList(List<TpBillInvoice> billList) {
+        this.billList = billList;
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpBuilding {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer phaseId;
+
+    private String phaseName;
+
+    private String name;
+
+    private String sort;
+
+    private Date createDate;
+
+    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 Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -9,16 +9,25 @@ public class TpBuildingOwnerInfo {
 
     private String idCard;
 
-    // 期
-    private String phase;
+    private Integer phaseId;
 
-    private String building;
+    private String phaseName;
 
-    private String unit;
+    private Integer buildingId;
 
-    private String level;
+    private String buildingName;
 
-    private String roomNo;
+    private Integer unitId;
+
+    private String unitName;
+
+    private Integer levelId;
+
+    private String levelName;
+
+    private Integer roomNoId;
+
+    private String roomNoName;
 
     private String ownerName;
 
@@ -30,6 +39,8 @@ public class TpBuildingOwnerInfo {
 
     private String verifyStatus;
 
+    private String sort;
+
     private Integer createUser;
 
     private Date createDate;
@@ -38,6 +49,8 @@ public class TpBuildingOwnerInfo {
 
     private Date updateDate;
 
+    private Integer taUserVerifyId;
+
     public Integer getId() {
         return id;
     }
@@ -59,47 +72,87 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setIdCard(String idCard) {
-        this.idCard = idCard == null ? null : idCard.trim();
+        this.idCard = idCard;
+    }
+
+    public Integer getPhaseId() {
+        return phaseId;
     }
 
-    public String getPhase() {
-        return phase;
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
     }
 
-    public void setPhase(String phase) {
-        this.phase = phase;
+    public String getPhaseName() {
+        return phaseName;
     }
 
-    public String getBuilding() {
-        return building;
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName;
     }
 
-    public void setBuilding(String building) {
-        this.building = building == null ? null : building.trim();
+    public Integer getBuildingId() {
+        return buildingId;
     }
 
-    public String getUnit() {
-        return unit;
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
     }
 
-    public void setUnit(String unit) {
-        this.unit = unit == null ? null : unit.trim();
+    public String getBuildingName() {
+        return buildingName;
     }
 
-    public String getLevel() {
-        return level;
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName;
     }
 
-    public void setLevel(String level) {
-        this.level = level == null ? null : level.trim();
+    public Integer getUnitId() {
+        return unitId;
     }
 
-    public String getRoomNo() {
-        return roomNo;
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
     }
 
-    public void setRoomNo(String roomNo) {
-        this.roomNo = roomNo == null ? null : roomNo.trim();
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public Integer getLevelId() {
+        return levelId;
+    }
+
+    public void setLevelId(Integer levelId) {
+        this.levelId = levelId;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
+
+    public Integer getRoomNoId() {
+        return roomNoId;
+    }
+
+    public void setRoomNoId(Integer roomNoId) {
+        this.roomNoId = roomNoId;
+    }
+
+    public String getRoomNoName() {
+        return roomNoName;
+    }
+
+    public void setRoomNoName(String roomNoName) {
+        this.roomNoName = roomNoName;
     }
 
     public String getOwnerName() {
@@ -107,7 +160,7 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setOwnerName(String ownerName) {
-        this.ownerName = ownerName == null ? null : ownerName.trim();
+        this.ownerName = ownerName;
     }
 
     public String getOwnerTel() {
@@ -115,7 +168,7 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setOwnerTel(String ownerTel) {
-        this.ownerTel = ownerTel == null ? null : ownerTel.trim();
+        this.ownerTel = ownerTel;
     }
 
     public String getGender() {
@@ -123,7 +176,7 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setGender(String gender) {
-        this.gender = gender == null ? null : gender.trim();
+        this.gender = gender;
     }
 
     public String getPairStatus() {
@@ -131,7 +184,7 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setPairStatus(String pairStatus) {
-        this.pairStatus = pairStatus == null ? null : pairStatus.trim();
+        this.pairStatus = pairStatus;
     }
 
     public String getVerifyStatus() {
@@ -139,7 +192,15 @@ public class TpBuildingOwnerInfo {
     }
 
     public void setVerifyStatus(String verifyStatus) {
-        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
+        this.verifyStatus = verifyStatus;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
     }
 
     public Integer getCreateUser() {
@@ -173,4 +234,12 @@ public class TpBuildingOwnerInfo {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
 }

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

@@ -0,0 +1,125 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpConfiguration {
+    private Integer id;
+
+    private String key;
+
+    private String configurationName;
+
+    private Integer configurationType;
+
+    private String configurationValue;
+
+    private Date createTiem;
+
+    private Integer createUser;
+
+    private Date updateTime;
+
+    private Integer updateUser;
+
+    private Integer communityId;
+
+    private String dooruuid;
+
+    private String deviceuuid;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key == null ? null : key.trim();
+    }
+
+    public String getConfigurationName() {
+        return configurationName;
+    }
+
+    public void setConfigurationName(String configurationName) {
+        this.configurationName = configurationName == null ? null : configurationName.trim();
+    }
+
+    public Integer getConfigurationType() {
+        return configurationType;
+    }
+
+    public void setConfigurationType(Integer configurationType) {
+        this.configurationType = configurationType;
+    }
+
+    public String getConfigurationValue() {
+        return configurationValue;
+    }
+
+    public void setConfigurationValue(String configurationValue) {
+        this.configurationValue = configurationValue == null ? null : configurationValue.trim();
+    }
+
+    public Date getCreateTiem() {
+        return createTiem;
+    }
+
+    public void setCreateTiem(Date createTiem) {
+        this.createTiem = createTiem;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getDooruuid() {
+        return dooruuid;
+    }
+
+    public void setDooruuid(String dooruuid) {
+        this.dooruuid = dooruuid == null ? null : dooruuid.trim();
+    }
+
+    public String getDeviceuuid() {
+        return deviceuuid;
+    }
+
+    public void setDeviceuuid(String deviceuuid) {
+        this.deviceuuid = deviceuuid == null ? null : deviceuuid.trim();
+    }
+}

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

@@ -0,0 +1,260 @@
+package com.community.huiju.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+
+import java.util.Date;
+
+public class TpEquipment {
+    private Integer id;
+
+    private Integer urlId;
+
+    private Integer communityId;
+
+    private Integer securityGuardTelId;
+
+    private Integer securityRoomTelId;
+
+    private Integer addressId;
+
+    private Date createTime;
+
+    private Integer createUser;
+
+    private Date updateTime;
+
+    private Integer updateUser;
+
+    private Integer uuidId;
+
+    private String equipmentType;
+
+    private Integer equipmentTreeId;
+
+    /**
+     * 这个值不返回给客户端
+     */
+    @JSONField(serialize = false)
+    private String appkey;
+
+    /**
+     * 这个值不返回给客户端
+     */
+    @JSONField(serialize = false)
+    private String secret;
+
+    /**
+     * 这个值不返回给客户端
+     */
+    @JSONField(serialize = false)
+    private String opUserUuid;
+
+    /**
+     * 这个值不返回给客户端
+     */
+    @JSONField(serialize = false)
+    private String httpServer;
+
+    /**
+     * 这个值不返回给客户端
+     */
+    @JSONField(serialize = false)
+    private String unitUuids;
+    // ====================================
+
+    /**
+     * 监控url
+     */
+    private String monitoringUrl;
+
+    /**
+     * 保卫人员电话
+     */
+    private String securityGuardTel;
+
+    /**
+     * 安保室电话
+     */
+    private String securityRoomTel;
+
+    /**
+     * 监控地址
+     */
+    private String monitoringAddress;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUrlId() {
+        return urlId;
+    }
+
+    public void setUrlId(Integer urlId) {
+        this.urlId = urlId;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getSecurityGuardTelId() {
+        return securityGuardTelId;
+    }
+
+    public void setSecurityGuardTelId(Integer securityGuardTelId) {
+        this.securityGuardTelId = securityGuardTelId;
+    }
+
+    public Integer getSecurityRoomTelId() {
+        return securityRoomTelId;
+    }
+
+    public void setSecurityRoomTelId(Integer securityRoomTelId) {
+        this.securityRoomTelId = securityRoomTelId;
+    }
+
+    public Integer getAddressId() {
+        return addressId;
+    }
+
+    public void setAddressId(Integer addressId) {
+        this.addressId = addressId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Integer getUuidId() {
+        return uuidId;
+    }
+
+    public void setUuidId(Integer uuidId) {
+        this.uuidId = uuidId;
+    }
+
+    public String getEquipmentType() {
+        return equipmentType;
+    }
+
+    public void setEquipmentType(String equipmentType) {
+        this.equipmentType = equipmentType;
+    }
+
+    public Integer getEquipmentTreeId() {
+        return equipmentTreeId;
+    }
+
+    public void setEquipmentTreeId(Integer equipmentTreeId) {
+        this.equipmentTreeId = equipmentTreeId;
+    }
+
+    public String getMonitoringUrl() {
+        return monitoringUrl;
+    }
+
+    public void setMonitoringUrl(String monitoringUrl) {
+        this.monitoringUrl = monitoringUrl;
+    }
+
+    public String getSecurityGuardTel() {
+        return securityGuardTel;
+    }
+
+    public void setSecurityGuardTel(String securityGuardTel) {
+        this.securityGuardTel = securityGuardTel;
+    }
+
+    public String getSecurityRoomTel() {
+        return securityRoomTel;
+    }
+
+    public void setSecurityRoomTel(String securityRoomTel) {
+        this.securityRoomTel = securityRoomTel;
+    }
+
+    public String getMonitoringAddress() {
+        return monitoringAddress;
+    }
+
+    public void setMonitoringAddress(String monitoringAddress) {
+        this.monitoringAddress = monitoringAddress;
+    }
+
+    public String getAppkey() {
+        return appkey;
+    }
+
+    public void setAppkey(String appkey) {
+        this.appkey = appkey;
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+    public String getOpUserUuid() {
+        return opUserUuid;
+    }
+
+    public void setOpUserUuid(String opUserUuid) {
+        this.opUserUuid = opUserUuid;
+    }
+
+    public String getHttpServer() {
+        return httpServer;
+    }
+
+    public void setHttpServer(String httpServer) {
+        this.httpServer = httpServer;
+    }
+
+    public String getUnitUuids() {
+        return unitUuids;
+    }
+
+    public void setUnitUuids(String unitUuids) {
+        this.unitUuids = unitUuids;
+    }
+}

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

@@ -0,0 +1,145 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpEquipmentTree {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String equipmentName;
+
+    private Integer pid;
+
+    private Integer sort;
+
+    private Date createTime;
+
+    private Integer createUser;
+
+    private Date updateTime;
+
+    private Integer updateUser;
+
+    private String appkey;
+
+    private String secret;
+
+    private String opUserUuid;
+
+    private String httpServer;
+
+    private String unitUuids;
+
+    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 getEquipmentName() {
+        return equipmentName;
+    }
+
+    public void setEquipmentName(String equipmentName) {
+        this.equipmentName = equipmentName == null ? null : equipmentName.trim();
+    }
+
+    public Integer getPid() {
+        return pid;
+    }
+
+    public void setPid(Integer pid) {
+        this.pid = pid;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public String getAppkey() {
+        return appkey;
+    }
+
+    public void setAppkey(String appkey) {
+        this.appkey = appkey == null ? null : appkey.trim();
+    }
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret == null ? null : secret.trim();
+    }
+
+    public String getOpUserUuid() {
+        return opUserUuid;
+    }
+
+    public void setOpUserUuid(String opUserUuid) {
+        this.opUserUuid = opUserUuid == null ? null : opUserUuid.trim();
+    }
+
+    public String getHttpServer() {
+        return httpServer;
+    }
+
+    public void setHttpServer(String httpServer) {
+        this.httpServer = httpServer == null ? null : httpServer.trim();
+    }
+
+    public String getUnitUuids() {
+        return unitUuids;
+    }
+
+    public void setUnitUuids(String unitUuids) {
+        this.unitUuids = unitUuids;
+    }
+}

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

@@ -0,0 +1,115 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpLevel {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer phaseId;
+
+    private String phaseName;
+
+    private Integer buildingId;
+
+    private String buildingName;
+
+    private Integer unitId;
+
+    private String unitName;
+
+    private String name;
+
+    private String sort;
+
+    private Date createDate;
+
+    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 Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName == null ? null : phaseName.trim();
+    }
+
+    public Integer getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName == null ? null : buildingName.trim();
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName == null ? null : unitName.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort == null ? null : sort.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpPhase {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String name;
+
+    private String sort;
+
+    private Date createDate;
+
+    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 getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort == null ? null : sort.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,135 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpRoomNo {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer phaseId;
+
+    private String phaseName;
+
+    private Integer buildingId;
+
+    private String buildingName;
+
+    private Integer unitId;
+
+    private String unitName;
+
+    private Integer levelId;
+
+    private String levelName;
+
+    private String name;
+
+    private String sort;
+
+    private Date createDate;
+
+    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 Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName == null ? null : phaseName.trim();
+    }
+
+    public Integer getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName == null ? null : buildingName.trim();
+    }
+
+    public Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName == null ? null : unitName.trim();
+    }
+
+    public Integer getLevelId() {
+        return levelId;
+    }
+
+    public void setLevelId(Integer levelId) {
+        this.levelId = levelId;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName == null ? null : levelName.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort == null ? null : sort.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpRoomNoEquipment {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer roomNoId;
+
+    private Integer equipmentId;
+
+    private Date createDate;
+
+    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 Integer getRoomNoId() {
+        return roomNoId;
+    }
+
+    public void setRoomNoId(Integer roomNoId) {
+        this.roomNoId = roomNoId;
+    }
+
+    public Integer getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Integer equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -34,7 +34,12 @@ public class TpTransaction {
     private String telephone;
 
     private List<String> imgList;
-    
+
+    /**
+     * 房间号
+     */
+    private  String roomNoName;
+
     /**
      * 是否被举报 1是被举报 0或null是没被举报
      */
@@ -53,11 +58,41 @@ public class TpTransaction {
      */
     private Integer noLikeCount;
 
+    /**
+     * 对应app端的角色表，物业端发帖时不维护
+     */
+    private Integer taUserVerifyId;
+
+    /**
+     * 0为app端，1为物业
+     */
+    private String releaseIdentity;
+
+    /**
+     * 权重
+     */
+    private String sort;
+
+    public void setReleaseIdentity(String releaseIdentity) {
+        this.releaseIdentity = releaseIdentity;
+    }
+
+    public String getReleaseIdentity() {
+        return releaseIdentity;
+    }
+
     /**
      * 是否已点赞或者踩
      */
     private String bel;
 
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
 
     public String getRoleName() {
         return roleName;
@@ -223,4 +258,20 @@ public class TpTransaction {
     public void setBel(String bel) {
         this.bel = bel;
     }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getRoomNoName() {
+        return roomNoName;
+    }
+
+    public void setRoomNoName(String roomNoName) {
+        this.roomNoName = roomNoName;
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.community.huiju.model;
 
 import java.util.Date;
+import java.util.List;
 
 public class TpTransactionReply {
+
     private Integer id;
 
     private Integer communityId;
@@ -31,6 +33,58 @@ public class TpTransactionReply {
      */
     private String replyRoleName;
 
+    /**
+     * 回复的图片
+     * @return
+     */
+    private List<String> imgList;
+
+    /**
+     *0代表app端用户，1代表物业端用户
+     * @return
+     */
+    private String releaseIdentity;
+
+    /**
+     * 用于查询app端角色，物业端不维护
+     * @param releaseIdentity
+     */
+    private  Integer taUserVerifyId;
+
+    private String roomNoName;
+
+    public String getRoomNoName() {
+        return roomNoName;
+    }
+
+    public void setRoomNoName(String roomNoName) {
+        this.roomNoName = roomNoName;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
+
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setReleaseIdentity(String releaseIdentity) {
+        this.releaseIdentity = releaseIdentity;
+    }
+
+    public String getReleaseIdentity() {
+        return releaseIdentity;
+    }
+
+    public List<String> getImgList() {
+        return imgList;
+    }
+
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -1,5 +1,8 @@
 package com.community.huiju.model;
 
+import javax.xml.crypto.Data;
+import java.util.Date;
+
 public class TpTransactionReport {
     private Integer id;
 
@@ -11,6 +14,16 @@ public class TpTransactionReport {
 
     private Integer reporterId;
 
+    private Date createDate;
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpUnit {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer phaseId;
+
+    private String phaseName;
+
+    private Integer buildingId;
+
+    private String buildingName;
+
+    private String name;
+
+    private String sort;
+
+    private Date createDate;
+
+    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 Integer getPhaseId() {
+        return phaseId;
+    }
+
+    public void setPhaseId(Integer phaseId) {
+        this.phaseId = phaseId;
+    }
+
+    public String getPhaseName() {
+        return phaseName;
+    }
+
+    public void setPhaseName(String phaseName) {
+        this.phaseName = phaseName == null ? null : phaseName.trim();
+    }
+
+    public Integer getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(Integer buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName == null ? null : buildingName.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort == null ? null : sort.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpUnitEquipment {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer unitId;
+
+    private Integer equipmentId;
+
+    private Date createDate;
+
+    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 Integer getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(Integer unitId) {
+        this.unitId = unitId;
+    }
+
+    public Integer getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Integer equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

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

@@ -8,9 +8,9 @@ public interface AliPayServiceI {
 	/**
 	 * 微信支付统一下单
 	 * @return
-	 * @param billInvoiceId
+	 * @param outTradeNo
 	 * @param userElement
 	 */
-	String AliPayOrder(Integer billInvoiceId, UserElement userElement) throws Exception;
+	String AliPayOrder(String outTradeNo, UserElement userElement) throws Exception;
 	
 }

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

@@ -12,5 +12,19 @@ import java.util.List;
 public interface BannerServiceI {
 
     ToBanner viewBannerImg(Integer bannerId);
+
+    /**
+     * 根据 banner位置，小区获取
+     * @param bannerPosition
+     * @param communityId
+     * @return
+     */
+    List<ToBanner> viewAllBannerImgAndCommunityId(Integer bannerPosition, Integer communityId);
+
+    /**
+     * 根据banner位置
+     * @param bannerPosition
+     * @return
+     */
     List<ToBanner> viewAllBannerImg(Integer bannerPosition);
 }

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

@@ -1,18 +1,22 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
 import java.util.List;
 import java.util.Map;
 
 public interface BillServiceI {
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据
-	 * @param communityId
+	 *
+	 * @param userElement
 	 * @param payType
 	 * @param pageNum
 	 * @param pageSize
 	 * @return
 	 */
-	Map<String, Object> getBillsList(Integer communityId, Integer payType, Integer userId ,Integer pageNum, Integer pageSize);
+	Map<String, Object> getBillsList(UserElement userElement, Integer payType, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 获取账单的详细信息
@@ -20,4 +24,18 @@ public interface BillServiceI {
 	 * @return
 	 */
 	Map<String, Object> getBillInvoiceDetail(Integer communityId,Integer billInvoiceId);
+
+	/**
+	 * 获取缴费历史
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean payHistory(UserElement userElement);
+
+	/**
+	 * 订单详情
+	 * @param orderNumber
+	 * @return
+	 */
+	ResponseBean getOrderInfo(String orderNumber);
 }