图片地址变更

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasDefaultModuleFunctionDao.java

@@ -3,6 +3,8 @@ package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
@@ -15,5 +17,7 @@ public interface SaasDefaultModuleFunctionDao extends PagingAndSortingRepository
    List<SaasDefaultModuleFunctionDO> findBySaasType(Integer saasType);
    @Modifying
    @Query("delete from SaasDefaultModuleFunctionDO sdf where sdf.saasType = ?1 ")
    void deleteBySaasType(Integer saasType);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasTypeDictEndpoint.java

@@ -5,14 +5,13 @@ import com.yihu.jw.base.service.saas.SaasService;
import com.yihu.jw.base.service.saas.SaasTypeDictService;
import com.yihu.jw.base.service.user.UserService;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.restmodel.base.saas.SaasDefaultModuleFunctionVO;
import com.yihu.jw.restmodel.base.saas.SaasTypeDictVO;
import com.yihu.jw.restmodel.base.saas.SaasVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.*;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
@@ -57,8 +56,8 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
    }
    @PostMapping(value = BaseRequestMapping.Saas.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    @PostMapping(value = BaseRequestMapping.SaasTypeDict.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新租户类型")
    public ObjEnvelop<SaasTypeDictVO> update(
            @ApiParam(name = "saasTypeDictJson", value = "saas类型Json数据")
            @RequestParam(value = "saasTypeDictJson", required = true) String saasTypeDictJson,
@@ -77,7 +76,7 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
        return success("更新成功！", saasTypeDictDO, SaasTypeDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Saas.PAGE)
    @GetMapping(value = BaseRequestMapping.SaasTypeDict.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<SaasTypeDictVO> page(
            @ApiParam(name = "name", value = "租户类型名称")
@@ -103,7 +102,7 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
        return success(saasTypeDictDOS, count, page, size, SaasTypeDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Saas.LIST)
    @GetMapping(value = BaseRequestMapping.SaasTypeDict.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<SaasTypeDictVO> list(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
@@ -116,5 +115,17 @@ public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
        return success(saasTypeDictDOS, SaasTypeDictVO.class);
    }
//    @GetMapping(value = BaseRequestMapping.SaasTypeDict.FINDBYID)
//    @ApiOperation(value = "根据id获取单个租户类型")
//    public MixEnvelop<SaasTypeDictVO,List<SaasDefaultModuleFunctionVO>> findById(
//            @ApiParam(name = "saasTypeDictId", value = "租户类型id")
//            @RequestParam(value = "saasTypeDictId", required = true) String saasTypeDictId) throws Exception {
//
//        SaasTypeDictDO saasTypeDictDO = saasTypeDictService.findById(saasTypeDictId);
//        //根据租户类型获取关联的模块
//        List<SaasDefaultModuleFunctionDO> saasDefaultModuleFunctionDOList = saasDefaultModuleFunctionService.findByField("saasType",saasTypeDictId);
//        return success(saasTypeDictDO, SaasTypeDictVO.class);
//    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasTypeDictService.java

@@ -14,6 +14,7 @@ import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
import com.yihu.jw.entity.base.saas.SaasModuleFunctionDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.base.user.UserRoleDO;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;
import org.hibernate.SQLQuery;
@@ -43,7 +44,7 @@ public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasType
    public SaasTypeDictDO save(SaasTypeDictDO saasTypeDictDO, String saasTypeDefaultModuleIds) {
        //初始化租户信息
        Integer code ;
        Integer code;
        if (StringUtils.isEmpty(saasTypeDictDO.getId())) {
            //新增
            code = getNextSaasTypeDictCode();
@@ -54,19 +55,21 @@ public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasType
        }
        //根据moduleId获取模块关联的接口id
        String[] ids = saasTypeDefaultModuleIds.split(",");
        List<FunctionDO> functionDOList = functionDao.findFunctionDOSByModuleIdExists(ids);
        //初始化租户默认模块
        List<SaasDefaultModuleFunctionDO> saasDefaultModuleDOS = new ArrayList<>();
        functionDOList.forEach(item -> {
            SaasDefaultModuleFunctionDO saasDefaultModuleFunctionDO = new SaasDefaultModuleFunctionDO();
            saasDefaultModuleFunctionDO.setSaasType(code);
            saasDefaultModuleFunctionDO.setModuleId(item.getModuleId());
            saasDefaultModuleFunctionDO.setFunctionId(item.getId());
            saasDefaultModuleDOS.add(saasDefaultModuleFunctionDO);
        });
        if (null != ids && ids.length > 0) {
            List<FunctionDO> functionDOList = functionDao.findFunctionDOSByModuleIdExists(ids);
            //初始化租户默认模块
            List<SaasDefaultModuleFunctionDO> saasDefaultModuleDOS = new ArrayList<>();
            functionDOList.forEach(item -> {
                SaasDefaultModuleFunctionDO saasDefaultModuleFunctionDO = new SaasDefaultModuleFunctionDO();
                saasDefaultModuleFunctionDO.setSaasType(code);
                saasDefaultModuleFunctionDO.setModuleId(item.getModuleId());
                saasDefaultModuleFunctionDO.setFunctionId(item.getId());
                saasDefaultModuleDOS.add(saasDefaultModuleFunctionDO);
            });
            saasDefaultModuleFunctionDao.save(saasDefaultModuleDOS);
        }
        //保存数据
        saasTypeDictDO = saasTypeDictDao.save(saasTypeDictDO);
        saasDefaultModuleFunctionDao.save(saasDefaultModuleDOS);
        return saasTypeDictDO;
    }
@@ -94,4 +97,8 @@ public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasType
        BigInteger count = (BigInteger) sqlQuery.uniqueResult();
        return count.compareTo(new BigInteger("0")) > 0;
    }
    public SaasTypeDictDO findById(String id){
        return saasTypeDictDao.findById(id);
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/dfs/FastDFSController.java

@@ -48,8 +48,6 @@ public class FastDFSController extends EnvelopRestEndpoint {
    @Value("${img.path1}")
    private String img_path1;
    @Value("${img.path2}")
    private String img_path2;
    private final ResourceLoader resourceLoader;
@@ -225,7 +223,7 @@ public class FastDFSController extends EnvelopRestEndpoint {
//        if (path.split(":").length < 2) {
//            return failed("参数有误");
//        }
        byte[] bytes = load(path);
        byte[] bytes = load(img_path1+path);
        String fileStream = new String(Base64.getEncoder().encode(bytes));
        if (!StringUtils.isEmpty(fileStream)) {
            return success(fileStream);
@@ -241,10 +239,10 @@ public class FastDFSController extends EnvelopRestEndpoint {
     */
    public String upload(InputStream inputStream, String fileName) {
        OutputStream outputStream = null;
        String path1 = img_path1+img_path2 + "/" + fileName;
        String path1 = img_path1+ "/" + fileName;
        try {
            //文件源
            File files = new File(img_path1+img_path2);
            File files = new File(img_path1);
            if (!files.exists()) {//判断文件夹是否创建，没有创建则创建新文件夹
                files.mkdirs();
            }
@@ -271,7 +269,7 @@ public class FastDFSController extends EnvelopRestEndpoint {
                e.printStackTrace();
            }
        }
        return img_path2 + "/" + fileName;
        return  fileName;
    }
    /**

svr/svr-healthy-house/src/main/resources/application.yml

@@ -88,7 +88,6 @@ jw:
img:
#  path1: E:/tryfile/upload/img
  path1: /data/upload/img/
  path2: /group1
---
spring:
@@ -108,7 +107,6 @@ jw:
img:
#  path1: E:/tryfile/upload/img
  path1: /data/upload/img/
  path2: /group1
---
spring:
  profiles: prod
@@ -126,5 +124,4 @@ jw:
  smsUrl: http://svr-base:10020/sms_gateway/send
img:
#  path1: E:/tryfile/upload/img
  path1: /data/upload/img/
  path2: /group1
  path1: /data/upload/img/