合并

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

@@ -31,6 +31,28 @@ public class FSController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/car/parkGetMonthCardInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/parkGetTempCarPaymentInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo);
+        return responseBean;
+    }
+
     @RequestMapping(value = "/car/apiThirdPartyMonthCardPay", method = RequestMethod.POST)
     @ApiOperation(value = "月卡续费", notes = "月卡续费")
     @ApiImplicitParams({

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

@@ -14,6 +14,7 @@ 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.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -50,10 +51,24 @@ public class HkController {
 		return responseBean;
 	}
 
+	@Deprecated
 	@RequestMapping(value = "/downloadAuthorityByDeviceUuids", method = RequestMethod.POST)
 	public ResponseBean pushHKPerson() {
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = ihkService.downloadAuthorityByDeviceUuids();
 		return responseBean;
 	}
+
+	@ApiOperation(value = "门口机开门", notes = "门口机开门")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userVerifyId", value = "用户审核房产id")
+	})
+	@RequestMapping(value = "/visual/syncControl", method = RequestMethod.GET)
+	public ResponseBean syncControl(@RequestParam("userVerifyId") Integer userVerifyId, HttpServletRequest request, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.syncControl(userVerifyId);
+		return responseBean;
+	}
+
+
 }

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

@@ -1,42 +0,0 @@
-package com.community.huiju.controller;
-
-import com.community.commom.constant.Constant;
-import com.community.commom.mode.ResponseBean;
-import com.community.commom.session.UserElement;
-import com.community.huiju.service.IVisualIntercomService;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-@RestController
-@RefreshScope
-@RequestMapping("/")
-@Api(value = "可视对讲 API", description = "可视对讲 API")
-public class VisualIntercomContrller extends BaseController {
-
-    @Autowired
-    private IVisualIntercomService iVisualIntercomService;
-
-    @ApiOperation(value = "门口机开门", notes = "门口机开门")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
-    })
-    @RequestMapping(value = "/visual/syncControl", method = RequestMethod.GET)
-    public ResponseBean syncControl(HttpServletRequest request, HttpSession session){
-        ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        responseBean = iVisualIntercomService.syncControl(userElement);
-        return responseBean;
-    }
-
-
-}

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

@@ -27,6 +27,10 @@ public class TaUserLicense {
 
     private Integer updateUser;
 
+    private Integer renewTime;
+
+    private Integer licenseType;
+
     public Integer getId() {
         return id;
     }
@@ -122,4 +126,20 @@ public class TaUserLicense {
     public void setUpdateUser(Integer updateUser) {
         this.updateUser = updateUser;
     }
+
+    public Integer getRenewTime() {
+        return renewTime;
+    }
+
+    public void setRenewTime(Integer renewTime) {
+        this.renewTime = renewTime;
+    }
+
+    public Integer getLicenseType() {
+        return licenseType;
+    }
+
+    public void setLicenseType(Integer licenseType) {
+        this.licenseType = licenseType;
+    }
 }

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

@@ -60,4 +60,18 @@ public interface IFuShiService {
      * @return
      */
     ResponseBean apiGetOfflineFee(String CarNoOrCardNo);
+
+    /**
+     * 获取月租车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo);
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo);
 }

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

@@ -21,4 +21,12 @@ public interface IHKService {
      */
     ResponseBean downloadAuthorityByDeviceUuids();
 
+    /**
+     * 异步反控开门 (远程开门)
+     *
+     * @param userVerifyId 审核ID
+     * @return
+     */
+    ResponseBean syncControl(Integer userVerifyId);
+
 }

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

@@ -1,22 +0,0 @@
-package com.community.huiju.service;
-
-import com.community.commom.mode.ResponseBean;
-import com.community.commom.session.UserElement;
-
-/**
- * 可视对讲的业务
- * @author weiximei
- */
-public interface IVisualIntercomService {
-
-    /**
-     * 反控开门
-     *
-     *      app端, 发送开门指令
-     *
-     * @param userElement 用户信息体
-     * @return
-     */
-    ResponseBean syncControl(UserElement userElement);
-
-}

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

@@ -159,7 +159,7 @@ public class FaceServicelimpl implements FaceServiceI {
         face.setFaceImg(faceImg);
         face.setUpdateUser(userElement.getId());
         face.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
@@ -170,8 +170,20 @@ public class FaceServicelimpl implements FaceServiceI {
 
     /**
      * 验证图片是否为人脸，推送海康
+     * @param faceImg
+     * @param taFace
+     * @param isA
+     * @param uploadFile
+     * @param userId
+     * @param communityId
+     * @param roomNoId
+     * @param unitId
+     * @param appkey
+     * @param secret
+     * @param openapi_ip_port_http 海康服务器地址
+     * @return
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret, String openapi_ip_port_http) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
         if (user.getHkUserId() == null) {
@@ -188,7 +200,7 @@ public class FaceServicelimpl implements FaceServiceI {
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
             /*推送海康*/
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret);
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret, openapi_ip_port_http);
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
@@ -220,6 +232,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 map.put("personIds", String.valueOf(user.getHkUserId()));
                 map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
                 map.put("type", 1);
+                map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
                 HKOpenApi.downloadFaceAndFingerInfos(map);
 
                 //可视对讲时 指定人员人脸权限下载
@@ -229,7 +242,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 // TODO 根据期楼栋号，来查询出门口机
                 List<String> visualList = new ArrayList<>();
                 visualList.add("10010100000");
-                HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+                HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
             } else {
                 responseBean.addError("请录入正确图片");
             }
@@ -333,7 +346,7 @@ public class FaceServicelimpl implements FaceServiceI {
         if (null == face) {
             boolean isA = true;
             if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
-                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("图片录入成功");
                 } else {
@@ -433,6 +446,7 @@ public class FaceServicelimpl implements FaceServiceI {
         selectUserFaceMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         selectUserFaceMap.put("appkey", tpEquipmentTree.getAppkey());
         selectUserFaceMap.put("secret", tpEquipmentTree.getSecret());
+        selectUserFaceMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         // 查询人脸信息
         HKOpenApi.selectUserFace(selectUserFaceMap);
 
@@ -442,6 +456,7 @@ public class FaceServicelimpl implements FaceServiceI {
         deleteUserMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
         deleteUserMap.put("appkey", tpEquipmentTree.getAppkey());
         deleteUserMap.put("secret", tpEquipmentTree.getSecret());
+        deleteUserMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         // 删除当前人脸设备信息
         String data= HKOpenApi.deleteUser(deleteUserMap);
         JSONObject object= JSONObject.parseObject(data);
@@ -462,6 +477,7 @@ public class FaceServicelimpl implements FaceServiceI {
         appointJurisdictionMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
         appointJurisdictionMap.put("operateType",3);
         appointJurisdictionMap.put("includeFinger",0);
+        appointJurisdictionMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
 
          HKOpenApi.appointJurisdiction(appointJurisdictionMap);
         // HKOpenApi.selectUserSynchronization();

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

@@ -41,7 +41,10 @@ public class FuShiServiceImpl implements IFuShiService {
     private Map<String,Object> getFuShiInfo(String jsonString) {
         JSONObject jsonObject = JSONObject.parseObject(jsonString);
         Map<String, Object> map = Maps.newHashMap();
-        map.put("JsonParam", jsonObject.getJSONObject("JsonParam").getInnerMap());
+        Map<String, Object> jsonParam = jsonObject.getJSONObject("JsonParam").getInnerMap();
+        // 移除优惠券
+        jsonParam.remove("CouponList");
+        map.put("JsonParam", jsonParam);
         map.put("Redirect", jsonObject.getString("Redirect"));
         map.put("DataType", jsonObject.getInteger("DataType"));
         return map;
@@ -123,4 +126,42 @@ public class FuShiServiceImpl implements IFuShiService {
         responseBean.addSuccess(map);
         return responseBean;
     }
+
+    /**
+     * 获取月租车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取月租车信息（通过车牌号）")
+    @Override
+    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> map = Maps.newHashMap();
+        Map<String, Object> result = jsonObject.getJSONObject("Result").getInnerMap();
+        result.remove("CouponList");
+        map.put("Result", result);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取临时车信息（通过车牌号）")
+    @Override
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> map = Maps.newHashMap();
+        Map<String, Object> result = jsonObject.getJSONObject("Result").getInnerMap();
+        result.remove("CouponList");
+        map.put("Result", result);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
 }

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

@@ -110,6 +110,7 @@ public class HKServiceImpl implements IHKService {
         map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
         map.put("secret", tpEquipmentTree.getSecret());
         map.put("appkey", tpEquipmentTree.getAppkey());
+        map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         HKOpenApi.addAuthoritiesByPersonIds(map);
 
         // 下发门禁权限
@@ -120,6 +121,7 @@ public class HKServiceImpl implements IHKService {
         downloadAuthorityByPersonIdsMap.put("includeFinger",1);
         downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
         downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
+        downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
 
         //--------- 可视对讲 ----------
@@ -142,6 +144,7 @@ public class HKServiceImpl implements IHKService {
     }
 
     @Override
+    @Deprecated
     public ResponseBean downloadAuthorityByDeviceUuids() {
         ResponseBean responseBean = new ResponseBean();
         // 下发门禁权限
@@ -162,6 +165,7 @@ public class HKServiceImpl implements IHKService {
         parDept.put("pageNo", 1);
         parDept.put("pageSize", 100);
         parDept.put("deptName", Constant.DEPT_RESIDENTS);
+        parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         // 部门UUID
         String deptUuid = getDeptUUID(parDept);
 
@@ -173,6 +177,7 @@ public class HKServiceImpl implements IHKService {
         parUser.put("deptUuid", deptUuid);
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
+        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
         int errorCode = (int) resultMap.get("errorCode");
         if (errorCode == 0) {
@@ -243,6 +248,7 @@ public class HKServiceImpl implements IHKService {
         parOpenCard.put("endTime", time);
         parOpenCard.put("secret", tpEquipmentTree.getSecret());
         parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
+        parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
         int code = (int) openCardJSON.get("errorCode");
         if (code == 0) {
@@ -301,7 +307,32 @@ public class HKServiceImpl implements IHKService {
         downloadFingerMap.put("opType", 1);
         downloadFingerMap.put("personIds", map.get("personIds"));
         downloadFingerMap.put("longNums", map.get("longNums"));
+        downloadFingerMap.put("openapi_ip_port_http", map.get("openapi_ip_port_http"));
         // 可视对讲 指定人员指纹权限下载
         HKOpenApi.downloadFinger(downloadFingerMap);
     }
+
+    @Override
+    public ResponseBean syncControl(Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询当前的房产
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
+        // TODO 查询设备编号
+
+        Map<String,Object> parMap = com.beust.jcommander.internal.Maps.newHashMap();
+        parMap.put("longNums", "10010100000");
+        parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        String data = HKOpenApi.syncControl(parMap);
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        int errorCode = jsonObject.getInteger("errorCode");
+        if (errorCode == 0) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
 }

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

@@ -53,6 +53,10 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         // 获取最新的车牌信息
         getTaUserLicense(carNo, taUserLicense);
 
+        if (taUserLicense.getLicenseType().intValue() != 1) {
+            throw new WisdomException("该车牌不是月租车！");
+        }
+
         int rows = 0;
         if (null == taUserLicense.getId()) {
             rows = taUserLicenseMapper.insertSelective(taUserLicense);
@@ -129,18 +133,19 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
 
         // 获取到的车牌信息
         Map<String,Object> map = (Map<String,Object>)resultCar;
-        Integer dataType = (Integer) map.get("DataType");
-        if (dataType.intValue() != 1) {
-            throw new WisdomException("该车牌不是月租车！");
-        }
 
         Map<String,Object> jsonParam = (Map<String, Object>) map.get("JsonParam");
 
+        Integer dataType = (Integer) map.get("DataType");
+        // 车类型
+        taUserLicense.setLicenseType(dataType);
+
         taUserLicense.setLicensePlate(carNo);
         String price = String.valueOf(Double.valueOf(((BigDecimal) jsonParam.get("Cost")).toString()) * 100);
         taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
         taUserLicense.setCreateDate(new Date());
         taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
+        taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(jsonParam.get("RenewTime"))));
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         try {

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

@@ -119,6 +119,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TpEquipmentMapper tpEquipmentMapper;
 
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
     /**
      * 期
      */
@@ -328,7 +331,8 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("号码已占用");
             return response;
         }
-        String data = HKOpenApi.HKpersonPhone(user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), phone);
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
+        String data = HKOpenApi.HKpersonPhone(user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), phone, tpEquipmentTree.getHttpServer());
         JSONObject jsonobject = JSONObject.parseObject(data);
         int errorCode = jsonobject.getInteger("errorCode");
         if (errorCode != 0) {
@@ -705,7 +709,7 @@ public class TaUserServiceImpl implements ITaUserService {
         addOrUpdateUserRole(type, response, user, false);
 
         // 推送海康
-        updateUser(response, user);
+       //  updateUser(response, user, );
 
         // 下发门禁权限
 //         HKOpenApi.downloadAuthorityByDeviceUuids();
@@ -736,7 +740,9 @@ public class TaUserServiceImpl implements ITaUserService {
      * @param response
      * @param user
      */
-    private void updateUser(ResponseBean response, TaUser user) {
+    private void updateUser(ResponseBean response, TaUser user, Integer communityId) {
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+
         Map<String, Object> parDept = Maps.newHashMap();
         parDept.put("pageNo", 1);
         parDept.put("pageSize", 100);
@@ -751,6 +757,7 @@ public class TaUserServiceImpl implements ITaUserService {
         parUser.put("personName", user.getUserName());
         parUser.put("phoneNo", user.getLoginName());
         parUser.put("deptUuid", deptUuid);
+        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.updateUser(parUser), HashMap.class);
         int errorCode = (int) resultMap.get("errorCode");
         if (errorCode == 0) {

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

@@ -117,7 +117,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
         String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
                 Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStartTime().getTime(),
-                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId(), tpEquipmentTree.getOpUserUuid(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId(), tpEquipmentTree.getOpUserUuid(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
 
         JSONObject resultJSON = JSONObject.parseObject(result);
         int errorCode = resultJSON.getInteger("errorCode");

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

@@ -1,40 +0,0 @@
-package com.community.huiju.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.beust.jcommander.internal.Maps;
-import com.community.commom.mode.ResponseBean;
-import com.community.commom.session.UserElement;
-import com.community.commom.hk.HKOpenApi;
-import com.community.huiju.service.IVisualIntercomService;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 可视对讲的业务实现
- * @author weiximei
- */
-@Service
-public class VisualIntercomServiceImpl implements IVisualIntercomService {
-
-
-    @Override
-    public ResponseBean syncControl(UserElement userElement) {
-        ResponseBean responseBean = new ResponseBean();
-
-        // TODO 这里应该根据 小区期楼栋号查询出这个楼栋下面的门口机, 然后发送开门
-
-        Map<String,Object> parMap = Maps.newHashMap();
-        // TODO 只有一个设备, 临时固定的编号
-        parMap.put("longNums", "10010100000");
-        String data = HKOpenApi.syncControl(parMap);
-        JSONObject jsonObject = JSONObject.parseObject(data);
-        int errorCode = jsonObject.getInteger("errorCode");
-        if (errorCode == 0) {
-            responseBean.addSuccess("操作成功!");
-            return responseBean;
-        }
-        responseBean.addError("操作失败!");
-        return responseBean;
-    }
-}

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

@@ -28,6 +28,7 @@ import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -362,6 +363,18 @@ public class WxPayServiceImpl implements WxPayServiceI {
 					taUserLicense = (TaUserLicense) licenseData;
 				}
 
+				// 校验车状态
+				if (taUserLicense.getLicenseType().intValue() != 1) {
+					throw new WisdomException("异常状态，不能缴月租费!");
+				}
+
+				// 校验是否，超出缴费有效期时间
+				LocalDateTime expireDateLocalDateTime = LocalDateTime.ofInstant(taUserLicense.getExpireDate().toInstant(), ZoneId.systemDefault());
+				expireDateLocalDateTime.plusDays(taUserLicense.getRenewTime());
+				if (System.currentTimeMillis() > expireDateLocalDateTime.toEpochSecond(ZoneOffset.of("+8"))) {
+					throw new WisdomException("已超出续费时间，请找物业处理!");
+				}
+
 				TaUserLicenseOrder taUserLicenseOrder = new TaUserLicenseOrder();
 				taUserLicenseOrder.setCommunityId(userElement.getCommunityId());
 				taUserLicenseOrder.setTaUserId(userElement.getId());

CODE/smart-community/app-api/src/main/resources/mapper/TaUserLicenseMapper.xml

@@ -14,10 +14,12 @@
     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="renew_time" property="renewTime" jdbcType="INTEGER" />
+    <result column="license_type" property="licenseType" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, ta_user_id, license_plate, order_number, expire_date, unit_price,
-    parking_lot, create_date, create_user, update_date, update_user
+    parking_lot, create_date, create_user, update_date, update_user, renew_time, license_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -33,15 +35,15 @@
     insert into ta_user_license (id, community_id, ta_user_id,
       license_plate, order_number, expire_date,
       unit_price, parking_lot, create_date,
-      create_user, update_date, update_user
-      )
+      create_user, update_date, update_user,
+      renew_time, license_type)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER},
       #{licensePlate,jdbcType=VARCHAR}, #{orderNumber,jdbcType=VARCHAR}, #{expireDate,jdbcType=TIMESTAMP},
       #{unitPrice,jdbcType=VARCHAR}, #{parkingLot,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
-      #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}
-      )
+      #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER},
+      #{renewTime,jdbcType=INTEGER}, #{licenseType,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserLicense"  useGeneratedKeys="true" keyColumn="id" keyProperty="id" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserLicense" useGeneratedKeys="true" keyColumn="id" keyProperty="id" >
     insert into ta_user_license
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -80,6 +82,12 @@
       <if test="updateUser != null" >
         update_user,
       </if>
+      <if test="renewTime != null" >
+        renew_time,
+      </if>
+      <if test="licenseType != null" >
+        license_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -118,6 +126,12 @@
       <if test="updateUser != null" >
         #{updateUser,jdbcType=INTEGER},
       </if>
+      <if test="renewTime != null" >
+        #{renewTime,jdbcType=INTEGER},
+      </if>
+      <if test="licenseType != null" >
+        #{licenseType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUserLicense" >
@@ -156,6 +170,12 @@
       <if test="updateUser != null" >
         update_user = #{updateUser,jdbcType=INTEGER},
       </if>
+      <if test="renewTime != null" >
+        renew_time = #{renewTime,jdbcType=INTEGER},
+      </if>
+      <if test="licenseType != null" >
+        license_type = #{licenseType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -171,8 +191,9 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       create_user = #{createUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
-      update_user = #{updateUser,jdbcType=INTEGER}
+      update_user = #{updateUser,jdbcType=INTEGER},
+      renew_time = #{renewTime,jdbcType=INTEGER},
+      license_type = #{licenseType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
-
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FuShiRequestAPI.java

@@ -189,5 +189,39 @@ public class FuShiRequestAPI {
     }
 
 
+    /**
+     * 获取月租车信息（通过车牌号）
+     * @return
+     */
+    public String parkGetMonthCardInfoByCarNo(String ParkingCode, String CarNo) {
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("ParkingCode", ParkingCode);
+        map.put("CarNo", CarNo);
+        String json = JSONObject.toJSONString(map);
+        log.info("获取月租车信息（通过车牌号） 请求参数：{}", json);
+        SignBuild signBuild = requestSign(json);
+        String result = client.doJsonPost(FushiConstant.PARK_GETMONTHCARDINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
+        showException(result);
+        log.info("获取月租车信息（通过车牌号） 返回数据：{}", result);
+        return result;
+    }
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     * @return
+     */
+    public String parkGetTempCarPaymentInfoByCarNo(String ParkingCode, String CarNo) {
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("ParkingCode", ParkingCode);
+        map.put("CarNo", CarNo);
+        String json = JSONObject.toJSONString(map);
+        log.info("获取临时车信息（通过车牌号） 请求参数：{}", json);
+        SignBuild signBuild = requestSign(json);
+        String result = client.doJsonPost(FushiConstant.PARK_GETTEMPCARPAYMENTINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
+        showException(result);
+        log.info("获取临时车信息（通过车牌号） 返回数据：{}", result);
+        return result;
+    }
+
 
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FushiConstant.java

@@ -26,4 +26,14 @@ public class FushiConstant {
      */
     public static final String CALCULATIONCOST_APIGETOFFLINEFEE = "/CalculationCost/ApiGetOfflineFee";
 
+    /**
+     * 获取月租车信息（通过车牌号）
+     */
+    public static final String PARK_GETMONTHCARDINFOBYCARNO = "/Park/GetMonthCardInfoByCarNo";
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     */
+    public static final String PARK_GETTEMPCARPAYMENTINFOBYCARNO = "/Park/GetTempCarPaymentInfoByCarNo";
+
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java

@@ -26,7 +26,7 @@ public class HKOpenApi {
      */
     public static String getMonitoryPoint(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -58,7 +58,7 @@ public class HKOpenApi {
      */
     public static String getDeptName(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_LIKE_DEPT_NAME;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_LIKE_DEPT_NAME;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -91,7 +91,7 @@ public class HKOpenApi {
      */
     public static String addUser(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_ADD_USER;
         //设置APPKEY获取中心信息
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -125,7 +125,7 @@ public class HKOpenApi {
      */
     public static String openCard(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_OPEN_CARD;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_OPEN_CARD;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -157,7 +157,7 @@ public class HKOpenApi {
      */
     public static String getACDevicesByUnitUuids(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -188,7 +188,7 @@ public class HKOpenApi {
      */
     public static String getDoors(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GET_DOORS; // HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GET_DOORS; // HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -218,7 +218,7 @@ public class HKOpenApi {
      */
     public static String getUnitsByUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -248,7 +248,7 @@ public class HKOpenApi {
      */
     public static String getRegionsByUnitUuid(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -279,7 +279,7 @@ public class HKOpenApi {
      */
     public static String getDoorsByRegionUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOORS_BY_REGION_UUIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOORS_BY_REGION_UUIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -307,7 +307,7 @@ public class HKOpenApi {
      */
     public static String addAuthoritiesByPersonIds(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -339,7 +339,7 @@ public class HKOpenApi {
      */
     public static String downloadAuthorityByDeviceUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -370,7 +370,7 @@ public class HKOpenApi {
      */
     public static String downloadAuthorityByPersonIds(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_PERSONIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_AUTHORITY_BY_PERSONIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -407,7 +407,7 @@ public class HKOpenApi {
     public static String getPlans(Integer pageNo, Integer pageSize, Map<String, Object> map) {
 
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETPLANS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETPLANS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -436,7 +436,7 @@ public class HKOpenApi {
      */
     public static String downloadFaceAndFingerInfos(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -468,8 +468,8 @@ public class HKOpenApi {
      * personName 名称
      * @return
      */
-    public static String HKpersonGroupId(MultipartFile faceImg,Integer personNo,String personName){
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personNo,String personName, String openapi_ip_port_http){
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_ADD_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         map.put("time", System.currentTimeMillis());
@@ -498,7 +498,7 @@ public class HKOpenApi {
      *  * personName 卡号
      * @return
      */
-    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo, String  appkey, String secret) {
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo, String  appkey, String secret, String openapi_ip_port_http) {
         byte [] fileByte = new byte[0];
         try {
             if (null!=faceImg) {
@@ -510,7 +510,7 @@ public class HKOpenApi {
         byte[] imgs=PicUtils.compressPicForScale(fileByte,99L,"x");
 
         String img = PicUtils.getImgStr(imgs);
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        String url = openapi_ip_port_http == null  ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         map.put("time", System.currentTimeMillis());
@@ -544,7 +544,7 @@ public class HKOpenApi {
      * @return
      */
     public static String updateUser(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -581,9 +581,9 @@ public class HKOpenApi {
      * @param personId 被访人ID
      * @return
      */
-    public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId, String opUserUuid, String appkey, String secret){
+    public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId, String opUserUuid, String appkey, String secret, String openapi_ip_port_http){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.TEMPORARY_REGISTER;
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.TEMPORARY_REGISTER;
         //设置APPKEY
         parMap.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         //设置时间参数
@@ -623,9 +623,9 @@ public class HKOpenApi {
      * @param phoneNo 电话
      * @return
      */
-    public static String HKpersonPhone(Integer personId,Long personNo,String personName,String phoneNo) {
+    public static String HKpersonPhone(Integer personId,Long personNo,String personName,String phoneNo, String openapi_ip_port_http) {
 
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         map.put("time", System.currentTimeMillis());
@@ -666,7 +666,7 @@ public class HKOpenApi {
      */
     public static String HKgetDoorDevicesByUnitUuids(Map<String, Object> map){
 
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETDOORDEVICESBYUNITUUIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETDOORDEVICESBYUNITUUIDS;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -703,7 +703,7 @@ public class HKOpenApi {
      * @return
      */
     public static String syncControl(Map<String, Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.SYNCCONTROL;
+        String url =  map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") +  HKConstant.SYNCCONTROL;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -733,8 +733,8 @@ public class HKOpenApi {
      * @param longNums
      * @return
      */
-    public static String visualIntercom(String opUserUuid, Integer opType,List<Integer> personIds,List<String> longNums, String appkey, String secret) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOADFACE;
+    public static String visualIntercom(String opUserUuid, Integer opType,List<Integer> personIds,List<String> longNums, String appkey, String secret, String openapi_ip_port_http) {
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.DOWNLOADFACE;
         HashMap map = new HashMap<>();
         map.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         map.put("time", System.currentTimeMillis());
@@ -767,7 +767,7 @@ public class HKOpenApi {
      * @return
      */
     public static String addOutDoorAuth(Map<String, Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADDOUTDOORAUTH;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ADDOUTDOORAUTH;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -804,7 +804,7 @@ public class HKOpenApi {
      * @return
      */
     public static String delOutDoorAuth(Map<String, Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DELOUTDOORAUTH;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DELOUTDOORAUTH;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -841,7 +841,7 @@ public class HKOpenApi {
      * @return
      */
     public static String downloadFinger(Map<String, Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOADFINGER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOADFINGER;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -872,7 +872,7 @@ public class HKOpenApi {
      * @return
      */
     public static String getUsers(Map<String, Object> map){
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETUSERS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETUSERS;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -901,7 +901,7 @@ public class HKOpenApi {
      * @return
      */
     public static String getPersonInfosEx(Map<String, Object> map){
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETPERSONINFOSEX;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETPERSONINFOSEX;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -928,9 +928,9 @@ public class HKOpenApi {
      *  获取默认用户UUID
      * @return
      */
-    public static String getDefaultUserUuid(String appkey, String secret){
+    public static String getDefaultUserUuid(String appkey, String secret, String openapi_ip_port_http){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADDRESS_GET_DEFAULT_USER_UUID;
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_ADDRESS_GET_DEFAULT_USER_UUID;
         //设置APPKEY
         parMap.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         //设置时间参数
@@ -979,7 +979,7 @@ public class HKOpenApi {
      *     删除当前人脸设备信息
      */
     public static String deleteUser(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_DELETE_USER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_DELETE_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1008,7 +1008,7 @@ public class HKOpenApi {
      *     查询当前人脸设备信息
      */
     public static String selectUserFace(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_USER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1037,7 +1037,7 @@ public class HKOpenApi {
      * @return
      */
     public static String selectUserSynchronization(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_USER_SDH;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_USER_SDH;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1064,7 +1064,7 @@ public class HKOpenApi {
      * @return
      */
     public static String appointJurisdiction(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_APPOIN;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_APPOIN;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1093,5 +1093,4 @@ public class HKOpenApi {
         return data;
     }
 
-
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TaUserLicenseOrderController.java

@@ -0,0 +1,62 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * <p>
+ * 月租车缴费订单表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "月租车缴费订单表", description = "月租车缴费订单表")
+public class TaUserLicenseOrderController extends BaseController {
+
+    @Autowired
+    private ITaUserLicenseOrderService iTaUserLicenseOrderService;
+
+    @RequestMapping(value = "/user/license/order", method = RequestMethod.GET)
+    @ApiOperation(value = "获取月租车缴费记录", notes = "获取月租车缴费记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "licensePlate", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "orderNumber", value = "订单号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "paymentName", value = "缴费人姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "paymentTel", value = "缴费人手机号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少条"),
+    })
+    public ResponseBean getAll(@RequestParam(value = "id",required = false) Integer id,
+                               @RequestParam(value = "licensePlate",required = false) String licensePlate,
+                               @RequestParam(value = "orderNumber",required = false) String orderNumber,
+                               @RequestParam(value = "paymentName",required = false) String paymentName,
+                               @RequestParam(value = "paymentTel",required = false) String paymentTel,
+                               @RequestParam(value = "pageNum",defaultValue = "1", required = false) Integer pageNum,
+                               @RequestParam(value = "pageSize" ,defaultValue = "10", required = false) Integer pageSize,
+                               HttpSession session) {
+
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserLicenseOrderService.getAll(id, licensePlate, orderNumber, paymentName, paymentTel, pageNum, pageSize, userElement);
+        return responseBean;
+    }
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpRentalHouseController.java

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 出租公寓表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+public class TpRentalHouseController extends BaseController {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpRentalHouseImgController.java

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 出租房间图片 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+public class TpRentalHouseImgController extends BaseController {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopController.java

@@ -1,20 +1,30 @@
 package com.community.huiju.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpShop;
+import com.community.huiju.model.TpShopType;
 import com.community.huiju.service.ITpShopService;
+import com.netflix.ribbon.proxy.annotation.Http;
 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.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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -54,4 +64,104 @@ public class TpShopController extends BaseController {
 		responseBean = shopService.getShopList(id,shopName,shopTypeId,shopStatus,userElement,pageNum,pageSize);
 		return responseBean;
 	}
+	
+	@ApiOperation(value = "添加商铺", notes = "添加商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShop", name = "shop", value = "商铺"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/add",method = RequestMethod.POST)
+	public ResponseBean saveShop(@RequestBody TpShop shop, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopService.saveShop(shop,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取商铺信息", notes = "获取商铺信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "商铺Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/get/{id}",method = RequestMethod.GET)
+	public ResponseBean getShop(@PathVariable Integer id, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TpShop tpShop = shopService.getShopById(id);
+		responseBean.addSuccess(tpShop);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "更新商铺", notes = "更新商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "TpShop", name = "shop", value = "商铺"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/update",method = RequestMethod.POST)
+	public ResponseBean updateShop(@RequestBody TpShop shop, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		responseBean = shopService.updateShop(shop,userElement);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "上架商铺", notes = "上架商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/shelf",method = RequestMethod.POST)
+	public ResponseBean shelfShop(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpShop> tpShopList = new ArrayList<>();
+		for (Object id : ids){
+			TpShop tpShop = new TpShop();
+			tpShop.setId((Integer) id);
+			tpShop.setShopStatus("1");
+			tpShop.setUpdateUser(userElement.getId());
+			tpShop.setUpdateDate(LocalDateTime.now());
+			tpShopList.add(tpShop);
+		}
+		
+		boolean state = shopService.updateBatchById(tpShopList);
+		if (state){
+			responseBean.addSuccess("上架成功");
+		}else{
+			responseBean.addError("上架失败");
+		}
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "下架商铺", notes = "下架商铺")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/shop/obtained",method = RequestMethod.POST)
+	public ResponseBean obtainedShop(@RequestBody String jsonString, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		JSONObject jsonObject = JSONObject.parseObject(jsonString);
+		JSONArray ids = jsonObject.getJSONArray("idArray");
+		List<TpShop> tpShopList = new ArrayList<>();
+		for (Object id : ids){
+			TpShop tpShop = new TpShop();
+			tpShop.setId((Integer) id);
+			tpShop.setShopStatus("2");
+			tpShop.setUpdateUser(userElement.getId());
+			tpShop.setUpdateDate(LocalDateTime.now());
+			tpShopList.add(tpShop);
+		}
+		
+		boolean state = shopService.updateBatchById(tpShopList);
+		if (state){
+			responseBean.addSuccess("下架成功");
+		}else{
+			responseBean.addError("下架失败");
+		}
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopImgController.java

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 商铺图片 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@RestController
+@RequestMapping("/")
+public class TpShopImgController extends BaseController {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserLicenseOrderMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseImgMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpRentalHouseImg;
+
+/**
+ * <p>
+ * 出租房间图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface TpRentalHouseImgMapper extends BaseMapper<TpRentalHouseImg> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpRentalHouseMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpRentalHouse;
+
+/**
+ * <p>
+ * 出租公寓表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface TpRentalHouseMapper extends BaseMapper<TpRentalHouse> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpShopImgMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpShopImg;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商铺图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface TpShopImgMapper extends BaseMapper<TpShopImg> {
+	
+	int batchSave(List<TpShopImg> carouselList);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaUserLicenseOrder.java

@@ -0,0 +1,118 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 月租车缴费订单表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_user_license_order")
+public class TaUserLicenseOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 人员ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 支付状态  0：未支付  1: 已支付 2: 正在支付中 3:已关闭
+     */
+    private String orderStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 延期月份
+     */
+    private Integer extensionMonth;
+
+    /**
+     * 延期费用
+     */
+    private String extensionPrice;
+
+    /**
+     * 缴费手机号
+     */
+    private String paymentTel;
+
+    /**
+     * 缴费人姓名
+     */
+    private String paymentName;
+
+    /**
+     * 缴费方式 0是微信支付 2是支付宝 
+     */
+    private String paymentType;
+
+    /**
+     * 到期时间
+     */
+    private LocalDateTime expireDate;
+
+    /**
+     * 单价费用
+     */
+    private String unitPrice;
+
+    /**
+     * 停车场
+     */
+    private String parkingLot;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpRentalHouse.java

@@ -0,0 +1,178 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 出租公寓表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpRentalHouse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 房间名称
+     */
+    private String houseName;
+
+    /**
+     * 房屋租金
+     */
+    private String rentalPrice;
+
+    /**
+     * 面积
+     */
+    private String area;
+
+    /**
+     * 出租方式 1 是整租 2是合租
+     */
+    private String rentalType;
+
+    /**
+     * 户型 1 是一室居 2是二室居 3 是三室局 4 是四室居及以上
+     */
+    private String houseType;
+
+    /**
+     * 上架状态 1 是已上架 2是已下架
+     */
+    private String houseStatus;
+
+    /**
+     * 楼层
+     */
+    private String houseLevel;
+
+    /**
+     * 标签
+     */
+    private String houseLabel;
+
+    /**
+     * 权重
+     */
+    private Integer sort;
+
+    /**
+     * 联系电话
+     */
+    private String houseTel;
+
+    /**
+     * 小区地址
+     */
+    private String communityAddress;
+
+    /**
+     * 小区经度
+     */
+    private String communityLongitude;
+
+    /**
+     * 小区纬度
+     */
+    private String communityLatitude;
+
+    /**
+     * 房屋介绍
+     */
+    private String houseIntroduction;
+
+    /**
+     * 床   1 有
+     */
+    private String bed;
+
+    /**
+     * 衣柜 1 有
+     */
+    private String wardrobe;
+
+    /**
+     * 餐桌 1 有
+     */
+    private String diningTable;
+
+    /**
+     * 电脑桌 1 有
+     */
+    private String computerDesk;
+
+    /**
+     * 热水器 1 有
+     */
+    private String waterHeater;
+
+    /**
+     * 椅子 1 有
+     */
+    private String chair;
+
+    /**
+     *  洗衣机 1 有
+     */
+    private String washingMachine;
+
+    /**
+     * 空调 1 有
+     */
+    private String airConditioning;
+
+    /**
+     * 台灯 1 有
+     */
+    private String tableLamp;
+
+    /**
+     * WiFi 1 有
+     */
+    @TableField("WiFi")
+    private String WiFi;
+
+    /**
+     * 微波炉 1 有
+     */
+    private String microwaveOven;
+
+    /**
+     * 天然气 1 有
+     */
+    private String naturalGas;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpRentalHouseImg.java

@@ -0,0 +1,51 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 出租房间图片
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpRentalHouseImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 出租房间ID
+     */
+    private Integer rentalHouseId;
+
+    /**
+     * 出租房间图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 出租房间图片类型 1是app列表图，2是轮播图
+     */
+    private String imgType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpShop.java

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -125,4 +126,22 @@ public class TpShop implements Serializable {
      */
     @TableField(exist = false)
     private String userName;
+    
+    /**
+     * 首页图片地址
+     */
+    @TableField(exist = false)
+    private String appIndexImg;
+    
+    /**
+     * app列表展示图
+     */
+    @TableField(exist = false)
+    private String appListImg;
+    
+    /**
+     * app商铺轮播图
+     */
+    @TableField(exist = false)
+    private List<String> appCarouselImg;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpShopImg.java

@@ -0,0 +1,51 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商铺图片
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TpShopImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 商铺ID
+     */
+    private Integer shopId;
+
+    /**
+     * 商铺图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 商铺图片类型 1是app首页图片每个商铺唯一，2是app列表图片,3是app商铺轮播图
+     */
+    private String imgType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaUserLicenseOrderService.java

@@ -0,0 +1,29 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface ITaUserLicenseOrderService extends IService<TaUserLicenseOrder> {
+
+    /**
+     * 获取所有缴费记录
+     * @param id
+     * @param licensePlate
+     * @param orderNumber
+     * @param paymentName
+     * @param paymentTel
+     * @return
+     */
+    ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, UserElement userElement);
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpRentalHouseImgService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpRentalHouseImg;
+
+/**
+ * <p>
+ * 出租房间图片 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface ITpRentalHouseImgService extends IService<TpRentalHouseImg> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpRentalHouseService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpRentalHouse;
+
+/**
+ * <p>
+ * 出租公寓表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface ITpRentalHouseService extends IService<TpRentalHouse> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpShopImgService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpShopImg;
+
+/**
+ * <p>
+ * 商铺图片 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface ITpShopImgService extends IService<TpShopImg> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITpShopService.java

@@ -27,4 +27,27 @@ public interface ITpShopService extends IService<TpShop> {
 	 * @return
 	 */
 	ResponseBean getShopList(Integer id, String shopName, Integer shopTypeId, String shopStatus, UserElement userElement, Integer pageNum, Integer pageSize);
+	
+	/**
+	 * 保存商铺
+	 * @param shop
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean saveShop(TpShop shop, UserElement userElement);
+	
+	/**
+	 * 获取商铺信息
+	 * @param id
+	 * @return
+	 */
+	TpShop getShopById(Integer id);
+	
+	/**
+	 * 更新商铺信息
+	 * @param shop
+	 * @param userElement
+	 * @return
+	 */
+	ResponseBean updateShop(TpShop shop, UserElement userElement);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseOrderServiceImpl.java

@@ -0,0 +1,44 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TaUserLicenseOrder;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Service
+public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrderMapper, TaUserLicenseOrder> implements ITaUserLicenseOrderService {
+
+    @Override
+    public ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaUserLicenseOrder> page = new Page<>();
+        page.setSize(pageSize);
+        page.setCurrent(pageNum);
+        QueryWrapper<TaUserLicenseOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(id != null ,"id", id);
+        queryWrapper.like(StringUtils.isNotBlank(licensePlate), "license_plate", licensePlate);
+        queryWrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
+        queryWrapper.like(StringUtils.isNotBlank(paymentName), "payment_name", paymentName);
+        queryWrapper.like(StringUtils.isNotBlank(paymentTel), "payment_tel", paymentTel);
+        queryWrapper.eq("community_id", userElement.getCommunityId());
+
+        IPage<TaUserLicenseOrder> orderIPage = this.page(page, queryWrapper);
+        responseBean.addSuccess(orderIPage);
+        return responseBean;
+    }
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseImgServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpRentalHouseImgMapper;
+import com.community.huiju.model.TpRentalHouseImg;
+import com.community.huiju.service.ITpRentalHouseImgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 出租房间图片 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Service
+public class TpRentalHouseImgServiceImpl extends ServiceImpl<TpRentalHouseImgMapper, TpRentalHouseImg> implements ITpRentalHouseImgService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpRentalHouseServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpRentalHouseMapper;
+import com.community.huiju.model.TpRentalHouse;
+import com.community.huiju.service.ITpRentalHouseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 出租公寓表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Service
+public class TpRentalHouseServiceImpl extends ServiceImpl<TpRentalHouseMapper, TpRentalHouse> implements ITpRentalHouseService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopImgServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpShopImgMapper;
+import com.community.huiju.model.TpShopImg;
+import com.community.huiju.service.ITpShopImgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商铺图片 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Service
+public class TpShopImgServiceImpl extends ServiceImpl<TpShopImgMapper, TpShopImg> implements ITpShopImgService {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopServiceImpl.java

@@ -1,15 +1,21 @@
 package com.community.huiju.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpShopImgMapper;
 import com.community.huiju.dao.TpShopMapper;
 import com.community.huiju.model.TpShop;
+import com.community.huiju.model.TpShopImg;
 import com.community.huiju.service.ITpShopService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,11 +29,15 @@ import java.util.Map;
  * @since 2019-05-10
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> implements ITpShopService {
 
 	@Autowired
 	private TpShopMapper shopMapper;
 	
+	@Autowired
+	private TpShopImgMapper shopImgMapper;
+	
 	/**
 	 * 根据条件查询商铺列表
 	 *
@@ -57,4 +67,141 @@ public class TpShopServiceImpl extends ServiceImpl<TpShopMapper, TpShop> impleme
 		responseBean.addSuccess(map);
 		return responseBean;
 	}
+	
+	/**
+	 * 保存商铺
+	 *
+	 * @param shop
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean saveShop(TpShop shop, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		//添加商铺信息
+		Integer communityId = userElement.getCommunityId();
+		LocalDateTime localDateTime = LocalDateTime.now();
+		shop.setCommunityId(communityId);
+		shop.setCreateUser(userElement.getId());
+		shop.setUpdateDate(localDateTime);
+		shopMapper.insert(shop);
+		//添加商铺app首页图片信息
+		TpShopImg appIndexShopImg = new TpShopImg();
+		appIndexShopImg.setCommunityId(communityId);
+		appIndexShopImg.setCreateDate(localDateTime);
+		appIndexShopImg.setImgType("1");
+		appIndexShopImg.setShopId(shop.getId());
+		appIndexShopImg.setImgUrl(shop.getAppIndexImg());
+		shopImgMapper.insert(appIndexShopImg);
+		//添加商铺app列表图片信息
+		TpShopImg appListShopImg = new TpShopImg();
+		appListShopImg.setCommunityId(communityId);
+		appListShopImg.setCreateDate(localDateTime);
+		appListShopImg.setImgType("2");
+		appListShopImg.setShopId(shop.getId());
+		appListShopImg.setImgUrl(shop.getAppListImg());
+		shopImgMapper.insert(appListShopImg);
+		//批量添加app轮播图片
+		List<String> list = shop.getAppCarouselImg();
+		List<TpShopImg> carouselList = new ArrayList<>();
+		list.stream().forEach(e -> {
+			TpShopImg appCarouselImg = new TpShopImg();
+			appCarouselImg.setCommunityId(communityId);
+			appCarouselImg.setCreateDate(localDateTime);
+			appCarouselImg.setImgType("3");
+			appCarouselImg.setShopId(shop.getId());
+			appCarouselImg.setImgUrl(e);
+			carouselList.add(appCarouselImg);
+		});
+		shopImgMapper.batchSave(carouselList);
+		responseBean.addSuccess("添加成功");
+		return responseBean;
+	}
+	
+	/**
+	 * 获取商铺信息
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public TpShop getShopById(Integer id) {
+		TpShop tpShop = shopMapper.selectById(id);
+		//获取商铺app首页图片信息
+		QueryWrapper<TpShopImg> tpShopImgQueryWrapper = new QueryWrapper<>();
+		tpShopImgQueryWrapper.eq("community_id",tpShop.getCommunityId());
+		tpShopImgQueryWrapper.eq("shop_id",tpShop.getId());
+		tpShopImgQueryWrapper.eq("img_type","1");
+		TpShopImg tpShopImg = shopImgMapper.selectOne(tpShopImgQueryWrapper);
+		tpShop.setAppIndexImg(tpShopImg.getImgUrl());
+		//获取商铺APP列表图片信息
+		QueryWrapper<TpShopImg> tpShopImgListWrapper = new QueryWrapper<>();
+		tpShopImgListWrapper.eq("community_id",tpShop.getCommunityId());
+		tpShopImgListWrapper.eq("shop_id",tpShop.getId());
+		tpShopImgListWrapper.eq("img_type","2");
+		TpShopImg listShopImg = shopImgMapper.selectOne(tpShopImgListWrapper);
+		tpShop.setAppListImg(listShopImg.getImgUrl());
+		//获取商铺轮播图列表
+		QueryWrapper<TpShopImg> tpShopImgCarouselWrapper = new QueryWrapper<>();
+		tpShopImgCarouselWrapper.eq("community_id",tpShop.getCommunityId());
+		tpShopImgCarouselWrapper.eq("shop_id",tpShop.getId());
+		tpShopImgCarouselWrapper.eq("img_type","3");
+		List<TpShopImg> carouselList = shopImgMapper.selectList(tpShopImgCarouselWrapper);
+		List<String> carouselUrlList = new ArrayList<>();
+		carouselList.stream().forEach(e -> {
+			carouselUrlList.add(e.getImgUrl());
+		});
+		tpShop.setAppCarouselImg(carouselUrlList);
+		return tpShop;
+	}
+	
+	/**
+	 * 更新商铺信息
+	 *
+	 * @param shop
+	 * @param userElement
+	 * @return
+	 */
+	@Override
+	public ResponseBean updateShop(TpShop shop, UserElement userElement) {
+		ResponseBean responseBean = new ResponseBean();
+		shopMapper.updateById(shop);
+		//添加商铺app首页图片信息
+		TpShopImg appIndexShopImg = new TpShopImg();
+		appIndexShopImg.setImgUrl(shop.getAppIndexImg());
+		QueryWrapper<TpShopImg> tpShopImgQueryWrapper = new QueryWrapper<>();
+		tpShopImgQueryWrapper.eq("community_id",shop.getCommunityId());
+		tpShopImgQueryWrapper.eq("shop_id",shop.getId());
+		tpShopImgQueryWrapper.eq("img_type","1");
+		shopImgMapper.update(appIndexShopImg,tpShopImgQueryWrapper);
+		//添加商铺app列表图片信息
+		TpShopImg appListShopImg = new TpShopImg();
+		appListShopImg.setImgUrl(shop.getAppListImg());
+		QueryWrapper<TpShopImg> tpShopImgListWrapper = new QueryWrapper<>();
+		tpShopImgListWrapper.eq("community_id",shop.getCommunityId());
+		tpShopImgListWrapper.eq("shop_id",shop.getId());
+		tpShopImgListWrapper.eq("img_type","2");
+		shopImgMapper.update(appListShopImg,tpShopImgListWrapper);
+		//先删除在批量添加app轮播图片
+		QueryWrapper<TpShopImg> tpShopImgCarouselWrapper = new QueryWrapper<>();
+		tpShopImgCarouselWrapper.eq("community_id",shop.getCommunityId());
+		tpShopImgCarouselWrapper.eq("shop_id",shop.getId());
+		tpShopImgCarouselWrapper.eq("img_type","3");
+		shopImgMapper.delete(tpShopImgCarouselWrapper);
+		//重新添加
+		List<String> list = shop.getAppCarouselImg();
+		List<TpShopImg> carouselList = new ArrayList<>();
+		list.stream().forEach(e -> {
+			TpShopImg appCarouselImg = new TpShopImg();
+			appCarouselImg.setCommunityId(shop.getCommunityId());
+			appCarouselImg.setCreateDate(LocalDateTime.now());
+			appCarouselImg.setImgType("3");
+			appCarouselImg.setShopId(shop.getId());
+			appCarouselImg.setImgUrl(e);
+			carouselList.add(appCarouselImg);
+		});
+		shopImgMapper.batchSave(carouselList);
+		responseBean.addSuccess("修改成功");
+		return responseBean;
+	}
 }

CODE/smart-community/property-api/src/main/resources/mapper/TaUserLicenseOrderMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TaUserLicenseOrderMapper">
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpRentalHouseImgMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpRentalHouseImgMapper">
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpRentalHouseMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpRentalHouseMapper">
+
+</mapper>

CODE/smart-community/property-api/src/main/resources/mapper/TpShopImgMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpShopImgMapper">
+
+    <insert id="batchSave" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_shop_img(community_id,shop_id,img_url,img_type,create_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.shopId},#{item.imgUrl},#{item.imgType},#{item.createDate})
+        </foreach>
+    </insert>
+
+</mapper>

VUECODE/smart-operate-manage/src/components/Wangeditor/index.vue

@@ -16,81 +16,25 @@ export default {
       editorObject: ''
     }
   },
+  watch: {
+    content(nw, old) {
+      window.console.log('---->', nw, old)
+      if (!old && nw) {
+        window.console.log('--1111-->', nw)
+        this.editorContent = nw
+        this.initEditor()
+      }
+    }
+  },
   computed: {
     ...mapGetters([
       'token'
     ])
   },
   mounted() {
-    this.editorObject = new E(this.$refs.editorElem) // 创建富文本实例
-    var editor = this.editorObject
-    editor.customConfig.onchange = (html) => {
-      this.editorContent = html
-      this.childWangeditorValue() // 把这个html通过catchData的方法传入父组件
-      // this.catchData(html) // 把这个html通过catchData的方法传入父组件
-    }
-    editor.customConfig.zIndex = 100
-    editor.customConfig.uploadImgServer = process.env.BASE_API + '/uploadimage'
-    editor.customConfig.uploadFileName = 'uploadFiles'
-    editor.customConfig.uploadImgHeaders = {
-      'Accept': '*/*',
-      'Authorization': 'Bearer ' + this.token // 头部token
-    }
-    editor.customConfig.menus = [ // 菜单配置
-      'head',
-      'list', // 列表
-      'justify', // 对齐方式
-      'bold',
-      'fontSize', // 字号
-      'italic',
-      'underline',
-      'image', // 插入图片
-      'foreColor', // 文字颜色
-      'undo', // 撤销
-      'redo' // 重复
-    ]
-    // 下面是最重要的的方法
-    editor.customConfig.uploadImgHooks = {
-      before: function(xhr, editor, files) {
-        // 图片上传之前触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，files是选择的图片文件
-        // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
-        // return {
-        //     prevent: true,
-        //     msg: '放弃上传'
-        // }
-      },
-      success: function(xhr, editor, result) {
-        // 图片上传并返回结果，图片插入成功之后触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
-        this.imgUrl = Object.values(result.data).toString()
-      },
-      fail: function(xhr, editor, result) {
-        // 图片上传并返回结果，但图片插入错误时触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
-      },
-      error: function(xhr, editor) {
-        // 图片上传出错时触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
-      },
-      timeout: function(xhr, editor) {
-        // 图片上传超时时触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
-      },
-      // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
-      // （但是，服务器端返回的必须是一个 JSON 格式字符串！！！否则会报错）
-      customInsert: function(insertImg, result, editor) {
-        // 图片上传并返回结果，自定义插入图片的事件（而不是编辑器自动插入图片！！！）
-        // insertImg 是插入图片的函数，editor 是编辑器对象，result 是服务器端返回的结果
-        // 举例：假如上传图片成功后，服务器端返回的是 {url:'....'} 这种格式，即可这样插入图片：
-        const url = Object.values(result.data)// result.data就是服务器返回的图片名字和链接
-        JSON.stringify(url)// 在这里转成JSON格式
-        insertImg(url)
-        // result 必须是一个 JSON 格式字符串！！！否则报错
-      }
-    }
-    editor.create()
-    editor.txt.html(this.editorContent)
+    this.$nextTick(() => {
+      this.initEditor()
+    })
   },
   methods: {
     childWangeditorValue() {
@@ -99,6 +43,77 @@ export default {
     },
     setWangeditorValue(value) { // 父组件调用此方法传入参数
       this.editorObject.txt.html(value)
+    },
+    initEditor() {
+      this.editorObject = new E(this.$refs.editorElem) // 创建富文本实例
+      var editor = this.editorObject
+      editor.customConfig.onchange = (html) => {
+        this.editorContent = html
+        this.childWangeditorValue() // 把这个html通过catchData的方法传入父组件
+        // this.catchData(html) // 把这个html通过catchData的方法传入父组件
+      }
+      editor.customConfig.zIndex = 100
+      editor.customConfig.uploadImgServer = process.env.BASE_API + '/uploadimage'
+      editor.customConfig.uploadFileName = 'uploadFiles'
+      editor.customConfig.uploadImgHeaders = {
+        'Accept': '*/*',
+        'Authorization': 'Bearer ' + this.token // 头部token
+      }
+      editor.customConfig.menus = [ // 菜单配置
+        'head',
+        'list', // 列表
+        'justify', // 对齐方式
+        'bold',
+        'fontSize', // 字号
+        'italic',
+        'underline',
+        'image', // 插入图片
+        'foreColor', // 文字颜色
+        'undo', // 撤销
+        'redo' // 重复
+      ]
+      // 下面是最重要的的方法
+      editor.customConfig.uploadImgHooks = {
+        before: function(xhr, editor, files) {
+          // 图片上传之前触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，files是选择的图片文件
+          // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
+          // return {
+          //     prevent: true,
+          //     msg: '放弃上传'
+          // }
+        },
+        success: function(xhr, editor, result) {
+          // 图片上传并返回结果，图片插入成功之后触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
+          this.imgUrl = Object.values(result.data).toString()
+        },
+        fail: function(xhr, editor, result) {
+          // 图片上传并返回结果，但图片插入错误时触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
+        },
+        error: function(xhr, editor) {
+          // 图片上传出错时触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
+        },
+        timeout: function(xhr, editor) {
+          // 图片上传超时时触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
+        },
+        // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
+        // （但是，服务器端返回的必须是一个 JSON 格式字符串！！！否则会报错）
+        customInsert: function(insertImg, result, editor) {
+          // 图片上传并返回结果，自定义插入图片的事件（而不是编辑器自动插入图片！！！）
+          // insertImg 是插入图片的函数，editor 是编辑器对象，result 是服务器端返回的结果
+          // 举例：假如上传图片成功后，服务器端返回的是 {url:'....'} 这种格式，即可这样插入图片：
+          const url = Object.values(result.data)// result.data就是服务器返回的图片名字和链接
+          JSON.stringify(url)// 在这里转成JSON格式
+          insertImg(url)
+          // result 必须是一个 JSON 格式字符串！！！否则报错
+        }
+      }
+      editor.create()
+      editor.txt.html(this.editorContent)
     }
   }
 }

VUECODE/smart-property-manage/index.html

@@ -4,8 +4,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <title>智慧社区物业平台</title>
-    <script src="//webapi.amap.com/maps?v=1.4.10&key=81f5560856a88eb5b3da440f18a97845&plugin=AMap.DistrictLayer"></script>
-    <script src="//webapi.amap.com/ui/1.0/main.js"></script>
   </head>
   <body>
     <div id="app"></div>

VUECODE/smart-property-manage/src/api/license.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询月租车记录
+export function getLicenseAll(data) {
+  return request({
+    url: '/user/license/order',
+    method: 'get',
+    params: {
+      id: data.id,
+      licensePlate: data.licensePlate,
+      orderNumber: data.orderNumber,
+      paymentName: data.paymentName,
+      paymentTel: data.paymentTel,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}

VUECODE/smart-property-manage/src/api/shopType.js

@@ -26,6 +26,14 @@ export function addShopType(listQuery) {
   })
 }
 
+export function addShop(listQuery) {
+  return request({
+    url: '/shop/add',
+    method: 'post',
+    data: listQuery
+  })
+}
+
 export function getShopType(id) {
   return request({
     url: '/shop/get/type/' + id,
@@ -33,6 +41,13 @@ export function getShopType(id) {
   })
 }
 
+export function getShop(id) {
+  return request({
+    url: '/shop/get/' + id,
+    method: 'get'
+  })
+}
+
 export function updateShopType(listQuery) {
   return request({
     url: '/shop/update/type',
@@ -41,6 +56,14 @@ export function updateShopType(listQuery) {
   })
 }
 
+export function updateShop(listQuery) {
+  return request({
+    url: '/shop/update',
+    method: 'post',
+    data: listQuery
+  })
+}
+
 export function deleteShopType(ids) {
   return request({
     url: '/shop/delete/type',
@@ -51,6 +74,26 @@ export function deleteShopType(ids) {
   })
 }
 
+export function obtainedShop(ids) {
+  return request({
+    url: '/shop/obtained',
+    method: 'post',
+    data: {
+      idArray: ids
+    }
+  })
+}
+
+export function shelfShop(ids) {
+  return request({
+    url: '/shop/shelf',
+    method: 'post',
+    data: {
+      idArray: ids
+    }
+  })
+}
+
 export function fetchShopList(query) {
   return request({
     url: '/shops',

VUECODE/smart-property-manage/src/components/Wangeditor/index.vue

@@ -16,81 +16,25 @@ export default {
       editorObject: ''
     }
   },
+  watch: {
+    content(nw, old) {
+      window.console.log('---->', nw, old)
+      if (!old && nw) {
+        window.console.log('--1111-->', nw)
+        this.editorContent = nw
+        this.initEditor()
+      }
+    }
+  },
   computed: {
     ...mapGetters([
       'token'
     ])
   },
   mounted() {
-    this.editorObject = new E(this.$refs.editorElem) // 创建富文本实例
-    var editor = this.editorObject
-    editor.customConfig.onchange = (html) => {
-      this.editorContent = html
-      this.childWangeditorValue() // 把这个html通过catchData的方法传入父组件
-      // this.catchData(html) // 把这个html通过catchData的方法传入父组件
-    }
-    editor.customConfig.zIndex = 100
-    editor.customConfig.uploadImgServer = process.env.BASE_API + '/uploadimage'
-    editor.customConfig.uploadFileName = 'uploadFiles'
-    editor.customConfig.uploadImgHeaders = {
-      'Accept': '*/*',
-      'Authorization': 'Bearer ' + this.token // 头部token
-    }
-    editor.customConfig.menus = [ // 菜单配置
-      'head',
-      'list', // 列表
-      'justify', // 对齐方式
-      'bold',
-      'fontSize', // 字号
-      'italic',
-      'underline',
-      'image', // 插入图片
-      'foreColor', // 文字颜色
-      'undo', // 撤销
-      'redo' // 重复
-    ]
-    // 下面是最重要的的方法
-    editor.customConfig.uploadImgHooks = {
-      before: function(xhr, editor, files) {
-        // 图片上传之前触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，files是选择的图片文件
-        // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
-        // return {
-        //     prevent: true,
-        //     msg: '放弃上传'
-        // }
-      },
-      success: function(xhr, editor, result) {
-        // 图片上传并返回结果，图片插入成功之后触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
-        this.imgUrl = Object.values(result.data).toString()
-      },
-      fail: function(xhr, editor, result) {
-        // 图片上传并返回结果，但图片插入错误时触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
-      },
-      error: function(xhr, editor) {
-        // 图片上传出错时触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
-      },
-      timeout: function(xhr, editor) {
-        // 图片上传超时时触发
-        // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
-      },
-      // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
-      // （但是，服务器端返回的必须是一个 JSON 格式字符串！！！否则会报错）
-      customInsert: function(insertImg, result, editor) {
-        // 图片上传并返回结果，自定义插入图片的事件（而不是编辑器自动插入图片！！！）
-        // insertImg 是插入图片的函数，editor 是编辑器对象，result 是服务器端返回的结果
-        // 举例：假如上传图片成功后，服务器端返回的是 {url:'....'} 这种格式，即可这样插入图片：
-        const url = Object.values(result.data)// result.data就是服务器返回的图片名字和链接
-        JSON.stringify(url)// 在这里转成JSON格式
-        insertImg(url)
-        // result 必须是一个 JSON 格式字符串！！！否则报错
-      }
-    }
-    editor.create()
-    editor.txt.html(this.editorContent)
+    this.$nextTick(() => {
+      this.initEditor()
+    })
   },
   methods: {
     childWangeditorValue() {
@@ -99,6 +43,78 @@ export default {
     },
     setWangeditorValue(value) { // 父组件调用此方法传入参数
       this.editorObject.txt.html(value)
+    },
+    initEditor() {
+      this.editorObject = new E(this.$refs.editorElem) // 创建富文本实例
+      var editor = this.editorObject
+      editor.customConfig.onchange = (html) => {
+        this.editorContent = html
+        this.childWangeditorValue() // 把这个html通过catchData的方法传入父组件
+        // this.catchData(html) // 把这个html通过catchData的方法传入父组件
+      }
+      editor.customConfig.zIndex = 100
+      editor.customConfig.uploadImgServer = process.env.BASE_API + '/uploadimage'
+      editor.customConfig.uploadFileName = 'uploadFiles'
+      editor.customConfig.uploadImgHeaders = {
+        'Accept': '*/*',
+        'Authorization': 'Bearer ' + this.token // 头部token
+      }
+      editor.customConfig.menus = [ // 菜单配置
+        'head',
+        'list', // 列表
+        'justify', // 对齐方式
+        'bold',
+        'fontSize', // 字号
+        'italic',
+        'underline',
+        'image', // 插入图片
+        'foreColor', // 文字颜色
+        'undo', // 撤销
+        'redo' // 重复
+      ]
+      // 下面是最重要的的方法
+      editor.customConfig.uploadImgHooks = {
+        before: function(xhr, editor, files) {
+          // 图片上传之前触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，files是选择的图片文件
+          // 如果返回的结果是 {prevent: true, msg: 'xxxx'} 则表示用户放弃上传
+          // return {
+          //     prevent: true,
+          //     msg: '放弃上传'
+          // }
+        },
+        success: function(xhr, editor, result) {
+          // 图片上传并返回结果，图片插入成功之后触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
+          this.imgUrl = Object.values(result.data).toString()
+        },
+        fail: function(xhr, editor, result) {
+          // 图片上传并返回结果，但图片插入错误时触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象，result 是服务器端返回的结果
+        },
+        error: function(xhr, editor) {
+          // 图片上传出错时触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
+        },
+        timeout: function(xhr, editor) {
+          // 图片上传超时时触发
+          // xhr 是 XMLHttpRequst 对象，editor 是编辑器对象
+        },
+        // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
+        // （但是，服务器端返回的必须是一个 JSON 格式字符串！！！否则会报错）
+        customInsert: function(insertImg, result, editor) {
+          // 图片上传并返回结果，自定义插入图片的事件（而不是编辑器自动插入图片！！！）
+          // insertImg 是插入图片的函数，editor 是编辑器对象，result 是服务器端返回的结果
+          // 举例：假如上传图片成功后，服务器端返回的是 {url:'....'} 这种格式，即可这样插入图片：
+          const url = Object.values(result.data)// result.data就是服务器返回的图片名字和链接
+          JSON.stringify(url)// 在这里转成JSON格式
+          insertImg(url)
+          // result 必须是一个 JSON 格式字符串！！！否则报错
+        }
+      }
+      editor.create()
+      console.log('富文本接收到的值：', this.editorContent)
+      editor.txt.html(this.editorContent)
     }
   }
 }

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

@@ -335,6 +335,12 @@ export const constantRouterMap = [
         name: 'bill-statement-info-index',
         hidden: true,
         meta: { title: '订单详情', icon: 'table' }
+      },
+      {
+        path: '/bill/management/license',
+        component: () => import('@/views/bill/license/index'),
+        name: 'bill-license',
+        meta: { title: '月租车续费', icon: 'table' }
       }
     ]
   },
@@ -394,6 +400,50 @@ export const constantRouterMap = [
         component: () => import('@/views/shop/shopIndex'),
         name: 'shop-index',
         meta: { title: '商铺列表', icon: 'table' }
+      },
+      {
+        path: '/shop/add',
+        component: () => import('@/views/shop/shopAdd'),
+        name: 'shop-add',
+        hidden: true,
+        meta: { title: '添加商铺信息', icon: 'table' }
+      },
+      {
+        path: '/shop/edit',
+        component: () => import('@/views/shop/shopEdit'),
+        name: 'shop-edit',
+        hidden: true,
+        meta: { title: '修改商铺信息', icon: 'table' }
+      }
+    ]
+  },
+  {
+    path: '/rental',
+    component: Layout,
+    redirect: '/rental/index',
+    name: 'rental',
+    alwaysShow: true,
+    meta: { title: '长租公寓', icon: 'zip' },
+    children: [
+      {
+        path: '/rental/index',
+        component: () => import('@/views/rental/rentalIndex'),
+        name: 'rental-index',
+        meta: { title: '房间列表', icon: 'table' }
+      },
+      {
+        path: '/rental/add',
+        component: () => import('@/views/rental/rentalAdd'),
+        name: 'shop-add',
+        hidden: true,
+        meta: { title: '添加房间信息', icon: 'table' }
+      },
+      {
+        path: '/rental/edit',
+        component: () => import('@/views/rental/rentalEdit'),
+        name: 'rental-edit',
+        hidden: true,
+        meta: { title: '修改房间信息', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/index.js

@@ -23,7 +23,7 @@ import buildingTree from './modules/buildingTree'
 import equipment from './modules/equipment'
 import shopType from './modules/shopType'
 import grogshop from './modules/grogshop'
-
+import license from './modules/license'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -49,7 +49,8 @@ const store = new Vuex.Store({
     buildingTree,
     equipment,
     shopType,
-    grogshop
+    grogshop,
+    license
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/license.js

@@ -0,0 +1,23 @@
+import { getLicenseAll } from '@/api/license'
+
+const license = {
+  state: {
+
+  },
+  mutations: {
+
+  },
+  actions: {
+    GetLicenseAll({ commit }, data) {
+      return new Promise((resolve, reject) => { // 查询月租车记录
+        getLicenseAll(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default license

VUECODE/smart-property-manage/src/store/modules/shopType.js

@@ -1,4 +1,4 @@
-import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect } from '@/api/shopType'
+import { fetchShopTypeList, changeShopSetting, addShopType, getShopType, updateShopType, deleteShopType, fetchShopList, fetchShopTypeSelect, addShop, getShop, updateShop, shelfShop, obtainedShop } from '@/api/shopType'
 
 const transaction = {
   namespaced: true,
@@ -39,6 +39,15 @@ const transaction = {
         })
       })
     },
+    AddShop({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        addShop(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     GetShopType({ commit }, id) {
       return new Promise((resolve, reject) => {
         getShopType(id).then(response => {
@@ -48,6 +57,15 @@ const transaction = {
         })
       })
     },
+    GetShop({ commit }, id) {
+      return new Promise((resolve, reject) => {
+        getShop(id).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     UpdateShopType({ commit }, listQuery) {
       return new Promise((resolve, reject) => {
         updateShopType(listQuery).then(response => {
@@ -57,6 +75,15 @@ const transaction = {
         })
       })
     },
+    UpdateShop({ commit }, listQuery) {
+      return new Promise((resolve, reject) => {
+        updateShop(listQuery).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     DeleteShopType({ commit }, ids) {
       return new Promise((resolve, reject) => {
         deleteShopType(ids).then(response => {
@@ -66,6 +93,24 @@ const transaction = {
         })
       })
     },
+    ShelfShop({ commit }, ids) {
+      return new Promise((resolve, reject) => {
+        shelfShop(ids).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    ObtainedShop({ commit }, ids) {
+      return new Promise((resolve, reject) => {
+        obtainedShop(ids).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     FetchShopList({ commit }, listQuery) {
       return new Promise((resolve, reject) => {
         fetchShopList(listQuery).then(response => {

VUECODE/smart-property-manage/src/views/bill/license/index.vue

@@ -0,0 +1,221 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="listQuery" class="form-inline">
+      <el-form-item label="编号">
+        <el-input v-model="listQuery.id" placeholder="编号"/>
+      </el-form-item>
+      <el-form-item label="车牌号">
+        <el-input v-model="listQuery.licensePlate" placeholder="车牌号"/>
+      </el-form-item>
+      <el-form-item label="缴费订单号">
+        <el-input v-model="listQuery.orderNumber" placeholder="缴费订单号"/>
+      </el-form-item>
+      <el-form-item label="缴费人姓名">
+        <el-input v-model="listQuery.paymentName" placeholder="缴费人姓名"/>
+      </el-form-item>
+      <el-form-item label="缴费人手机号">
+        <el-input v-model="listQuery.paymentTel" placeholder="缴费人手机号"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" @click="clearQuery">清空</el-button>
+        <el-button type="primary" @click="query">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div>
+      <el-button type="primary" @click="exportLicense">导出数据</el-button>
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      border
+      style="width: 100%">
+      <el-table-column
+        prop="id"
+        label="编号"
+        align="center"
+        width="180"/>
+      <el-table-column
+        prop="licensePlate"
+        label="车牌号"
+        align="center"
+        width="180"/>
+      <el-table-column
+        prop="extensionMonth"
+        align="center"
+        label="续期时长（月）"/>
+      <el-table-column
+        prop="extensionPrice"
+        align="center"
+        label="续期费用（元）">
+        <template slot-scope="scope">{{ scope.row.extensionPrice / 100 }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="orderNumber"
+        align="center"
+        label="缴费订单号"/>
+      <el-table-column
+        prop="paymentTel"
+        align="center"
+        label="缴费人手机号"/>
+      <el-table-column
+        prop="paymentName"
+        align="center"
+        label="缴费人姓名"/>
+      <el-table-column
+        prop="paymentType"
+        align="center"
+        label="缴费方式">
+        <template slot-scope="scope">{{ showPayType(scope.row.paymentType) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="expireDate"
+        align="center"
+        label="延期后到期日">
+        <template slot-scope="scope">{{ formatDate(scope.row.expireDate) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="orderStatus"
+        align="center"
+        label="订单状态">
+        <template slot-scope="scope">{{ showStatus(scope.row.orderStatus) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="updateDate"
+        align="center"
+        label="缴费完成时间">
+        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
+      </el-table-column>
+    </el-table>
+    <div class="block-page">
+      <el-pagination
+        :current-page="listQuery.pageNum"
+        :page-sizes="[10, 20, 40, 80]"
+        :page-size="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'License',
+  data() {
+    return {
+      listQuery: {
+        id: '',
+        licensePlate: '',
+        orderNumber: '',
+        paymentName: '',
+        paymentTel: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      list: [],
+      total: 0,
+      loading: false
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    formatDate(val) {
+      if (val === null || val === '') {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    showPayType(obj) {
+      let str = ''
+      switch (obj) {
+        case '0':
+          str = '微信缴费'
+          break
+        case '1':
+          str = '线下缴费'
+          break
+        case '2':
+          str = '支付宝缴费'
+          break
+      }
+      return str
+    },
+    clearQuery() {
+      this.listQuery.id = ''
+      this.listQuery.licensePlate = ''
+      this.listQuery.orderNumber = ''
+      this.listQuery.paymentName = ''
+      this.listQuery.paymentTel = ''
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.getData()
+    },
+    query() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.getData()
+    },
+    getData() {
+      this.loading = true
+      this.$store.dispatch('GetLicenseAll', this.listQuery).then((res) => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.loading = false
+          this.$message.error(res.message)
+          return
+        }
+        const resData = res.data
+        this.list = resData.records
+        this.listQuery.pageNum = resData.current
+        this.listQuery.pageSize = resData.size
+        this.total = resData.total
+        this.loading = false
+      }).catch(() => {
+        console.log('error GetLicenseAll')
+        this.loading = false
+      })
+    },
+    showStatus(val) {
+      let str = ''
+      switch (val) {
+        case '0':
+          str = '未支付'
+          break
+        case '1':
+          str = '已支付'
+          break
+        case '2':
+          str = '正在支付中'
+          break
+        case '3':
+          str = '已关闭'
+          break
+      }
+      return str
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-inline {
+  margin-top: 20px;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block-page {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

VUECODE/smart-property-manage/src/views/rental/rentalAdd.vue

@@ -0,0 +1,315 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item label="商铺名称" prop="shopName">
+        <el-input v-model="listData.shopName"/>
+      </el-form-item>
+      <el-form-item label="商铺说明" prop="remark">
+        <el-input v-model="listData.remark"/>
+      </el-form-item>
+      <el-form-item label="app首页展示图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppIndexSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app列表展示图" prop="appListImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appListImg" :src="listData.appListImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="商铺类型" prop="shopTypeId">
+        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="shopStatus">
+        <el-select v-model="listData.shopStatus" placeholder="请选择">
+          <el-option label="已上架" value="1"/>
+          <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="shopTel">
+        <el-input v-model="listData.shopTel"/>
+      </el-form-item>
+      <el-form-item label="商铺地址" prop="shopAddress">
+        <el-input v-model="listData.shopAddress"/>
+      </el-form-item>
+      <el-form-item label="人均消费" prop="averagePrice">
+        <el-input v-model="listData.averagePrice"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="商铺介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+
+export default {
+  components: { Pagination, Wangeditor },
+  data() {
+    return {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.shopLongitude = e.lnglat.lng
+          this.listData.shopLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
+        shopName: '',
+        remark: '',
+        appIndexImg: '',
+        appListImg: '',
+        appCarouselImg: [],
+        sort: '',
+        shopTypeId: '',
+        shopStatus: '',
+        shopTel: '',
+        shopAddress: '',
+        averagePrice: '',
+        shopLongitude: '',
+        shopLatitude: '',
+        shopIntroduction: ''
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        ],
+        shopTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        shopAddress: [
+          { required: true, message: '请输入商铺地址', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app首页展示图', trigger: 'blur' }
+        ],
+        appListImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  mounted() {
+    this.getShopTypeList()
+  },
+  methods: {
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appListImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addShop()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    addShop() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/AddShop', this.listData).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue

@@ -0,0 +1,330 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item label="商铺名称" prop="shopName">
+        <el-input v-model="listData.shopName"/>
+      </el-form-item>
+      <el-form-item label="商铺说明" prop="remark">
+        <el-input v-model="listData.remark"/>
+      </el-form-item>
+      <el-form-item label="app首页展示图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppIndexSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app列表展示图" prop="appListImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appListImg" :src="listData.appListImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :file-list="displayAppCarouselImg"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="商铺类型" prop="shopTypeId">
+        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="shopStatus">
+        <el-select v-model="listData.shopStatus" placeholder="请选择">
+          <el-option label="已上架" value="1"/>
+          <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="shopTel">
+        <el-input v-model="listData.shopTel"/>
+      </el-form-item>
+      <el-form-item label="商铺地址" prop="shopAddress">
+        <el-input v-model="listData.shopAddress"/>
+      </el-form-item>
+      <el-form-item label="人均消费" prop="averagePrice">
+        <el-input v-model="listData.averagePrice"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="商铺介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor :content="listData.shopIntroduction" @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+
+export default {
+  components: { Pagination, Wangeditor },
+  data() {
+    return {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.shopLongitude = e.lnglat.lng
+          this.listData.shopLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
+        id: '',
+        shopName: '',
+        remark: '',
+        appIndexImg: '',
+        appListImg: '',
+        appCarouselImg: [],
+        sort: '',
+        shopTypeId: '',
+        shopStatus: '',
+        shopTel: '',
+        shopAddress: '',
+        averagePrice: '',
+        shopLongitude: '',
+        shopLatitude: '',
+        shopIntroduction: ''
+      },
+      displayAppCarouselImg: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        ],
+        shopTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        shopAddress: [
+          { required: true, message: '请输入商铺地址', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app首页展示图', trigger: 'blur' }
+        ],
+        appListImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  created() {
+    this.listData.id = this.$route.query.id
+    this.getById()
+    this.getShopTypeList()
+  },
+  methods: {
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    getById() {
+      this.$store.dispatch('shopType/GetShop', this.listData.id).then((res) => {
+        const shopData = res.data
+        this.listData = shopData
+        alert(this.listData.shopIntroduction)
+        // 多张图片进行遍历
+        for (let i = 0; i < shopData.appCarouselImg.length; i++) {
+          this.displayAppCarouselImg.push({ url: shopData.appCarouselImg[i] })
+        }
+      })
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appListImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.updateShop()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    updateShop() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/UpdateShop', this.listData).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error UpdateShop')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

VUECODE/smart-property-manage/src/views/rental/rentalIndex.vue

@@ -0,0 +1,328 @@
+
+<template>
+  <div class="root">
+    <el-form :inline="true" :model="listQuery" class="form-listQuery">
+      <el-form-item class="filter-item" label="房间编号">
+        <el-input v-model.trim="listQuery.id" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="房间编号" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="房间名称" >
+        <el-input v-model.trim="listQuery.shopName" placeholder="房间名称" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="租金从" >
+        <el-input v-model.trim="listQuery.shopName" placeholder="租金从" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="到" >
+        <el-input v-model.trim="listQuery.shopName" placeholder="到" />
+      </el-form-item>
+      <el-form-item class="filter-item" label="租赁方式" >
+        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+            <el-option label="整租" value="1"/>
+            <el-option label="合租" value="2"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item class="filter-item" label="户型" >
+        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+            <el-option label="一室居" value="1"/>
+            <el-option label="二室居" value="2"/>
+            <el-option label="三室居" value="3"/>
+            <el-option label="四室居及以上" value="4"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item class="filter-item" label="上架状态" >
+        <el-select v-model="listQuery.shopStatus" placeholder="请选择">
+            <el-option label="已上架" value="1"/>
+            <el-option label="已下架" value="2"/>
+          </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
+        <el-button type="primary" @click="search">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="button">
+      <el-button type="primary" @click="add">添加</el-button>
+      <el-button type="warning" @click="edit">修改</el-button>
+      <el-button type="danger" @click="shelfShop">上架房间</el-button>
+      <el-button type="danger" @click="obtainedShop">下架房间</el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="rentalList"
+      border
+      tooltip-effect="dark"
+      style="width: 100%; margin-top: 20px;"
+      @selection-change="handleSelectionChange">
+      <el-table-column
+        type="selection"
+        width="55"/>
+      <el-table-column prop="id" label="房间编号" align="center"/>
+      <el-table-column prop="shopName" label="房间名称" align="center" >
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.shopName }}</span></a></template>
+      </el-table-column>
+      <el-table-column prop="sort" label="权重" align="center"/>
+      <el-table-column prop="typeName" label="租金" align="center"/>
+      <el-table-column prop="shopStatus" label="上架状态" align="center">\
+        <template slot-scope="scope">
+          <span v-if="scope.row.shopStatus === '1'">已上架</span>
+          <span v-if="scope.row.shopStatus === '2'">已下架</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="shopStatus" label="租赁方式" align="center">\
+        <template slot-scope="scope">
+          <span v-if="scope.row.shopStatus === '1'">整租</span>
+          <span v-if="scope.row.shopStatus === '2'">合租</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="shopStatus" label="户型" align="center">\
+        <template slot-scope="scope">
+          <span v-if="scope.row.shopStatus === '1'">一室居</span>
+          <span v-if="scope.row.shopStatus === '2'">二室居</span>
+          <span v-if="scope.row.shopStatus === '3'">三室居</span>
+          <span v-if="scope.row.shopStatus === '4'">四室居及以上</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateDate" label="编辑时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
+      <el-table-column prop="userName" label="编辑人" align="center"/>
+    </el-table>
+    <div class="block">
+      <el-pagination
+        :current-page.sync="listQuery.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size.sync="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState, mapActions, mapMutations } from 'vuex'
+
+export default {
+  data() {
+    return {
+      listQuery: {
+        id: '',
+        shopName: '',
+        shopTypeId: '',
+        shopStatus: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0, // 数据总数
+      shopList: [],
+      shopTypeList: [],
+      deleteIds: [], // 选择的id集合
+      listLoading: true // 加载圈
+    }
+  },
+  mounted() {
+    // 获取数据
+    this.dataQuery()
+    this.getShopTypeList()
+  },
+  methods: {
+    ...mapActions('shopType', [
+      'FetchShopList',
+      'FetchShopTypeSelect'
+    ]),
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val
+      this.dataQuery()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val
+      this.dataQuery()
+    },
+    padDate(value) {
+      value = value < 10 ? '0' + value : value
+      return value
+    },
+    getStatus(row) { // 获取状态
+      let statusName = ''
+
+      // 判断状态
+      switch (row.status) {
+        case '0':
+          statusName = '已作废'
+          break
+        case '1':
+          statusName = '已发布'
+          break
+        case '2':
+          statusName = '草稿'
+          break
+      }
+
+      // 如果修改时间和创建时间不一致, 就显示已修改
+      if (row.status === '1' && (row.updateDate > row.createDate)) {
+        statusName = '已修改'
+      }
+
+      return statusName
+    },
+    dataQuery() { // 查询数据
+      this.listLoading = true
+      this.$store.dispatch('shopType/FetchShopList', this.listQuery).then((res) => {
+        const resData = res.data
+        this.rentalList = resData.list
+        this.total = resData.total
+        this.listLoading = false
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error ListAnnouncement')
+      })
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listQuery).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    handleSelectionChange(data) {
+      // 设置为 空
+      this.deleteIds = []
+      for (let i = 0; i < data.length; i++) {
+        this.deleteIds.push(data[i].id)
+      }
+    },
+	  search() {
+      this.listQuery.pageNum = 1
+      this.dataQuery()
+    },
+    handleFilter() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.listQuery.id =''
+      this.listQuery.shopName=''
+      this.listQuery.shopTypeId=''
+      this.listQuery.shopStatus=''
+      this.dataQuery()
+    },
+    // 添加公告
+    add() {
+      this.$router.push({ name: 'shop-add' })
+    },
+    edit(){// 编辑公告
+      const ids = this.deleteIds
+      if (ids.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      if (ids < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+       let ide= this.deleteIds[0]
+       this.listQuery.id = ide
+       this.$router.push({ name: 'shop-edit', query: { id: ide }})
+      },
+    deleteAnnouncement(){
+       let ide= this.deleteIds[0]
+       this.listQuery.id = ide 
+      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
+        const resData = res.data
+        const announcement = resData.tpAnnouncement
+        const imgList = resData.studentList
+        this.listQuery.status= announcement.status
+        console.log("1",this.listQuery.status)
+        if(this.listQuery.status == 0){
+          this.$message.error('已作废不可以作废')
+          return
+        }
+        this.deleteId()     
+      })    
+    },
+    shelfShop() {
+      this.listLoading = true
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请至少选择一行数据上架!')
+        return
+      }
+      this.$store.dispatch('shopType/ShelfShop', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+    obtainedShop() {
+      this.listLoading = true
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请至少选择一行数据下架!')
+        return
+      }
+      this.$store.dispatch('shopType/ObtainedShop', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+    deleteId(){
+       const ids = this.deleteIds
+      this.listLoading = true
+      console.log(ids)
+      this.$store.dispatch('DeleteAnnouncement', ids).then((res) => {
+        this.listLoading = false
+        this.listQuery.announcementTitle = ''
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+
+
+    clickTitle(id) {
+      this.$router.push({ name: 'shop-edit', query: { id: id }})
+    },
+    formatDate(val) {
+      if (val === null) {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      return year + '-' + month + '-' + day
+    }
+  }
+}
+</script>
+
+<style scoped>
+.root{
+  display: flex;
+  flex-flow: column;
+}
+.form-listQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+.operation{
+  display: flex;
+  justify-content: space-between;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block{
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
+}
+.button {
+  margin-left: 20px;
+}
+</style>
+

VUECODE/smart-property-manage/src/views/shop/shopAdd.vue

@@ -0,0 +1,315 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item label="商铺名称" prop="shopName">
+        <el-input v-model="listData.shopName"/>
+      </el-form-item>
+      <el-form-item label="商铺说明" prop="remark">
+        <el-input v-model="listData.remark"/>
+      </el-form-item>
+      <el-form-item label="app首页展示图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppIndexSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app列表展示图" prop="appListImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appListImg" :src="listData.appListImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="商铺类型" prop="shopTypeId">
+        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="shopStatus">
+        <el-select v-model="listData.shopStatus" placeholder="请选择">
+          <el-option label="已上架" value="1"/>
+          <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="shopTel">
+        <el-input v-model="listData.shopTel"/>
+      </el-form-item>
+      <el-form-item label="商铺地址" prop="shopAddress">
+        <el-input v-model="listData.shopAddress"/>
+      </el-form-item>
+      <el-form-item label="人均消费" prop="averagePrice">
+        <el-input v-model="listData.averagePrice"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="商铺介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
+          <div id="father">
+            <wangeditor @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+        <el-button @click="resetForm('ruleForm')">重置</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+
+export default {
+  components: { Pagination, Wangeditor },
+  data() {
+    return {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.shopLongitude = e.lnglat.lng
+          this.listData.shopLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
+        shopName: '',
+        remark: '',
+        appIndexImg: '',
+        appListImg: '',
+        appCarouselImg: [],
+        sort: '',
+        shopTypeId: '',
+        shopStatus: '',
+        shopTel: '',
+        shopAddress: '',
+        averagePrice: '',
+        shopLongitude: '',
+        shopLatitude: '',
+        shopIntroduction: ''
+      },
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        ],
+        shopTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        shopAddress: [
+          { required: true, message: '请输入商铺地址', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app首页展示图', trigger: 'blur' }
+        ],
+        appListImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  mounted() {
+    this.getShopTypeList()
+  },
+  methods: {
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appListImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.addShop()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    addShop() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/AddShop', this.listData).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error AddBuilding')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

VUECODE/smart-property-manage/src/views/shop/shopEdit.vue

@@ -0,0 +1,332 @@
+<template>
+  <div class="root">
+    <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+      <el-form-item label="商铺名称" prop="shopName">
+        <el-input v-model="listData.shopName"/>
+      </el-form-item>
+      <el-form-item label="商铺说明" prop="remark">
+        <el-input v-model="listData.remark"/>
+      </el-form-item>
+      <el-form-item label="app首页展示图" prop="appIndexImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppIndexSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appIndexImg" :src="listData.appIndexImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app列表展示图" prop="appListImg">
+        <el-upload
+          class="avatar-uploader"
+          name="uploadFiles"
+          :action="uploadImgUrl"
+          :show-file-list="false"
+          :on-success="handleAppListSuccess"
+          :before-upload="beforeAvatarUpload">
+          <img v-if="listData.appListImg" :src="listData.appListImg" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="app商铺轮播图" prop="appCarouselImg">
+        <el-upload
+          name="uploadFiles"
+          :limit="6"
+          :action="uploadImgUrl"
+          list-type="picture-card"
+          :file-list="displayAppCarouselImg"
+          :on-preview="handlePictureCardPreview"
+          :on-remove="handleRemove"
+          :on-success="handleSuccessCarouselImg">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+      </el-form-item>
+      <el-form-item label="权重" prop="sort">
+        <el-input v-model="listData.sort"/>
+      </el-form-item>
+      <el-form-item label="商铺类型" prop="shopTypeId">
+        <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
+          <el-option v-for="item in shopTypeList" :key="item.id" :value="item.id" :label="item.typeName"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="shopStatus">
+        <el-select v-model="listData.shopStatus" placeholder="请选择">
+          <el-option label="已上架" value="1"/>
+          <el-option label="已下架" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="shopTel">
+        <el-input v-model="listData.shopTel"/>
+      </el-form-item>
+      <el-form-item label="商铺地址" prop="shopAddress">
+        <el-input v-model="listData.shopAddress"/>
+      </el-form-item>
+      <el-form-item label="人均消费" prop="averagePrice">
+        <el-input v-model="listData.averagePrice"/>
+      </el-form-item>
+      <el-form-item label="高德坐标">
+        <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
+      </el-form-item>
+      <el-form-item label="">
+         <!-- 地图 -->
+        <div style="width:100%;height:300px;" class="amap-page-container">
+          <el-amap-search-box :search-option="searchOption" :on-search-result="onSearchResult" class="search-box"/>
+          <el-amap ref="map" :events="events" :center="mapCenter" :zoom="12" class="amap-demo" vid="amapDemo">
+            <el-amap-marker v-for="(item,index) in markers" :key="index" :position="item" />
+          </el-amap>
+        </div>
+      </el-form-item>
+      <el-form-item label="商铺介绍">
+          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/>  listData.shopIntroduction-->
+          <div id="father">
+            <wangeditor :content="listData.shopIntroduction" @wangeditorEvent="wangeditorValue"/>
+          </div>
+        </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
+import Wangeditor from '@/components/Wangeditor'
+
+export default {
+  components: { Pagination, Wangeditor },
+  data() {
+    return {
+      events: {
+        click: e => {
+          // _self.postData.Coordinate = e.lnglat.lat + ',' + e.lnglat.lng
+          this.listData.shopLongitude = e.lnglat.lng
+          this.listData.shopLatitude = e.lnglat.lat
+        }
+      },
+      listData: {
+        id: '',
+        shopName: '',
+        remark: '',
+        appIndexImg: '',
+        appListImg: '',
+        appCarouselImg: [],
+        sort: '',
+        shopTypeId: '',
+        shopStatus: '',
+        shopTel: '',
+        shopAddress: '',
+        averagePrice: '',
+        shopLongitude: '',
+        shopLatitude: '',
+        shopIntroduction: ''
+      },
+      ediContent: '',
+      displayAppCarouselImg: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      uploadImgUrl: process.env.BASE_API + '/uploadimage',
+      markers: [],
+      shopTypeList: [],
+      searchOption: {
+        city: '南京',
+        citylimit: false
+      },
+      mapCenter: [118.789509, 32.019989],
+      tableKey: 0,
+      rules: {
+        typeName: [
+          { required: true, message: '请输入商铺名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入商铺说明', trigger: 'blur' }
+        ],
+        shopTel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' }
+        ],
+        shopAddress: [
+          { required: true, message: '请输入商铺地址', trigger: 'blur' }
+        ],
+        appIndexImg: [
+          { required: true, message: 'app首页展示图', trigger: 'blur' }
+        ],
+        appListImg: [
+          { required: true, message: 'app列表展示图', trigger: 'blur' }
+        ],
+        appCarouselImg: [
+          { required: true, message: 'app商铺轮播图', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  created() {
+    this.listData.id = this.$route.query.id
+    this.getById()
+    this.getShopTypeList()
+    // this.listData.shopIntroduction = "555555"
+  },
+  methods: {
+     addMarker() {
+      const lng = 121.5 + Math.round(Math.random() * 1000) / 10000
+      const lat = 31.197646 + Math.round(Math.random() * 500) / 10000
+      this.markers.push([lng, lat])
+    },
+    getById() {
+      this.$store.dispatch('shopType/GetShop', this.listData.id).then((res) => {
+        const shopData = res.data
+        this.listData = { ...shopData }
+        console.log(this.listData.shopIntroduction)
+        // 多张图片进行遍历
+        for (let i = 0; i < shopData.appCarouselImg.length; i++) {
+          this.displayAppCarouselImg.push({ url: shopData.appCarouselImg[i] })
+        }
+      })
+    },
+    beforeAvatarUpload(file) {
+    },
+    handleAppIndexSuccess(res, file) {
+      this.listData.appIndexImg = res.data[0]
+    },
+    handleAppListSuccess(res, file) {
+      this.listData.appListImg = res.data[0]
+    },
+    handleRemove(file, fileList) {
+      this.listData.appCarouselImg = []
+      for (let i = 0; i < fileList.length; i++) {
+        this.listData.appCarouselImg.push(fileList[i].response.data[0])
+      }
+    },
+    handleSuccessCarouselImg(response, file, fileList) { // 活动配图上传成功时回调
+      const resImg = response.data[0]
+      this.listData.appCarouselImg.push(resImg)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    getShopTypeList() {
+      this.$store.dispatch('shopType/FetchShopTypeSelect', this.listData).then((res) => {
+        this.shopTypeList = res.data
+      }).catch(() => {
+        console.log('error ListAnnouncement')
+      })
+    },
+    onSearchResult(pois) {
+      // 搜索地图
+      let latSum = 0
+      let lngSum = 0
+      if (pois.length > 0) {
+        pois.forEach(poi => {
+          const { lng, lat } = poi
+          lngSum += lng
+          latSum += lat
+          this.markers.push([poi.lng, poi.lat])
+        })
+        const center = {
+          lng: lngSum / pois.length,
+          lat: latSum / pois.length
+        }
+        this.mapCenter = [center.lng, center.lat]
+      }
+    },
+    wangeditorValue(value) {
+      this.listData.shopIntroduction = value // 在这里接受子组件传过来的参数，赋值给data里的参数
+    },
+    submitForm(formName) { // 提交
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.updateShop()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    resetForm(formName) { // 重置
+      // 重置为未注册
+      this.isRegistered = true
+      // 重置为非户主
+      this.roleDisabled = false
+
+      console.log(this.isRegistered)
+      this.$refs[formName].resetFields()
+    },
+    updateShop() {
+      // 加载框
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      this.$store.dispatch('shopType/UpdateShop', this.listData).then((res) => {
+        if (res.code === '0') {
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+          this.$router.push({ name: 'shop-index' })
+          loading.close()
+          return
+        }
+        this.$message.error(res.message)
+        loading.close()
+      }).catch(() => {
+        loading.close()
+        console.log('error UpdateShop')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  
+.add-ruleForm{
+  width: 800px;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 50px;
+}
+</style>
+<style scoped>
+.search-box {
+  position: absolute;
+  top: 25px;
+  left: 20px;
+}
+
+.amap-page-container {
+  position: relative;
+}
+</style>

VUECODE/smart-property-manage/src/views/shop/shopIndex.vue

@@ -27,7 +27,8 @@
     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
-      <el-button type="danger" @click="deleteAnnouncement">作废</el-button>
+      <el-button type="danger" @click="shelfShop">上架商铺</el-button>
+      <el-button type="danger" @click="obtainedShop">下架商铺</el-button>
     </div>
     <el-table
       v-loading="listLoading"
@@ -42,7 +43,7 @@
         width="55"/>
       <el-table-column prop="id" label="商铺编号" align="center"/>
       <el-table-column prop="shopName" label="商铺名称" align="center" >
-        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.shopName)">{{ scope.row.shopName }}</span></a></template>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.shopName }}</span></a></template>
       </el-table-column>
       <el-table-column prop="imgUrl" label="首页展示图" align="center">
         <template scope="scope">
@@ -182,7 +183,7 @@ export default {
     },
     // 添加公告
     add() {
-      this.$router.push({ name: 'announcement-add' })
+      this.$router.push({ name: 'shop-add' })
     },
     edit(){// 编辑公告
       const ids = this.deleteIds
@@ -196,19 +197,7 @@ export default {
       }
        let ide= this.deleteIds[0]
        this.listQuery.id = ide
-      this.$store.dispatch('AnnouncementById', this.listQuery).then((res) => {
-        const resData = res.data
-        const announcement = resData.tpAnnouncement
-        const imgList = resData.studentList
-        this.listQuery = announcement
-        this.listQuery.announcementTitle = ''
-        console.log("1",this.listQuery.status)
-        if(this.listQuery.status == 0){
-          this.$message.error('已作废不可以修改')
-          return
-        } 
-       this.$router.push({ name: 'announcement-edit', query: { id: ide }})
-      }) 
+       this.$router.push({ name: 'shop-edit', query: { id: ide }})
       },
     deleteAnnouncement(){
        let ide= this.deleteIds[0]
@@ -226,7 +215,36 @@ export default {
         this.deleteId()     
       })    
     },
-
+    shelfShop() {
+      this.listLoading = true
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请至少选择一行数据上架!')
+        return
+      }
+      this.$store.dispatch('shopType/ShelfShop', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
+    obtainedShop() {
+      this.listLoading = true
+      const ids = this.deleteIds
+      if (ids < 1) {
+        this.$message.error('请至少选择一行数据下架!')
+        return
+      }
+      this.$store.dispatch('shopType/ObtainedShop', ids).then((res) => {
+        this.listLoading = false
+        this.dataQuery()
+      }).catch(() => {
+        this.listLoading = false
+        console.log('error DeleteAnnouncement')
+      })
+    },
     deleteId(){
        const ids = this.deleteIds
       this.listLoading = true
@@ -243,7 +261,7 @@ export default {
 
 
     clickTitle(id) {
-      this.$router.push({ name: 'contentParticulars-details', query: { id: id }})
+      this.$router.push({ name: 'shop-edit', query: { id: id }})
     },
     formatDate(val) {
       if (val === null) {