Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into baseCopy1

common/common-entity/sql记录

@@ -1035,12 +1035,12 @@ CREATE TABLE `base_doctor_patient_tmp` (
-- 2021-06-10
alter table base.base_service_package_item add column topic_item varchar(50) default null COMMENT '服务项所属专题(base_system_dict_entry remark字段) security 安防服务专题';
--2021-06-11
-- 2021-06-11
ALTER table base.base_security_monitoring_order add column topic_item varchar(50) default "preventLost" COMMENT '安防工单所属专题 base_system_dict_entry表service_item';
ALTER TABLE base.base_security_monitoring_order ADD INDEX idx_topIt(topic_item);
ALTER table base_capacity_assessment_record add column age tinyint(4) default  COMMENT '年龄';
ALTER table base_capacity_assessment_record add column age tinyint(4) default null  COMMENT '年龄';
ALTER TABLE base.base_doctor_patient_tmp MODIFY COLUMN  doctor_code varchar(50) DEFAULT NULL COMMENT 'type=(1,2,4为医生id) ';
@@ -1049,7 +1049,7 @@ ALTER TABLE base.base_doctor_patient_tmp ADD COLUMN org_code varchar(50) DEFAULT
ALTER TABLE base_security_monitoring_order add column scene_img VARCHAR(1000) default null COMMENT '工单发起时的现场照片';
--2021-06-21
-- 2021-06-21
ALTER table base_patient add column idcard_front varchar(1000) default NULL  COMMENT '身份证正面';
ALTER table base_patient add column idcard_back varchar(1000) default NULL  COMMENT '身份证反面';

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -2004,6 +2004,27 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
                return ObjEnvelop.getSuccess("修改成功！");
            }
            return ObjEnvelop.getError("手机号未注册！");
        }else if ("hz_yyyzh_wx".equalsIgnoreCase(wechatId)){
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyhospitalSysdictDao.findDictById("isNeedSMS");
            if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
                if (captcha.equalsIgnoreCase(wlyyHospitalSysDictDO.getDictValue())){
                }else {
                    return ObjEnvelop.getError("验证码错误！");
                }
            }else {
                if (wlyyRedisVerifyCodeService.verification(client_id, mobile, captcha)) {
                    //验证码正确
                } else {
                    return ObjEnvelop.getError("验证码错误！");
                }
            }
            String rs = registerService.updateDoctorPw(mobile,pw,wechatId);
            if("ok".equals(rs)){
                return ObjEnvelop.getSuccess("修改成功！");
            }
            return ObjEnvelop.getError("手机号未注册！");
        }else {
            return ObjEnvelop.getError("暂未开放");

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/dict/PrivateDictEndpoint.java

@@ -0,0 +1,78 @@
package com.yihu.jw.care.endpoint.dict;
import com.yihu.jw.dict.service.PrivateDictService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/***
 * @ClassName: PrivateDictEndpoint
 * @Description: 关于我们，隐私策略管理(杭州医养)
 * @Auther: shi kejing
 * @Date: 2021/6/23 14:40
 */
@RestController
@RequestMapping("/endpointEy" )
@Api(tags = "关于我们-隐私策略管理", description = "关于我们-隐私策略管理")
public class PrivateDictEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private PrivateDictService privateDictService;
    @ApiOperation("查询隐私策略")
    @PostMapping(value= "/findPrivateDictEy")
    public Envelop findPrivateDict(@ApiParam(name = "dictCode", value = "隐私code")
                                   @RequestParam(value = "dictCode", required = false) String dictCode,
                                   @ApiParam(name = "hospitalCode", value = "")
                                   @RequestParam(value = "hospitalCode", required = false) String hospitalCode){
        try {
            return success(privateDictService.findByHospitalCodeAndDictCode(dictCode));
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value= "/savePrivateDictEy")
    @ApiOperation("更新/新增隐私策略")
    public MixEnvelop savePrivateDict(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id", required = true)String id,
            @ApiParam(name = "dictCode", value = "dictCode", required = false)
            @RequestParam(value = "dictCode", required = false)String dictCode,
            @ApiParam(name = "dictName", value = "dictName", required = false)
            @RequestParam(value = "dictName", required = false)String dictName,
            @ApiParam(name = "dictValue", value = "dictValue", required = false)
            @RequestParam(value = "dictValue", required = false)String dictValue,
            @ApiParam(name = "hospitalCode", value = "hospitalCode", required = false)
            @RequestParam(value = "hospitalCode", required = false)String hospitalCode,
            @ApiParam(name = "hospitalName", value = "hospitalName", required = false)
            @RequestParam(value = "hospitalName", required = false)String hospitalName,
            @ApiParam(name = "imgUrl", value = "imgUrl", required = false)
            @RequestParam(value = "imgUrl", required = false)String imgUrl)throws Exception {
        try {
            MixEnvelop mixEnvelop =privateDictService.addPrivateDict(id,dictCode,dictName,dictValue,hospitalCode,hospitalName,imgUrl);
            return mixEnvelop;
        }catch (Exception e){
            return failedMixEnvelopException(e);
        }
    }
    @ApiOperation("删除隐私策略")
    @GetMapping(value= "/delPrivateDictEy")
    public MixEnvelop delPrivateDict(@ApiParam(name = "id", value = "id", required = true)
                                     @RequestParam(value = "id", required = true)String id){
        try {
            MixEnvelop mixEnvelop =privateDictService.deleteById(id);
            return mixEnvelop;
        }catch (Exception e){
            return failedMixEnvelopException(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/security/SecurityMonitoringOrderEndpoint.java

@@ -295,9 +295,11 @@ public class SecurityMonitoringOrderEndpoint extends EnvelopRestEndpoint {
    @RequestMapping(value = "patientMonitoringInfo", method = {RequestMethod.POST, RequestMethod.GET})
    @ResponseBody
    public ObjEnvelop patientMonitoringInfo(@ApiParam(name = "patient", value = "patient")
                                @RequestParam(value = "patient") String patient) {
                                @RequestParam(value = "patient") String patient,
                                @ApiParam(name = "topicItem", value = "专题code,security安防相关专题", required = false)
                                @RequestParam(value = "topicItem",required = false,defaultValue = "preventLost") String topicItem) {
        try {
            return ObjEnvelop.getSuccess( "查询成功", securityMonitoringOrderService.patientMonitoringInfo(patient));
            return ObjEnvelop.getSuccess( "查询成功", securityMonitoringOrderService.patientMonitoringInfo(patient,topicItem));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/ConsultService.java

@@ -221,7 +221,7 @@ public class ConsultService {
            sql += " and a.id = '" + id + "'";
        }
        sql += " ORDER BY a.czrq desc ";
        sql += " GROUP BY a.id ORDER BY a.czrq desc ";
        logger.info("sql="+sql);
        List<Map<String,Object>> result = hibenateUtils.createSQLQuery(sql,page,pagesize);
        Map<String,Integer> unreadNum = new HashedMap();

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/DoctorDoorCoachOrderService.java

@@ -368,6 +368,7 @@ public class DoctorDoorCoachOrderService {
            object.put("doctorName", doorServiceOrder.getDoctorName());
            object.put("doctorType", doorServiceOrder.getDoctorType());
            object.put("type", doorServiceOrder.getType());
            object.put("orderType", 21);
            jsonArray.add(object);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java

@@ -640,8 +640,9 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
            logger.error(failMsg);
            return result;
        }
        doorServiceOrderDO.setRemark(remark);
        if (StringUtils.isNotBlank(remark)&&!"null".equals(remark)){
            doorServiceOrderDO.setRemark(remark);
        }
        doorServiceOrderDO.setDoctor(doctor);
        doorServiceOrderDO.setDoctorName(doctorName);
        doorServiceOrderDO.setDoctorType(doctorJobName);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -315,6 +315,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                JSONObject monitorUrl = ysDeviceServicel.getDeviceLiveAddress(orderDO.getPatient(),devicePatientDeviceDos.get(0).getDeviceSn(),1,null);
                Map<String,Object> map = new HashMap<>();
                map.put("monitorInfoStatus",monitorUrl.getIntValue(ResponseContant.resultFlag));
                map.put("patientAddress",devicePatientDeviceDos.get(0).getSosAddress());
                if (monitorUrl.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                    map.put("monitorInfo",monitorUrl.getString(ResponseContant.resultMsg));
                }
@@ -479,7 +480,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                "where 1=1 ";
        String fliter = "  ";
        String sql = " select p.id patientCode,p.name,p.sex,p.photo,p.idcard,ord.id orderId,ord.number,ord.serve_desc,ord.create_time,ord.`status`,ord.doctor," +
                "ord.doctor_name,ord.patient_phone,ord.conclusion_status from base_security_monitoring_order ord INNER JOIN base_patient p on p.id = ord.patient " +
                "ord.doctor_name,ord.update_user,ord.update_user_name,ord.patient_phone,ord.conclusion_status from base_security_monitoring_order ord INNER JOIN base_patient p on p.id = ord.patient " +
                "where 1=1 ";
        if (StringUtils.isNotBlank(doctor)){
            fliter+=" and  EXISTS ( SELECT 1 from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i ," +
@@ -532,6 +533,10 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            }
            tmp.put("conclusionStatusName",conclusionStatusName);
            Integer statustemp = Integer.valueOf(one.get("status")+"");
            if (-2==statustemp||-1==statustemp){
                tmp.put("doctor",one.get("update_user"));
                tmp.put("doctorName",one.get("update_user_name"));
            }
            String statusName = "";
            switch (statustemp){
                case -2:statusName="误警报";break;
@@ -540,7 +545,6 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                case 1:statusName="申请中";break;
            }
            tmp.put("statusName",statusName);
            result.add(tmp);
            Integer age  = IdCardUtil.getAgeForIdcard(tmp.getString("idcard"));
            tmp.put("age",age);
            //患者设备
@@ -551,6 +555,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            else {
                tmp.put("deviceFlag","0");
            }
            result.add(tmp);
        }
        return PageEnvelop.getSuccessListWithPage("success",result,page,pageSize,count);
    }
@@ -1094,7 +1099,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        return result;
    }
    public JSONObject patientMonitoringInfo(String patient){
    public JSONObject patientMonitoringInfo(String patient,String topicItem){
        JSONObject result = new JSONObject();
        result.put("location",null);
        result.put("fences",null);
@@ -1102,74 +1107,79 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        result.put("fire",null);
        result.put("deviceSn",null);
        result.put("monitorInfo",null);
        List<DevicePatientDevice> devicePatientDeviceDos = patientDeviceDao.findByUserAndCategoryCode(patient,"4");
        if (devicePatientDeviceDos.size()==0){
        }
        else {
            DevicePatientDevice device = devicePatientDeviceDos.get(0);
            result.put("deviceSn",device.getDeviceSn());
            try {
             JSONObject response= patientDeviceService.getAqgDeviceInfo(device.getDeviceSn());
             if (response!=null){
                 //定位信息
                if (response.containsKey("last_location")&&response.get("last_location")!=null){
                    JSONObject locationTmp = response.getJSONObject("last_location");
                    Double lon = locationTmp.getJSONArray("coordinates").getDouble(0);
                    Double lat = locationTmp.getJSONArray("coordinates").getDouble(1);
                    JSONObject tmp = gpsUtil.gcj02_To_Bd09(lat,lon);
                    tmp.put("city",response.getString("last_city"));
                    tmp.put("province",response.getString("last_province"));
                    tmp.put("address",response.getString("last_address"));
                    result.put("location",tmp);
                }
                //围栏信息
                 if (response.containsKey("fences")&&response.get("fences")!=null){
                     JSONArray fencesArr = response.getJSONArray("fences");
                     JSONArray fencesEnables = new JSONArray();
                     for (int i=0;i<fencesArr.size();i++){
                         JSONObject tmp = fencesArr.getJSONObject(i);
                         if (tmp.getBooleanValue("enable")){//围栏生效
                            JSONObject fenceTmp = new JSONObject();
                            fenceTmp.put("fenceNO",tmp.getInteger("seqid").toString());
                            fenceTmp.put("name",tmp.getString("name"));
                            JSONArray fenceLocationTmp = tmp.getJSONObject("safe_area").getJSONArray("coordinates").getJSONArray(0);
                            JSONArray fenceLocation = new JSONArray();
                            for (int j=0;j<fenceLocationTmp.size();j++){
                                Double lon = fenceLocationTmp.getJSONArray(j).getDouble(0);
                                Double lat = fenceLocationTmp.getJSONArray(j).getDouble(1);
                                JSONObject positionTmp = gpsUtil.gcj02_To_Bd09(lat,lon);
                                fenceLocation.add(positionTmp);
        if ((StringUtils.isNotBlank(topicItem)&&"preventLost".equals(topicItem))||null==topicItem){
            List<DevicePatientDevice> devicePatientDeviceDos = patientDeviceDao.findByUserAndCategoryCode(patient,"4");
            if (devicePatientDeviceDos.size()==0){
            }
            else {
                DevicePatientDevice device = devicePatientDeviceDos.get(0);
                result.put("deviceSn",device.getDeviceSn());
                try {
                    JSONObject response= patientDeviceService.getAqgDeviceInfo(device.getDeviceSn());
                    if (response!=null){
                        //定位信息
                        if (response.containsKey("last_location")&&response.get("last_location")!=null){
                            JSONObject locationTmp = response.getJSONObject("last_location");
                            Double lon = locationTmp.getJSONArray("coordinates").getDouble(0);
                            Double lat = locationTmp.getJSONArray("coordinates").getDouble(1);
                            JSONObject tmp = gpsUtil.gcj02_To_Bd09(lat,lon);
                            tmp.put("city",response.getString("last_city"));
                            tmp.put("province",response.getString("last_province"));
                            tmp.put("address",response.getString("last_address"));
                            result.put("location",tmp);
                        }
                        //围栏信息
                        if (response.containsKey("fences")&&response.get("fences")!=null){
                            JSONArray fencesArr = response.getJSONArray("fences");
                            JSONArray fencesEnables = new JSONArray();
                            for (int i=0;i<fencesArr.size();i++){
                                JSONObject tmp = fencesArr.getJSONObject(i);
                                if (tmp.getBooleanValue("enable")){//围栏生效
                                    JSONObject fenceTmp = new JSONObject();
                                    fenceTmp.put("fenceNO",tmp.getInteger("seqid").toString());
                                    fenceTmp.put("name",tmp.getString("name"));
                                    JSONArray fenceLocationTmp = tmp.getJSONObject("safe_area").getJSONArray("coordinates").getJSONArray(0);
                                    JSONArray fenceLocation = new JSONArray();
                                    for (int j=0;j<fenceLocationTmp.size();j++){
                                        Double lon = fenceLocationTmp.getJSONArray(j).getDouble(0);
                                        Double lat = fenceLocationTmp.getJSONArray(j).getDouble(1);
                                        JSONObject positionTmp = gpsUtil.gcj02_To_Bd09(lat,lon);
                                        fenceLocation.add(positionTmp);
                                    }
                                    fenceTmp.put("location",fenceLocation);
                                    fenceTmp.put("inFenceStatus",countDistance.isInPolygon(result.getJSONObject("location").getDouble("lon"),result.getJSONObject("location").getDouble("lat"),fenceLocation));
                                    fencesEnables.add(fenceTmp);
                                }
                            }
                            fenceTmp.put("location",fenceLocation);
                            fenceTmp.put("inFenceStatus",countDistance.isInPolygon(result.getJSONObject("location").getDouble("lon"),result.getJSONObject("location").getDouble("lat"),fenceLocation));
                            fencesEnables.add(fenceTmp);
                         }
                     }
                     if (fencesEnables.size()>0){
                         result.put("fences",fencesEnables);
                     }
                 }
             }
            }catch (Exception e){
                e.printStackTrace();
                result.put("location",null);
                            if (fencesEnables.size()>0){
                                result.put("fences",fencesEnables);
                            }
                        }
                    }
                }catch (Exception e){
                    e.printStackTrace();
                    result.put("location",null);
                }
            }
        }
        devicePatientDeviceDos = patientDeviceDao.findByUserAndCategoryCode(patient,"12");
        if (devicePatientDeviceDos.size()==0){
        }
        else{
            try {
                JSONObject monitorUrl = ysDeviceServicel.getDeviceLiveAddress(patient,devicePatientDeviceDos.get(0).getDeviceSn(),1,null);
                result.put("monitorInfoStatus",monitorUrl.getIntValue(ResponseContant.resultFlag));
                if (monitorUrl.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                    result.put("monitorInfo",monitorUrl.getString(ResponseContant.resultMsg));
                }
                else {
                    result.put("monitorInfo",monitorUrl.getJSONObject(ResponseContant.resultMsg));
        if ((StringUtils.isNotBlank(topicItem)&&"preventFall".equals(topicItem))||null==topicItem){
            List<DevicePatientDevice> devicePatientDeviceDos = patientDeviceDao.findByUserAndCategoryCode(patient,"12");
            if (devicePatientDeviceDos.size()==0){
            }
            else{
                try {
                    JSONObject monitorUrl = ysDeviceServicel.getDeviceLiveAddress(patient,devicePatientDeviceDos.get(0).getDeviceSn(),1,null);
                    result.put("monitorInfoStatus",monitorUrl.getIntValue(ResponseContant.resultFlag));
                    result.put("patientAddress",devicePatientDeviceDos.get(0).getSosAddress());
                    if (monitorUrl.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail){
                        result.put("monitorInfo",monitorUrl.getString(ResponseContant.resultMsg));
                    }
                    else {
                        result.put("monitorInfo",monitorUrl.getJSONObject(ResponseContant.resultMsg));
                    }
                }catch (Exception e){
                    e.printStackTrace();
                }
            }catch (Exception e){
                e.printStackTrace();
            }
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -183,7 +183,7 @@ public class PatientInfoPlatFormService {
     * @return
     */
    public JSONObject getPatientMonitoringInfo(String patient){
        return securityMonitoringOrderService.patientMonitoringInfo(patient);
        return securityMonitoringOrderService.patientMonitoringInfo(patient,null);
    }
    /**

svr/svr-cloud-care/src/main/resources/application.yml

@@ -456,7 +456,7 @@ es:
  type:
    Statistics: hlw_quota_prod
    FollowUpContent: wlyy_followup_content
  host:  http://10.18.43.40:9000
  host:  http://10.18.43.40:9200
  tHost: 10.18.43.40:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr

svr/svr-cloud-device/src/main/resources/application.yml

@@ -272,12 +272,12 @@ cloudCare:
  url: http://ehr.yihu.com/hlwyy/cloudCare/
---
spring:
  profiles: jwprod
  profiles: hzprod
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.16.1.42:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: im
    password: 2oEq3Kf7
    url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: wlyy
    password: '0XxS3W*!cRj'
#  elasticsearch:
#    cluster-name: jkzl #集群名 默认elasticsearch
#    cluster-nodes: 192.0.33.26:9200 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -287,17 +287,17 @@ spring:
#      connection-timeout: 60000 # Connection timeout in milliseconds.
#      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://59.61.92.90:9103
    user: jkzl
    password: jkzlehr
    broker-url: tcp://10.18.43.41:61616
    user: admin
    password: admin
  redis:
    host: 192.0.33.26 # Redis server host.
    port: 6390 # Redis server port.
    host: 10.18.43.40 # Redis server host.
    port: 6379 # Redis server port.
    password: Kb6wKDQP1W4
fastDFS:
  fastdfs_file_url: https://hlwyy.xmzsh.com/fastdfs/
  fastdfs_file_url: http://10.18.43.40:80/
fast-dfs:
  tracker-server: 192.0.33.26:22122 #服务器地址
  tracker-server: 10.18.43.40:22122 #服务器地址
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP #todo 待配置
@@ -310,33 +310,33 @@ demo:
pay:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  url: https://wx.sh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
wechat:
  appId: wxd03f859efdf0873d
  appSecret: 2935b54b53a957d9516c920a544f2537
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  appId: wxd03f873d
  appSecret: 2935b54b53a950a544f2537
  wechat_token: 27eb3bb24f1bb154b08040
  wechat_base_url: http%3a%n%2fwlyy-dev
  accId: gh0fb21
  id: ijk  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
im:
  im_list_get: http://172.26.0.105:3000/
  im_list_get: http://127.0.0.0:3000/
  data_base_name: im_internet_hospital
es:
  pwflag: 1 # 1需要密码，2不需要密码
  index:
    Statistics: hlw_quota_test
    Statistics: hlw_quota_prod
    FollowUp: wlyy_followup
  type:
    Statistics: hlw_quota_test
    Statistics: hlw_quota_prod
    FollowUpContent: wlyy_followup_content
  host:  http://172.26.0.55:9000
  tHost: 172.26.0.55:9300
  host:  http://10.18.43.40:9000
  tHost: 10.18.43.40:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
@@ -352,19 +352,22 @@ FileTempPath:
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
  remote_inner_url: 172.13/open/fileUpload/upload_stream
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://www.xest/
qywx:
  url: https://hlwyy.xmzsh.com/hlwyy
  url: https://hlwyhlwyy
  id: zsyy
express:
  sf_url: https://mrds-admin.sf-express.com:443
  sf_url: https://mrds-adpress.com:443
  sf_code: WH000102
  sf_check_word: TGUQASFNAZyjt9112
baiduApi:
  AK: 0vjnCSReegE7A47a941ohjv9a07ONiMC
  url: http://api.map.baidu.com/
cloudCare:
  url: http://127.0.0.1:10301/

svr/svr-statistics-es/doc/es/命令建索引.txt

@@ -0,0 +1,10 @@
curl -XPUT http://10.18.43.40:9200/hlw_quota_prod
curl -XPUT http://10.18.43.40:9200/hlw_quota_prod/_mapping/hlw_quota_prod?pretty -d '{"properties": {
"deptName": {"type": "string",    "index": "not_analyzed"},  "city": {"type": "string",    "index": "not_analyzed"},  "slaveKey4Name": {"type": "string",  "index": "not_analyzed"},  "doctorName": {"type": "string",  "index": "not_analyzed"},  "cityName": {"type": "string",  "index": "not_analyzed"},
  "areaLevel": {"type": "string",  "index": "not_analyzed"},  "hospital": {"type": "string",  "index": "not_analyzed"},  "slaveKey3Name": {  "type": "string",  "index": "not_analyzed"},  "quotaDate": {
  "type": "date"},  "quotaCode": {  "type": "string",  "index": "not_analyzed"},  "result2": {  "type": "double"},  "result1": {  "type": "double"},  "slaveKey1": {  "type": "string",  "index": "not_analyzed"},  "slaveKey2": {  "type": "string",  "index": "not_analyzed"},  "townName": {  "type": "string",  "index": "not_analyzed"
},  "slaveKey3": {  "type": "string",  "index": "not_analyzed"},  "slaveKey4": {  "type": "string",  "index": "not_analyzed"},  "town": {  "type": "string",  "index": "not_analyzed"
},  "slaveKey2Name": {  "type": "string",  "index": "not_analyzed"},  "timeLevel": {  "type": "string",  "index": "not_analyzed"},  "dept": {  "type": "string",  "index": "not_analyzed"},  "hospitalName": {  "type": "string",  "index": "not_analyzed"
},  "doctor": {  "type": "string",  "index": "not_analyzed"},  "createTime": {  "type": "date"},  "slaveKey1Name": {  "type": "string",  "index": "not_analyzed"}}
}'

svr/svr-statistics-es/doc/es/统计新增索引.txt

@@ -1,114 +1,114 @@
创建索引
POST  http://172.19.103.68:9200/hlw_quota_test
POST  http://172.19.103.68:9200/hlw_quota_prod
查询索引
GET http://172.19.103.68:9200/hlw_quota_test/
GET http://172.19.103.68:9200/hlw_quota_prod/
给索引加mapping
POST http://172.19.103.68:9200/hlw_quota_test/hlw_quota_test/_mapping
POST http://172.19.103.68:9200/hlw_quota_prod/hlw_quota_prod/_mapping
{
    "hlw_quota_test": {
            "properties": {
                "quotaCode": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "city": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "cityName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "town": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "townName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "hospital": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "hospitalName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "dept": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "deptName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "doctor": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "doctorName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey1": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey1Name": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey2": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey2Name": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey3": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey3Name": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey4": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey4Name": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "areaLevel": {
                    "type": "string",
                    "index": "not_analyzed"
                }, 
               "timeLevel": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "result1": {
                    "type": "double"
                },
                "result2": {
                    "type": "double"
                },
                "quotaDate": {
                    "type": "date"
                },
                "createTime": {
                    "type": "date"
                }
    "hlw_quota_prod": {
        "properties": {
            "deptName": {
                "type": "string",
                "index": "not_analyzed"
            },
              "city": {
                "type": "string",
                "index": "not_analyzed"
            },
              "slaveKey4Name": {
              "type": "string",
              "index": "not_analyzed"
            },
              "doctorName": {
              "type": "string",
              "index": "not_analyzed"
            },
              "cityName": {
              "type": "string",
              "index": "not_analyzed"
            },
              "areaLevel": {
              "type": "string",
              "index": "not_analyzed"
            },
              "hospital": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey3Name": {
              "type": "string",
              "index": "not_analyzed"
            },
              "quotaDate": {
              "type": "date"
            },
              "quotaCode": {
              "type": "string",
              "index": "not_analyzed"
            },
              "result2": {
              "type": "double"
            },
              "result1": {
              "type": "double"
            },
              "slaveKey1": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey2": {
              "type": "string",
              "index": "not_analyzed"
            },
              "townName": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey3": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey4": {
              "type": "string",
              "index": "not_analyzed"
            },
              "town": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey2Name": {
              "type": "string",
              "index": "not_analyzed"
            },
              "timeLevel": {
              "type": "string",
              "index": "not_analyzed"
            },
              "dept": {
              "type": "string",
              "index": "not_analyzed"
            },
              "hospitalName": {
              "type": "string",
              "index": "not_analyzed"
            },
              "doctor": {
              "type": "string",
              "index": "not_analyzed"
            },
              "createTime": {
              "type": "date"
            },
              "slaveKey1Name": {
              "type": "string",
              "index": "not_analyzed"
            }
          }
        }
  }
增加索引搜索大小
PUT  http://172.19.103.68:9200/hlw_quota_test/_settings
PUT  http://172.19.103.68:9200/hlw_quota_prod/_settings
{
  "index": {
    "max_result_window": 500000

svr/svr-statistics-es/doc/业务文档/命令行处理.txt

@@ -0,0 +1,13 @@
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=28'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=29'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=30'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=34'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=35'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=36'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=42'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=8'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startNowById?id=8'

svr/svr-statistics-es/src/main/resources/application-prod.yml

@@ -1,24 +1,24 @@
spring:
  profiles: jwprod
  profiles: hzprod
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    primaryReadWrite:
      url: jdbc:mysql://192.0.33.27:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: im
      password: 2oEq3Kf7
      url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: '0XxS3W*!cRj'
    primaryRead:
      url: jdbc:mysql://192.0.33.27:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: im
      password: 2oEq3Kf7
      url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: '0XxS3W*!cRj'
    im: #im库:
      url: jdbc:mysql://192.0.33.27:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: im
      password: 2oEq3Kf7
      url: jdbc:mysql://10.18.43.40:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: '0XxS3W*!cRj'
  redis:
    host: 192.0.33.26 # Redis server host.
    port: 6390 # Redis server port.
    host: 10.18.43.40 # Redis server host.
    port: 6379 # Redis server port.
    password: Kb6wKDQP1W4
  followupMessage:
@@ -32,15 +32,17 @@ es:
  pwflag: 1 # 1需要密码，0不需要密码
  index: hlw_quota_prod
  type: hlw_quota_prod
  host:  http://192.0.33.26:9200
  tHost: 192.0.33.26:9300
  host:  http://10.18.43.40:9200
  tHost: 10.18.43.40:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
wlyy:
  im:
    databaseName: im
    databaseName: im_internet_hospital
quartz:
  name: schedulerFactoryBean_es_prod