forked from kidgrow-microservices-platform
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/FileService.java
@@ -54,7 +54,10 @@ */ @PostMapping(value = "/baseDownLoad",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE},consumes = MediaType.MULTIPART_FORM_DATA_VALUE) ResultBody baseDownLoad(@RequestBody Map<String,Object> map) throws Exception; /** * byte数组模式上传 到 oss * @param fileName bytes */ @PostMapping(value="byteUplaod") FileInfo byteUplaod(@RequestParam("fileName") String fileName,@RequestBody byte[] bytes);
@@ -45,6 +45,8 @@ @Value("${kidgrow.file-server.oss.domain}") private String DOMAIN; @Value("${spring.profiles.active}") private String OssPathEn; @Override public FileInfo upload(MultipartFile file) throws Exception { FileInfo fileInfo = FileUtil.getFileInfo(file); @@ -330,7 +332,7 @@ newfileInfo.setSource("aliyun"); newfileInfo.setImgType(houzhui); newfileInfo.setCreateTime(new Date()); this.fileUpLoadOss(newfileInfo,"pdf/"+newFileName,inputStream); this.fileUpLoadOss(newfileInfo,OssPathEn+"pdf/"+newFileName,inputStream); baseMapper.insert(newfileInfo); return newfileInfo; } kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java
@@ -6,8 +6,8 @@ import com.kidgrow.oprationcenter.feign.fallback.DiagnosticServiceFallbackFactory; import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.Map; /** @@ -24,6 +24,6 @@ /** * feign rpc访问远程 接口 */ @PostMapping(value = "/diagnostic/diagnosticitem") ResultBody<PageResult> getDiagnosticItemList(@RequestBody Map<String, Object> params); @GetMapping(value = "/diagnostic/diagnosticitem") ResultBody<PageResult> getDiagnosticItemList(@RequestParam Map<String, Object> params); } kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java
@@ -1,29 +1,26 @@ package com.kidgrow.usercenter.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kidgrow.common.annotation.LoginUser; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kidgrow.common.model.*; import com.kidgrow.common.service.impl.SuperServiceImpl; import com.kidgrow.usercenter.dto.SysRoleOrganizationDto; import com.kidgrow.usercenter.dto.SysRoleOrganizationMybatisDto; import com.kidgrow.usercenter.mapper.SysRoleMapper; import com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper; import com.kidgrow.usercenter.model.SysRoleOrganization; import com.kidgrow.usercenter.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kidgrow.common.service.impl.SuperServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import org.apache.commons.collections4.MapUtils; import lombok.extern.slf4j.Slf4j; import com.kidgrow.usercenter.model.SysRoleOrganization; import com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper; import org.springframework.transaction.annotation.Transactional; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -136,7 +133,7 @@ public List<Map<String, Object>> getTreeData(Long MyId, List<SysOrganization> sysOrganizations, List<Long> col) { List<Map<String, Object>> listMap = new ArrayList<>(); Map<Long, SysOrganization> collect = sysOrganizations.stream().collect(Collectors.toMap(SysOrganization::getId, SysOrganization -> SysOrganization)); List<Long> idList = sysOrganizations.stream().filter(e -> e.getOrgParentId() == MyId).map(e -> e.getId()).collect(Collectors.toList()); List<Long> idList = sysOrganizations.stream().filter(e -> e.getOrgParentId() .equals(MyId)).map(e -> e.getId()).collect(Collectors.toList()); for (Long id : idList ) { Map<String, Object> map = new HashMap<>(); @@ -144,7 +141,7 @@ map.put("name", collect.get(id).getOrgName()); map.put("level", collect.get(id).getOrgLevel()); map.put("checked", col.contains(id)); List<Long> childs = sysOrganizations.stream().filter(e -> e.getOrgParentId() == id).map(e -> e.getId()).collect(Collectors.toList()); List<Long> childs = sysOrganizations.stream().filter(e -> e.getOrgParentId().equals(id)).map(e -> e.getId()).collect(Collectors.toList()); if (childs.size() > 0) { List<Map<String, Object>> treeData = getTreeData(id, sysOrganizations, col); map.put("children", treeData); kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
@@ -164,7 +164,7 @@ <if test="itemto.flag"> </if> <if test="!itemto.flag"> or ( HOS.is_del = 0 and HOS.enabled=1) or ( hospitals.hosisdel = 0 and hospitals.hosenabled=1) </if> </when> <when test="inx==2"> @@ -183,7 +183,7 @@ index=""> create_user_org_code = #{itemtoto.orgCode} </foreach> and HOS.is_del = 0 and HOS.enabled=1 and hospitals.hosisdel = 0 and hospitals.hosenabled=1 ) </if> </when> @@ -193,7 +193,7 @@ create_user_org_code = #{itemto.object} </if> <if test="!itemto.flag"> or (create_user_org_code = #{itemto.object} and HOS.is_del = 0 and HOS.enabled=1) or (create_user_org_code = #{itemto.object} and hospitals.hosisdel = 0 and hospitals.hosenabled=1) </if> </when> <when test="inx == 4"> @@ -202,17 +202,17 @@ create_user_org_code like '${itemto.object}%' </if> <if test="!itemto.flag"> or (create_user_org_code like '${itemto.object}%' and HOS.is_del = 0 and HOS.enabled=1) or (create_user_org_code like '${itemto.object}%' and hospitals.hosisdel = 0 and hospitals.hosenabled=1) </if> </when> <when test="inx == 5"> <if test="itemto.flag"> AND HOS.create_user_id = #{itemto.object} hospitals.create_user_id = #{itemto.object} </if> <if test="!itemto.flag"> or (HOS.create_user_id = #{itemto.object} and HOS.is_del = 0 and HOS.enabled=1) or (hospitals.create_user_id = #{itemto.object} and hospitals.hosisdel = 0 and hospitals.hosenabled=1) </if> </when> <otherwise> @@ -258,7 +258,8 @@ HOS.create_time, HOS.is_del hosisdel, HOS.enabled hosenabled, ORG.id AS hosorgid ORG.id AS hosorgid, HOS.create_user_id FROM sys_hospital HOS LEFT JOIN sys_organization ORG ON HOS.org_id = ORG.id and ORG.is_del=0 kidgrow-config/src/main/resources/application-open.properties
New file @@ -0,0 +1,74 @@ # \u7EBF\u4E0A\u73AF\u5883 ########################## \u7EDF\u4E00\u53D8\u91CF\u914D\u7F6E ########################## ##### \u6570\u636E\u5E93\u914D\u7F6E kidgrow.datasource.ip=rm-2ze84sb2l40k33a034o.mysql.rds.aliyuncs.com kidgrow.datasource.username=yingdawangluo kidgrow.datasource.password=Yingdawangluo2020 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver ##### Redis\u914D\u7F6E # \u662F\u5426\u5F00\u542FRedis\u7F13\u5B58 true\u5F00\u542F false \u5173\u95ED spring.redis.open=true spring.redis.host=182.92.99.224 spring.redis.port=6379 spring.redis.password=kidgrow spring.redis.timeout=5000 #rabbitmq\u914D\u7F6E kidgrow.rabbitmq.host=182.92.99.224 kidgrow.rabbitmq.port=5672 kidgrow.rabbitmq.username=liuke kidgrow.rabbitmq.password=kidgrow2020 kidgrow.rabbitmq.exchangeName=BoneAgeEvaluation kidgrow.rabbitmq.queueName=test_queue kidgrow.rabbitmq.routingKeyName=Kidgrow2020 kidgrow.rabbitmq.virtual-host=kidgrow #\u963F\u91CCDruid\u914D\u7F6E kidgrow.druid.loginname=admin kidgrow.druid.loginpwd=123456 #eureka \u6CE8\u518C\u4E2D\u5FC3Url kidgrow.eureka.client.serviceUrl.defaultZone=http://172.17.97.143:9001/eureka/,http://172.17.64.228:9001/eureka/ kidgrow.eureka.instance.hostname=127.0.0.1 ##eureka client\u53D1\u9001\u5FC3\u8DF3\u7ED9server\u7AEF\u7684\u9891\u7387 eureka.instance.lease-renewal-interval-in-seconds=30 #eureka client\u95F4\u9694\u591A\u4E45\u53BB\u62C9\u53D6\u670D\u52A1\u6CE8\u518C\u4FE1\u606F\uFF0C\u9ED8\u8BA4\u4E3A30\u79D2\uFF0C\u5BF9\u4E8Eapi-gateway\uFF0C\u5982\u679C\u8981\u8FC5\u901F\u83B7\u53D6\u670D\u52A1\u6CE8\u518C\u72B6\u6001\uFF0C\u53EF\u4EE5\u7F29\u5C0F\u8BE5\u503C\uFF0C\u6BD4\u59825\u79D2 eureka.instance.lease-expiration-duration-in-seconds=30 ##### elasticsearch\u914D\u7F6E kidgrow.elasticsearch.cluster-name=Kidgrow kidgrow.elasticsearch.cluster-nodes=192.168.2.240 ##### sentinel\u914D\u7F6E kidgrow.sentinel.dashboard=127.0.0.1:6999 ##### fastDFS\u914D\u7F6E kidgrow.fdfs.web-url=127.0.0.1 kidgrow.fdfs.trackerList=${kidgrow.fdfs.web-url}:22122 ####\u963F\u91CCOSS\u914D\u7F6E kidgrow.oss.access-key=LTAI4FennfcwZupz3B6hkK3N kidgrow.oss.accessKeySecret=NzBBGe8SS41qJlp0nA3tlJ3t74lBZM kidgrow.oss.endpoint=oss-cn-beijing-internal.aliyuncs.com kidgrow.oss.bucketName=kidgrow kidgrow.oss.domain=http://open.oss.kidgrow.cloud/ ##### \u65E5\u5FD7\u94FE\u8DEF\u8FFD\u8E2A kidgrow.trace.enable=true ##### \u8D1F\u8F7D\u5747\u8861\u9694\u79BB(version\u9694\u79BB\uFF0C\u53EA\u9002\u7528\u4E8E\u5F00\u53D1\u73AF\u5883) kidgrow.ribbon.isolation.enabled=false ##### mybatis-plus\u6253\u5370\u5B8C\u6574sql(\u53EA\u9002\u7528\u4E8E\u5F00\u53D1\u73AF\u5883) mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl ##### \u5BA1\u8BA1\u65E5\u5FD7\u914D\u7F6E kidgrow.audit-log.enabled=true kidgrow.audit-log.log-type=db kidgrow.audit-log.datasource.driver-class-name=com.mysql.cj.jdbc.Driver kidgrow.audit-log.datasource.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center_${spring.profiles.active}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai kidgrow.audit-log.datasource.username=${kidgrow.datasource.username} kidgrow.audit-log.datasource.password=${kidgrow.datasource.password} ##### \u79FB\u52A8\u7AEF\u4E0A\u4F20\u5149\u7247Web\u5E94\u7528URL appUrl=http://open.upload.kidgrow.cloud/ kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -37,8 +37,8 @@ add-host-header: true host: # connectTimeoutMillis: 10000 socket-timeout-millis: 60000 connect-timeout-millis: 60000 socket-timeout-millis: 100000 connect-timeout-millis: 100000 routes: auth: path: /api-uaa/** @@ -198,7 +198,7 @@ execution: isolation: thread: timeoutInMilliseconds: 100000 timeoutInMilliseconds: 300000 kidgrow: oauth2: @@ -227,6 +227,7 @@ - /api-evaluation/evaluationxrayinfo/appSave - /api-file/baseUplaod - /api-user/users/python - /api-evaluation/evaluationxrayinfo/checkQRCode # - /api-user/syshospital/findAllByMap # - /api-user/sysdictionaries/findAll # - /api-user/sysdepartment/findListByHospitalId @@ -259,7 +260,8 @@ /api-evaluation/evaluationxrayinfo/appUpload, /api-evaluation/evaluationxrayinfo/appSave, /api-file/baseUplaod, /api-user/users/python /api-user/users/python, /api-evaluation/evaluationxrayinfo/checkQRCode # /api-user/syshospital/findAllByMap, # /api-user/sysdictionaries/findAll, # /api-user/sysdepartment/findListByHospitalId
