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

common/common-entity/sql/2023.sql

@@ -2,4 +2,6 @@
ALTER TABLE wlyy_patient_device_location ADD city varchar(20) COMMENT '城市' ;
ALTER TABLE wlyy_patient_device_location ADD city_name varchar(20) COMMENT '城市名称' ;
ALTER TABLE wlyy_patient_device_location ADD town varchar(20) COMMENT '地区' ;
ALTER TABLE wlyy_patient_device_location ADD town_name varchar(20) COMMENT '地区名称' ;
ALTER TABLE wlyy_patient_device_location ADD town_name varchar(20) COMMENT '地区名称' ;
ALTER TABLE wlyy_knowledge_article_dict ADD url varchar(500) COMMENT '外链地址' ;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/wechat/WechatCoreController.java

@@ -6,11 +6,14 @@ import com.yihu.jw.care.service.wechat.WeiXinCoreService;
import com.yihu.jw.entity.base.wx.WxAccessTokenDO;
import com.yihu.jw.entity.base.wx.WxTemplateConfigDO;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.util.wechat.WeixinMessagePushUtils;
import com.yihu.jw.wechat.dao.WxPushLogDao;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +29,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.*;
/*
 * Created by lyr on 2016/08/11.
@@ -193,4 +196,26 @@ public class WechatCoreController extends EnvelopRestEndpoint {
        return s;
    }
    public static void main(String[] args) {
        HttpClientUtil httpClientUtil = new HttpClientUtil();
        String url = "http://127.0.0.1:8080/doctor/application/getfyJson";
        List<NameValuePair> params = new ArrayList<>();
        params.add(new BasicNameValuePair("type", "2"));
        params.add(new BasicNameValuePair("size", "20"));
        Map<String,Object> headerMap = new HashMap<>();
        headerMap.put("user-agent","{\"uid\":\"admin\",\"imei\":\"admin_imei\",\"admin_token\":\"0a5c5258-8863-4b07-a3f9-88c768528ab4\",\"token\":\"\"}");
        for (int i = 0; i < 1000 ; i++) {
            System.out.println("第"+(i+1)+"次");
            String response = httpClientUtil.headerPost(url, params, "UTF-8",headerMap);
            System.out.println(response);
            if (!com.alibaba.fastjson.JSONObject.parseObject(response).get("msg").equals("成功")) {
                System.out.println("---------异常");
                break;
            }
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/monitorPlatform/MonitorPlatformController.java

@@ -10,7 +10,6 @@ import com.yihu.iot.service.equipment.IotEqtDetailService;
import com.yihu.iot.service.monitorPlatform.CopdXeekDeviceService;
import com.yihu.iot.service.monitorPlatform.MonitorPlatformService;
import com.yihu.iot.service.product.IotProductBaseInfoService;
import com.yihu.jw.entity.care.message.BaseServiceNews;
import com.yihu.jw.entity.iot.device.IotPatientDeviceDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.restmodel.iot.device.IotPatientDeviceVO;
@@ -172,6 +171,26 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
        }
    }
    @RequestMapping(value = "open/smartDeviceDistribution", method = RequestMethod.GET)
    @ApiOperation("智能设备发放")
    public MixEnvelop openSmartDeviceDistribution(@ApiParam(name = "startTime", value = "开始时间", defaultValue = "")
                                              @RequestParam(value = "startTime", required = false) String startTime,
                                              @ApiParam(name = "endTime", value = "结束时间", defaultValue = "")
                                              @RequestParam(value = "endTime", required = false) String endTime,
                                              @ApiParam(name = "deviceType", value = "设备类型", defaultValue = "")
                                              @RequestParam(value = "deviceType", required = false) String deviceType,
                                              @ApiParam(name = "area", value = "地区", defaultValue = "")
                                              @RequestParam(value = "area", required = false) String area,
                                              @ApiParam(name = "hospital", value = "机构", defaultValue = "")
                                              @RequestParam(value = "hospital", required = false) String hospital) {
        try {
            return MixEnvelop.getSuccess("查询成功", monitorPlatformService.smartDeviceDistribution(startTime, endTime, deviceType, area, hospital));
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError("查询失败");
        }
    }
    @RequestMapping(value = "/datafiltering", method = RequestMethod.GET)
    @ApiOperation("数据筛选")
    public MixEnvelop datafiltering(@ApiParam(name = "name", value = "设备sn码或居民姓名")