forked from kidgrow-microservices-platform

zhaoxiaohao
2020-12-09 b92f672511421c4f1b673242ef6ac5b186d10d1a
Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
1 files added
8 files modified
121 ■■■■■ changed files
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java 4 ●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java 2 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/HospitalScreeningMapper.java 13 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IHospitalScreeningService.java 11 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/HospitalScreeningServiceImpl.java 49 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml 7 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/RedisStartupRunner.java 19 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java 10 ●●●●● patch | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/screeningHospital_form.html 6 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/AliyunOSSAutoConfigure.java
@@ -149,6 +149,10 @@
                    fileFolder += "HospitalLogo/";
                } else if (imgType.toLowerCase().equals("doctor")) {
                    fileFolder += "DoctorImage/";
                } else if (imgType.toLowerCase().equals("customerhospital")) {
                    fileFolder += "Customer/Hospital/" + folderByDate + "/";
                } else if (imgType.toLowerCase().equals("customerhead")) {
                    fileFolder += "Customer/HeadImg/" + folderByDate + "/";
                } else {
                    fileFolder += "OtherImage/" + folderByDate + "/";
                }
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
@@ -1,5 +1,6 @@
package com.kidgrow.oprationcenter.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -83,5 +84,6 @@
    /**
     * 查询关键字
     */
    @TableField(exist = false)
    private String keyWord;
}
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/HospitalScreeningMapper.java
@@ -10,15 +10,17 @@
/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @version 1.0
 * @Description: 筛查医院信息表-未完待续<br>
 * @Project: 用户中心<br>
 * @CreateDate: Created in 2020-04-01 09:37:05 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 * @version 1.0
 */
public interface HospitalScreeningMapper extends SuperMapper<HospitalScreening> {
    /**
     * 分页查询筛查医院信息表-未完待续列表
     *
     * @param page
     * @param params
     * @return
@@ -27,6 +29,7 @@
    /**
     * 根据HospitalScreening对象当做查询条件进行查询
     *
     * @param
     * @return HospitalScreening对象
     */
@@ -34,8 +37,16 @@
    /**
     * 根据医院名称模糊查询医院数据列表
     *
     * @param hospitalName
     * @return
     */
    List<HospitalScreening> findByName(@Param("hospitalName") String hospitalName);
    /**
     * 查询所有有效医院,放入redis中
     *
     * @return
     */
    List<HospitalScreening> findAll();
}
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IHospitalScreeningService.java
@@ -54,10 +54,21 @@
    /**
     * 导出医院数据
     *
     * @param param 参数
     * @return
     */
    List<ScreeningHospitalDataExcel> export(Map<String, Object> param);
    /**
     * 医院数据放到redis
     */
    void tableToRedis();
    /**
     * @param hospitalScreening
     */
    void updateRedisById(HospitalScreening hospitalScreening);
}
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/HospitalScreeningServiceImpl.java
@@ -9,6 +9,7 @@
import com.kidgrow.oprationcenter.model.HospitalScreening;
import com.kidgrow.oprationcenter.model.ScreeningHospitalDataExcel;
import com.kidgrow.oprationcenter.service.IHospitalScreeningService;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.report.feign.ReportService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
@@ -20,11 +21,12 @@
/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @version 1.0
 * @Description: 筛查医院信息表-未完待续<br>
 * @Project: 用户中心<br>
 * @CreateDate: Created in 2020-04-01 09:37:05 <br>
 * @Author: <a href="4345453@kidgrow.com">liuke</a>
 * @version 1.0
 */
@Slf4j
@Service
@@ -32,9 +34,14 @@
    @Autowired
    private ReportService reportService;
    @Autowired
    private RedisUtils redisUtils;
    private static final String CUSOTMERHOSPITAL = "CUSOTMER_HOSPITAL";
    /**
     * 列表
     *
     * @param params
     * @return
     */
@@ -47,6 +54,7 @@
    /**
   * 根据HospitalScreening对象当做查询条件进行查询
     *
   * @param hospitalScreening
   * @return HospitalScreening
   */
@@ -57,6 +65,7 @@
    /**
     * 更新状态:推送装填,启停状态
     *
     * @param params 包含:1、type:0推送,1启停
     *                     2、ID :ID
     *                     3、val:对用的值
@@ -87,11 +96,14 @@
        int count = baseMapper.updateById(hospitalScreening);
        updateRedisById(hospitalScreening);
        return count > 0 ? ResultBody.ok().msg("更新成功") : ResultBody.failed("更新失败");
    }
    /**
     * 根据医院名称模糊查询医院数据列表
     *
     * @param hospitalName
     * @return
     */
@@ -100,6 +112,12 @@
        return ResultBody.ok().data(baseMapper.findByName(hospitalName)).msg("查询成功");
    }
    /**
     * 医院数据导出
     *
     * @param param 参数
     * @return
     */
    @Override
    public List<ScreeningHospitalDataExcel> export(Map<String, Object> param) {
        List<ScreeningHospitalDataExcel> list = null;
@@ -109,4 +127,33 @@
        }
        return list;
    }
    /**
     * 初始化,将表中的数据放入redis中
     */
    @Override
    public void tableToRedis() {
        List<HospitalScreening> list = baseMapper.findAll();
        if (list.size() > 0) {
            if (redisUtils.hasKey(CUSOTMERHOSPITAL)) {
                redisUtils.del(CUSOTMERHOSPITAL);
            }
            for (HospitalScreening hs : list) {
                redisUtils.hset(CUSOTMERHOSPITAL, String.valueOf(hs.getId()), hs);
            }
        }
    }
    /**
     * 更新redis
     *
     * @param hospitalScreening
     */
    @Override
    public void updateRedisById(HospitalScreening hospitalScreening) {
        if (redisUtils.hasKey(CUSOTMERHOSPITAL)) {
            redisUtils.hset(CUSOTMERHOSPITAL, String.valueOf(hospitalScreening.getId()), hospitalScreening);
        }
    }
}
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
@@ -98,4 +98,11 @@
        where is_del=0 and enabled=1 and hospital_name LIKE concat('%',#{hospitalName},'%')
        order by hospital_name desc,id desc
    </select>
    <select id="findAll" resultType="com.kidgrow.oprationcenter.model.HospitalScreening">
        select
        <include refid="Column_List"/>
        from hospital_screening
        where  is_del=0
    </select>
</mapper>
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/RedisStartupRunner.java
New file
@@ -0,0 +1,19 @@
package com.kidgrow.oprationcenter.config;
import com.kidgrow.oprationcenter.service.IHospitalScreeningService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@Component //作为bean加入spring
@Order(value = 2)//多个启动任务的执行顺序
public class RedisStartupRunner implements CommandLineRunner {
    @Autowired
    IHospitalScreeningService hospitalScreeningService;
    @Override
    public void run(String... args) throws Exception {
        hospitalScreeningService.tableToRedis();
    }
}
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/HospitalScreeningController.java
@@ -28,6 +28,7 @@
/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
 *
 * @Description: 筛查医院信息表-未完待续
 * @Project: 运营中心
 * @CreateDate: Created in 2020-04-02 18:25:34 <br>
@@ -101,10 +102,12 @@
                }
            }
            boolean v= hospitalScreeningService.saveOrUpdate(hospitalScreening);
            //更新redis
            hospitalScreeningService.updateRedisById(hospitalScreening);
            if(v) {
                return ResultBody.ok().data(hospitalScreening).msg("保存成功");
            }
            else {
            } else {
                return ResultBody.failed().msg("保存失败");
            }
        }
@@ -119,8 +122,7 @@
        boolean v= hospitalScreeningService.removeById(id);
        if(v) {
            return ResultBody.ok().msg("删除成功");
        }
        else {
        } else {
            return ResultBody.failed().msg("删除失败");
        }
    }
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/screeningHospital_form.html
@@ -133,12 +133,13 @@
        //上传二维码
        upload.render({
            elem: '#qr',
            url: config.base_server + 'api-file/files-anon',
            url: config.base_server + 'api-file/files-upload',
            accept: 'file',
            auto: true,
            headers: {
                "Authorization": "Bearer " + config.getToken().access_token
            },
            data:{"imgType":"customerhospital"},
            before: function (obj) {
                layer.load(); //上传loading
                //预读本地文件示例,不支持ie8
@@ -160,12 +161,13 @@
        //微站首页图片
        upload.render({
            elem: '#phonto',
            url: config.base_server + 'api-file/files-anon',
            url: config.base_server + 'api-file/files-upload',
            accept: 'file',
            auto: true,
            headers: {
                "Authorization": "Bearer " + config.getToken().access_token
            },
            data:{"imgType":"customerhospital"},
            before: function (obj) {
                layer.load(); //上传loading
                //预读本地文件示例,不支持ie8