suntianwu 3 лет назад
Родитель
Сommit
46022f8525

+ 2 - 4
src/main/java/com/care/bms/service/OrganizationService.java

@@ -22,7 +22,6 @@ import com.care.common.util.DateUtils;
 
 import com.care.common.util.HttpUtil;
 import com.care.common.util.ImgUtil;
-import com.care.common.util.Result;
 import com.care.common.vo.org.OrganizationVO;
 import com.care.common.vo.PageReqVO;
 import com.care.common.vo.UserLogindConvertVO;
@@ -39,9 +38,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.*;
 
 
@@ -138,7 +135,8 @@ public class OrganizationService {
         OrganizationVO vo = new OrganizationVO();
         CareOrganization organizationInfo = this.careOrganizationService.getById(organizationId);
         BeanUtil.copyProperties(organizationInfo,vo);
-        //服务有效期
+
+        //机构账号
         QueryWrapper<CareSysUser> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.lambda().eq(CareSysUser::getOrgId, organizationId).eq(CareSysUser::getRole,UserRoleEnum.ORG);
         CareSysUser careSysUser = this.careSysUserService.getOne(queryWrapper2);

+ 1 - 1
src/main/java/com/care/bms/service/StationService.java

@@ -120,7 +120,7 @@ public class StationService {
         queryWrapper.lambda().eq(CareStation::getName,vo.getName());
         int count = this.careStationService.count(queryWrapper);
         if(count > 0){
-            throw new BDException("服务站名称已经存在已存在!");
+            throw new BDException("服务站名称已经存在!");
         }
 
         CareStation careStation = new CareStation();

+ 0 - 3
src/main/java/com/care/common/vo/org/OrganizationVO.java

@@ -73,9 +73,6 @@ public class OrganizationVO implements Serializable {
     @ApiModelProperty("log")
     private String logo;
 
-    @ApiModelProperty("log图片MultipartFile对象")
-    private MultipartFile logoImg;
-
     @ApiModelProperty("createTime")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;

+ 1 - 1
src/main/resources/application-dev.properties

@@ -42,7 +42,7 @@ mqtt.username=shangxingkeji
 mqtt.password=sxkj@1234
 
 #是否开启mqtt消息接受服务,开启:1,不开启:0
-mqtt.on=1
+mqtt.on=0
 #设备激活返回消息超时(秒)
 mqtt.dev.jihuo.timeout=30