Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/po/repair/RepairSettingPo.java

@@ -17,7 +17,7 @@ public class RepairSettingPo implements Serializable {
     private String returnVisitFlag;
     private String repairSettingType;
 
-    private String statusCd;
+    private String statusCd = "0";
 
 
     public String getRepairTypeName() {

java110-bean/src/main/java/com/java110/po/repair/RepairTypeUserPo.java

@@ -11,7 +11,7 @@ public class RepairTypeUserPo implements Serializable {
     private String staffName;
     private String communityId;
     private String staffId;
-    private String statusCd;
+    private String statusCd = "0";
 
     public String getTypeUserId() {
         return typeUserId;

service-community/src/main/java/com/java110/community/cmd/ownerRepair/SaveOwnerRepairCmd.java

@@ -13,12 +13,14 @@ import com.java110.dto.file.FileDto;
 import com.java110.dto.file.FileRelDto;
 import com.java110.dto.repair.RepairDto;
 import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.user.UserDto;
 import com.java110.intf.common.IFileInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
 import com.java110.intf.community.IRepairUserV1InnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.file.FileRelPo;
 import com.java110.po.owner.RepairPoolPo;
 import com.java110.po.owner.RepairUserPo;
@@ -49,6 +51,9 @@ public class SaveOwnerRepairCmd extends Cmd {
     @Autowired
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Autowired
     private IRepairPoolV1InnerServiceSMO repairPoolV1InnerServiceSMOImpl;
 
@@ -75,9 +80,19 @@ public class SaveOwnerRepairCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "repairObjName", "必填，请填写报修对象名称");
         Assert.hasKeyAndValue(reqJson, "appointmentTime", "必填，请填写预约时间");
         Assert.hasKeyAndValue(reqJson, "context", "必填，请填写报修内容");
-        Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写提交用户ID");
-        Assert.hasKeyAndValue(reqJson, "userName", "必填，请填写提交用户名称");
         Assert.hasKeyAndValue(reqJson, "communityId", "必填，请填写小区ID");
+
+       String userId =  context.getReqHeaders().get("user-id");
+       Assert.hasLength(userId,"请填写提交用户ID");
+       UserDto userDto = new UserDto();
+       userDto.setUserId(userId);
+       userDto.setPage(1);
+       userDto.setRow(1);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+       Assert.listOnlyOne(userDtos,"未查询到用户");
+        reqJson.put("userId",userDtos.get(0).getUserId());
+        reqJson.put("userName",userDtos.get(0).getName());
+
     }
 
     @Override

service-community/src/main/java/com/java110/community/cmd/ownerRepair/UpdateOwnerRepairCmd.java

@@ -31,7 +31,6 @@ public class UpdateOwnerRepairCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "repairObjName", "必填，请填写报修对象名称");
         Assert.hasKeyAndValue(reqJson, "appointmentTime", "必填，请填写预约时间");
         Assert.hasKeyAndValue(reqJson, "context", "必填，请填写报修内容");
-        Assert.hasKeyAndValue(reqJson, "state", "必填，请填写报修状态");
     }
 
     @Override

service-community/src/main/java/com/java110/community/cmd/parkingSpace/EditParkingSpaceCmd.java

@@ -65,7 +65,7 @@ public class EditParkingSpaceCmd extends Cmd {
         businessParkingSpace.put("state", parkingSpaceDto.getState());
         ParkingSpacePo parkingSpacePo = BeanConvertUtil.covertBean(businessParkingSpace, ParkingSpacePo.class);
         //parkingSpaceInnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
-        int flag =  parkingSpaceV1InnerServiceSMOImpl.deleteParkingSpace(parkingSpacePo);
+        int flag =  parkingSpaceV1InnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
 
         if(flag < 1){
             throw new CmdException("修改车位失败");

springboot/src/main/java/com/java110/boot/components/cache/CacheManageComponent.java

@@ -0,0 +1,54 @@
+package com.java110.boot.components.cache;
+
+
+import com.java110.boot.smo.cache.IListCachesSMO;
+import com.java110.core.context.IPageData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 服务绑定组件管理类
+ *
+ * add by wuxw
+ *
+ * 2019-06-29
+ */
+@Component("cacheManage")
+public class CacheManageComponent {
+
+    @Autowired
+    private IListCachesSMO listCachesSMOImpl;
+
+
+
+    /**
+     * 查询服务绑定列表
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd){
+        return listCachesSMOImpl.listCaches(pd);
+    }
+
+
+    /**
+     * 刷新缓存
+     * @param pd
+     * @return
+     */
+    public ResponseEntity<String> flushCache(IPageData pd){
+        return listCachesSMOImpl.flushCache(pd);
+
+    }
+
+    public IListCachesSMO getListCachesSMOImpl() {
+        return listCachesSMOImpl;
+    }
+
+    public void setListCachesSMOImpl(IListCachesSMO listCachesSMOImpl) {
+        this.listCachesSMOImpl = listCachesSMOImpl;
+    }
+
+}

springboot/src/main/java/com/java110/boot/smo/cache/IListCachesSMO.java

@@ -0,0 +1,30 @@
+package com.java110.boot.smo.cache;
+
+import com.java110.core.context.IPageData;
+import com.java110.utils.exception.SMOException;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 缓存管理服务接口类
+ *
+ * add by wuxw 2019-06-29
+ */
+public interface IListCachesSMO {
+
+    /**
+     * 查询缓存信息
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象数据
+     * @throws SMOException 业务代码层 异常
+     */
+    ResponseEntity<String> listCaches(IPageData pd) throws SMOException;
+
+
+    /**
+     * 刷新缓存
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象数据
+     * @throws SMOException 业务代码层 异常
+     */
+    ResponseEntity<String> flushCache(IPageData pd) throws SMOException;
+}

springboot/src/main/java/com/java110/boot/smo/cache/impl/ListCachesSMOImpl.java

@@ -0,0 +1,108 @@
+package com.java110.boot.smo.cache.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.boot.smo.DefaultAbstractComponentSMO;
+import com.java110.boot.smo.cache.IListCachesSMO;
+import com.java110.core.context.IPageData;
+import com.java110.entity.component.ComponentValidateResult;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Map;
+
+/**
+ * 查询serviceRegister服务类
+ */
+@Service("listCachesSMOImpl")
+public class ListCachesSMOImpl extends DefaultAbstractComponentSMO implements IListCachesSMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    public ResponseEntity<String> listCaches(IPageData pd) throws SMOException {
+        return businessProcess(pd);
+    }
+
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+
+        super.validatePageInfo(pd);
+
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.HAS_LIST_CACHE);
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+        Map paramMap = BeanConvertUtil.beanCovertMap(result);
+        paramIn.putAll(paramMap);
+        int page = paramIn.getInteger("page");
+        paramIn.put("page", ( page - 1)* paramIn.getInteger("row"));
+
+        String apiUrl = "query.console.caches" + mapToUrlParam(paramIn);
+        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
+                apiUrl,
+                HttpMethod.GET);
+
+        return responseEntity;
+    }
+
+
+    @Override
+    public ResponseEntity<String> flushCache(IPageData pd) throws SMOException {
+
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.HAS_LIST_CACHE);
+
+        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+
+
+
+        //根据ID查询缓存ID
+        String apiUrl = "query.console.cache" + mapToUrlParam(paramIn);
+        ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
+                apiUrl,
+                HttpMethod.GET);
+
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            return responseEntity;
+        }
+
+        JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+
+        Assert.hasKey(paramOut, "cache", "查询缓存失败，返回报文中未包含cache节点");
+
+        JSONObject cacheObj = paramOut.getJSONObject("cache");
+
+        Assert.hasKeyAndValue(cacheObj, "url", "查询缓存失败，返回报文中未包含url节点");
+
+        String url = cacheObj.getString("url");
+
+        //调用地址刷新缓存
+        //根据ID查询缓存ID
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                url,
+                HttpMethod.GET);
+
+        return responseEntity;
+    }
+
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}