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

java110-core/src/main/java/com/java110/core/factory/SendSmsFactory.java

@@ -35,7 +35,7 @@ public class SendSmsFactory {
 
         if (!StringUtils.isEmpty(smsCompany) && SMS_COMPANY_ALI.equals(smsCompany.trim())) {
             AliSendMessageFactory.sendMessage(tel, code);
-        }else if(SMS_COMPANY_ALI.equals(smsCompany.trim())){
+        }else if(SMS_COMPANY_YIDONG.equals(smsCompany.trim())){
             YidongSendMessageFactory.sendMessage(tel,code);
         } else {
             TencentSendMessageFactory.sendMessage(tel, code);
@@ -47,7 +47,7 @@ public class SendSmsFactory {
         ResultVo resultVo = null;
         if (SMS_COMPANY_ALI.equals(smsConfigDto.getSmsType().trim())) {
             resultVo = AliSendMessageFactory.sendOweFeeSms(tel, param,smsConfigDto);
-        } else if(SMS_COMPANY_ALI.equals(smsConfigDto.getSmsType().trim())){
+        } else if(SMS_COMPANY_YIDONG.equals(smsConfigDto.getSmsType().trim())){
             resultVo = YidongSendMessageFactory.sendOweFeeSms(tel, param,smsConfigDto);
         } else {
             resultVo = TencentSendMessageFactory.sendOweFeeSms(tel, param,smsConfigDto);

java110-db/src/main/resources/mapper/job/UserDownloadFileV1ServiceDaoImplMapper.xml

@@ -81,9 +81,7 @@
         <if test="remark !=null and remark != ''">
             , t.remark= #{remark}
         </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
+
         <if test="downloadUserName !=null and downloadUserName != ''">
             , t.download_user_name= #{downloadUserName}
         </if>
@@ -94,6 +92,9 @@
         <if test="downloadId !=null and downloadId != ''">
             and t.download_id= #{downloadId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
     </update>
 

service-common/src/main/java/com/java110/common/smo/impl/AccessControlWhiteV1InnerServiceSMOImpl.java

@@ -150,6 +150,7 @@ public class AccessControlWhiteV1InnerServiceSMOImpl extends BaseServiceSMO impl
 
     @Override
     public int queryAccessControlWhitesCount(@RequestBody AccessControlWhiteDto accessControlWhiteDto) {
+
         return accessControlWhiteV1ServiceDaoImpl.queryAccessControlWhitesCount(BeanConvertUtil.beanCovertMap(accessControlWhiteDto));
     }
 

service-community/src/main/java/com/java110/community/cmd/communityVenue/SaveCommunityVenueCmd.java

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.community.ICommunityVenueV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
 import com.java110.po.communityVenue.CommunityVenuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -52,6 +53,9 @@ public class SaveCommunityVenueCmd extends Cmd {
     @Autowired
     private ICommunityVenueV1InnerServiceSMO communityVenueV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
@@ -67,6 +71,8 @@ public class SaveCommunityVenueCmd extends Cmd {
         communityVenuePo.setVenueId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = communityVenueV1InnerServiceSMOImpl.saveCommunityVenue(communityVenuePo);
 
+
+
         if (flag < 1) {
             throw new CmdException("保存数据失败");
         }

service-community/src/main/java/com/java110/community/cmd/floor/SaveFloorCmd.java

@@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
         @Java110ParamDoc(name = "name", length = 64, remark = "名称"),
         @Java110ParamDoc(name = "floorArea", length = 64, remark = "面积"),
         @Java110ParamDoc(name = "floorNum", length = 64, remark = "编号"),
-        @Java110ParamDoc(name = "seq",type = "int",length = 11, remark = "排序"),
+        @Java110ParamDoc(name = "seq", type = "int", length = 11, remark = "排序"),
 })
 
 @Java110ResponseDoc(
@@ -46,8 +46,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 )
 
 @Java110ExampleDoc(
-        reqBody="{\"floorId\":\"\",\"name\":\"2号楼\",\"floorName\":\"\",\"floorArea\":\"22\",\"floorNum\":\"2\",\"remark\":\"2\",\"errorInfo\":\"\",\"seq\":\"22\",\"communityId\":\"2022081539020475\"}",
-        resBody="{'code':0,'msg':'成功'}"
+        reqBody = "{\"floorId\":\"\",\"name\":\"2号楼\",\"floorName\":\"\",\"floorArea\":\"22\",\"floorNum\":\"2\",\"remark\":\"2\",\"errorInfo\":\"\",\"seq\":\"22\",\"communityId\":\"2022081539020475\"}",
+        resBody = "{'code':0,'msg':'成功'}"
 )
 
 
@@ -75,6 +75,16 @@ public class SaveFloorCmd extends Cmd {
         if (floorCount > 0) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "楼栋编号已经存在");
         }
+
+        floorDto = new FloorDto();
+        floorDto.setFloorName(reqJson.getString("name"));
+        floorDto.setCommunityId(reqJson.getString("communityId"));
+
+        floorCount = floorInnerServiceSMOImpl.queryFloorsCount(floorDto);
+
+        if (floorCount > 0) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "楼栋名称已经存在");
+        }
     }
 
     @Override
@@ -89,7 +99,7 @@ public class SaveFloorCmd extends Cmd {
         businessFloor.put("floorNum", reqJson.getString("floorNum"));
         businessFloor.put("communityId", reqJson.getString("communityId"));
         businessFloor.put("floorArea", reqJson.getString("floorArea"));
-        businessFloor.put("seq",reqJson.getString("seq"));
+        businessFloor.put("seq", reqJson.getString("seq"));
         FloorPo floorPo = BeanConvertUtil.covertBean(businessFloor, FloorPo.class);
         int flag = floorV1InnerServiceSMOImpl.saveFloor(floorPo);
 

service-job/src/main/java/com/java110/job/adapt/car/CarOutParkingAreaAdapt.java

@@ -193,7 +193,7 @@ public class CarOutParkingAreaAdapt extends DatabusAdaptImpl {
             return remark;
         }
 
-        remark = "物业费欠费"+oweFee+"元，请点击详情交费！";
+        remark = "物业费欠费" + oweFee + "元，请点击详情交费！";
 
         return remark;
     }